From 342d2e7f208f131f6405aa482216a50ffafa78d7 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sun, 11 Oct 2026 14:45:57 -0400 Subject: [PATCH 001/174] fix: the Steam client download resumes, retries and shows megabytes A first run downloads the native client, about 360 MB in 17 parts, before anything is on screen. The script ran plain `curl -fsSL` per part: no timeout, no retry, no progress. A stalled connection could wait for ever on "downloading Steam: bins_linuxarm64_linuxarm64 (2/17)" (a 110 MB part), a failed one ended the session and threw away everything fetched, and the loading screen said "~1-2 min" while counting parts, not bytes. Parts now go to package/droiddeck-download and stay there until the client is installed. Each one resumes from the bytes on disk (curl -C -), a transfer under 4 KB/s for a minute is dropped and resumed, attempts without progress back off 5-30 s before giving up, and a finished part is marked unpacked so a later session skips it. Bytes that fail their checksum are fetched whole again; a server that will not resume starts the part over; parts left for another client version are dropped. A repair redoes every part once and keeps what an interrupted repair redid. Every 5 s the step line carries megabytes overall ("(2/17), 45 of 360 MB"), which the loading screen shows as "45 / 360 MB" with the bar following the bytes. The session's step no longer promises 1-2 minutes. --- .../launcher/session/LoadingState.kt | 23 ++- .../launcher/session/LoadingStateTest.kt | 37 ++++ .../overlay/usr/local/bin/droiddeck-session | 4 +- .../usr/local/bin/droiddeck-steam-install | 108 ++++++++++-- tools/tests/test_steam_install.py | 159 +++++++++++++++++- 5 files changed, 311 insertions(+), 20 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/LoadingStateTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt index 26799d0036..a190cbaef8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt @@ -102,11 +102,10 @@ class LoadingState(context: Context, private val steam: Boolean = true) { if (line.startsWith("== STEP ")) { stepAt = at stepText = line.substringAfter("== STEP ").substringAfter(' ') - val m = INSTALL_COUNT.find(line) - if (m != null) { + clientDownload(line)?.let { (what, percent) -> clientDownloadAt = at - clientDownload = m.groupValues[1] - clientPercent = m.groupValues[2].toInt() * 100 / maxOf(1, m.groupValues[3].toInt()) + clientDownload = what + clientPercent = percent } } else { val m = UPDATE_PROGRESS.find(line) @@ -152,6 +151,21 @@ class LoadingState(context: Context, private val steam: Boolean = true) { } } + /** + * What a Steam client download line says to show and how far it is: megabytes when the + * runtime counts them (" (2/17), 45 of 360 MB"), else the part and its number. + */ + internal fun clientDownload(line: String): Pair? { + val count = INSTALL_COUNT.find(line) ?: return null + val mb = INSTALL_MEGABYTES.find(line.substring(count.range.last + 1)) + val done = mb?.groupValues?.get(1)?.toLongOrNull() + val total = mb?.groupValues?.get(2)?.toLongOrNull() + if (done != null && total != null && total > 0) { + return "$done / $total MB" to (done * 100 / total).toInt().coerceIn(0, 100) + } + return count.groupValues[1] to count.groupValues[2].toInt() * 100 / maxOf(1, count.groupValues[3].toInt()) + } + /** The script's install lines are worth reading as they are; its other notes are not. */ internal fun readableScriptStep(scriptStep: String): Boolean { val t = scriptStep.lowercase() @@ -161,5 +175,6 @@ class LoadingState(context: Context, private val steam: Boolean = true) { private const val TAIL_BYTES = 48L * 1024 private val UPDATE_PROGRESS = Regex("""Downloading update \((\d+) of (\d+) KB\)""") private val INSTALL_COUNT = Regex("""downloading Steam: (\S+) \((\d+)/(\d+)\)""") + private val INSTALL_MEGABYTES = Regex("""^, (\d+) of (\d+) MB""") } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/LoadingStateTest.kt b/app/src/test/java/com/droiddeck/launcher/session/LoadingStateTest.kt new file mode 100644 index 0000000000..dd545f1f51 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/LoadingStateTest.kt @@ -0,0 +1,37 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class LoadingStateTest { + @Test fun clientDownloadCountsMegabytesWhenTheRuntimeSaysThem() { + assertEquals( + "45 / 360 MB" to 12, + LoadingState.clientDownload("== STEP 17:38:20 downloading Steam: bins_linuxarm64_linuxarm64 (2/17), 45 of 360 MB"), + ) + } + + @Test fun aStalledDownloadStillShowsWhereItIs() { + assertEquals( + "45 / 360 MB" to 12, + LoadingState.clientDownload( + "== STEP 17:39:20 downloading Steam: bins_linuxarm64_linuxarm64 (2/17), 45 of 360 MB" + + " - interrupted (curl exit 28), trying again in 5 s", + ), + ) + } + + @Test fun anOlderRuntimeShowsThePartAndItsNumber() { + assertEquals( + "bins_linuxarm64_linuxarm64" to 11, + LoadingState.clientDownload("== STEP 17:38:17 downloading Steam: bins_linuxarm64_linuxarm64 (2/17)"), + ) + // Under a megabyte in all: nothing to count yet. + assertEquals("a_all" to 50, LoadingState.clientDownload("== STEP 00:00:00 downloading Steam: a_all (1/2), 0 of 0 MB")) + } + + @Test fun otherStepsAreNotClientDownloads() { + assertNull(LoadingState.clientDownload("== STEP 17:38:14 checking the Steam client (a first run downloads it)")) + } +} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 94d9a69370..5822ef0beb 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -368,7 +368,9 @@ case $mode in esac ;; steam) - step "checking the Steam client (first run downloads it, ~1-2 min with nothing on screen)" + # A first run downloads the client (about 360 MB in 2026): minutes on a slow connection, with + # the progress in megabytes on the loading screen. + step "checking the Steam client (a first run downloads it)" droiddeck-steam-install || exit $? step "Steam client ready" steam_root=$XDG_DATA_HOME/Steam diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install index 0eae6d0d27..85404bd620 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install @@ -12,6 +12,9 @@ stamp=$steam_root/package/droiddeck-installed legacy_stamp=$steam_root/package/bannerlator-installed unconfirmed=$steam_root/package/droiddeck-unconfirmed repair_request=$HOME/.bl-steam-repair +# The parts of an unfinished download: a session that ends, or loses its connection, part way +# through picks up where it stopped instead of fetching the whole client again. +parts=$steam_root/package/droiddeck-download if [ -f "$legacy_stamp" ] && [ ! -f "$stamp" ]; then mv -f "$legacy_stamp" "$stamp" || true fi @@ -24,6 +27,11 @@ elif [ -f "$unconfirmed" ] && ! grep -qx repaired "$unconfirmed" \ fi if [ -n "$repair" ]; then echo "== STEP $(date -u +%H:%M:%S) repairing the Steam client ($repair)" + # A repair unpacks every part again - once: an interrupted one keeps what it has redone. + if [ ! -f "$parts/.repair" ]; then + rm -rf "$parts" + mkdir -p "$parts" && : > "$parts/.repair" + fi rm -f "$stamp" "$legacy_stamp" "$steam_root/.crash" "$steam_root/steam.pid" \ "$steam_root"/package/steam_client_*.manifest "$steam_root"/package/steam_client_*.installed for part in "$steam_root"/package/*.zip.*; do @@ -41,26 +49,105 @@ fi work=$(mktemp -d) trap 'rm -rf "$work"' EXIT -curl -fsSL "$cdn/$manifest" -o "$work/manifest" + +# A sleep that starts no process (droiddeck-session's nap): read -t on a pipe nothing writes to. +nap() { + [ -n "${nap_fd:-}" ] || exec {nap_fd}<> <(:) + read -r -t "$1" -u "$nap_fd" _ 2>/dev/null || : +} +size_of() { + local n=0 + [ -f "$1" ] && n=$(wc -c < "$1") + echo $((n)) +} +# A connection can stall without closing (Wi-Fi power save, a phone changing networks), and +# curl's default then is to wait for ever with nothing on screen. A transfer under 4 KB/s for a +# minute is dropped and resumed from the bytes already on disk. +limits=(--connect-timeout 30 --speed-limit 4096 --speed-time 60) +# Seconds between attempts that made no progress; the download fails after the last one. +read -r -a delays <<< "${BL_STEAM_RETRY_DELAYS:-5 10 20 30 30}" + +step() { echo "== STEP $(date -u +%H:%M:%S) $*"; } +# The line the app's loading screen reads: the part, its number, and megabytes overall. A third +# argument is said after it (a stall), and is always said; otherwise only a change is. +progress() { + local mb=$(( (done_bytes + $(size_of "$1")) / 1000000 )) + [ -z "${3:-}" ] && [ "$mb" = "${shown_mb:-}" ] && [ "$2" = "${shown_part:-}" ] && return 0 + shown_mb=$mb shown_part=$2 + step "downloading Steam: $2 ($i/$total), $mb of $((total_bytes / 1000000)) MB${3:+ - $3}" +} + +# fetch URL FILE SIZE SHA256 PART: FILE complete and checked, resuming whatever is already there. +fetch() { + local url=$1 dest=$2 size=$3 sum=$4 part=$5 failures=0 bad=0 finished=0 before rc fd wait + while :; do + # Whole once it is as long as the manifest says, or (no size given) once curl finished it. + if [ -f "$dest" ] && { [ "$finished" = 1 ] || { [ "$size" -gt 0 ] && [ "$(size_of "$dest")" -ge "$size" ]; }; }; then + echo "$sum $dest" | sha256sum -c --quiet 2>/dev/null && return 0 + # Bytes that do not check out are fetched whole again, a few times at most. + rm -f "$dest" + finished=0 bad=$((bad + 1)) + [ "$bad" -lt 3 ] || { echo "droiddeck-steam-install: $part does not match its checksum" >&2; return 1; } + fi + before=$(size_of "$dest") + # curl's status comes back through the pipe (|| keeps set -e from ending the subshell before it + # is said); until then a progress line every 5 s. + exec {fd}< <(curl -fsSL "${limits[@]}" -C - -o "$dest" "$url" && echo 0 || echo $?) + until read -r -t 5 -u "$fd" rc; do + if [ $? -le 128 ]; then rc=1; break; fi + progress "$dest" "$part" + done + exec {fd}<&- + if [ "$rc" = 0 ]; then finished=1; continue; fi + # 33: the server would not resume. Start the part over. + [ "$rc" = 33 ] && rm -f "$dest" + if [ "$(size_of "$dest")" -gt "$before" ]; then failures=0; else failures=$((failures + 1)); fi + if [ "$failures" -gt "${#delays[@]}" ]; then + echo "droiddeck-steam-install: could not download $part (curl exit $rc); what arrived is kept for the next try" >&2 + return 1 + fi + wait=${delays[$((failures > 0 ? failures - 1 : 0))]} + progress "$dest" "$part" "interrupted (curl exit $rc), trying again in ${wait} s" + nap "$wait" + done +} + +curl -fsSL "${limits[@]}" --retry 5 --retry-connrefused --retry-delay 5 "$cdn/$manifest" -o "$work/manifest" version=$(awk -F'"' '$2 == "version" { print $4; exit }' "$work/manifest") -# Every component block: its name, then the plain zip's file name and sha256. +# Every component block: its name, then the plain zip's file name, sha256 and size. awk -F'"' ' /^\t"/ && NF >= 3 && $4 == "" { block = $2 } $2 == "file" { file[block] = $4 } $2 == "sha2" { sha[block] = $4 } - END { for (b in file) if (b ~ /_all$/ || b ~ /_linuxarm64_linuxarm64$/) print b, file[b], sha[b] } + $2 == "size" { size[block] = $4 } + END { for (b in file) if (b ~ /_all$/ || b ~ /_linuxarm64_linuxarm64$/) print b, file[b], sha[b], size[b] + 0 } ' "$work/manifest" | sort > "$work/parts" [ -s "$work/parts" ] || { echo "droiddeck-steam-install: no client components in $manifest" >&2; exit 1; } total=$(grep -c . "$work/parts" 2>/dev/null || echo 0) +total_bytes=$(awk '{ n += $4 } END { print n + 0 }' "$work/parts") -mkdir -p "$steam_root/package" -while read -r block file sum; do +mkdir -p "$parts" +# What an earlier attempt left for another client version is no use to this one. A part's file +# name carries its own hash, so a name still listed is the same part. +for left in "$parts"/*; do + [ -e "$left" ] || continue + name=${left##*/} + name=${name%.unpacked} + grep -qF " $name " "$work/parts" || rm -rf "$left" +done +done_bytes=0 +while read -r block file sum size; do i=$((${i:-0} + 1)) - echo "== STEP $(date -u +%H:%M:%S) downloading Steam: $block ($i/$total)" - curl -fsSL "$cdn/$file" -o "$work/$file" - echo "$sum $work/$file" | sha256sum -c --quiet - unzip -qo "$work/$file" -d "$steam_root" - rm -f "$work/$file" + if [ -f "$parts/$file.unpacked" ]; then + done_bytes=$((done_bytes + size)) + continue + fi + progress "$parts/$file" "$block" + fetch "$cdn/$file" "$parts/$file" "$size" "$sum" "$block" || exit 1 + unzip -qo "$parts/$file" -d "$steam_root" + : > "$parts/$file.unpacked" + rm -f "$parts/$file" + done_bytes=$((done_bytes + size)) done < "$work/parts" # Some entries are zipped with Windows separators; unzip keeps the backslash in the file name. find "$steam_root" -depth -name '*\\*' | while read -r odd; do @@ -90,6 +177,7 @@ ln -sfn "$steam_root/linuxarm64" "$HOME/.steam/sdkarm64" ln -sfn "$steam_root/steamrtarm64" "$HOME/.steam/binarm64" ln -sfn "$steam_root/linux32" "$HOME/.steam/sdk32" echo "$version" > "$stamp" +rm -rf "$parts" if [ -n "$repair" ]; then echo repaired > "$unconfirmed" rm -f "$repair_request" diff --git a/tools/tests/test_steam_install.py b/tools/tests/test_steam_install.py index f3e29bbe26..d71dd7b4db 100644 --- a/tools/tests/test_steam_install.py +++ b/tools/tests/test_steam_install.py @@ -26,13 +26,43 @@ class SteamInstallTest(unittest.TestCase): self.bin = self.root / 'bin' self.bin.mkdir() # Only the network is faked: exercise real manifest parsing, checksums and zip extraction. + # TEST_PLAN lines " " are used up in order by requests for that file: + # "cut " delivers up to that offset then drops the connection, "fail " + # delivers nothing, "norange" refuses to resume. curl = self.bin / 'curl' - curl.write_text('''#!/bin/bash -set -eu -printf '%s\\n' "$2" >> "$TEST_REQUESTS" -cp "$TEST_CDN/${2##*/}" "$4" + curl.write_text('''#!/usr/bin/env python3 +import os, sys +args = sys.argv[1:] +url = next(a for a in args if a.startswith('https://')) +out = args[args.index('-o') + 1] +name = url.rsplit('/', 1)[1] +offset = os.path.getsize(out) if '-C' in args and os.path.exists(out) else 0 +with open(os.environ['TEST_REQUESTS'], 'a') as log: + log.write(url + '\\n') +with open(os.environ['TEST_REQUESTS'] + '.offsets', 'a') as log: + log.write(f'{name} {offset}\\n') +action = [] +plan = os.environ.get('TEST_PLAN') +if plan and os.path.exists(plan): + lines = open(plan).read().splitlines() + for n, line in enumerate(lines): + if line.split()[0] == name: + action = line.split()[1:] + del lines[n] + open(plan, 'w').write(''.join(l + '\\n' for l in lines)) + break +if action[:1] == ['fail']: + sys.exit(int(action[1])) +if action[:1] == ['norange'] and offset: + sys.exit(33) +data = open(os.path.join(os.environ['TEST_CDN'], name), 'rb').read() +end = int(action[1]) if action[:1] == ['cut'] else len(data) +with open(out, 'ab' if offset else 'wb') as target: + target.write(data[offset:end]) +sys.exit(28 if end < len(data) else 0) ''') curl.chmod(0o755) + self.plan = self.root / 'plan' # macOS has shasum; the guest and Linux CI have sha256sum. if shutil.which('sha256sum') is None: sha = self.bin / 'sha256sum' @@ -44,7 +74,8 @@ cp "$TEST_CDN/${2##*/}" "$4" sha1.chmod(0o755) self.env = dict(os.environ, HOME=str(self.home), XDG_DATA_HOME=str(self.data), PATH=str(self.bin) + os.pathsep + os.environ['PATH'], - TEST_CDN=str(self.cdn), TEST_REQUESTS=str(self.requests)) + TEST_CDN=str(self.cdn), TEST_REQUESTS=str(self.requests), + TEST_PLAN=str(self.plan), BL_STEAM_RETRY_DELAYS='0 0 0') for channel in ('steamdeck_publicbeta',): archive = self.cdn / (channel + '.zip') with zipfile.ZipFile(archive, 'w') as package: @@ -157,5 +188,123 @@ cp "$TEST_CDN/${2##*/}" "$4" self.assertFalse(self.requests.exists()) + def publish(self, **parts): + """The CDN's client as these parts (block name -> byte count of incompressible content), + listed with sizes as Valve's manifest lists them.""" + files = {} + blocks = '' + for block, length in parts.items(): + archive = self.cdn / f'{block}.zip.{hashlib.sha1(block.encode()).hexdigest()}' + with zipfile.ZipFile(archive, 'w', zipfile.ZIP_STORED) as package: + package.writestr(f'parts/{block}', os.urandom(length)) + if block.endswith('_linuxarm64_linuxarm64'): + package.writestr('steamrtarm64/steam', 'steamdeck_publicbeta') + data = archive.read_bytes() + files[block] = archive.name + blocks += (f'\t"{block}"\n\t{{\n\t\t"file"\t\t"{archive.name}"\n\t\t"size"\t\t"{len(data)}"\n' + f'\t\t"sha2"\t\t"{hashlib.sha256(data).hexdigest()}"\n\t}}\n') + (self.cdn / 'steam_client_steamdeck_publicbeta_linuxarm64').write_text( + '"linuxarm64"\n{\n\t"version"\t\t"123456"\n' + blocks + '}\n') + return files + + def two_parts(self): + return self.publish(a_all=1_200_000, client_linuxarm64_linuxarm64=1_300_000) + + def plan_for(self, name, *actions): + with self.plan.open('a') as plan: + plan.writelines(f'{name} {action}\n' for action in actions) + + def offsets(self, name): + log = Path(str(self.requests) + '.offsets') + return [int(line.split()[1]) for line in log.read_text().splitlines() if line.split()[0] == name] + + def requested(self): + return [line.rsplit('/', 1)[1] for line in self.requests.read_text().splitlines()] + + @property + def download(self): + return self.steam / 'package/droiddeck-download' + + def test_progress_is_counted_in_megabytes_across_parts(self): + self.two_parts() + result = self.install() + self.assertEqual(0, result.returncode, result.stderr) + self.assertIn('downloading Steam: a_all (1/2), 0 of 2 MB\n', result.stdout) + self.assertIn('downloading Steam: client_linuxarm64_linuxarm64 (2/2), 1 of 2 MB\n', result.stdout) + self.assertTrue((self.steam / 'parts/a_all').is_file()) + self.assertFalse(self.download.exists()) + + def test_a_dropped_connection_resumes_from_what_arrived(self): + files = self.two_parts() + client = files['client_linuxarm64_linuxarm64'] + self.plan_for(client, 'cut 500000') + result = self.install() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual([0, 500000], self.offsets(client)) + self.assertIn('interrupted (curl exit 28), trying again in 0 s', result.stdout) + self.assertEqual('123456\n', (self.steam / 'package/droiddeck-installed').read_text()) + + def test_a_failed_session_keeps_what_it_finished_and_fetched(self): + files = self.two_parts() + client = files['client_linuxarm64_linuxarm64'] + self.plan_for(client, 'cut 400000', *['fail 6'] * 4) + result = self.install() + self.assertNotEqual(0, result.returncode) + self.assertIn('could not download client_linuxarm64_linuxarm64 (curl exit 6)', result.stderr) + self.assertFalse((self.steam / 'package/droiddeck-installed').exists()) + self.assertTrue((self.download / (files['a_all'] + '.unpacked')).is_file()) + self.assertFalse((self.download / files['a_all']).exists()) + self.assertEqual(400000, (self.download / client).stat().st_size) + self.requests.unlink() + Path(str(self.requests) + '.offsets').unlink() + self.assertEqual(0, self.install().returncode) + # The next session asks only for the rest of the part it did not finish. + self.assertEqual(['steam_client_steamdeck_publicbeta_linuxarm64', client], self.requested()) + self.assertEqual([400000], self.offsets(client)) + self.assertFalse(self.download.exists()) + + def test_a_server_that_will_not_resume_starts_the_part_over(self): + files = self.two_parts() + client = files['client_linuxarm64_linuxarm64'] + self.plan_for(client, 'cut 400000', 'norange') + result = self.install() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual([0, 400000, 0], self.offsets(client)) + + def test_bytes_that_do_not_check_out_are_fetched_again(self): + files = self.two_parts() + client = files['client_linuxarm64_linuxarm64'] + self.download.mkdir(parents=True) + (self.download / client).write_bytes(b'x' * (self.cdn / client).stat().st_size) + result = self.install() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual([0], self.offsets(client)) + + def test_parts_left_for_another_client_version_are_dropped(self): + files = self.two_parts() + self.download.mkdir(parents=True) + (self.download / 'a_all.zip.0123').write_bytes(b'older') + (self.download / 'b_all.zip.4567.unpacked').write_bytes(b'') + self.plan_for(files['client_linuxarm64_linuxarm64'], *['fail 7'] * 4) + self.assertNotEqual(0, self.install().returncode) + self.assertEqual([files['a_all'] + '.unpacked'], sorted(p.name for p in self.download.iterdir())) + + def test_a_repair_unpacks_every_part_again_once(self): + files = self.two_parts() + self.assertEqual(0, self.install().returncode) + (self.home / '.bl-steam-repair').write_text('1\n') + self.requests.unlink() + self.plan_for(files['client_linuxarm64_linuxarm64'], *['fail 7'] * 4) + self.assertNotEqual(0, self.install().returncode) + self.assertIn(files['a_all'], self.requested()) + self.requests.unlink() + # Still a repair, but what the interrupted one redid is not done a third time. + self.assertEqual(0, self.install().returncode) + self.assertEqual(['steam_client_steamdeck_publicbeta_linuxarm64', files['client_linuxarm64_linuxarm64']], + self.requested()) + self.assertFalse((self.home / '.bl-steam-repair').exists()) + self.assertFalse(self.download.exists()) + + if __name__ == '__main__': unittest.main() From 0cd7f077257c8c86b7cd6ec5dfc0fa085ff0e1e3 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sun, 11 Oct 2026 14:45:57 -0400 Subject: [PATCH 002/174] fix: a first run's Steam client download is not paused out of sight With the default background behavior (Manual), a session pauses as soon as DroidDeck is hidden or the screen turns off - one second after start in the report this came from, before the download had begun. "Keep downloads running" did not help: it is off by default, and it only recognizes the client's own game downloads, not the runtime fetching the client itself. Until the session shows its first frame, the download watch now also asks whether the client is still to be fetched (no install stamp or no client binary, or a repair asked for). While it is, the session is kept awake with its wake and Wi-Fi locks whatever the downloads setting says, the notification reads "Steam download active" with Suspend now, and a steam.client_download event marks start and end. The watch is set up before the first suspend decision, so a session started with the screen off is not paused first. Once the client is there, the chosen behavior applies again. --- .../launcher/session/SessionService.kt | 55 ++++++++++++++----- .../launcher/session/SteamDownloadMonitor.kt | 27 ++++++--- .../session/SteamDownloadMonitorTest.kt | 33 +++++++++++ 3 files changed, 93 insertions(+), 22 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 4910015614..77031187a8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -83,6 +83,12 @@ class SessionService : Service() { private val steamDownloadMonitor = SteamDownloadMonitor() private var downloadMonitorTask: Runnable? = null private var downloadActive = false + /** + * The runtime is fetching the Steam client itself (a first run, a repair), before anything is on + * screen. That download keeps the session awake whatever the downloads setting says: paused, a + * first run never gets as far as showing Steam. + */ + private var clientInstallActive = false private var suspendDownloadNow = false private var suspendPolicy = SessionPrefs.SUSPEND_MANUAL private var steamDownloadsInBackground = false @@ -229,6 +235,7 @@ class SessionService : Service() { suspendDownloadNow = false steamDownloadMonitor.reset() downloadActive = false + clientInstallActive = false steamSleepToken = null completeNativeSleep() suspendOperationPending = false @@ -550,8 +557,9 @@ class SessionService : Service() { if (!pulse.setSinkSuspended(false)) Log.w(TAG, "could not resume audio sink") }, ) - mainHandler.post { updateSuspendPolicy() } + // Watching first: a first run's client download must be known before anything is paused. updateDownloadMonitoring() + mainHandler.post { updateSuspendPolicy() } } } @@ -1331,8 +1339,7 @@ class SessionService : Service() { } val controller = suspendController ?: return val hidden = !activityVisible || !screenOn - val downloadsBlockingSuspend = steamDownloadsInBackground && SessionState.mode == MODE_STEAM && - suspendPolicy != SessionPrefs.SUSPEND_NEVER && hidden && downloadActive && !suspendDownloadNow + val downloadsBlockingSuspend = downloadsKeepAwake() && hidden && !suspendDownloadNow if (downloadsBlockingSuspend) acquireLocks() if (suspendPolicy != SessionPrefs.SUSPEND_NATIVE || !hidden || downloadsBlockingSuspend) { completeNativeSleep() @@ -1709,8 +1716,7 @@ class SessionService : Service() { .setContentText(getString( when { SessionState.suspended -> R.string.session_notification_paused - downloadActive && steamDownloadsInBackground && - suspendPolicy != SessionPrefs.SUSPEND_NEVER -> R.string.session_notification_downloads + downloadsKeepAwake() -> R.string.session_notification_downloads else -> R.string.session_notification } )) @@ -1718,8 +1724,7 @@ class SessionService : Service() { .apply { if (SessionState.suspended) { addAction(Notification.Action.Builder(null, getString(R.string.resume_session), resume).build()) - } else if (downloadActive && steamDownloadsInBackground && - suspendPolicy != SessionPrefs.SUSPEND_NEVER) { + } else if (downloadsKeepAwake()) { val suspend = PendingIntent.getService( this@SessionService, 3, Intent(this@SessionService, SessionService::class.java).setAction(ACTION_SUSPEND_NOW), @@ -1739,31 +1744,51 @@ class SessionService : Service() { getSystemService(NotificationManager::class.java)?.notify(NOTIFICATION_ID, buildNotification()) } + /** A download is under way that holds the session awake while it is out of sight. */ + private fun downloadsKeepAwake(): Boolean = + downloadActive && (steamDownloadsInBackground || clientInstallActive) && + SessionState.mode == MODE_STEAM && suspendPolicy != SessionPrefs.SUSPEND_NEVER + + /** + * Steam's own downloads with the downloads setting on, and the Steam client's download until the + * session shows its first frame whatever the setting: once Steam is on screen it was fetched. + */ + private fun downloadWatchWanted(): Boolean = + SessionState.running && SessionState.mode == MODE_STEAM && suspendPolicy != SessionPrefs.SUSPEND_NEVER && + (steamDownloadsInBackground || !SessionState.firstFrameSeen) + private fun updateDownloadMonitoring() { - val enabled = SessionState.running && SessionState.mode == MODE_STEAM && - steamDownloadsInBackground && suspendPolicy != SessionPrefs.SUSPEND_NEVER - if (!enabled) { + if (!downloadWatchWanted()) { val wasActive = downloadActive downloadMonitorTask?.let(mainHandler::removeCallbacks) downloadMonitorTask = null steamDownloadMonitor.reset() downloadActive = false + clientInstallActive = false if (wasActive) refreshNotification() return } if (downloadMonitorTask != null) return val poll = object : Runnable { override fun run() { - if (downloadMonitorTask !== this || !SessionState.running || - SessionState.mode != MODE_STEAM || !steamDownloadsInBackground || - suspendPolicy == SessionPrefs.SUSPEND_NEVER) { + if (downloadMonitorTask !== this) return + if (!downloadWatchWanted()) { + downloadMonitorTask = null + updateDownloadMonitoring() + updateSuspendPolicy() return } + val root = LinuxRuntime.rootDir(this@SessionService) val wasActive = downloadActive - downloadActive = steamDownloadMonitor.poll( - LinuxRuntime.rootDir(this@SessionService), + val wasInstalling = clientInstallActive + clientInstallActive = !SessionState.firstFrameSeen && SteamDownloadMonitor.clientInstallPending(root) + downloadActive = clientInstallActive || steamDownloadsInBackground && steamDownloadMonitor.poll( + root, receivedBytes = TrafficStats.getUidRxBytes(android.os.Process.myUid()), ) + if (wasInstalling != clientInstallActive) { + SessionEvents.record("steam.client_download", mapOf("active" to clientInstallActive)) + } if (wasActive != downloadActive) refreshNotification() updateSuspendPolicy() mainHandler.postDelayed(this, DOWNLOAD_POLL_MS) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt index af8515fbb6..d43aa3ab27 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt @@ -126,13 +126,26 @@ internal class SteamDownloadMonitor { private fun value(text: String, key: String): String? = Regex("\"$key\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1) - private companion object { - const val MANIFEST_PROGRESS_GRACE_MS = 8_000L + companion object { + /** + * The runtime has yet to fetch the Steam client: a first run, or a repair asked for or begun + * (droiddeck-steam-install drops its stamp as it starts one). That download runs before + * anything is on screen, and a paused session pauses it with the rest. + */ + fun clientInstallPending(runtimeRoot: File): Boolean { + val home = File(runtimeRoot, "root") + val steam = File(home, ".local/share/Steam") + val stamped = File(steam, "package/droiddeck-installed").isFile || + File(steam, "package/bannerlator-installed").isFile + return !(stamped && File(steam, "steamrtarm64/steam").isFile) || File(home, ".bl-steam-repair").exists() + } + + private const val MANIFEST_PROGRESS_GRACE_MS = 8_000L // Longer than Steam's ~60 s between rate lines, for when no traffic counter is available. - const val CONTENT_ACTIVITY_GRACE_MS = 90_000L - const val MIN_RECEIVE_BYTES_PER_SEC = 64L * 1024L - val PATH = Regex("\"path\"\\s+\"([^\"]+)\"") - val CONTENT_UPDATE = Regex("""AppID (\d+) (App|Workshop|Shader) update changed : (.*)""") - val CURRENT_RATE = Regex("""Current download rate: ([\d.]+) Mbps""") + private const val CONTENT_ACTIVITY_GRACE_MS = 90_000L + private const val MIN_RECEIVE_BYTES_PER_SEC = 64L * 1024L + private val PATH = Regex("\"path\"\\s+\"([^\"]+)\"") + private val CONTENT_UPDATE = Regex("""AppID (\d+) (App|Workshop|Shader) update changed : (.*)""") + private val CURRENT_RATE = Regex("""Current download rate: ([\d.]+) Mbps""") } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt index 86cf320093..7ac818cfba 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt @@ -126,6 +126,39 @@ class SteamDownloadMonitorTest { } } + @Test fun theClientIsPendingUntilItIsInstalledAndStamped() { + val root = Files.createTempDirectory("droiddeck-steam-client-").toFile() + try { + val steam = File(root, "root/.local/share/Steam") + assertTrue(SteamDownloadMonitor.clientInstallPending(root)) + File(steam, "steamrtarm64").mkdirs() + File(steam, "steamrtarm64/steam").writeText("client") + // Unpacked but not finished: droiddeck-steam-install stamps the client last. + assertTrue(SteamDownloadMonitor.clientInstallPending(root)) + File(steam, "package").mkdirs() + File(steam, "package/droiddeck-installed").writeText("1791686101\n") + assertFalse(SteamDownloadMonitor.clientInstallPending(root)) + } finally { + root.deleteRecursively() + } + } + + @Test fun anOlderStampCountsAndARepairRequestIsPending() { + val root = Files.createTempDirectory("droiddeck-steam-client-").toFile() + try { + val steam = File(root, "root/.local/share/Steam") + File(steam, "steamrtarm64").mkdirs() + File(steam, "steamrtarm64/steam").writeText("client") + File(steam, "package").mkdirs() + File(steam, "package/bannerlator-installed").writeText("1\n") + assertFalse(SteamDownloadMonitor.clientInstallPending(root)) + File(root, "root/.bl-steam-repair").writeText("1\n") + assertTrue(SteamDownloadMonitor.clientInstallPending(root)) + } finally { + root.deleteRecursively() + } + } + private fun manifest(root: File, appId: String, downloaded: Long, total: Long, flags: Int): File { val file = File(root, "steamapps/appmanifest_$appId.acf") check(file.parentFile?.mkdirs() != false) From b9d703db344c8698841e730246978dba692b68cf Mon Sep 17 00:00:00 2001 From: Moroni Granja Date: Mon, 19 Oct 2026 22:43:49 -0300 Subject: [PATCH 003/174] fix: extract GOG installers natively on ARM The GOG installer fallback downloaded only the setup stub and then launched it through Proton/FEX, where the 32-bit Inno Setup stub corrupts its own path strings before CreateFileW. Download every installer part and extract them with the bundled ARM64 innoextract in the Linux guest instead, registering the real game executable. Also classify truncated response bodies as server faults so the native engine retries on the other CDN mirror. --- app/build.gradle | 1 + .../launcher/runtime/GuestCommand.kt | 27 ++- .../launcher/session/SessionFiles.kt | 9 + .../launcher/stores/gog/GogBackend.kt | 37 ++-- .../stores/gog/GogDownloadManager.java | 183 +++++++++++++++--- app/src/main/rust/stores/src/fetch_core.rs | 101 ++++++++-- app/src/main/rust/stores/src/fetch_tuning.rs | 4 + .../stores/gog/GogInstallerPartsTest.kt | 90 +++++++++ .../usr/local/bin/droiddeck-innoextract | 7 + .../usr/local/lib/droiddeck-inno/innoextract | Bin 0 -> 793704 bytes .../libboost_container.so.1.92.0 | Bin 0 -> 133208 bytes .../libboost_filesystem.so.1.92.0 | Bin 0 -> 264456 bytes .../libboost_iostreams.so.1.92.0 | Bin 0 -> 133200 bytes .../libboost_program_options.so.1.92.0 | Bin 0 -> 461016 bytes .../droiddeck-inno/libboost_random.so.1.92.0 | Bin 0 -> 67712 bytes .../licenses/droiddeck-inno/LICENSE.boost | 23 +++ .../droiddeck-inno/LICENSE.innoextract | 18 ++ 17 files changed, 435 insertions(+), 65 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/gog/GogInstallerPartsTest.kt create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/innoextract create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0 create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_filesystem.so.1.92.0 create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0 create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_program_options.so.1.92.0 create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_random.so.1.92.0 create mode 100644 tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.boost create mode 100644 tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract diff --git a/app/build.gradle b/app/build.gradle index 2e269ac50e..c11a7557a2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -230,6 +230,7 @@ def runtimeAssetsDir = layout.buildDirectory.dir('runtimeAssets') def stageRuntimeAssets = tasks.register('stageRuntimeAssets', Sync) { dependsOn(stageSessionScripts) from(layout.projectDirectory.dir('src/main/assets')) { exclude 'pulseaudio.tzst' } + from(rootProject.file('tools/linuxfs/innoextract')) from(layout.buildDirectory.dir('prepared-assets')) into(runtimeAssetsDir) } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt index 8b4f14e5ad..c417228ea4 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt @@ -8,10 +8,12 @@ import com.droiddeck.launcher.session.SessionFiles import com.droiddeck.launcher.session.SessionPaths import com.droiddeck.launcher.session.SessionPrefs import java.io.File +import java.util.concurrent.atomic.AtomicBoolean object GuestCommand { fun run(context: Context, argv: List, fakeRoot: Boolean = false, logName: String? = null, - linkDir: File? = null, extraBinds: List? = null, fastPath: Boolean = false, onLine: (String) -> Unit): Int { + linkDir: File? = null, extraBinds: List? = null, fastPath: Boolean = false, cancelled: AtomicBoolean? = null, + onLine: (String) -> Unit): Int { val log = logName?.let { try { File(File(LinuxRuntime.logDir(context), SessionPaths.TOOLS_DIR).apply { mkdirs() }, "$it.log").printWriter() @@ -19,14 +21,14 @@ object GuestCommand { } log?.println("== ${java.util.Date()} ${argv.joinToString(" ")}") try { - return runLogged(context, argv, fakeRoot, linkDir, extraBinds, fastPath) { line -> log?.println(line); log?.flush(); onLine(line) } + return runLogged(context, argv, fakeRoot, linkDir, extraBinds, fastPath, cancelled) { line -> log?.println(line); log?.flush(); onLine(line) } } finally { log?.close() } } private fun runLogged(context: Context, argv: List, fakeRoot: Boolean, linkDir: File?, extraBinds: List?, - fastPath: Boolean, onLine: (String) -> Unit): Int { + fastPath: Boolean, cancelled: AtomicBoolean?, onLine: (String) -> Unit): Int { val root = LinuxRuntime.rootDir(context) LinuxRuntime.writeAccounts(context) SessionFiles.stage(context, root) @@ -56,13 +58,32 @@ object GuestCommand { fastPathKey?.let { ProotFastPath.hostEnv(it).let { (k, v) -> put(k, v) } } LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } } + if (cancelled?.get() == true) return 130 val process = builder.start() val pid = HostProcess.pidOf(process) OrphanReaper.keep(pid) + val watcher = cancelled?.let { flag -> + Thread({ + try { + while (process.isAlive && !flag.get()) Thread.sleep(200) + if (flag.get()) { + // PRoot ignores SIGTERM; SIGQUIT makes it kill its tracees and exit cleanly. + if (pid > 0) { + runCatching { android.system.Os.kill(pid, android.system.OsConstants.SIGQUIT) } + } else { + process.destroy() + } + if (!process.waitFor(3, java.util.concurrent.TimeUnit.SECONDS)) process.destroyForcibly() + } + } catch (_: InterruptedException) { + } + }, "guest-cancel").apply { isDaemon = true; start() } + } try { process.inputStream.bufferedReader().useLines { lines -> lines.forEach(onLine) } return process.waitFor() } finally { + watcher?.interrupt() OrphanReaper.release(pid) } } 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 46d84c50a8..a29531cc1f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -88,6 +88,15 @@ object SessionFiles { "usr/local/bin/droiddeck-script-run" to "usr/local/bin/droiddeck-script-run", "usr/local/bin/droiddeck-open" to "usr/local/bin/droiddeck-open", "usr/local/bin/droiddeck-proton-run" to "usr/local/bin/droiddeck-proton-run", + "usr/local/bin/droiddeck-innoextract" to "usr/local/bin/droiddeck-innoextract", + "usr/local/lib/droiddeck-inno/innoextract" to "usr/local/lib/droiddeck-inno/innoextract", + "usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0", + "usr/local/lib/droiddeck-inno/libboost_filesystem.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_filesystem.so.1.92.0", + "usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0", + "usr/local/lib/droiddeck-inno/libboost_program_options.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_program_options.so.1.92.0", + "usr/local/lib/droiddeck-inno/libboost_random.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_random.so.1.92.0", + "usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract" to "usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract", + "usr/local/share/licenses/droiddeck-inno/LICENSE.boost" to "usr/local/share/licenses/droiddeck-inno/LICENSE.boost", "usr/bin/steamos-update" to "usr/bin/steamos-update", "usr/bin/steamos-select-branch" to "usr/bin/steamos-select-branch", "usr/bin/steamos-session-select" to "usr/bin/steamos-session-select", diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt index 1003921c04..1676ef9dbe 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt @@ -82,24 +82,31 @@ object GogBackend : StoreBackend { handle.stage(DownloadStage.MANIFEST) StoreInstalls.begin(folder, Store.GOG, game.gameId, game.title, item.tallImageUrl ?: item.imageUrl, item.imageUrl) var downloading = false - val result = GogDownloadManager.install(app, game, folder, object : GogDownloadManager.Callback { - override fun onProgress(message: String, pct: Int) { - when { - message.startsWith("Finishing") -> handle.stage(DownloadStage.INSTALL, message) - message.startsWith("Downloading") || message.startsWith("Verified") || message.startsWith("Resuming") -> { - if (!downloading) { downloading = true; handle.stage(DownloadStage.DOWNLOAD, message) } else handle.progress(-1, -1, message) + val result = try { + GogDownloadManager.install(app, game, folder, object : GogDownloadManager.Callback { + override fun onProgress(message: String, pct: Int) { + when { + message.startsWith("Finishing") || message.startsWith("Extracting") -> handle.stage(DownloadStage.INSTALL, message) + message.startsWith("Downloading") || message.startsWith("Verified") || message.startsWith("Resuming") -> { + if (!downloading) { downloading = true; handle.stage(DownloadStage.DOWNLOAD, message) } else handle.progress(-1, -1, message) + } + else -> handle.stage(DownloadStage.MANIFEST, message) } - else -> handle.stage(DownloadStage.MANIFEST, message) } + override fun onBytes(done: Long, total: Long, speedBps: Long) { handle.progress(done, total, null, speedBps) } + override fun onLog(line: String) { handle.log(line) } + override fun onSizes(downloadBytes: Long, diskBytes: Long) { handle.diskSize(diskBytes) } + override fun onStage(stage: String, done: Long, total: Long, items: Int, itemsTotal: Int) { + handle.stage(when (stage) { "check" -> DownloadStage.MANIFEST; "verify" -> DownloadStage.VERIFY; else -> DownloadStage.INSTALL }) + handle.stageProgress(done, total, items, itemsTotal, bytes = stage == "install") + } + }, cancelled) + } catch (t: Throwable) { + if (t is GogDownloadManager.InstallerException && !cancelled.get()) { + StoreInstalls.discard(app, folder, listOf(File(folder, ".gog_chunks"))) } - override fun onBytes(done: Long, total: Long, speedBps: Long) { handle.progress(done, total, null, speedBps) } - override fun onLog(line: String) { handle.log(line) } - override fun onSizes(downloadBytes: Long, diskBytes: Long) { handle.diskSize(diskBytes) } - override fun onStage(stage: String, done: Long, total: Long, items: Int, itemsTotal: Int) { - handle.stage(when (stage) { "check" -> DownloadStage.MANIFEST; "verify" -> DownloadStage.VERIFY; else -> DownloadStage.INSTALL }) - handle.stageProgress(done, total, items, itemsTotal, bytes = stage == "install") - } - }, cancelled) ?: return null + throw t + } ?: return null if (cancelled.get()) return null handle.stage(DownloadStage.INSTALL, app.getString(com.droiddeck.launcher.R.string.stores_registering)) val sidecar = StoreGameSidecar( diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java index b61af1e96c..e5e1bec684 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java @@ -3,6 +3,8 @@ package com.droiddeck.launcher.stores.gog; import android.content.Context; import android.util.Log; +import com.droiddeck.launcher.frontend.AddedGames; +import com.droiddeck.launcher.runtime.GuestCommand; import com.droiddeck.launcher.stores.StoreLog; import com.droiddeck.launcher.stores.download.StoreDownloadTier; @@ -20,7 +22,9 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.file.Files; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; @@ -60,10 +64,15 @@ public final class GogDownloadManager { Result(String exeRelative, String buildId, long bytes) { this.exeRelative = exeRelative; this.buildId = buildId; this.bytes = bytes; } } - public static final class InstallException extends Exception { + public static class InstallException extends Exception { InstallException(String message) { super(message); } } + /** A failure of the offline-installer fallback; its partial files can be discarded. */ + public static final class InstallerException extends InstallException { + InstallerException(String message) { super(message); } + } + private GogDownloadManager() {} public static Result install(Context ctx, GogGame game, File installPath, Callback cb, AtomicBoolean cancelled) throws InstallException { @@ -385,41 +394,149 @@ public final class GogDownloadManager { String productJson = httpGet("https://api.gog.com/products/" + game.gameId + "?expand=downloads", token); if (productJson == null) throw new InstallException("No downloadable builds for this game"); JSONObject downloads = new JSONObject(productJson).optJSONObject("downloads"); - JSONArray installers = downloads == null ? null : downloads.optJSONArray("installers"); - if (installers == null || installers.length() == 0) throw new InstallException("No downloadable builds for this game"); - String manualUrl = null, fileName = null; - for (int i = 0; i < installers.length(); i++) { - JSONObject inst = installers.getJSONObject(i); - if (!"windows".equals(inst.optString("os"))) continue; - JSONArray files = inst.optJSONArray("files"); - if (files != null && files.length() > 0) { - JSONObject f = files.getJSONObject(0); - manualUrl = f.optString("downlink", null); - if (manualUrl == null) manualUrl = f.optString("manualUrl", null); - fileName = f.optString("filename", null); - } - if (manualUrl == null) manualUrl = inst.optString("manualUrl", null); - if (fileName == null || fileName.isEmpty()) fileName = "setup_" + game.gameId + ".exe"; - break; - } - if (manualUrl == null) throw new InstallException("No Windows installer for this game"); - String downloadUrl = resolveRedirect(manualUrl, token); - if (downloadUrl == null) throw new InstallException("The installer link could not be resolved"); + List parts = installerParts(downloads, game.gameId); + if (parts.isEmpty()) throw new InstallException("No downloadable builds for this game"); installPath.mkdirs(); - File outFile = new File(installPath, fileName); - cb.onProgress("Downloading installer: " + fileName, 15); - long size = downloadWithProgress(downloadUrl, outFile, cb, cancelled); + long planned = 0; + boolean sized = true; + for (InstallerPart part : parts) { planned += part.size; if (part.size <= 0) sized = false; } + if (sized) { + long usable = com.droiddeck.launcher.stores.StoreInstallRoot.availableBytes(installPath); + if (com.droiddeck.launcher.stores.StoreInstallRoot.insufficientSpace(planned, usable)) { + throw new InstallException("Not enough free space: need " + formatBytes(planned) + ", only " + formatBytes(usable) + " free"); + } + } + long total = 0; + for (InstallerPart part : parts) { + if (cancelled.get()) return null; + String downloadUrl = resolveRedirect(part.url, token); + if (downloadUrl == null) throw new InstallException("The installer link could not be resolved: " + part.filename); + File outFile; + try { + outFile = installerDestination(installPath, part.filename); + } catch (IOException e) { + throw new InstallException("The installer part is not inside the game folder: " + part.filename); + } + cb.onProgress("Downloading installer: " + part.filename, 15 + (int) ((total / (float) Math.max(1, planned)) * 80)); + long size = downloadWithProgress(downloadUrl, outFile, cb, cancelled, total, sized ? planned : 0); + if (cancelled.get()) return null; + if (size <= 0) throw new InstallException("The installer download failed: " + part.filename); + total += size; + } if (cancelled.get()) return null; - if (size <= 0) throw new InstallException("The installer download failed"); - cb.onLog("gog: installer downloaded; the game installs itself on first launch"); - return new Result(fileName, "", size); - } catch (InstallException e) { + cb.onLog("gog: installer downloaded (" + parts.size() + " file(s)); extracting natively"); + extractInstaller(ctx, installPath, parts.get(0).filename, cb, cancelled); + if (cancelled.get()) return null; + for (InstallerPart part : parts) new File(installPath, part.filename).delete(); + deleteDir(new File(installPath, "tmp")); + deleteDir(new File(installPath, "commonappdata")); + String exe = pickExe(installPath, null, game.title); + if (exe.isEmpty()) throw new InstallException("The installer was extracted but no game executable was found"); + cb.onLog("gog: installer extracted natively; game exe " + exe); + return new Result(exe, "", total); + } catch (InstallerException e) { throw e; + } catch (InstallException e) { + throw new InstallerException(e.getMessage()); } catch (Exception e) { - throw new InstallException("Installer download error: " + e.getClass().getSimpleName()); + throw new InstallerException("Installer download error: " + e.getClass().getSimpleName()); } } + /** + * GOG's Windows installer is a 32-bit Inno Setup stub. On ARM64 it runs through + * Proton/FEX, where its path strings are corrupted before CreateFileW (observed on + * Wine 11 + FEX: "Path not found"). Extracting the same files with innoextract in + * the Linux guest avoids that path entirely. + */ + private static void extractInstaller(Context ctx, File installPath, String setupName, Callback cb, AtomicBoolean cancelled) throws InstallException { + String guestDir = AddedGames.INSTANCE.guestPath(ctx, installPath); + if (guestDir == null || guestDir.isEmpty()) { + throw new InstallException("The game folder is not visible to the Linux session"); + } + String guestSetup = guestDir + "/" + setupName; + cb.onProgress("Extracting installer…", 95); + int rc; + try { + rc = GuestCommand.INSTANCE.run(ctx, Arrays.asList( + "/usr/local/bin/droiddeck-innoextract", "--gog", "--silent", + "-d", guestDir, guestSetup), + false, "gog-innoextract", null, null, false, cancelled, + line -> { cb.onLog("gog innoextract: " + line); return kotlin.Unit.INSTANCE; }); + } catch (Exception e) { + throw new InstallException("The installer could not be extracted: " + e.getClass().getSimpleName()); + } + if (cancelled.get()) return; + if (rc != 0) throw new InstallException("The installer could not be extracted (innoextract exit " + rc + ")"); + } + + static final class InstallerPart { + final String url; + final String filename; + final long size; + InstallerPart(String url, String filename, long size) { this.url = url; this.filename = filename; this.size = size; } + } + + /** + * Every file of the first usable Windows installer. GOG lists a setup stub and its data parts as + * separate files, often without a filename; the parts are named after the stub so the installer + * finds them when launched (setup_<id>.exe, setup_<id>-1.bin, ...). + */ + static List installerParts(JSONObject downloads, String gameId) { + List out = new ArrayList<>(); + if (downloads == null) return out; + JSONArray installers = downloads.optJSONArray("installers"); + if (installers == null) return out; + for (int i = 0; i < installers.length(); i++) { + JSONObject inst = installers.optJSONObject(i); + if (inst == null || !"windows".equals(inst.optString("os"))) continue; + JSONArray files = inst.optJSONArray("files"); + String base = null; + if (files != null) { + for (int j = 0; j < files.length(); j++) { + JSONObject f = files.optJSONObject(j); + if (f == null) continue; + String url = f.optString("downlink", ""); + if (url.isEmpty()) url = f.optString("manualUrl", ""); + if (url.isEmpty()) continue; + String name = partName(f.optString("filename", "")); + if (name.isEmpty()) { + if (base == null) base = "setup_" + safeName(gameId); + name = out.isEmpty() ? base + ".exe" : base + "-" + out.size() + ".bin"; + } else if (base == null) { + base = name.toLowerCase(java.util.Locale.US).endsWith(".exe") ? name.substring(0, name.length() - 4) : name; + } + out.add(new InstallerPart(url, name, f.optLong("size", 0))); + } + } + if (out.isEmpty()) { + String url = inst.optString("manualUrl", ""); + if (url.isEmpty()) url = inst.optString("downlink", ""); + if (!url.isEmpty()) out.add(new InstallerPart(url, "setup_" + safeName(gameId) + ".exe", inst.optLong("total_size", 0))); + } + if (!out.isEmpty()) return out; + } + return out; + } + + static File installerDestination(File installPath, String filename) throws IOException { + File root = installPath.getCanonicalFile(); + File candidate = new File(root, filename); + if (Files.isSymbolicLink(candidate.toPath())) throw new IOException("installer part is a link"); + File out = candidate.getCanonicalFile(); + if (out.equals(root) || !out.toPath().startsWith(root.toPath())) throw new IOException("installer part leaves the game folder"); + return out; + } + + private static String partName(String raw) { + return raw == null ? "" : new File(raw.replace('\\', '/')).getName(); + } + + private static String safeName(String raw) { + String cleaned = raw == null ? "" : raw.replaceAll("[^A-Za-z0-9._-]", "_"); + return cleaned.isEmpty() ? "game" : cleaned; + } + private static String resolveRedirect(String url, String token) { try { if (url.startsWith("/")) url = "https://www.gog.com" + url; @@ -452,7 +569,7 @@ public final class GogDownloadManager { return null; } - private static long downloadWithProgress(String url, File out, Callback cb, AtomicBoolean cancelled) { + private static long downloadWithProgress(String url, File out, Callback cb, AtomicBoolean cancelled, long doneBefore, long planned) { try { HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection(); conn.setConnectTimeout(TIMEOUT); conn.setReadTimeout(60_000); @@ -468,7 +585,11 @@ public final class GogDownloadManager { downloaded += n; windowBytes += n; long elapsed = System.currentTimeMillis() - windowStart; if (elapsed >= 500) { speed = windowBytes * 1000L / elapsed; windowStart = System.currentTimeMillis(); windowBytes = 0; } - if (total > 0) { + if (planned > 0) { + long shown = doneBefore + downloaded; + cb.onProgress("Downloading: " + out.getName() + speedSuffix(speed), 15 + (int) ((shown / (float) planned) * 80)); + cb.onBytes(shown, planned, speed); + } else if (total > 0) { cb.onProgress("Downloading: " + out.getName() + speedSuffix(speed), 15 + (int) ((downloaded / (float) total) * 80)); cb.onBytes(downloaded, total, speed); } diff --git a/app/src/main/rust/stores/src/fetch_core.rs b/app/src/main/rust/stores/src/fetch_core.rs index e0c10112ca..f019734405 100644 --- a/app/src/main/rust/stores/src/fetch_core.rs +++ b/app/src/main/rust/stores/src/fetch_core.rs @@ -1,7 +1,8 @@ use crate::fetch_tuning::{ budget_admits, connect_timeout, inflight_budget_bytes, retry_backoff_millis, AsyncFetchError, FetchFailKind, BOOTSTRAP_WINDOW, MAX_CHUNK_ATTEMPTS, NOMINAL_CHUNK_RESERVE_BYTES, - RATE_LIMIT_COOLDOWN_MS, SERVER_EXPLORE_EVERY, USER_AGENT, WINDOW_BPS_EWMA_ALPHA, + RATE_LIMIT_COOLDOWN_MS, SERVER_EXPLORE_EVERY, SERVER_FAULT_COOLDOWN_MS, USER_AGENT, + WINDOW_BPS_EWMA_ALPHA, WINDOW_COOLDOWN_MS, WINDOW_DECLINE_EPS, WINDOW_ERR_BURST_IMMEDIATE, WINDOW_ERR_RATE_HIGH, WINDOW_ERR_RATE_LOW, WINDOW_HARD_CAP, WINDOW_IMPROVE_EPS, WINDOW_LOG_EVERY_PROBES, WINDOW_MIN_FLOOR, WINDOW_PLATEAU_PATIENCE, WINDOW_PLATEAU_REARM_MAX_MS, @@ -607,6 +608,10 @@ fn classify_reqwest_error(err: &reqwest::Error) -> FetchFailKind { FetchFailKind::Timeout } else if err.is_connect() { FetchFailKind::Connect + } else if err.is_body() || err.is_decode() { + // A truncated or undecodable body comes from the CDN, not the request. Rest that host so + // the retry goes to another mirror instead of reading the same bad object again. + FetchFailKind::ServerFault } else { FetchFailKind::Other } @@ -663,14 +668,9 @@ async fn fetch_once( } Ok(None) => break, Err(err) => { - let kind = if err.is_timeout() { - FetchFailKind::Timeout - } else { - FetchFailKind::Other - }; return Err(AsyncFetchError { message: format!("http body: {err}"), - kind, + kind: classify_reqwest_error(&err), }); } } @@ -1150,7 +1150,7 @@ async fn run_driver(ctx: DriverCtx<'_>) { Ok(Fetched::Body(body)) => { let raw_len = body.len() as u64; meter.record(done.server_idx, raw_len); - sched.on_success(done.server_idx, raw_len, done.elapsed); + sched.on_success(done.server_idx, raw_len, done.elapsed, now); window.record_ok(done.elapsed.as_secs_f64() * 1000.0); if raw_len >= done.reserve { in_flight.fetch_add(raw_len - done.reserve, Ordering::Relaxed); @@ -1172,7 +1172,7 @@ async fn run_driver(ctx: DriverCtx<'_>) { } Ok(Fetched::Streamed(total_len)) => { meter.record(done.server_idx, total_len); - sched.on_success(done.server_idx, total_len, done.elapsed); + sched.on_success(done.server_idx, total_len, done.elapsed, now); window.record_ok(done.elapsed.as_secs_f64() * 1000.0); outstanding += 1; if txs[done.idx % txs.len()] @@ -1335,6 +1335,7 @@ struct ServerHealth { samples: u32, consecutive_errors: u32, cooldown_until: Option, + fault_until: Option, } struct FetchScheduler { @@ -1412,7 +1413,7 @@ impl FetchScheduler { }) } - fn on_success(&mut self, server_idx: usize, bytes: u64, elapsed: Duration) { + fn on_success(&mut self, server_idx: usize, bytes: u64, elapsed: Duration, now: Instant) { let secs = elapsed.as_secs_f64().max(0.001); let bps = bytes as f64 / secs; let h = &mut self.health[server_idx]; @@ -1423,7 +1424,15 @@ impl FetchScheduler { }; h.samples = h.samples.saturating_add(1); h.consecutive_errors = 0; - h.cooldown_until = None; + // A success can belong to a request that was already in flight when another response from + // this host failed. Keep a server-fault cooldown until it expires instead of clearing it + // early and sending the retry straight back to the same mirror. + if let Some(fault) = h.fault_until.filter(|until| *until > now) { + h.cooldown_until = Some(h.cooldown_until.map_or(fault, |current| current.max(fault))); + } else { + h.fault_until = None; + h.cooldown_until = None; + } } fn rest(&mut self, server_idx: usize, now: Instant, rest: Duration) { @@ -1436,10 +1445,18 @@ impl FetchScheduler { let h = &mut self.health[server_idx]; h.consecutive_errors = h.consecutive_errors.saturating_add(1); let mut backoff = retry_backoff_millis(h.consecutive_errors); - if kind == FetchFailKind::RateLimited { - backoff = backoff.max(RATE_LIMIT_COOLDOWN_MS); + match kind { + FetchFailKind::RateLimited => backoff = backoff.max(RATE_LIMIT_COOLDOWN_MS), + FetchFailKind::ServerFault => backoff = backoff.max(SERVER_FAULT_COOLDOWN_MS), + _ => {} } - h.cooldown_until = Some(now + Duration::from_millis(backoff)); + let until = now + Duration::from_millis(backoff); + if kind == FetchFailKind::ServerFault { + h.fault_until = Some(now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS)); + } + let current = h.cooldown_until.unwrap_or(until); + let fault = h.fault_until.unwrap_or(until); + h.cooldown_until = Some(current.max(fault).max(until)); h.ewma_bps *= 0.5; } } @@ -1806,6 +1823,7 @@ mod tests { use super::*; use crate::fetch_tuning::{ FETCH_INFLIGHT_BUDGET_FLOOR_BYTES, FETCH_INFLIGHT_BUDGET_HARD_CAP_BYTES, PER_HOST_CAP, + SERVER_FAULT_COOLDOWN_MS, }; use std::collections::HashMap; use std::io::{Read, Write}; @@ -1900,9 +1918,9 @@ mod tests { let mut s = FetchScheduler::new(&hosts, 2); let now = Instant::now(); assert_eq!(s.pick(now), Some(0)); - s.on_success(0, 1_000_000, Duration::from_millis(100)); + s.on_success(0, 1_000_000, Duration::from_millis(100), now); assert_eq!(s.pick(now), Some(1)); - s.on_success(1, 1_000_000, Duration::from_millis(500)); + s.on_success(1, 1_000_000, Duration::from_millis(500), now); assert_eq!(s.pick(now), Some(0)); s.on_error(0, now, FetchFailKind::Timeout); assert_eq!(s.pick(now), Some(1)); @@ -1911,6 +1929,57 @@ mod tests { assert_eq!(s.pick(now + Duration::from_secs(6)), Some(0)); } + #[test] + fn a_server_fault_rests_the_host_for_the_other_mirror() { + let hosts = vec!["a".to_string(), "b".to_string()]; + let mut s = FetchScheduler::new(&hosts, 2); + let now = Instant::now(); + s.on_success(0, 1_000_000, Duration::from_millis(100), now); + s.on_success(1, 1_000_000, Duration::from_millis(100), now); + s.on_error(0, now, FetchFailKind::ServerFault); + assert_eq!(s.pick(now), Some(1)); + assert_eq!( + s.pick(now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS - 1)), + Some(1) + ); + assert!(!s.eligible(0, now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS - 1))); + assert!(s.eligible(0, now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS))); + } + + #[test] + fn a_success_from_an_earlier_request_does_not_clear_a_server_fault_cooldown() { + let hosts = vec!["a".to_string(), "b".to_string()]; + let mut s = FetchScheduler::new(&hosts, 2); + let now = Instant::now(); + s.on_error(0, now, FetchFailKind::ServerFault); + s.on_success(0, 1_000_000, Duration::from_millis(100), now + Duration::from_millis(100)); + assert!(!s.eligible(0, now + Duration::from_millis(100))); + assert!(s.eligible(0, now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS))); + } + + #[test] + fn a_success_keeps_a_longer_cooldown_than_the_server_fault() { + let hosts = vec!["a".to_string(), "b".to_string()]; + let mut s = FetchScheduler::new(&hosts, 2); + let now = Instant::now(); + s.on_error(0, now, FetchFailKind::ServerFault); + s.rest(0, now, Duration::from_secs(30)); + s.on_success(0, 1_000_000, Duration::from_millis(100), now + Duration::from_millis(100)); + assert!(!s.eligible(0, now + Duration::from_secs(29))); + assert!(s.eligible(0, now + Duration::from_secs(30))); + } + + #[test] + fn a_server_fault_keeps_a_longer_host_stall_cooldown() { + let hosts = vec!["a".to_string(), "b".to_string()]; + let mut s = FetchScheduler::new(&hosts, 2); + let now = Instant::now(); + s.rest(0, now, Duration::from_secs(30)); + s.on_error(0, now, FetchFailKind::ServerFault); + assert!(!s.eligible(0, now + Duration::from_secs(29))); + assert!(s.eligible(0, now + Duration::from_secs(30))); + } + #[test] fn window_shrinks_only_on_error_bursts() { let now = Instant::now(); diff --git a/app/src/main/rust/stores/src/fetch_tuning.rs b/app/src/main/rust/stores/src/fetch_tuning.rs index 4f1f7074f9..5c380d537b 100644 --- a/app/src/main/rust/stores/src/fetch_tuning.rs +++ b/app/src/main/rust/stores/src/fetch_tuning.rs @@ -68,6 +68,10 @@ pub const SERVER_EXPLORE_EVERY: u64 = 8; pub const NOMINAL_CHUNK_RESERVE_BYTES: u64 = 1024 * 1024; pub const RATE_LIMIT_COOLDOWN_MS: u64 = 5_000; +// Long enough that every retry of the item (5 attempts, at most ~4.5 s of backoff) goes to another +// mirror after this one served a truncated or undecodable body. +pub const SERVER_FAULT_COOLDOWN_MS: u64 = 10_000; + pub fn retry_backoff_millis(attempt: u32) -> u64 { if attempt == 0 { return 0; diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogInstallerPartsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogInstallerPartsTest.kt new file mode 100644 index 0000000000..e60775b0e3 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogInstallerPartsTest.kt @@ -0,0 +1,90 @@ +package com.droiddeck.launcher.stores.gog + +import java.io.File +import java.io.IOException +import java.nio.file.Files +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class GogInstallerPartsTest { + private fun downloads(json: String) = JSONObject("""{"downloads":$json}""").getJSONObject("downloads") + + @Test fun everyFileOfTheWindowsInstallerIsKeptAndThePartsAreNamedAfterItsSetup() { + val parts = GogDownloadManager.installerParts( + downloads( + """{"installers":[ + {"os":"windows","language":"en","files":[ + {"id":"en1installer0","size":1048576,"downlink":"https://api.gog.com/products/1947927225/downlink/installer/en1installer0"}, + {"id":"en1installer1","size":3786407936,"downlink":"https://api.gog.com/products/1947927225/downlink/installer/en1installer1"} + ]}, + {"os":"linux","files":[{"downlink":"https://example.invalid/linux"}]} + ]}""", + ), + "1947927225", + ) + assertEquals(listOf("setup_1947927225.exe", "setup_1947927225-1.bin"), parts.map { it.filename }) + assertEquals(listOf(1048576L, 3786407936L), parts.map { it.size }) + assertTrue(parts[1].url.endsWith("en1installer1")) + } + + @Test fun explicitNamesAreKeptAndUnnamedPartsFollowTheFirstSetupExe() { + val parts = GogDownloadManager.installerParts( + downloads( + """{"installers":[{"os":"windows","files":[ + {"filename":"setup_witcher_2.1.0.exe","downlink":"https://example.invalid/setup"}, + {"downlink":"https://example.invalid/data"}, + {"filename":"readme.bin","downlink":"https://example.invalid/readme"} + ]}]}""", + ), + "1207658924", + ) + assertEquals(listOf("setup_witcher_2.1.0.exe", "setup_witcher_2.1.0-1.bin", "readme.bin"), parts.map { it.filename }) + } + + @Test fun aSingleManualInstallerIsNamedForTheGameAndSanitised() { + val parts = GogDownloadManager.installerParts( + downloads("""{"installers":[{"os":"windows","manualUrl":"https://example.invalid/setup","total_size":42}]}"""), + "../game id", + ) + assertEquals(1, parts.size) + assertEquals("setup_.._game_id.exe", parts[0].filename) + assertEquals(42L, parts[0].size) + } + + @Test fun installerPartsStayInsideTheGameFolder() { + val root = kotlin.io.path.createTempDirectory("gog-installer").toFile() + try { + assertEquals( + File(root, "setup_1.exe").canonicalFile, + GogDownloadManager.installerDestination(root, "setup_1.exe"), + ) + assertThrows(IOException::class.java) { + GogDownloadManager.installerDestination(root, "../outside.exe") + } + val outside = File(root.parentFile, "outside-${System.nanoTime()}.bin").apply { writeText("x") } + try { + Files.createSymbolicLink(File(root, "setup_1-1.bin").toPath(), outside.toPath()) + assertThrows(IOException::class.java) { + GogDownloadManager.installerDestination(root, "setup_1-1.bin") + } + } finally { + outside.delete() + } + } finally { + root.deleteRecursively() + } + } + + @Test fun anotherPlatformOrNoDownloadsAddsNothing() { + assertEquals(0, GogDownloadManager.installerParts(downloads("""{"installers":[{"os":"linux","manualUrl":"https://example.invalid/x"}]}"""), "1").size) + assertEquals(0, GogDownloadManager.installerParts(downloads("{}"), "1").size) + } +} diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract b/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract new file mode 100755 index 0000000000..217878a368 --- /dev/null +++ b/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract @@ -0,0 +1,7 @@ +#!/bin/sh +# Runs DroidDeck's bundled innoextract with its own boost libraries. The guest's +# env -i startup has no LD_LIBRARY_PATH, and the rootfs must not grow a second +# copy of boost for the installer fallback. +LD_LIBRARY_PATH=/usr/local/lib/droiddeck-inno +export LD_LIBRARY_PATH +exec /usr/local/lib/droiddeck-inno/innoextract "$@" diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/innoextract b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/innoextract new file mode 100755 index 0000000000000000000000000000000000000000..ef18119f427a3f9acd112d58389079ff855bb99b GIT binary patch literal 793704 zcmeFad3+n?wfOy5&Z0mdDhWX>C33dbl0bIy6z8I89zU4DtHs;XMxt6JPIs^ItRHuud4G#UsdPncN6W`@49}nZt|xE zKj-hu;WPQt?^0I2LNE2Nk-uO5_EGjRe}Cdc8w>re&-*txPue-zmj?w`;(1Pf$^MHH z)bIMd^E*3MpWnIW1Dze+>k}VnYwL~1mMl82ujjm4Rc|RLJ$UIAAGQ_9cu%)~Q=iX) z-zAfuKlrDwerMVBO@D1#cHGAv9$sH~>>Nu9?XK!up^z&{B5eHG+ybl?LH z{0qPTHuxBmpRB^<-offxapw(a}M$;2mU<={+I**tpoqN1DBmgB|lsMyprFpbKsjC z^lWk9Uw6>6-9i3G4)T9@;BPzd1a#_^>h&uJ-U6LnCI8$Dypo_z#nkn(_#3pWX}TNmCC)`LB7pFeyfB0fCK-! z1OJhOe#=4rJqPZFX-=j3)&Q?m-#Q20=%D8#4t$*hzs-UFz=0PW_X5mmK&}vntzvxdU%^ z;2VHf%FoXNuhcIMI_SCEfq%z=|Ca+Fao`U+@W&kZuO0aF4*YMxEBWD72l;B4uvf~T z84i4o13wpdrE-@!$PYU3VF&)-4*Wp}{uuB|_Wa6$|JFgzvkv?WP+rMzwZJQt`%wq^ zbq+k?z_&Q?0SEpC2mWOT{&fd_uLGYAPN?LE#~k>t9QeBq{OsA4_5ZsA-|WD*Iq=&Y z_^<=F9QYZqu&v~WX5iqu1724<@J~AE+2+7g4m{_e|HR`f+xZCx{&@%fbKsTgwZ}nz z-rUOamjJKiw;l(6zXSif13&hJ%K94}_|*

A-*L!1E5g##`B*%?^A3cqKpor-S@s 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̥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ℜ)sO2k5VjmO*3w;^M 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'n^3p#n^_v$ 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 LZ}t`FONRazjAy!( literal 0 HcmV?d00001 diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0 b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0 new file mode 100755 index 0000000000000000000000000000000000000000..c7ea48d83ad8064af706e4722ca3764d1047e7a0 GIT binary patch literal 133208 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 z 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≺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 literal 0 HcmV?d00001 diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0 b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0 new file mode 100755 index 0000000000000000000000000000000000000000..aceb212bde18fe5b11f5d92389125cfdac1119b5 GIT binary patch literal 133200 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 z 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

  • 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
    What went wrong (Gradle)" - echo - echo '```' - awk '/^\* What went wrong/{p=1} /^\* Try:/{p=0} p{print}' /tmp/build.log 2>/dev/null | head -60 - echo '```' - echo "
    " - ;; - skipped:*|cancelled:*) - echo "### Not built" - echo - echo "The build did not run (see above, or [the run]($RUN_URL))." - ;; - esac - echo - } > /tmp/pr-report.md - cat /tmp/pr-report.md >> "$GITHUB_STEP_SUMMARY" - ID=$(gh api "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" --paginate --jq ".[] | select(.body | startswith(\"$MARK\")) | .id" | head -1 || true) - if [ -n "$ID" ]; then - gh api -X PATCH "repos/${GITHUB_REPOSITORY}/issues/comments/${ID}" -F body=@/tmp/pr-report.md >/dev/null - else - gh api -X POST "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" -F body=@/tmp/pr-report.md >/dev/null - fi + run: bash tools/release/report-build.sh python-tests: name: Python and native regression tests - needs: xbox + needs: source if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} runs-on: ubuntu-24.04 timeout-minutes: 15 @@ -794,7 +618,7 @@ jobs: - name: Merge the pinned APK base if: github.event_name == 'pull_request' env: - BUILD_BASE_SHA: ${{ needs.xbox.outputs.base-sha }} + BUILD_BASE_SHA: ${{ needs.source.outputs.base-sha }} run: | set -euo pipefail git fetch --no-tags origin "$BUILD_BASE_SHA" @@ -803,11 +627,40 @@ jobs: git merge --no-ff --no-edit FETCH_HEAD - name: Verify backend and test source match env: - XBOX_SOURCE_TREE: ${{ needs.xbox.outputs.tree-sha }} + XBOX_SOURCE_TREE: ${{ needs.source.outputs.tree-sha }} run: test "$(git rev-parse 'HEAD^{tree}')" = "$XBOX_SOURCE_TREE" - name: Install Python test dependencies timeout-minutes: 7 run: bash tools/ci/install-ubuntu-packages.sh python3-yaml gcc-aarch64-linux-gnu libc6-dev-arm64-cross qemu-user libvulkan-dev mesa-vulkan-drivers + - name: Resolve the pinned Android NDK + run: bash tools/ci/resolve-ndk.sh + + - name: Check Quest tracking IPC + run: | + set -euo pipefail + NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" + VK_INCLUDE=$(ls -d "$NDK"/toolchains/llvm/prebuilt/*/sysroot/usr/include | head -1) + mkdir -p build/vr/include + cp -R "$VK_INCLUDE/vulkan" build/vr/include/ + if [ -d "$VK_INCLUDE/vk_video" ]; then cp -R "$VK_INCLUDE/vk_video" build/vr/include/; fi + g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_tracking.cpp -o /tmp/test-xr-tracking + /tmp/test-xr-tracking + g++ -std=c++17 -Wall -Wextra -Werror tools/vr/tests/test_xr_touch.cpp -o /tmp/test-xr-touch + /tmp/test-xr-touch + g++ -std=c++17 -Wall -Wextra -Werror tools/vr/tests/test_pad_controller_config.cpp -o /tmp/test-pad-controller-config + /tmp/test-pad-controller-config + g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_vsync.cpp -o /tmp/test-xr-vsync + /tmp/test-xr-vsync + g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_frames.cpp -o /tmp/test-xr-frames + /tmp/test-xr-frames + cc -Itools/vr/third_party/wayland -c tools/vr/src/wayland_client_stub.c -o /tmp/test-wayland-stub.o + cc -Itools/vr/third_party/wayland -c app/src/main/cpp/waylandcomp/generated/xdg-shell-protocol.c -o /tmp/test-xdg-shell.o + g++ -std=c++17 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers -pthread -Ibuild/vr/include \ + -Itools/vr/third_party/wayland -Iapp/src/main/cpp/waylandcomp/generated \ + tools/vr/tests/test_presenter_shutdown.cpp tools/vr/src/presenter.cpp /tmp/test-wayland-stub.o /tmp/test-xdg-shell.o \ + -ldl -o /tmp/test-presenter-shutdown + timeout 10 /tmp/test-presenter-shutdown + - name: Steam import and game environment tests run: python3 -m unittest discover -s tools/tests -p 'test_*.py' @@ -857,6 +710,10 @@ jobs: CI_REPO: Droid-Deck/DroidDeck-CI KEEP: 10 steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.sha }} + persist-credentials: false - uses: actions/download-artifact@v4 with: pattern: droiddeck-signed-* @@ -874,72 +731,13 @@ jobs: - name: Describe the change env: GH_TOKEN: ${{ github.token }} - run: | - set -euo pipefail - pr=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA/pulls" \ - --jq '[.[] | select(.merged_at != null and .base.ref == "main")] | first // empty') - if [ -n "$pr" ]; then - number=$(jq -r .number <<<"$pr") - title=$(jq -r .title <<<"$pr") - merged=$(jq -r '.merged_at[:10]' <<<"$pr") - summary=$(jq -r '.body // ""' <<<"$pr" | tr -d '\r' | { grep -v '^🤖' || true; } | - awk '!p && /^#/ { next } NF { p = 1; print; next } p { exit }' | head -n 6 | cut -c1-400) - { - echo "**Merged to main** - [PR #$number]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/$number): $title (merged $merged)" - if [ -n "$summary" ]; then - echo - echo "$summary" - fi - } > notes-head.md - else - subject=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA" --jq '.commit.message | split("\n")[0]') - echo "**Pushed to main** without a PR - $subject" > notes-head.md - fi - cat notes-head.md + run: bash tools/release/describe-build.sh - name: Publish to DroidDeck-CI id: publish env: GH_TOKEN: ${{ steps.ci-token.outputs.token }} - run: | - set -euo pipefail - tag=main-${GITHUB_SHA::7} - cat signed/SHA256SUMS-*.txt > signed/SHA256SUMS.txt - rm signed/SHA256SUMS-*.txt - notes="$(cat notes-head.md) - - Signed build of $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA - in main, not yet in a DroidDeck release; for testing. - Commit: $GITHUB_SHA - VersionCode: $(sed -n 's/^ *versionCode \([0-9][0-9]*\)$/\1/p' app/build.gradle) - Each apk installs over a DroidDeck release and keeps its data. \`standard\` is the normal app; the others are the same app under another package name, installed beside it. - - SHA-256: - \`\`\` - $(cat signed/SHA256SUMS.txt) - \`\`\`" - gh release delete "$tag" -R "$CI_REPO" --yes --cleanup-tag 2>/dev/null || true - gh release create "$tag" -R "$CI_REPO" --target main --prerelease \ - --title "main ${GITHUB_SHA::7}" --notes "$notes" signed/* - gh release list -R "$CI_REPO" -L 200 --json tagName,publishedAt \ - --jq '[.[] | select(.tagName | startswith("main-"))] | sort_by(.publishedAt) | reverse | .['"$KEEP"':][] | .tagName' | - while IFS= read -r old; do - if [ "$old" = "$tag" ]; then - continue - fi - if ! gh release delete "$old" -R "$CI_REPO" --yes --cleanup-tag 2>/dev/null; then - if gh release view "$old" -R "$CI_REPO" >/dev/null 2>&1; then - echo "::error::Could not delete old release $old" - exit 1 - fi - fi - done - published=$(gh release view "$tag" -R "$CI_REPO" --json tagName,assets) - jq -e --arg tag "$tag" '.tagName == $tag and (.assets | length) > 0' <<< "$published" >/dev/null - url="$GITHUB_SERVER_URL/$CI_REPO/releases/tag/$tag" - apk=$(cd signed && ls DroidDeck-*.apk | awk 'length(a) == 0 || length($0) < length(a) { a = $0 } END { print a }') - echo "release=$url" >> "$GITHUB_OUTPUT" - echo "apk=$GITHUB_SERVER_URL/$CI_REPO/releases/download/$tag/$apk" >> "$GITHUB_OUTPUT" - echo "Published $url" + run: bash tools/release/publish-ci.sh - name: Post the Preview build to Discord env: @@ -947,26 +745,8 @@ jobs: GH_TOKEN: ${{ github.token }} RELEASE: ${{ steps.publish.outputs.release }} APK: ${{ steps.publish.outputs.apk }} - run: | - set -euo pipefail - if [ -z "$WEBHOOK" ]; then - echo "::notice::No DISCORD_BUILDS_WEBHOOK secret; nothing posted" - exit 0 - fi - commit=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA") - subject=$(jq -r '.commit.message | split("\n")[0]' <<<"$commit") - title=$(jq -r '.commit.message | split("\n") | map(select(length > 0)) | .[1] // ""' <<<"$commit") - pr=$(sed -n 's/^Merge pull request #\([0-9]*\).*/\1/p' <<<"$subject") - if [ -n "$pr" ]; then - what="[#$pr]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/$pr): ${title:-$subject}" - else - what="[\`${GITHUB_SHA::7}\`]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA): $subject" - fi - get=$(printf 'Download: [standard APK](<%s>) · [all variants](<%s>)' "$APK" "$RELEASE") - content=$(printf '**New signed Preview build** `main-%s`\n%s\nIn the app: **Updates → Preview**\n%s' "${GITHUB_SHA::7}" "$what" "$get") - jq -n --arg content "$content" '{content: $content, allowed_mentions: {parse: []}}' | - curl -fsS -H 'Content-Type: application/json' -d @- "$WEBHOOK" -o /dev/null - echo "Posted: $content" + run: bash tools/release/announce-preview.sh + catalog: needs: announce diff --git a/tools/ci/resolve-ndk.sh b/tools/ci/resolve-ndk.sh new file mode 100644 index 0000000000..61df33c501 --- /dev/null +++ b/tools/ci/resolve-ndk.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -euo pipefail +repo=$(cd "$(dirname "$0")/../.." && pwd) +source "$repo/tools/ci/toolchains.env" +ndk="$ANDROID_HOME/ndk/$CI_ANDROID_NDK_VERSION" +if [ ! -f "$ndk/source.properties" ]; then + sdkmanager --sdk_root="$ANDROID_HOME" --install "ndk;$CI_ANDROID_NDK_VERSION" +fi +actual=$(sed -n 's/^Pkg.Revision *= *//p' "$ndk/source.properties" | tr -d '\r') +test "$actual" = "$CI_ANDROID_NDK_VERSION" +{ + echo "NDK_VERSION=$actual" + echo "ANDROID_NDK_HOME=$ndk" + echo "ANDROID_NDK_ROOT=$ndk" + echo "ANDROID_NDK_LATEST_HOME=$ndk" +} >> "$GITHUB_ENV" diff --git a/tools/ci/toolchains.env b/tools/ci/toolchains.env new file mode 100644 index 0000000000..ac365f2bb6 --- /dev/null +++ b/tools/ci/toolchains.env @@ -0,0 +1 @@ +CI_ANDROID_NDK_VERSION=30.0.16248370 diff --git a/tools/components/README.md b/tools/components/README.md index 646c099ccb..782d8b9f14 100644 --- a/tools/components/README.md +++ b/tools/components/README.md @@ -1,10 +1,40 @@ -# Verified preload snapshots +# Runtime component preparation + +`recipes.json` owns component source inputs, builders, outputs, package requirements +and pinned downloads. `prepare.py` runs those recipes, calculates cache identities, +installs the union of missing tools and verifies the prepared artifact handoff. +Builders live in `recipes/`; the workflow describes scheduling and gates. + +```mermaid +flowchart LR + Source[Pin source tree] --> Components[Prepare verified components] + Source --> Xbox[Xbox ARM64 backend] + Source --> Tests[Python and native tests] + Components --> APK[Compile APK and Android tests] + Xbox --> APK + APK --> Gate[Compile and test APK gate] + Tests --> Gate + Gate --> Publish[Main only: signing and publishing] +``` + +All workers verify the same source tree. The component artifact records that tree, +recipe identities and every output hash; the APK worker verifies the inventory +before building. This handoff verifies consistency within the same CI run. It is +not independent provenance for arbitrary artifacts. Source policy checks, tests, +APK content/ABI checks and signing/publication gates remain in place. + +`tools/ci/toolchains.env` pins the Android NDK shared by component, APK and native +test workers. Linux builds use Ubuntu 24.04. Recipe and input changes invalidate +the relevant component cache; ordinary caches remain performance aids. + +## Verified preload snapshots `preloads.lock.json` pins a small immutable preload archive. It records each binary's hash, its producing main CI run, the original APK artifact identity and digest, source/header hashes, the ARM64 build recipe and x86 compiler-image inputs. It covers core ARM64 preloads and the x86 preload libraries. VR, Android native -libraries, Comet and Xbox keep their existing preparation paths. +libraries, Comet and Xbox use their registered recipes and existing release pins +or component caches. Every build compares current source inputs, including transitive quoted headers, and build recipes with this manifest. Changed groups rebuild from source. A diff --git a/tools/components/preloads.lock.json b/tools/components/preloads.lock.json index 4093912e32..a92cd6deaa 100644 --- a/tools/components/preloads.lock.json +++ b/tools/components/preloads.lock.json @@ -1,6 +1,6 @@ { "archive_sha256": "cb6487a94f25a3068fd07958174eb5b5e14f709655ff4ef0a8cdbd99138513b2", - "arm64_recipe": "62c8b9cf001f1b04b52856bd74d353842a4be29960f033067f34c7d3a9a48681", + "arm64_recipe": "1c92a1b0669277de3e78e9f292634affb5b5a19d5ea49d3ad8610c1dc638c2fb", "groups": { "arm64": { "@runner": "84f825635599f81ed33f62c5fc4c73f66044d1468b060d65f83855eb9c8bfe77", diff --git a/tools/components/preloads.py b/tools/components/preloads.py index 7da904080f..6714740403 100644 --- a/tools/components/preloads.py +++ b/tools/components/preloads.py @@ -1,6 +1,7 @@ """Reuse reviewed preload snapshots; changed snapshots must prove their main-build origin.""" import argparse import gzip +import http.client import hashlib import io import json @@ -10,6 +11,7 @@ import re from pathlib import Path import subprocess import tarfile +import textwrap import urllib.error import urllib.request from zipfile import ZipFile @@ -17,20 +19,12 @@ from zipfile import ZipFile ROOT = Path(__file__).resolve().parents[2] REPO = 'Droid-Deck/DroidDeck' LOCK = 'tools/components/preloads.lock.json' -COMMON = ['app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/cpp/adrenotools/src/hook/kgsl.h', - 'app/src/main/cpp/venc/venc_proto.h', 'tools/linuxfs/preload', - 'tools/quest/kgsl_compat.c', 'tools/quest/kgsl_compat.h'] -INPUTS = { - 'arm64': COMMON + ['tools/proot/fastpath', 'tools/linuxfs/ssbs', 'tools/linuxfs/clipboard'], - 'x86': COMMON + ['tools/linuxfs/fex', 'tools/linuxfs/build-x86-preloads.sh', 'tools/linuxfs/debian-image.env'], -} -OUTPUTS = { - 'arm64': ['libfakeinput.so', 'libblsession.so', 'libblfastpath.so', 'libblaudit.so', 'libssbs.so', - 'usr/local/bin/droiddeck-clipboard'], - 'x86': [f'{arch}/{name}.so' for arch in ('x86_64', 'i386') - for name in ('libfakeinput', 'libblsession', 'libfaultreport')] - + ['x86_64/libwebkitinput.so', 'x86_64/libvulkan-thunk.so'], -} +DEFINITIONS = json.loads((ROOT / 'tools/components/recipes.json').read_text()) +INPUTS = {group: DEFINITIONS[name]['source_inputs'] for group, name in + [('arm64', 'arm64-preloads'), ('x86', 'x86-preloads')]} +OUTPUTS = {group: DEFINITIONS[name]['snapshot_outputs'] for group, name in + [('arm64', 'arm64-preloads'), ('x86', 'x86-preloads')]} +COMMON = [name for name in INPUTS['arm64'] if name in INPUTS['x86']] FILES = set(sum(OUTPUTS.values(), [])) @@ -46,12 +40,13 @@ def api(path): return json.loads(run('gh', 'api', 'repos/' + REPO + '/' + path)) -def source_files(group, root=ROOT, commit=None): +def source_files(group, root=ROOT, commit=None, patterns=None): + patterns = patterns if patterns is not None else INPUTS[group] if commit: - paths = run('git', 'ls-tree', '-r', '--name-only', commit, '--', *INPUTS[group], root=root).decode().splitlines() + paths = run('git', 'ls-tree', '-r', '--name-only', commit, '--', *patterns, root=root).decode().splitlines() read = lambda path: run('git', 'show', f'{commit}:{path}', root=root) else: - paths = run('git', 'ls-files', '--cached', '--others', '--exclude-standard', '--', *INPUTS[group], root=root).decode().splitlines() + paths = run('git', 'ls-files', '--cached', '--others', '--exclude-standard', '--', *patterns, root=root).decode().splitlines() read = lambda path: (root / path).read_bytes() paths = [p for p in paths if not p.endswith('.md') and '__pycache__' not in p and not p.endswith('.pyc')] if not paths: @@ -70,7 +65,8 @@ def source_files(group, root=ROOT, commit=None): pending.append(posixpath.normpath(posixpath.join(posixpath.dirname(path), include.decode()))) workflow = (run('git', 'show', f'{commit}:.github/workflows/build.yml', root=root).decode() if commit else (root / '.github/workflows/build.yml').read_text()) - runner = re.search(r'(?ms)^ build:\n.*?^ runs-on: ([^\n]+)', workflow) + job = 'components' if re.search(r'(?m)^ components:', workflow) else 'build' + runner = re.search(r'(?ms)^ ' + job + r':\n.*?^ runs-on: ([^\n]+)', workflow) if runner is None: raise ValueError('APK build runner policy is missing') result['@runner'] = sha(runner[1].strip().encode()) @@ -85,14 +81,14 @@ def recipe(root=ROOT, commit=None): if commit and run('git', 'ls-tree', commit, script, root=root) == b'': workflow = read('.github/workflows/build.yml') text = workflow[workflow.index(' aarch64-linux-gnu-g++ -shared'):] - text = text[:text.index(' VK_INCLUDE=')] + text = textwrap.dedent(text[:text.index(' VK_INCLUDE=')]) else: text = read(script) preamble = '#!/usr/bin/env bash\nset -euo pipefail\nD=${1:?output directory}\nmkdir -p "$D"\n' if not text.startswith(preamble): return sha(text.encode()) text = text[len(preamble):] - return sha(' '.join(text.split()).encode()) + return sha(text.replace('\r\n', '\n').encode()) def artifact_bytes(origin, cache): @@ -130,6 +126,26 @@ def validate_lock(data): raise ValueError('Invalid preload checksum') +def producer_sources(group, commit, root=ROOT): + config = 'tools/components/recipes.json' + if run('git', 'ls-tree', commit, config, root=root): + definitions = json.loads(run('git', 'show', f'{commit}:{config}', root=root)) + name = 'arm64-preloads' if group == 'arm64' else 'x86-preloads' + patterns = definitions[name]['source_inputs'] + else: + # Older approved builds kept ARM64 commands inline, before the Vulkan/VR build. + if group == 'arm64': + text = run('git', 'show', f'{commit}:.github/workflows/build.yml', root=root).decode() + text = text[text.index(' aarch64-linux-gnu-g++ -shared'):] + text = text[:text.index(' VK_INCLUDE=')] + else: + text = run('git', 'show', f'{commit}:tools/linuxfs/build-x86-preloads.sh', root=root).decode() + patterns = re.findall(r'\b((?:tools|app)/[\w./*+-]+\.(?:cpp|c|h))(?=\s|$)', text) + if group == 'x86': + patterns += ['tools/linuxfs/fex', 'tools/linuxfs/build-x86-preloads.sh', 'tools/linuxfs/debian-image.env'] + return source_files(group, root, commit, patterns) + + def prove_origin(data, cache, root=ROOT): content = artifact_bytes(data['origin'], cache) if {name: sha(value) for name, value in content.items()} != data['outputs']: @@ -139,6 +155,9 @@ def prove_origin(data, cache, root=ROOT): for group in INPUTS: if source_files(group, root, commit) != data['groups'][group]: raise ValueError('Snapshot inputs differ from the producing source') + for name, checksum in producer_sources(group, commit, root).items(): + if data['groups'][group].get(name) != checksum: + raise ValueError('Snapshot omits or changes a producing build dependency') if recipe(root, commit) != data['arm64_recipe']: raise ValueError('Snapshot recipe differs from the producing source') @@ -179,14 +198,19 @@ def restore(root=ROOT): if result.returncode == 0: approved = json.loads(result.stdout) if approved != data: - prove_origin(data, root / 'app/build/component-downloads', root) + try: + prove_origin(data, root / 'app/build/component-downloads', root) + except (subprocess.CalledProcessError, OSError, http.client.HTTPException): + print('Snapshot origin is unavailable; rebuilding without trusting the snapshot.') + matching = dict.fromkeys(INPUTS, False) + if any(matching.values()): url = (f"https://github.com/Droid-Deck/DroidDeck-Components/releases/download/" f"preloads-{data['archive_sha256']}/preloads.tar.gz") try: with urllib.request.urlopen(url, timeout=60) as response: content = response.read(64 * 1024 * 1024) - except urllib.error.HTTPError as error: - if error.code != 404: + except (OSError, http.client.HTTPException) as error: + if isinstance(error, urllib.error.HTTPError) and error.code not in (404, 429) and error.code < 500: raise print('Preload snapshot is unavailable; rebuilding from source.') matching = dict.fromkeys(INPUTS, False) diff --git a/tools/components/prepare.py b/tools/components/prepare.py new file mode 100644 index 0000000000..064b452bee --- /dev/null +++ b/tools/components/prepare.py @@ -0,0 +1,167 @@ +"""One entry point for runtime recipes, cache identities and verified job handoff.""" +import argparse +import hashlib +import json +import os +from pathlib import Path, PurePosixPath +import shutil +import subprocess +import tarfile + +ROOT = Path(__file__).resolve().parents[2] +REGISTRY = 'tools/components/recipes.json' +TREES = ['app/src/main/assets/linuxfs', 'app/src/main/assets/directaudio', + 'app/src/main/assets/droiddeck-esync', 'app/build/prepared-assets', + 'app/build/component-records'] +LIBRARIES = ['app/src/main/jniLibs/arm64-v8a/' + name for name in + ('libproot.so', 'libproot-loader.so', 'libdirectaudiorelay.so')] +MANIFEST = 'app/build/prepared-components.json' + + +def digest(path): + with path.open('rb') as stream: + return hashlib.file_digest(stream, 'sha256').hexdigest() + + +def registry(root=ROOT): + return json.loads((root / REGISTRY).read_text()) + + +def identity(name, root=ROOT): + spec = registry(root)[name] + paths = subprocess.check_output(['git', 'ls-files', '--cached', '--others', '--exclude-standard', + '--', *spec['inputs'], *spec.get('source_inputs', [])], cwd=root, text=True).splitlines() + values = {} + for name_ in sorted(set(paths)): + if '__pycache__' in name_ or name_.endswith(('.pyc', '.md')): + continue + content = (root / name_).read_bytes() + if b'\0' not in content: + content = content.replace(b'\r\n', b'\n') + values[name_] = hashlib.sha256(content).hexdigest() + policy = dict(spec=spec, sources=values, runner=os.environ.get('RUNNER_OS', 'Linux'), + architecture=os.environ.get('RUNNER_ARCH', 'X64')) + entrypoint = root / 'tools/components/prepare.py' + if entrypoint.is_file(): + policy['entrypoint'] = hashlib.sha256(entrypoint.read_bytes().replace(b'\r\n', b'\n')).hexdigest() + installer = root / 'tools/ci/install-ubuntu-packages.sh' + if spec.get('packages') and installer.is_file(): + policy['installer'] = hashlib.sha256(installer.read_bytes().replace(b'\r\n', b'\n')).hexdigest() + if spec.get('ndk'): + policy['ndk'] = os.environ.get('NDK_VERSION', '') + policy['ndk_policy'] = hashlib.sha256((root / 'tools/ci/toolchains.env').read_bytes().replace(b'\r\n', b'\n')).hexdigest() + return hashlib.sha256(json.dumps(policy, sort_keys=True).encode()).hexdigest() + + +def prepare(name, root=ROOT): + spec = registry(root)[name] + prepare_tools([name], root) + if 'command' in spec: + command = spec['command'] + else: + script = (root / spec['script']).resolve() + if not script.is_relative_to((root / 'tools/components').resolve()): + raise ValueError('Recipe script escapes components directory') + command = ['bash', str(script)] + environment = dict(os.environ) + if spec.get('source'): + environment.update(COMPONENT_SOURCE_URL=spec['source']['url'], + COMPONENT_SOURCE_SHA256=spec['source']['sha256']) + subprocess.run(command, cwd=root, env=environment, check=True) + missing = [name_ for name_ in spec['outputs'] if not (root / name_).is_file()] + if missing: + raise ValueError(f'{name} did not prepare required outputs: {missing}') + record = dict(component=name, input_sha256=identity(name, root), + outputs={p: digest(root / p) for p in spec['outputs']}) + destination = root / 'app/build/component-records' / (name + '.json') + destination.parent.mkdir(parents=True, exist_ok=True) + destination.write_text(json.dumps(record, sort_keys=True, indent=2) + '\n') + + +def prepare_tools(names, root=ROOT): + packages = sorted({package for name in names for package in registry(root)[name].get('packages', [])}) + if packages: + subprocess.run(['bash', 'tools/ci/install-ubuntu-packages.sh', *packages], cwd=root, check=True) + + +def files(root=ROOT): + result = [] + for name in TREES: + folder = root / name + if not folder.is_dir() or folder.is_symlink(): + raise ValueError('Missing prepared component tree: ' + name) + for path in folder.rglob('*'): + if path.is_symlink(): + raise ValueError('Symlink in prepared components: ' + str(path)) + if path.is_file(): + result.append(path.relative_to(root).as_posix()) + for name in LIBRARIES: + if not (root / name).is_file() or (root / name).is_symlink(): + raise ValueError('Missing prepared component library: ' + name) + result.append(name) + return sorted(result) + + +def pack(destination, root=ROOT): + names = files(root) + tree = subprocess.check_output(['git', 'rev-parse', 'HEAD^{tree}'], cwd=root, text=True).strip() + data = dict(version=1, source_tree=tree, run=os.environ.get('GITHUB_RUN_ID', ''), + recipes={name: identity(name, root) for name in registry(root)}, + files={name: digest(root / name) for name in names}) + (root / MANIFEST).write_text(json.dumps(data, sort_keys=True, indent=2) + '\n') + destination.parent.mkdir(parents=True, exist_ok=True) + with tarfile.open(destination, mode='w:gz', compresslevel=1) as archive: + for name in names + [MANIFEST]: + archive.add(root / name, arcname=name, recursive=False) + + +def unpack(archive_path, source_tree, root=ROOT): + total = 0 + seen = set() + with tarfile.open(archive_path, mode='r:gz') as archive: + for entry in archive: + allowed = entry.name in LIBRARIES + [MANIFEST] or any(entry.name.startswith(p + '/') for p in TREES) + path = root / entry.name + total += entry.size + if (not allowed or '\\' in entry.name or '..' in PurePosixPath(entry.name).parts + or PurePosixPath(entry.name).as_posix() != entry.name + or not entry.isfile() or entry.name in seen or len(seen) >= 100000 + or entry.size > 512 * 1024 * 1024 + or total > 2 * 1024**3 or not path.resolve().is_relative_to(root.resolve()) + or path.is_symlink()): + raise ValueError('Unsafe prepared component archive') + seen.add(entry.name) + path.parent.mkdir(parents=True, exist_ok=True) + with path.open('wb') as output: + shutil.copyfileobj(archive.extractfile(entry), output) + path.chmod(entry.mode & 0o777) + data = json.loads((root / MANIFEST).read_text()) + actual = {name: digest(root / name) for name in files(root)} + recipes = {name: identity(name, root) for name in registry(root)} + if (data.get('version') != 1 or data['source_tree'] != source_tree or data['files'] != actual + or data['recipes'] != recipes): + raise ValueError('Prepared components do not match the pinned source tree and file hashes') + print('Prepared component source identity and all output hashes verified.') + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + parser.add_argument('recipe') + parser.add_argument('--archive', type=Path, default=ROOT / 'app/build/prepared-components.tar.gz') + parser.add_argument('--tree') + args = parser.parse_args() + if args.recipe == 'plan': + for name in registry(): + value = identity(name) + print(f'{name}: {value}') + if os.environ.get('GITHUB_OUTPUT'): + with open(os.environ['GITHUB_OUTPUT'], 'a') as stream: + stream.write(f'{name}={value}\n') + elif args.recipe == 'tools': + prepare_tools(os.environ.get('COMPONENTS_TO_BUILD', '').split()) + elif args.recipe == 'pack': + pack(args.archive) + elif args.recipe == 'unpack': + unpack(args.archive, args.tree) + else: + prepare(args.recipe) diff --git a/tools/components/recipes.json b/tools/components/recipes.json new file mode 100644 index 0000000000..19144018fc --- /dev/null +++ b/tools/components/recipes.json @@ -0,0 +1,225 @@ +{ + "runtime": { + "script": "tools/components/recipes/runtime.sh", + "inputs": [ + "tools/components/recipes/runtime.sh", + "tools/quest", + "tools/linuxfs/overlay", + "tools/linuxfs/desktop", + "tools/linuxfs/licenses", + "tools/linuxfs/uruntime.env", + "tools/gamescope/release.env", + "tools/wlroots/release.env", + "tools/mangoapp", + "tools/msitools", + "tools/pipewire", + "tools/vr", + "app/src/main/cpp/waylandcomp/generated", + "app/src/main/cpp/waylandcomp/src/headpose_shm.h", + "app/src/main/cpp/waylandcomp/src/spatialpose_shm.h", + "app/src/main/cpp/venc/venc_proto.h" + ], + "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" + ], + "ndk": true, + "packages": [ + "gcc-aarch64-linux-gnu", + "g++-aarch64-linux-gnu", + "libvulkan1", + "mesa-vulkan-drivers" + ] + }, + "esync": { + "script": "tools/components/recipes/esync.sh", + "inputs": [ + "tools/components/recipes/esync.sh", + "tools/droiddeck-esync/release.env" + ], + "outputs": [ + "app/src/main/assets/droiddeck-esync/index.json", + "app/src/main/assets/droiddeck-esync/index.json.sig" + ] + }, + "debian-image": { + "script": "tools/components/recipes/debian-image.sh", + "inputs": [ + "tools/components/recipes/debian-image.sh" + ], + "outputs": [] + }, + "x86-preloads": { + "script": "tools/components/recipes/x86-preloads.sh", + "inputs": [ + "tools/components/recipes/x86-preloads.sh", + "tools/linuxfs/build-x86-preloads.sh", + "tools/linuxfs/preload", + "tools/linuxfs/fex" + ], + "outputs": [ + "app/src/main/assets/linuxfs/x86_64/libfakeinput.so", + "app/src/main/assets/linuxfs/x86_64/libblsession.so", + "app/src/main/assets/linuxfs/x86_64/libfaultreport.so", + "app/src/main/assets/linuxfs/i386/libfakeinput.so", + "app/src/main/assets/linuxfs/i386/libblsession.so", + "app/src/main/assets/linuxfs/i386/libfaultreport.so", + "app/src/main/assets/linuxfs/x86_64/libwebkitinput.so", + "app/src/main/assets/linuxfs/x86_64/libvulkan-thunk.so" + ], + "source_inputs": [ + "app/src/main/cpp/fakeinput_steam.cpp", + "app/src/main/cpp/adrenotools/src/hook/kgsl.h", + "app/src/main/cpp/venc/venc_proto.h", + "tools/linuxfs/preload", + "tools/quest/kgsl_compat.c", + "tools/quest/kgsl_compat.h", + "tools/linuxfs/fex", + "tools/linuxfs/build-x86-preloads.sh", + "tools/linuxfs/debian-image.env" + ], + "snapshot_outputs": [ + "x86_64/libfakeinput.so", + "x86_64/libblsession.so", + "x86_64/libfaultreport.so", + "i386/libfakeinput.so", + "i386/libblsession.so", + "i386/libfaultreport.so", + "x86_64/libwebkitinput.so", + "x86_64/libvulkan-thunk.so" + ] + }, + "pulseaudio-source": { + "script": "tools/components/recipes/pulseaudio-source.sh", + "inputs": [ + "tools/components/recipes/pulseaudio-source.sh" + ], + "outputs": [ + "pa13/src/pulsecore/module.h" + ], + "source": { + "url": "https://github.com/pulseaudio/pulseaudio/archive/refs/tags/v13.0.tar.gz", + "sha256": "bd7980bc9bd44bd3b3363545dabd19476ebf4d6bb6d2527e7d179256394a6758" + } + }, + "directaudio": { + "script": "tools/components/recipes/directaudio.sh", + "inputs": [ + "tools/components/recipes/directaudio.sh", + "tools/directaudio" + ], + "outputs": [ + "app/src/main/jniLibs/arm64-v8a/libdirectaudiorelay.so" + ] + }, + "audio": { + "script": "tools/components/recipes/audio.sh", + "inputs": [ + "tools/aaudio-sink", + "tools/directaudio", + "tools/components/recipes/audio.sh", + "app/src/main/assets/pulseaudio.tzst" + ], + "outputs": [ + "app/build/prepared-assets/pulseaudio.tzst" + ], + "ndk": true + }, + "proot": { + "script": "tools/components/recipes/proot.sh", + "inputs": [ + "tools/proot", + "tools/components/recipes/proot.sh" + ], + "outputs": [ + "app/src/main/jniLibs/arm64-v8a/libproot.so", + "app/src/main/jniLibs/arm64-v8a/libproot-loader.so" + ], + "ndk": true + }, + "comet": { + "script": "tools/components/recipes/comet.sh", + "inputs": [ + "tools/comet", + "tools/components/recipes/comet.sh" + ], + "outputs": [ + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet/comet", + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet/version" + ], + "packages": [ + "gcc-aarch64-linux-gnu" + ] + }, + "arm64-preloads": { + "script": "tools/components/recipes/arm64-preloads.sh", + "inputs": [ + "tools/components/build-arm64-preloads.sh", + "tools/linuxfs/preload", + "app/src/main/cpp/fakeinput_steam.cpp", + "tools/components/recipes/arm64-preloads.sh" + ], + "outputs": [ + "app/src/main/assets/linuxfs/libfakeinput.so", + "app/src/main/assets/linuxfs/libblsession.so", + "app/src/main/assets/linuxfs/libblfastpath.so", + "app/src/main/assets/linuxfs/libblaudit.so", + "app/src/main/assets/linuxfs/libssbs.so", + "app/src/main/assets/linuxfs/usr/local/bin/droiddeck-clipboard" + ], + "packages": [ + "gcc-aarch64-linux-gnu", + "g++-aarch64-linux-gnu" + ], + "source_inputs": [ + "app/src/main/cpp/fakeinput_steam.cpp", + "app/src/main/cpp/adrenotools/src/hook/kgsl.h", + "app/src/main/cpp/venc/venc_proto.h", + "tools/linuxfs/preload", + "tools/quest/kgsl_compat.c", + "tools/quest/kgsl_compat.h", + "tools/proot/fastpath", + "tools/linuxfs/ssbs", + "tools/linuxfs/clipboard" + ], + "snapshot_outputs": [ + "libfakeinput.so", + "libblsession.so", + "libblfastpath.so", + "libblaudit.so", + "libssbs.so", + "usr/local/bin/droiddeck-clipboard" + ] + }, + "preload-snapshot": { + "command": [ + "python3", + "tools/components/preloads.py", + "restore" + ], + "inputs": [ + "tools/components/preloads.py", + "tools/components/preloads.lock.json" + ], + "outputs": [] + }, + "xbox": { + "script": "tools/components/recipes/xbox.sh", + "inputs": [ + "tools/xbox", + "tools/components/recipes/xbox.sh" + ], + "outputs": [ + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox/xodus-cli", + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox/xodus-service" + ], + "packages": [ + "build-essential", + "pkg-config", + "libssl-dev", + "protobuf-compiler", + "cmake", + "xz-utils" + ] + } +} diff --git a/tools/components/recipes/arm64-preloads.sh b/tools/components/recipes/arm64-preloads.sh new file mode 100644 index 0000000000..c6a227c2e4 --- /dev/null +++ b/tools/components/recipes/arm64-preloads.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +set -euo pipefail +bash tools/components/build-arm64-preloads.sh app/src/main/assets/linuxfs diff --git a/tools/components/recipes/audio.sh b/tools/components/recipes/audio.sh new file mode 100644 index 0000000000..819421d7c0 --- /dev/null +++ b/tools/components/recipes/audio.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +set -euo pipefail +export NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" +tools/aaudio-sink/build.sh "$PWD/pa13" "$PWD/sink-out" +rm -rf pa-bundle && mkdir -p pa-bundle +tar --use-compress-program=unzstd -xf app/src/main/assets/pulseaudio.tzst -C pa-bundle +test ! -f pa-bundle/modules/arm64/module-aaudio-sink.so +install -m755 sink-out/module-aaudio-sink.so pa-bundle/modules/arm64/module-aaudio-sink.so +install -m755 sink-out/module-directaudio-native-sink.so pa-bundle/modules/arm64/module-directaudio-native-sink.so +(cd pa-bundle && tar --use-compress-program='zstd -19' -cf ../pulseaudio.tzst .) +mkdir -p app/build/prepared-assets +mv pulseaudio.tzst app/build/prepared-assets/pulseaudio.tzst +tar --use-compress-program=unzstd -tf app/build/prepared-assets/pulseaudio.tzst | grep -c '\.so$' +rm -rf pa-bundle sink-out diff --git a/tools/components/recipes/comet.sh b/tools/components/recipes/comet.sh new file mode 100644 index 0000000000..e47d3e3d5b --- /dev/null +++ b/tools/components/recipes/comet.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -euo pipefail +rustup toolchain install 1.90.0 --profile minimal +rustup target add --toolchain 1.90.0 aarch64-unknown-linux-gnu +RUSTUP_TOOLCHAIN=1.90.0 bash tools/comet/build.sh diff --git a/tools/components/recipes/debian-image.sh b/tools/components/recipes/debian-image.sh new file mode 100644 index 0000000000..f982225dcc --- /dev/null +++ b/tools/components/recipes/debian-image.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +set -euo pipefail +. tools/linuxfs/debian-image.env +image=public.ecr.aws/docker/library/debian:bullseye +if gh release download "$DEBIAN_IMAGE_TAG" -R "$GITHUB_REPOSITORY" -p "$DEBIAN_IMAGE_ASSET" -O /tmp/debian-image.tar.zst \ + && { [ -z "$DEBIAN_IMAGE_SHA256" ] || echo "$DEBIAN_IMAGE_SHA256 /tmp/debian-image.tar.zst" | sha256sum -c -; }; then + zstd -dc /tmp/debian-image.tar.zst | docker load + rm -f /tmp/debian-image.tar.zst +else + echo "::warning::the hosted Debian image could not be fetched; pulling from the registry instead" + for attempt in 1 2 3 4 5; do + docker pull "$image" && break + [ "$attempt" -lt 5 ] || { echo "::error::could not pull $image after $attempt attempts"; exit 1; } + echo "pull attempt $attempt failed (registry busy?); retrying in $((attempt * 30)) s" + sleep $((attempt * 30)) + done +fi +docker image ls "$image" diff --git a/tools/components/recipes/directaudio.sh b/tools/components/recipes/directaudio.sh new file mode 100644 index 0000000000..c684f02624 --- /dev/null +++ b/tools/components/recipes/directaudio.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +set -euo pipefail +tools/directaudio/fetch.sh "$PWD" "$PWD/sink-out" \ No newline at end of file diff --git a/tools/components/recipes/esync.sh b/tools/components/recipes/esync.sh new file mode 100644 index 0000000000..691f77e99a --- /dev/null +++ b/tools/components/recipes/esync.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -euo pipefail +if [ -f tools/droiddeck-esync/release.env ]; then + . tools/droiddeck-esync/release.env + release_url="https://github.com/${SYNC_BUNDLE_REPO}/releases/download/${SYNC_BUNDLE_TAG}" + curl -fsSL --retry 3 -o sync-bundle.tzst "$release_url/$SYNC_BUNDLE_ASSET" + echo "$SYNC_BUNDLE_SHA256 sync-bundle.tzst" | sha256sum -c - + mkdir -p app/src/main/assets/droiddeck-esync + tar --use-compress-program=unzstd -xf sync-bundle.tzst -C app/src/main/assets/droiddeck-esync + rm sync-bundle.tzst + curl -fsSL --retry 3 -o sync-index.json "$release_url/index.json" + revoked=$(python3 -c 'import json, sys; print(" ".join(p["id"] for p in json.load(open(sys.argv[1]))["packs"] if p.get("revoked") is True))' sync-index.json) + for id in $revoked; do + if [ -e "app/src/main/assets/droiddeck-esync/packs/$id.tzst" ]; then + echo "::warning::$SYNC_BUNDLE_ASSET carries revoked pack $id; it is left out of the APK (point tools/droiddeck-esync/release.env at a newer bundle)" + rm -f "app/src/main/assets/droiddeck-esync/packs/$id.tzst" + fi + done + rm sync-index.json + test -f app/src/main/assets/droiddeck-esync/index.json + test -f app/src/main/assets/droiddeck-esync/index.json.sig + ls -lR app/src/main/assets/droiddeck-esync +fi diff --git a/tools/components/recipes/proot.sh b/tools/components/recipes/proot.sh new file mode 100644 index 0000000000..9bf7699e85 --- /dev/null +++ b/tools/components/recipes/proot.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +export NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" +tools/proot/build.sh app/src/main/jniLibs/arm64-v8a diff --git a/tools/components/recipes/pulseaudio-source.sh b/tools/components/recipes/pulseaudio-source.sh new file mode 100644 index 0000000000..5a2a6ed093 --- /dev/null +++ b/tools/components/recipes/pulseaudio-source.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -euo pipefail +curl -fsSL --retry 3 -o pa.tar.gz "$COMPONENT_SOURCE_URL" +echo "$COMPONENT_SOURCE_SHA256 pa.tar.gz" | sha256sum -c - +mkdir -p pa13 && tar -xzf pa.tar.gz -C pa13 --strip-components=1 && rm pa.tar.gz diff --git a/tools/components/recipes/runtime.sh b/tools/components/recipes/runtime.sh new file mode 100644 index 0000000000..0e640ab114 --- /dev/null +++ b/tools/components/recipes/runtime.sh @@ -0,0 +1,83 @@ +#!/usr/bin/env bash +set -euo pipefail +D=app/src/main/assets/linuxfs +mkdir -p "$D" +VK_INCLUDE=$(ls -d "${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}"/toolchains/llvm/prebuilt/*/sysroot/usr/include | head -1) \ + tools/vr/build.sh --native "$D/usr/local/lib/droiddeck-vr" +for script in tools/linuxfs/overlay/usr/local/bin/droiddeck-* tools/linuxfs/overlay/usr/local/bin/steam-compatibility; do + install -Dm644 "$script" "$D/usr/local/bin/$(basename "$script")" +done +for f in tools/linuxfs/overlay/usr/bin/* tools/linuxfs/overlay/usr/bin/steamos-polkit-helpers/*; do + [ -f "$f" ] && install -Dm644 "$f" "$D/${f#tools/linuxfs/overlay/}" +done +if [ -f tools/gamescope/release.env ]; then + . tools/gamescope/release.env + curl -fsSL --retry 3 -o gamescope.tzst "https://github.com/${GAMESCOPE_REPO:-${GITHUB_REPOSITORY}}/releases/download/${GAMESCOPE_TAG}/gamescope.tzst" + echo "${GAMESCOPE_SHA256} gamescope.tzst" | sha256sum -c - + tar --use-compress-program=unzstd -xf gamescope.tzst -C "$D" + test -f "$D/usr/local/bin/gamescope" + rm gamescope.tzst +fi +. tools/linuxfs/uruntime.env +curl -fsSL --retry 3 -o uruntime "https://github.com/VHSgunzo/uruntime/releases/download/${URUNTIME_VERSION}/${URUNTIME_ASSET}" +echo "${URUNTIME_SHA256} uruntime" | sha256sum -c - +install -Dm644 uruntime "$D/usr/local/lib/droiddeck/uruntime" +install -Dm644 tools/linuxfs/licenses/uruntime-LICENSE "$D/usr/local/share/licenses/uruntime/LICENSE" +rm uruntime +M="$D/usr/local/lib/mangoapp" +mkdir -p "$M" mango-pkgs +grep -v '^#' tools/mangoapp/packages.txt | while read -r sum url; do + [ -n "$url" ] || continue + curl -fsSL --retry 3 -o mango-pkgs/pkg.tar.zst "$url" + echo "$sum mango-pkgs/pkg.tar.zst" | sha256sum -c - + tar --use-compress-program=unzstd -xf mango-pkgs/pkg.tar.zst -C mango-pkgs + rm mango-pkgs/pkg.tar.zst +done +install -m644 mango-pkgs/usr/bin/mangoapp "$M/mangoapp" +for so in libfmt.so.10 libspdlog.so.1.13 libglfw.so.3 libtraceevent.so.1; do + cp -L "mango-pkgs/usr/lib/$so" "$M/$so" +done +aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -Wl,-soname,libtracefs.so.1 \ + -o "$M/libtracefs.so.1" tools/mangoapp/libtracefs-shim.c +aarch64-linux-gnu-strip --strip-unneeded "$M/libtracefs.so.1" +install -Dm644 tools/mangoapp/mangoapp "$D/usr/local/bin/mangoapp" +rm -rf mango-pkgs +ls -l "$M" +mkdir -p pw-pkgs +grep -v '^#' tools/pipewire/packages.txt | while read -r sum url; do + [ -n "$url" ] || continue + curl -fsSL --retry 3 -o pw-pkgs/pkg.tar.zst "$url" + echo "$sum pw-pkgs/pkg.tar.zst" | sha256sum -c - + tar --use-compress-program=unzstd -xf pw-pkgs/pkg.tar.zst -C pw-pkgs + rm pw-pkgs/pkg.tar.zst +done +tools/pipewire/assemble.sh pw-pkgs "$D/usr/local/lib/droiddeck-pipewire.tzst" +rm -rf pw-pkgs +ls -l "$D/usr/local/lib/droiddeck-pipewire.tzst" +T="$D/usr/local/lib/droiddeck-msitools" +mkdir -p "$T" msi-pkgs +grep -v '^#' tools/msitools/packages.txt | while read -r sum url; do + [ -n "$url" ] || continue + curl -fsSL --retry 3 -o msi-pkgs/pkg.tar.xz "$url" + echo "$sum msi-pkgs/pkg.tar.xz" | sha256sum -c - + tar -xJf msi-pkgs/pkg.tar.xz -C msi-pkgs + rm msi-pkgs/pkg.tar.xz +done +install -m644 msi-pkgs/usr/bin/msiinfo "$T/msiinfo" +install -m644 msi-pkgs/usr/bin/cabextract "$T/cabextract" +install -m644 msi-pkgs/usr/lib/7zip/7z "$T/7z" +install -m644 msi-pkgs/usr/lib/7zip/7z.so "$T/7z.so" +for so in libmsi-1.0.so.0 libgsf-1.so.114 libgcab-1.0.so.0; do + cp -L "msi-pkgs/usr/lib/$so" "$T/$so" +done +for f in NOTICE GPL-2 GPL-3 LGPL-2.1 7zip-License 7zip-unRarLicense; do + install -Dm644 "tools/msitools/licenses/$f" "$D/usr/local/share/licenses/droiddeck-msitools/$f" +done +rm -rf msi-pkgs +ls -l "$T" +install -Dm644 tools/linuxfs/desktop/droiddeck-desktop "$D/usr/local/bin/droiddeck-desktop" +install -Dm644 tools/linuxfs/desktop/droiddeck-gpu "$D/usr/local/bin/droiddeck-gpu" +install -Dm644 tools/linuxfs/desktop/droiddeck-desktop-gpu "$D/usr/local/bin/droiddeck-desktop-gpu" +install -Dm644 tools/linuxfs/desktop/kwin_wayland_wrapper "$D/usr/local/bin/kwin_wayland_wrapper" +install -Dm644 tools/linuxfs/desktop/firefox-droiddeck.js "$D/usr/lib/firefox/defaults/pref/droiddeck.js" +ls -lR "$D" diff --git a/tools/components/recipes/x86-preloads.sh b/tools/components/recipes/x86-preloads.sh new file mode 100644 index 0000000000..c107c543be --- /dev/null +++ b/tools/components/recipes/x86-preloads.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +set -euo pipefail +docker run --rm -v "$PWD:/src" -w /src public.ecr.aws/docker/library/debian:bullseye bash -c ' + set -euo pipefail + install_compilers() { + apt-get -o Acquire::Check-Valid-Until=false update -qq && + DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends gcc g++ gcc-multilib g++-multilib binutils >/dev/null + } + printf "deb http://deb.debian.org/debian bullseye main\ndeb http://security.debian.org/debian-security bullseye-security main\n" > /etc/apt/sources.list + if ! install_compilers; then + printf "deb http://archive.debian.org/debian bullseye main\ndeb http://archive.debian.org/debian-security bullseye-security main\n" > /etc/apt/sources.list + install_compilers + fi + tools/linuxfs/build-x86-preloads.sh app/src/main/assets/linuxfs +' +sudo chown -R "$(id -u):$(id -g)" app/src/main/assets/linuxfs +ls -l app/src/main/assets/linuxfs/x86_64 app/src/main/assets/linuxfs/i386 diff --git a/tools/components/recipes/xbox.sh b/tools/components/recipes/xbox.sh new file mode 100644 index 0000000000..87c9536560 --- /dev/null +++ b/tools/components/recipes/xbox.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +rustup toolchain install 1.99.0 --profile minimal +bash tools/xbox/build.sh diff --git a/tools/release/announce-preview.sh b/tools/release/announce-preview.sh new file mode 100644 index 0000000000..c4b63e727c --- /dev/null +++ b/tools/release/announce-preview.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +set -euo pipefail +if [ -z "$WEBHOOK" ]; then + echo "::notice::No DISCORD_BUILDS_WEBHOOK secret; nothing posted" + exit 0 +fi +commit=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA") +subject=$(jq -r '.commit.message | split("\n")[0]' <<<"$commit") +title=$(jq -r '.commit.message | split("\n") | map(select(length > 0)) | .[1] // ""' <<<"$commit") +pr=$(sed -n 's/^Merge pull request #\([0-9]*\).*/\1/p' <<<"$subject") +if [ -n "$pr" ]; then + what="[#$pr]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/$pr): ${title:-$subject}" +else + what="[\`${GITHUB_SHA::7}\`]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA): $subject" +fi +get=$(printf 'Download: [standard APK](<%s>) · [all variants](<%s>)' "$APK" "$RELEASE") +content=$(printf '**New signed Preview build** `main-%s`\n%s\nIn the app: **Updates → Preview**\n%s' "${GITHUB_SHA::7}" "$what" "$get") +jq -n --arg content "$content" '{content: $content, allowed_mentions: {parse: []}}' | + curl -fsS -H 'Content-Type: application/json' -d @- "$WEBHOOK" -o /dev/null +echo "Posted: $content" diff --git a/tools/release/describe-build.sh b/tools/release/describe-build.sh new file mode 100644 index 0000000000..46bc339ba0 --- /dev/null +++ b/tools/release/describe-build.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +set -euo pipefail +pr=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA/pulls" \ + --jq '[.[] | select(.merged_at != null and .base.ref == "main")] | first // empty') +if [ -n "$pr" ]; then + number=$(jq -r .number <<<"$pr") + title=$(jq -r .title <<<"$pr") + merged=$(jq -r '.merged_at[:10]' <<<"$pr") + summary=$(jq -r '.body // ""' <<<"$pr" | tr -d '\r' | { grep -v '^🤖' || true; } | + awk '!p && /^#/ { next } NF { p = 1; print; next } p { exit }' | head -n 6 | cut -c1-400) + { + echo "**Merged to main** - [PR #$number]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/$number): $title (merged $merged)" + if [ -n "$summary" ]; then + echo + echo "$summary" + fi + } > notes-head.md +else + subject=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA" --jq '.commit.message | split("\n")[0]') + echo "**Pushed to main** without a PR - $subject" > notes-head.md +fi +cat notes-head.md diff --git a/tools/release/publish-ci.sh b/tools/release/publish-ci.sh new file mode 100644 index 0000000000..987ef622dd --- /dev/null +++ b/tools/release/publish-ci.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +set -euo pipefail +tag=main-${GITHUB_SHA::7} +cat signed/SHA256SUMS-*.txt > signed/SHA256SUMS.txt +rm signed/SHA256SUMS-*.txt +notes="$(cat notes-head.md) + +Signed build of $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA - in main, not yet in a DroidDeck release; for testing. +Commit: $GITHUB_SHA +VersionCode: $(sed -n 's/^ *versionCode \([0-9][0-9]*\)$/\1/p' app/build.gradle) +Each apk installs over a DroidDeck release and keeps its data. \`standard\` is the normal app; the others are the same app under another package name, installed beside it. + +SHA-256: +\`\`\` +$(cat signed/SHA256SUMS.txt) +\`\`\`" +gh release delete "$tag" -R "$CI_REPO" --yes --cleanup-tag 2>/dev/null || true +gh release create "$tag" -R "$CI_REPO" --target main --prerelease \ + --title "main ${GITHUB_SHA::7}" --notes "$notes" signed/* +gh release list -R "$CI_REPO" -L 200 --json tagName,publishedAt \ + --jq '[.[] | select(.tagName | startswith("main-"))] | sort_by(.publishedAt) | reverse | .['"$KEEP"':][] | .tagName' | + while IFS= read -r old; do + if [ "$old" = "$tag" ]; then + continue + fi + if ! gh release delete "$old" -R "$CI_REPO" --yes --cleanup-tag 2>/dev/null; then + if gh release view "$old" -R "$CI_REPO" >/dev/null 2>&1; then + echo "::error::Could not delete old release $old" + exit 1 + fi + fi + done +published=$(gh release view "$tag" -R "$CI_REPO" --json tagName,assets) +jq -e --arg tag "$tag" '.tagName == $tag and (.assets | length) > 0' <<< "$published" >/dev/null +url="$GITHUB_SERVER_URL/$CI_REPO/releases/tag/$tag" +apk=$(cd signed && ls DroidDeck-*.apk | awk 'length(a) == 0 || length($0) < length(a) { a = $0 } END { print a }') +echo "release=$url" >> "$GITHUB_OUTPUT" +echo "apk=$GITHUB_SERVER_URL/$CI_REPO/releases/download/$tag/$apk" >> "$GITHUB_OUTPUT" +echo "Published $url" diff --git a/tools/release/report-build.sh b/tools/release/report-build.sh new file mode 100644 index 0000000000..fc031c634f --- /dev/null +++ b/tools/release/report-build.sh @@ -0,0 +1,77 @@ +#!/usr/bin/env bash +set -uo pipefail +MARK="" +{ + echo "$MARK" + echo "## Build of this pull request" + echo + [ -f /tmp/pr-merge.md ] && cat /tmp/pr-merge.md + echo + case "$BUILD_OUTCOME:$UNIT_TEST_OUTCOME:$APK_OUTCOME" in + success:success:success) + echo "### Build passed" + echo + echo "The \`droiddeck-apk\` artifact is [on this run]($RUN_URL), signed with the public test key." + echo + if [ "$SAME_REPO" = true ]; then + echo "After the parallel regression tests pass, a release-signed tester build that installs over Stable or Preview will be published and will appear in DroidDeck's **Test builds** list. Label the PR \`no-test-build\` to skip that." + else + echo "**Maintainer:** add the \`publish-test\` label to publish a release-signed tester build that installs over Stable or Preview and appears in DroidDeck's **Test builds** list. The label is removed automatically after publishing." + fi + echo + echo "Fallback: [open **PR Release Publish**]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/workflows/pr-release-publish.yml) on \`main\` and enter PR \`$PR\`." + ;; + success:success:*) + echo "### APK publication incomplete" + echo + echo "Compilation and unit tests passed, but APK publication did not complete. See [the run]($RUN_URL)." + ;; + success:failure:*) + echo "### ERROR: Unit tests failed" + echo + echo "The APK compiled, but unit tests failed. No installable artifact was published." + echo + if [ -n "$TEST_DIAGNOSTICS_URL" ]; then + echo "The [unit-test-results]($TEST_DIAGNOSTICS_URL) artifact contains the test log and any generated reports." + else + echo "The test diagnostics upload did not complete. See [the test log]($RUN_URL)." + fi + ;; + success:*) + echo "### Build incomplete" + echo + echo "The APK compiled, but unit tests did not complete successfully. See [the run]($RUN_URL)." + ;; + failure:*) + echo "### ERROR: Build failed" + echo + echo "The compiler's errors ([full log]($RUN_URL)):" + echo + echo '```' + { grep -E '^e: |^w: .*error|error:|CMake Error|fatal error|ninja: error|FAILED|What went wrong|Execution failed for task|Unresolved reference|Type mismatch|Unresolved' /tmp/build.log 2>/dev/null \ + | sed -e 's#file:///home/runner/work/[^/]*/[^/]*/##' -e 's#/home/runner/work/[^/]*/[^/]*/##' \ + | grep -v '^w: ' | awk '!seen[$0]++' | head -80; } || true + echo '```' + echo + echo "
    What went wrong (Gradle)" + echo + echo '```' + awk '/^\* What went wrong/{p=1} /^\* Try:/{p=0} p{print}' /tmp/build.log 2>/dev/null | head -60 + echo '```' + echo "
    " + ;; + skipped:*|cancelled:*) + echo "### Not built" + echo + echo "The build did not run (see above, or [the run]($RUN_URL))." + ;; + esac + echo +} > /tmp/pr-report.md +cat /tmp/pr-report.md >> "$GITHUB_STEP_SUMMARY" +ID=$(gh api "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" --paginate --jq ".[] | select(.body | startswith(\"$MARK\")) | .id" | head -1 || true) +if [ -n "$ID" ]; then + gh api -X PATCH "repos/${GITHUB_REPOSITORY}/issues/comments/${ID}" -F body=@/tmp/pr-report.md >/dev/null +else + gh api -X POST "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" -F body=@/tmp/pr-report.md >/dev/null +fi diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index d6cf46bc49..83f87be033 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -23,7 +23,7 @@ PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet'] SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/assets/pulseaudio.tzst', 'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', 'tools/gamescope/release.env', 'tools/droiddeck-esync/release.env', - 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/components', 'tools/build_local.sh', + 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/components', 'tools/ci', 'tools/build_local.sh', 'tools/release/runtime_inputs.py', 'app/src/main/assets/desktop-removal', 'tools/quest', 'tools/vr/src', 'tools/vr/driver_droiddeck', 'tools/vr/layer', 'tools/vr/build.sh', 'app/src/main/cpp/waylandcomp/src/headpose_shm.h', diff --git a/tools/tests/test_ci_checks.py b/tools/tests/test_ci_checks.py index df472a47d5..3a0216d778 100644 --- a/tools/tests/test_ci_checks.py +++ b/tools/tests/test_ci_checks.py @@ -12,6 +12,12 @@ ROOT = Path(__file__).resolve().parents[2] class CiChecksTest(unittest.TestCase): + def test_independent_jobs_wait_only_for_the_pinned_source(self): + jobs = yaml.safe_load((ROOT / '.github/workflows/build.yml').read_text())['jobs'] + for name in ('xbox', 'components', 'python-tests'): + self.assertEqual(jobs[name]['needs'], 'source') + self.assertEqual(set(jobs['build']['needs']), {'source', 'components', 'xbox'}) + def test_dependency_update_errors_block_installation(self): with tempfile.TemporaryDirectory() as directory: root = Path(directory) diff --git a/tools/tests/test_ci_ndk.py b/tools/tests/test_ci_ndk.py new file mode 100644 index 0000000000..eef737db63 --- /dev/null +++ b/tools/tests/test_ci_ndk.py @@ -0,0 +1,27 @@ +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + + +ROOT = Path(__file__).resolve().parents[2] + + +class CiNdkTest(unittest.TestCase): + def test_installed_ndk_must_match_the_declared_version(self): + version = (ROOT / 'tools/ci/toolchains.env').read_text().strip().split('=', 1)[1] + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + ndk = root / 'ndk' / version + ndk.mkdir(parents=True) + properties = ndk / 'source.properties' + properties.write_text('Pkg.Revision = ' + version + '\n') + output = root / 'environment' + env = dict(os.environ, ANDROID_HOME=str(root), GITHUB_ENV=str(output)) + script = ROOT / 'tools/ci/resolve-ndk.sh' + subprocess.run(['bash', str(script)], env=env, check=True) + self.assertIn('NDK_VERSION=' + version, output.read_text()) + self.assertIn('ANDROID_NDK_HOME=' + str(ndk), output.read_text()) + properties.write_text('Pkg.Revision = unexpected\n') + self.assertNotEqual(subprocess.run(['bash', str(script)], env=env).returncode, 0) diff --git a/tools/tests/test_component_prepare.py b/tools/tests/test_component_prepare.py new file mode 100644 index 0000000000..b513c8fe75 --- /dev/null +++ b/tools/tests/test_component_prepare.py @@ -0,0 +1,106 @@ +import importlib.util +import io +import json +import os +from pathlib import Path +import subprocess +import tarfile +import tempfile +import unittest +from unittest.mock import patch + +SPEC = importlib.util.spec_from_file_location('component_prepare', Path(__file__).resolve().parents[1] / 'components/prepare.py') +components = importlib.util.module_from_spec(SPEC) +SPEC.loader.exec_module(components) + + +class ComponentPrepareTest(unittest.TestCase): + def setUp(self): + directory = tempfile.TemporaryDirectory() + self.addCleanup(directory.cleanup) + self.root = Path(directory.name) + self.fixture(self.root) + + def fixture(self, root): + for name in components.TREES: + (root / name).mkdir(parents=True) + (root / 'tools/components/recipes').mkdir(parents=True) + (root / 'input.h').write_text('#define VALUE 1\n') + (root / 'tools/components/recipes/fake.sh').write_text('printf binary > app/src/main/assets/linuxfs/demo.so\n') + spec = dict(script='tools/components/recipes/fake.sh', inputs=['input.h', 'tools/components/recipes/fake.sh'], + outputs=['app/src/main/assets/linuxfs/demo.so']) + (root / components.REGISTRY).write_text(json.dumps(dict(fake=spec))) + for name in components.LIBRARIES: + (root / name).parent.mkdir(parents=True, exist_ok=True) + (root / name).write_bytes(b'library') + subprocess.run(['git', 'init', '-q', str(root)], check=True) + subprocess.run(['git', '-C', str(root), 'config', 'core.autocrlf', 'false'], check=True) + subprocess.run(['git', '-C', str(root), 'add', '.'], check=True) + subprocess.run(['git', '-C', str(root), '-c', 'user.name=Test Developer', '-c', 'user.email=test@example.test', + 'commit', '-qm', 'baseline'], check=True) + + def test_recipe_failure_or_missing_output_does_not_succeed(self): + script = self.root / 'tools/components/recipes/fake.sh' + script.write_text('exit 7\n') + with self.assertRaises(subprocess.CalledProcessError): + components.prepare('fake', self.root) + script.write_text('exit 0\n') + with self.assertRaisesRegex(ValueError, 'required outputs'): + components.prepare('fake', self.root) + + def test_identity_covers_source_and_recipe_changes(self): + original = components.identity('fake', self.root) + (self.root / 'input.h').write_text('#define VALUE 2\n') + changed = components.identity('fake', self.root) + self.assertNotEqual(original, changed) + script = self.root / 'tools/components/recipes/fake.sh' + script.write_text(script.read_text() + '\nprintf changed\n') + self.assertNotEqual(changed, components.identity('fake', self.root)) + + def test_tool_requirements_are_installed_in_one_union(self): + definitions = dict(one=dict(packages=['gcc', 'cmake']), two=dict(packages=['gcc', 'qemu-user'])) + with patch.object(components, 'registry', return_value=definitions), patch.object(components.subprocess, 'run') as run: + components.prepare_tools(['one', 'two'], self.root) + run.assert_called_once_with(['bash', 'tools/ci/install-ubuntu-packages.sh', 'cmake', 'gcc', 'qemu-user'], + cwd=self.root, check=True) + + def test_prepared_handoff_verifies_every_file_and_source_tree(self): + components.prepare('fake', self.root) + archive = self.root / 'prepared.tar.gz' + components.pack(archive, self.root) + tree = subprocess.check_output(['git', 'rev-parse', 'HEAD^{tree}'], cwd=self.root, text=True).strip() + target = self.root / 'target' + self.fixture(target) + components.unpack(archive, tree, target) + self.assertEqual((target / 'app/src/main/assets/linuxfs/demo.so').read_bytes(), b'binary') + with self.assertRaisesRegex(ValueError, 'pinned source'): + components.unpack(archive, 'wrong-tree', target) + + def test_tampered_component_bytes_fail_handoff_verification(self): + components.prepare('fake', self.root) + archive = self.root / 'prepared.tar.gz' + components.pack(archive, self.root) + corrupt = self.root / 'corrupt.tar.gz' + with tarfile.open(archive) as original, tarfile.open(corrupt, 'w:gz') as output: + for entry in original: + content = original.extractfile(entry).read() + if entry.name.endswith('demo.so'): + content = b'tampered' + entry.size = len(content) + output.addfile(entry, io.BytesIO(content)) + target = self.root / 'target' + self.fixture(target) + tree = subprocess.check_output(['git', 'rev-parse', 'HEAD^{tree}'], cwd=self.root, text=True).strip() + with self.assertRaisesRegex(ValueError, 'file hashes'): + components.unpack(corrupt, tree, target) + + def test_archive_cannot_overwrite_source_through_traversal(self): + archive = self.root / 'bad.tar.gz' + with tarfile.open(archive, mode='w:gz') as tar: + name = 'app/src/main/assets/linuxfs/../../../../../input.h' + entry = tarfile.TarInfo(name) + entry.size = 3 + tar.addfile(entry, io.BytesIO(b'bad')) + with self.assertRaisesRegex(ValueError, 'Unsafe'): + components.unpack(archive, 'tree', self.root) + self.assertEqual((self.root / 'input.h').read_text(), '#define VALUE 1\n') diff --git a/tools/tests/test_esync_packs.py b/tools/tests/test_esync_packs.py index 863a1003ba..7ba20b448b 100644 --- a/tools/tests/test_esync_packs.py +++ b/tools/tests/test_esync_packs.py @@ -1160,8 +1160,12 @@ class BundleTest(unittest.TestCase): except ImportError: self.skipTest("PyYAML is not installed") apk = yaml.safe_load((self.ROOT / ".github/workflows/build.yml").read_text()) - steps = {step.get("name"): step for step in apk["jobs"]["build"]["steps"]} - bundle = steps["Bundle the droiddeck-esync packs"] + steps = {step.get("name"): step for step in apk["jobs"]["components"]["steps"]} + import json + recipes = json.loads((self.ROOT / "tools/components/recipes.json").read_text()) + bundle = dict(steps["Bundle the droiddeck-esync packs"]) + self.assertIn("prepare.py esync", bundle["run"]) + bundle["run"] = (self.ROOT / recipes["esync"]["script"]).read_text() self.assertNotIn("if", bundle) self.assertIn("tools/droiddeck-esync/release.env", bundle["run"]) self.assertIn('release_url="https://github.com/${SYNC_BUNDLE_REPO}/releases/download/${SYNC_BUNDLE_TAG}"', bundle["run"]) @@ -1169,7 +1173,7 @@ class BundleTest(unittest.TestCase): self.assertIn('curl -fsSL --retry 3 -o sync-index.json "$release_url/index.json"', bundle["run"]) self.assertIn("sha256sum -c -", bundle["run"]) self.assertNotIn("revoked.txt", bundle["run"]) - stage = next(step for step in apk["jobs"]["build"]["steps"] if "overlay/usr/local/bin/droiddeck-*" in step.get("run", "")) + stage = {"run": (self.ROOT / recipes["runtime"]["script"]).read_text()} self.assertIn("tools/linuxfs/overlay/usr/local/bin/droiddeck-* ", stage["run"]) local = (self.ROOT / "tools/build_local.sh").read_text() self.assertIn("tools/linuxfs/overlay/usr/local/bin/droiddeck-* ", local) diff --git a/tools/tests/test_preload_snapshots.py b/tools/tests/test_preload_snapshots.py index 5a4cfb606c..ee03da0f8d 100644 --- a/tools/tests/test_preload_snapshots.py +++ b/tools/tests/test_preload_snapshots.py @@ -100,6 +100,13 @@ class PreloadSnapshotTest(unittest.TestCase): result, _, _ = self.restore() self.assertEqual(result, dict(arm64=False, x86=True)) + def test_shell_newline_changes_invalidate_the_recipe(self): + script = self.root / 'tools/components/build-arm64-preloads.sh' + original = snapshots.recipe(self.root) + text = script.read_text() + script.write_text(text.replace('-ldl\n', '-ldl ', 1)) + self.assertNotEqual(original, snapshots.recipe(self.root)) + def test_new_manifest_requires_main_build_proof(self): result, _, prove = self.restore('HEAD~1') self.assertTrue(all(result.values())) @@ -112,6 +119,18 @@ class PreloadSnapshotTest(unittest.TestCase): with self.assertRaisesRegex(ValueError, 'original main APK'): snapshots.prove_origin(data, self.root / 'cache', self.root) + def test_modified_input_policy_cannot_omit_producer_dependencies(self): + data = copy.deepcopy(self.data) + data['origin']['commit'] = self.base + omitted = snapshots.COMMON[0] + del data['groups']['arm64'][omitted] + with patch.object(snapshots, 'artifact_bytes', return_value=self.binaries), \ + patch.object(snapshots, 'run', return_value=b''), \ + patch.object(snapshots, 'source_files', side_effect=lambda group, *args: data['groups'][group]), \ + patch.object(snapshots, 'producer_sources', return_value={omitted: self.data['groups']['arm64'][omitted]}): + with self.assertRaisesRegex(ValueError, 'producing build dependency'): + snapshots.prove_origin(data, self.root / 'cache', self.root) + def test_non_main_or_unsuccessful_run_cannot_prove_origin(self): build = dict(event='pull_request', head_branch='main', conclusion='success', head_sha='abc', path='.github/workflows/build.yml', repository=dict(full_name=snapshots.REPO)) @@ -139,6 +158,18 @@ class PreloadSnapshotTest(unittest.TestCase): patch.object(snapshots.urllib.request, 'urlopen', side_effect=error): self.assertEqual(snapshots.restore(self.root), dict(arm64=False, x86=False)) + def test_transient_download_failure_rebuilds_but_integrity_errors_fail(self): + errors = [TimeoutError('network'), snapshots.http.client.IncompleteRead(b'partial'), + snapshots.urllib.error.HTTPError('https://example.test', 503, 'unavailable', {}, None)] + for error in errors: + with self.subTest(error=type(error).__name__), patch.dict(os.environ, COMPONENT_TRUSTED_BASE=self.base), \ + patch.object(snapshots.urllib.request, 'urlopen', side_effect=error): + self.assertEqual(snapshots.restore(self.root), dict(arm64=False, x86=False)) + with patch.dict(os.environ, COMPONENT_TRUSTED_BASE=self.base), \ + patch.object(snapshots.urllib.request, 'urlopen', return_value=io.BytesIO(b'corrupt')): + with self.assertRaisesRegex(ValueError, 'checksum'): + snapshots.restore(self.root) + def test_manual_rebuild_does_not_download_snapshot(self): with patch.dict(os.environ, FORCE_PRELOAD_REBUILD='true'), \ patch.object(snapshots.urllib.request, 'urlopen') as fetch: diff --git a/tools/tests/test_xbox_build_source.py b/tools/tests/test_xbox_build_source.py index 15e35ca5e5..427cea3425 100644 --- a/tools/tests/test_xbox_build_source.py +++ b/tools/tests/test_xbox_build_source.py @@ -31,14 +31,14 @@ class XboxBuildSourceTest(unittest.TestCase): git('switch', '-q', 'main') (root / 'backend').write_text('merged backend') git('commit', '-qam', 'backend changed after branch') - for name in ('xbox', 'apk', 'tests'): + for name in ('source', 'xbox', 'components', 'apk', 'tests', 'dispatch'): git('clone', '-q', str(root), str(root / name)) git('checkout', '-q', head, cwd=root / name) output = root / 'output' env['GITHUB_OUTPUT'] = str(output) - subprocess.run(['bash', '-c', step('xbox', 'Pin and merge the APK source')], cwd=root / 'xbox', env=env, check=True, capture_output=True) + subprocess.run(['bash', '-c', step('source', 'Pin and merge the APK source')], cwd=root / 'source', env=env, check=True, capture_output=True) base = output.read_text().strip().split('=', 1)[1] - tree = git('rev-parse', 'HEAD^{tree}', cwd=root / 'xbox') + tree = git('rev-parse', 'HEAD^{tree}', cwd=root / 'source') (root / 'backend').write_text('newer main, after backend build') git('commit', '-qam', 'main advanced again') env.update(BUILD_BASE_SHA=base, XBOX_SOURCE_TREE=tree) @@ -50,3 +50,15 @@ class XboxBuildSourceTest(unittest.TestCase): subprocess.run(['bash', '-c', step('python-tests', 'Merge the pinned APK base')], cwd=root / 'tests', env=env, check=True, capture_output=True) subprocess.run(['bash', '-c', step('python-tests', 'Verify backend and test source match')], cwd=root / 'tests', env=env, check=True, capture_output=True) self.assertEqual(git('rev-parse', 'HEAD^{tree}', cwd=root / 'tests'), tree) + + env['SOURCE_TREE'] = tree + for job in ('xbox', 'components'): + subprocess.run(['bash', '-c', step(job, 'Merge the pinned APK base')], cwd=root / job, env=env, check=True, capture_output=True) + subprocess.run(['bash', '-c', step(job, 'Verify pinned source tree')], cwd=root / job, env=env, check=True, capture_output=True) + self.assertEqual(git('rev-parse', 'HEAD^{tree}', cwd=root / job), tree) + + trusted = root / 'trusted-output' + env['GITHUB_OUTPUT'] = str(trusted) + subprocess.run(['bash', '-c', step('source', 'Resolve trusted manifest base')], cwd=root / 'dispatch', env=env, check=True, capture_output=True) + self.assertEqual(trusted.read_text().strip(), 'base-sha=' + git('rev-parse', 'main')) + self.assertNotEqual(git('rev-parse', 'HEAD', cwd=root / 'dispatch'), git('rev-parse', 'main')) From d32b1a13fdef00d1260b423c6f3e3548d2e43c19 Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 14:34:44 -0400 Subject: [PATCH 042/174] ci: verify x86 container build recipe --- tools/components/preloads.lock.json | 3 ++- tools/components/preloads.py | 20 +++++++++++++++++++- tools/tests/test_preload_snapshots.py | 12 +++++++++++- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/tools/components/preloads.lock.json b/tools/components/preloads.lock.json index a92cd6deaa..45beb41529 100644 --- a/tools/components/preloads.lock.json +++ b/tools/components/preloads.lock.json @@ -121,5 +121,6 @@ "arm64": "Ubuntu 24.04 GCC cross compiler; exact build commands pinned by arm64_recipe", "x86": "Debian bullseye compiler image and recipe pinned by source inputs" }, - "version": 1 + "version": 1, + "x86_recipe": "36d06d49f7a4bff5ef675c1e03ce5a5b61498df4c36b9d15a938b41564f755cc" } diff --git a/tools/components/preloads.py b/tools/components/preloads.py index 6714740403..5f16610c3f 100644 --- a/tools/components/preloads.py +++ b/tools/components/preloads.py @@ -91,6 +91,20 @@ def recipe(root=ROOT, commit=None): return sha(text.replace('\r\n', '\n').encode()) +def x86_recipe(root=ROOT, commit=None): + path = 'tools/components/recipes/x86-preloads.sh' + if commit and not run('git', 'ls-tree', commit, path, root=root): + workflow = run('git', 'show', f'{commit}:.github/workflows/build.yml', root=root).decode() + section = workflow[workflow.index(' - name: Build the x86 preloads'):] + text = section.split(' run: |\n', 1)[1].split('\n - name:', 1)[0] + text = textwrap.dedent(text).rstrip() + '\n' + else: + text = (run('git', 'show', f'{commit}:{path}', root=root).decode() if commit + else (root / path).read_text()) + text = text.removeprefix('#!/usr/bin/env bash\n') + return sha(text.replace('\r\n', '\n').encode()) + + def artifact_bytes(origin, cache): build = api(f"actions/runs/{origin['run']}") if (build['event'] != 'push' or build['head_branch'] != 'main' or build['conclusion'] != 'success' @@ -160,6 +174,8 @@ def prove_origin(data, cache, root=ROOT): raise ValueError('Snapshot omits or changes a producing build dependency') if recipe(root, commit) != data['arm64_recipe']: raise ValueError('Snapshot recipe differs from the producing source') + if x86_recipe(root, commit) != data['x86_recipe']: + raise ValueError('Snapshot x86 recipe differs from the producing source') def unpack(content, data): @@ -188,6 +204,7 @@ def restore(root=ROOT): validate_lock(data) matching = {group: source_files(group, root) == data['groups'][group] for group in INPUTS} matching['arm64'] &= recipe(root) == data['arm64_recipe'] + matching['x86'] &= x86_recipe(root) == data.get('x86_recipe') if os.environ.get('FORCE_PRELOAD_REBUILD') == 'true': matching = dict.fromkeys(INPUTS, False) if any(matching.values()): @@ -243,7 +260,8 @@ def snapshot(run_id, destination, root=ROOT): content = artifact_bytes(origin, root / 'app/build/component-downloads') run('git', 'fetch', '--no-tags', 'origin', origin['commit'], root=root) data = dict(version=1, origin=origin, groups={g: source_files(g, root, origin['commit']) for g in INPUTS}, - arm64_recipe=recipe(root, origin['commit']), outputs={name: sha(value) for name, value in content.items()}, + arm64_recipe=recipe(root, origin['commit']), x86_recipe=x86_recipe(root, origin['commit']), + outputs={name: sha(value) for name, value in content.items()}, toolchain=dict(arm64='Ubuntu 24.04 GCC cross compiler; exact build commands pinned by arm64_recipe', x86='Debian bullseye compiler image and recipe pinned by source inputs')) stream = io.BytesIO() diff --git a/tools/tests/test_preload_snapshots.py b/tools/tests/test_preload_snapshots.py index ee03da0f8d..464b24e7b6 100644 --- a/tools/tests/test_preload_snapshots.py +++ b/tools/tests/test_preload_snapshots.py @@ -41,6 +41,9 @@ class PreloadSnapshotTest(unittest.TestCase): recipe = 'tools/components/build-arm64-preloads.sh' (self.root / recipe).parent.mkdir(parents=True, exist_ok=True) (self.root / recipe).write_text((snapshots.ROOT / recipe).read_text()) + x86 = 'tools/components/recipes/x86-preloads.sh' + (self.root / x86).parent.mkdir(parents=True, exist_ok=True) + (self.root / x86).write_text((snapshots.ROOT / x86).read_text()) (self.root / '.github/workflows').mkdir(parents=True) (self.root / '.github/workflows/build.yml').write_text((snapshots.ROOT / '.github/workflows/build.yml').read_text()) self.git('init', '-q') @@ -52,7 +55,8 @@ class PreloadSnapshotTest(unittest.TestCase): self.content = archive(self.binaries) self.data = dict(version=1, origin=dict(run=123, commit='abc', artifact=456, artifact_sha256='0' * 64), groups={g: snapshots.source_files(g, self.root) for g in snapshots.INPUTS}, - arm64_recipe=snapshots.recipe(self.root), archive_sha256=snapshots.sha(self.content), + arm64_recipe=snapshots.recipe(self.root), x86_recipe=snapshots.x86_recipe(self.root), + archive_sha256=snapshots.sha(self.content), outputs={name: snapshots.sha(value) for name, value in self.binaries.items()}) (self.root / snapshots.LOCK).write_text(json.dumps(self.data)) self.git('add', '.') @@ -107,6 +111,12 @@ class PreloadSnapshotTest(unittest.TestCase): script.write_text(text.replace('-ldl\n', '-ldl ', 1)) self.assertNotEqual(original, snapshots.recipe(self.root)) + def test_x86_container_recipe_changes_rebuild_x86_only(self): + script = self.root / 'tools/components/recipes/x86-preloads.sh' + script.write_text(script.read_text().replace('debian:bullseye', 'debian:bookworm')) + result, _, _ = self.restore() + self.assertEqual(result, dict(arm64=True, x86=False)) + def test_new_manifest_requires_main_build_proof(self): result, _, prove = self.restore('HEAD~1') self.assertTrue(all(result.values())) From 5d1e70cd203046d90cb2ef4c953386551a31206a Mon Sep 17 00:00:00 2001 From: coffeemeist3r Date: Wed, 21 Oct 2026 23:57:09 -0500 Subject: [PATCH 043/174] Keep FEX's TSO on for Unity games A FEX preset that turns TSO off (Performance, Extreme, Extreme-gn, Denuvo) breaks Unity players under FEX: - Megabonk (Unity 2023.2, IL2CPP, native Linux build, "Linux x86 (FEX)") froze on about half of its launches, every thread parked on a futex. With TSO on: 5 of 5 starts, and a played run stayed responsive. - Crab Game (Windows IL2CPP build under Proton arm64) crashed on 1 of 5 starts with an access violation in UnityPlayer.dll on a garbage pointer. With TSO on: 5 of 5 starts. A Unity player (UnityPlayer.dll, UnityPlayer.so or GameAssembly.so beside the executable) now keeps FEX_TSOENABLED=1 over the shared preset, the way .NET games already keep full TSO. The FEX tool applies the environment half of the game-file fixes too, so native Linux builds get it as well. A FEX preset chosen for the game itself still wins. Related: #1386 (its Mono crash happens with TSO already on) --- docs/development/game-environment.md | 6 +++++ .../overlay/usr/local/bin/droiddeck-fex | 20 +++++++++++--- .../overlay/usr/local/bin/droiddeck-game-env | 9 +++++++ tools/tests/test_droiddeck_fex.py | 26 +++++++++++++++++++ tools/tests/test_game_environment.py | 21 +++++++++++++++ 5 files changed, 78 insertions(+), 4 deletions(-) diff --git a/docs/development/game-environment.md b/docs/development/game-environment.md index a6e02b8e27..62530ca48d 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -52,6 +52,12 @@ environment entries and is intentionally narrower than **Reset game profile**. Values are literal strings, with no shell expansion; quotes are only needed when the consuming program expects them. +A Unity game under FEX (`UnityPlayer.dll` for Windows builds under Proton, +`UnityPlayer.so` or `GameAssembly.so` for native Linux builds started by +**Linux x86 (FEX)**) keeps FEX's TSO on when the Default profile's FEX preset +turns it off: without TSO such games can deadlock or crash (seen with Megabonk +and Crab Game). A FEX preset chosen for the game itself still applies. + ## Defaults and available suggestions The initial configuration enables Mesa shader caching with diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex index 331dcfecc2..0c05d4089b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex @@ -671,15 +671,27 @@ def launch(command, env, mode, decide=None): return os.execve(fex["bin"], [fex["bin"], program] + command[1:], guest) -def game_environment(env): +def game_environment(env, command): try: game_env = runpy.run_path(os.path.join(BIN_DIR, "droiddeck-game-env")) env = game_env["game_gpu"](env) app = game_env["game_id"](env) or env.get("SteamAppId") or env.get("SteamGameId") if not app: return env - with open(GAME_ENVIRONMENT, encoding="utf-8") as source: - return game_env["apply_config"](env, json.load(source), str(app)) + fixes = {} + game = game_env["Game"](resolve(command[0], env), command[1:]) + for check in game_env["FIXES"]: + found = check(game) + # Environment fixes only: the launch arguments some fixes add were chosen for Windows builds. + if found and found[0]: + fixes.update(found[0]) + say(found[2]) + try: + with open(GAME_ENVIRONMENT, encoding="utf-8") as source: + config = json.load(source) + except FileNotFoundError: + config = {"version": 1} + return game_env["apply_config"](env, config, str(app), fixes) except FileNotFoundError: return env except Exception as error: @@ -810,7 +822,7 @@ def main(argv): return 0 if not command: return 2 - return launch(command, game_environment(dict(os.environ)), os.environ.get("DROIDDECK_FEX", "auto")) + return launch(command, game_environment(dict(os.environ), command), os.environ.get("DROIDDECK_FEX", "auto")) if action == "run": try: mode, decide, command = parse_run(args) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index a38d77d8c5..22b5248f36 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -87,6 +87,15 @@ def dotnet_memory_ordering(game): return DOTNET_FEX, [], ".NET runtime: FEX with full TSO and without multiblock" +@fix +def unity_memory_ordering(game): + """A Unity player under FEX without TSO deadlocks or crashes: Megabonk (Linux, IL2CPP) froze with every + thread parked on a futex on about half of all launches, Crab Game (Windows under Proton, IL2CPP) died with + an access violation in UnityPlayer.dll. Presets that turn TSO off keep it on for Unity games.""" + if {"unityplayer.so", "gameassembly.so", "unityplayer.dll"} & game.files: + return {"FEX_TSOENABLED": "1"}, [], "Unity: FEX with TSO" + + @fix def godot_vulkan(game): if is_godot(game) and not game.has_arg("--rendering-driver"): diff --git a/tools/tests/test_droiddeck_fex.py b/tools/tests/test_droiddeck_fex.py index fed546dddc..fb8f9ad732 100644 --- a/tools/tests/test_droiddeck_fex.py +++ b/tools/tests/test_droiddeck_fex.py @@ -690,6 +690,32 @@ class LaunchTest(FexTestCase): command, env, mode = G["launch"].call_args[0] self.assertEqual((command, mode), (["/game/run.sh", "-a"], "auto")) + def test_steam_games_get_their_settings_and_linux_unity_keeps_tso(self): + config = self.home / ".config/droiddeck/game-environment.json" + unity = self.write(self.tmp / "Megabonk/Megabonk.x86_64", elf(62), 0o755) + self.write(self.tmp / "Megabonk/UnityPlayer.so", elf(62)) + self.write(self.tmp / "Megabonk/GameAssembly.so", elf(62)) + other = self.write(self.tmp / "Other/game.x86_64", elf(62), 0o755) + self.write(config, json.dumps({"version": 1, "shared": {"FEX_TSOENABLED": "0", "FEX_MULTIBLOCK": "1"}, + "games": {"20": {"FEX_TSOENABLED": "0"}}})) + + def started(program, app): + with mock.patch.dict(G, {"launch": mock.Mock(return_value=0), "GAME_ENVIRONMENT": str(config)}), \ + mock.patch.dict(os.environ, {"SteamAppId": app}, clear=True): + _, said = self.quiet(FEX["main"], ["steam", "waitforexitandrun", str(program), "-arg"]) + command, env, _ = G["launch"].call_args[0] + self.assertEqual(command, [str(program), "-arg"]) + return env.get("FEX_TSOENABLED"), env.get("FEX_MULTIBLOCK"), said + + tso, multiblock, said = started(unity, "10") + self.assertEqual((tso, multiblock), ("1", "1")) + self.assertIn("Unity: FEX with TSO", said) + self.assertEqual(started(other, "10")[:2], ("0", "1")) + self.assertEqual(started(unity, "20")[:2], ("0", "1")) + config.unlink() + self.assertEqual(started(unity, "10")[:2], ("1", None)) + self.assertEqual(started(other, "10")[:2], (None, None)) + class AppInfoTest(unittest.TestCase): COMPAT = runpy.run_path(str(BIN / "steam-compatibility")) diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index c5c308c8cc..bbae1b3a7d 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -357,6 +357,27 @@ class GameEnvironmentTest(unittest.TestCase): (asylum / name).touch() self.assertEqual(MODULE["engine_fixes"](str(asylum / "BmLauncher.exe"), []), ({}, [], [])) + def test_unity_players_keep_tso_over_the_preset(self): + with tempfile.TemporaryDirectory() as tmp: + def game(*names): + for name in names: + (Path(tmp) / name).parent.mkdir(parents=True, exist_ok=True) + (Path(tmp) / name).touch() + return str(Path(tmp) / names[0]) + + il2cpp = game("Megabonk/Megabonk.x86_64", "Megabonk/UnityPlayer.so", "Megabonk/GameAssembly.so") + mono = game("Mono/Game.x86_64", "Mono/UnityPlayer.so") + windows = game("Crab Game/Crab Game.exe", "Crab Game/UnityPlayer.dll", "Crab Game/GameAssembly.dll") + windows_mono = game("RoR2/Risk of Rain 2.exe", "RoR2/UnityPlayer.dll", "RoR2/MonoBleedingEdge/mono-2.0-bdwgc.dll") + for exe in (il2cpp, mono, windows, windows_mono): + env, extra, notes = MODULE["engine_fixes"](exe, []) + self.assertEqual((env, extra, notes), ({"FEX_TSOENABLED": "1"}, [], ["Unity: FEX with TSO"])) + performance = {"version": 1, "shared": {"FEX_TSOENABLED": "0", "FEX_VECTORTSOENABLED": "0"}} + result = MODULE["apply_config"]({}, performance, "3405340", env) + self.assertEqual((result["FEX_TSOENABLED"], result["FEX_VECTORTSOENABLED"]), ("1", "0")) + performance["games"] = {"3405340": {"FEX_TSOENABLED": "0"}} + self.assertEqual(MODULE["apply_config"]({}, performance, "3405340", env)["FEX_TSOENABLED"], "0") + def test_a_new_fix_only_needs_registering(self): with tempfile.TemporaryDirectory() as tmp: (Path(tmp) / "Game.exe").touch() From 9438aac0db992cf9699e5b7b4b32bbaa7b4b83ee Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 14:55:33 -0400 Subject: [PATCH 044/174] fix: droiddeck-ntsync leaves one-shot handlers alone and replays deferred signals exactly once - Handlers installed with SA_RESETHAND are no longer wrapped, so a deferred one-shot signal can't fall through to the default action. - Deferred signals are replayed with every signal blocked, so a signal landing mid-replay can't send an entry twice. - Taking a deferral slot and holding a signal are safe when one signal interrupts another, and a held signal is released only at the nesting level that held it, so a handler's return can't block it again. --- tools/linuxfs/preload/ntsync.c | 76 +++++++++++++++++------------- tools/tests/test_ntsync_preload.py | 37 +++++++++++++++ 2 files changed, 81 insertions(+), 32 deletions(-) diff --git a/tools/linuxfs/preload/ntsync.c b/tools/linuxfs/preload/ntsync.c index 76e50972d4..d49bb42b74 100644 --- a/tools/linuxfs/preload/ntsync.c +++ b/tools/linuxfs/preload/ntsync.c @@ -260,14 +260,16 @@ static void ns_unlock(uint32_t *w) { } #define NS_DEFER 4 +#define NS_LEVELS 8 struct ns_cs { int depth; int count; - int nheld; + int level; + unsigned held_levels; int sigs[NS_DEFER]; siginfo_t info[NS_DEFER]; - sigset_t held; + sigset_t held[NS_LEVELS]; }; static __thread struct ns_cs ns_cs; @@ -284,17 +286,23 @@ static int ns_deferrable(int sig) { static int ns_defer(int sig, const siginfo_t *si) { struct ns_cs *cs = &ns_cs; if (sig < SIGRTMIN) - for (int i = 0; i < cs->count; i++) - if (cs->sigs[i] == sig) return 1; - if (cs->count >= NS_DEFER) return 0; - cs->sigs[cs->count] = sig; - if (si) memcpy(&cs->info[cs->count], si, sizeof(*si)); - else memset(&cs->info[cs->count], 0, sizeof(*si)); - cs->count++; + for (int i = 0; i < NS_DEFER; i++) + if (__atomic_load_n(&cs->sigs[i], __ATOMIC_RELAXED) == sig) return 1; + int i = __atomic_fetch_add(&cs->count, 1, __ATOMIC_RELAXED); + if (i >= NS_DEFER) { + __atomic_fetch_sub(&cs->count, 1, __ATOMIC_RELAXED); + return 0; + } + if (si) memcpy(&cs->info[i], si, sizeof(*si)); + else memset(&cs->info[i], 0, sizeof(*si)); + __atomic_signal_fence(__ATOMIC_SEQ_CST); + __atomic_store_n(&cs->sigs[i], sig, __ATOMIC_RELAXED); return 1; } static int ns_park(int sig, const siginfo_t *si, ucontext_t *uc) { + int level = ns_cs.level; + if (level < 0 || level >= NS_LEVELS) return 0; sigset_t one; sigemptyset(&one); sigaddset(&one, sig); @@ -306,9 +314,10 @@ static int ns_park(int sig, const siginfo_t *si, ucontext_t *uc) { errno = saved; if (!ok) return 0; sigaddset(&uc->uc_sigmask, sig); - if (!ns_cs.nheld) sigemptyset(&ns_cs.held); - sigaddset(&ns_cs.held, sig); - ns_cs.nheld = 1; + unsigned long *words = (unsigned long *)&ns_cs.held[level]; + unsigned bits = 8 * sizeof(unsigned long); + __atomic_fetch_or(&words[(unsigned)(sig - 1) / bits], 1ul << ((unsigned)(sig - 1) % bits), __ATOMIC_RELAXED); + __atomic_fetch_or(&ns_cs.held_levels, 1u << level, __ATOMIC_RELAXED); return 1; } @@ -316,21 +325,34 @@ static void ns_trampoline(int sig, siginfo_t *si, void *uc) { if (__atomic_load_n(&ns_cs.depth, __ATOMIC_RELAXED) > 0 && (ns_defer(sig, si) || (uc && ns_park(sig, si, uc)))) return; uintptr_t h = __atomic_load_n(&ns_handlers[sig], __ATOMIC_ACQUIRE); if (!h) return; + ns_cs.level++; + __atomic_signal_fence(__ATOMIC_SEQ_CST); if (__atomic_load_n(&ns_siginfo[sig], __ATOMIC_RELAXED)) ((void (*)(int, siginfo_t *, void *))h)(sig, si, uc); else ((void (*)(int))h)(sig); + __atomic_signal_fence(__ATOMIC_SEQ_CST); + ns_cs.level--; } static void ns_flush(void) { struct ns_cs *cs = &ns_cs; - int n = cs->count, sigs[NS_DEFER]; - siginfo_t info[NS_DEFER]; - memcpy(sigs, cs->sigs, sizeof(sigs)); - memcpy(info, cs->info, sizeof(info)); - cs->count = 0; + sigset_t all, mask; + sigfillset(&all); int saved = errno; + pthread_sigmask(SIG_BLOCK, &all, &mask); + int n = cs->count < NS_DEFER ? cs->count : NS_DEFER; pid_t pid = getpid(), tid = (pid_t)ns_self(); for (int i = 0; i < n; i++) - if (syscall(SYS_rt_tgsigqueueinfo, pid, tid, sigs[i], &info[i]) != 0) syscall(SYS_tgkill, pid, tid, sigs[i]); + if (cs->sigs[i] > 0 && syscall(SYS_rt_tgsigqueueinfo, pid, tid, cs->sigs[i], &cs->info[i]) != 0) syscall(SYS_tgkill, pid, tid, cs->sigs[i]); + memset(cs->sigs, 0, sizeof(cs->sigs)); + cs->count = 0; + int level = cs->level; + if (level >= 0 && level < NS_LEVELS && (cs->held_levels & (1u << level))) { + for (int sig = 1; sig < _NSIG; sig++) + if (sigismember(&cs->held[level], sig) == 1) sigdelset(&mask, sig); + sigemptyset(&cs->held[level]); + cs->held_levels &= ~(1u << level); + } + pthread_sigmask(SIG_SETMASK, &mask, NULL); errno = saved; } @@ -343,19 +365,8 @@ static void ns_restore(void) { __atomic_signal_fence(__ATOMIC_SEQ_CST); if (--ns_cs.depth == 0) { __atomic_signal_fence(__ATOMIC_SEQ_CST); - int nheld = ns_cs.nheld; - sigset_t held; - if (nheld) { - held = ns_cs.held; - ns_cs.nheld = 0; - __atomic_signal_fence(__ATOMIC_SEQ_CST); - } - if (ns_cs.count) ns_flush(); - if (nheld) { - int saved = errno; - pthread_sigmask(SIG_UNBLOCK, &held, NULL); - errno = saved; - } + if (ns_cs.count || (ns_cs.held_levels && ns_cs.level >= 0 && ns_cs.level < NS_LEVELS && (ns_cs.held_levels & (1u << ns_cs.level)))) + ns_flush(); } } @@ -371,7 +382,8 @@ int sigaction(int sig, const struct sigaction *act, struct sigaction *old) { uint8_t prev_info = __atomic_load_n(&ns_siginfo[sig], __ATOMIC_RELAXED); struct sigaction mine; const struct sigaction *use = act; - if (act && act->sa_handler != SIG_DFL && act->sa_handler != SIG_IGN && bl_from_ntdll(__builtin_return_address(0))) { + if (act && act->sa_handler != SIG_DFL && act->sa_handler != SIG_IGN && !(act->sa_flags & SA_RESETHAND) && + bl_from_ntdll(__builtin_return_address(0))) { mine = *act; mine.sa_sigaction = ns_trampoline; mine.sa_flags |= SA_SIGINFO; diff --git a/tools/tests/test_ntsync_preload.py b/tools/tests/test_ntsync_preload.py index 34f3eaea45..a2c50a7d68 100644 --- a/tools/tests/test_ntsync_preload.py +++ b/tools/tests/test_ntsync_preload.py @@ -23,6 +23,15 @@ int install_handler(int sig, void (*fn)(int, siginfo_t *, void *), void **seen) *seen = (void *)old.sa_sigaction; return 0; } + +int install_oneshot(int sig, void (*fn)(int, siginfo_t *, void *)) { + struct sigaction sa; + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction = fn; + sa.sa_flags = SA_SIGINFO | SA_RESTART | SA_RESETHAND; + sigemptyset(&sa.sa_mask); + return sigaction(sig, &sa, NULL); +} """ PROGRAM = r""" @@ -63,6 +72,7 @@ struct wait_args { uint64_t timeout, objs; uint32_t count, index, flags, owner, #define NT_EVENT_READ _IOR('N', 0x8d, struct event_args) int install_handler(int sig, void (*fn)(int, siginfo_t *, void *), void **seen); +int install_oneshot(int sig, void (*fn)(int, siginfo_t *, void *)); static int dev, fails; #define CHECK(name, cond) do { if (!(cond)) { printf("FAIL %s line %d errno %d\n", name, __LINE__, errno); fails++; } } while (0) @@ -423,6 +433,32 @@ static void bursts(void) { close(busy_obj); } +static volatile int oneshot_count; +static void oneshot(int sig, siginfo_t *si, void *uc) { + (void)sig; (void)si; (void)uc; + __atomic_add_fetch(&oneshot_count, 1, __ATOMIC_RELAXED); +} + +static void oneshots(void) { + busy_obj = event(0, 0); + pthread_t w; + stop_worker = 0; + oneshot_count = 0; + pthread_create(&w, NULL, worker, NULL); + int fired = 0; + for (int i = 0; i < 300; i++) { + if (install_oneshot(SIGWINCH, oneshot) != 0) break; + int before = __atomic_load_n(&oneshot_count, __ATOMIC_RELAXED); + pthread_kill(w, SIGWINCH); + fired++; + for (int j = 0; j < 2000 && __atomic_load_n(&oneshot_count, __ATOMIC_RELAXED) == before; j++) usleep(50); + } + stop_worker = 1; + pthread_join(w, NULL); + CHECK("oneshot_handlers_run", oneshot_count == fired && fired == 300); + close(busy_obj); +} + static int outer_obj, inner_obj, other_dev, other_obj; static volatile int nested_ok, nested_done, outer_done; static void nesting(int sig, siginfo_t *si, void *uc) { @@ -495,6 +531,7 @@ int main(void) { stress(); signals(); bursts(); + oneshots(); nested_waits(); printf("done fails=%d\n", fails); return fails != 0; From 4d868399100fd0a69718257e27c3eb91afeae3bb Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 15:00:11 -0400 Subject: [PATCH 045/174] fix: preserve GPU stats while pinning clocks --- app/src/main/cpp/waylandcomp/CMakeLists.txt | 1 + .../main/cpp/waylandcomp/src/gpu_clock_pin.c | 160 ++++++++++++++++ .../main/cpp/waylandcomp/src/gpu_clock_pin.h | 5 + .../cpp/waylandcomp/src/waylandcomp_jni.c | 11 +- .../droiddeck/launcher/session/GpuClockPin.kt | 1 + tools/tests/test_gpu_clock_pin.c | 172 ++++++++++++++++++ tools/tests/test_gpu_clock_pin.py | 30 +++ 7 files changed, 378 insertions(+), 2 deletions(-) create mode 100644 app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c create mode 100644 app/src/main/cpp/waylandcomp/src/gpu_clock_pin.h create mode 100644 tools/tests/test_gpu_clock_pin.c create mode 100644 tools/tests/test_gpu_clock_pin.py diff --git a/app/src/main/cpp/waylandcomp/CMakeLists.txt b/app/src/main/cpp/waylandcomp/CMakeLists.txt index 33585818ba..f8eb312910 100644 --- a/app/src/main/cpp/waylandcomp/CMakeLists.txt +++ b/app/src/main/cpp/waylandcomp/CMakeLists.txt @@ -8,6 +8,7 @@ add_library(droiddeckwayland SHARED src/sc_layer.c src/ahb_swapchain.c src/waylandcomp_jni.c + src/gpu_clock_pin.c src/droiddeck_ext.c src/wl_dmabuf.c src/wl_clipboard.c diff --git a/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c new file mode 100644 index 0000000000..5b079da973 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c @@ -0,0 +1,160 @@ +#include "gpu_clock_pin.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../../adrenotools/src/hook/kgsl.h" + +static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_t worker; +static bool joinable; +static atomic_bool running; + +struct pin { + int fd; + unsigned int context; + unsigned int memory; + unsigned int timestamp; + unsigned long gpuaddr; + void *commands; + size_t size; +}; + +static struct pin pin = { .fd = -1 }; + +static void release_pin(void) { + if (pin.context) { + struct kgsl_drawctxt_destroy destroy = { .drawctxt_id = pin.context }; + ioctl(pin.fd, IOCTL_KGSL_DRAWCTXT_DESTROY, &destroy); + } + if (pin.commands) munmap(pin.commands, pin.size); + if (pin.memory) { + struct kgsl_gpumem_free_id free_memory = { .id = pin.memory }; + ioctl(pin.fd, IOCTL_KGSL_GPUMEM_FREE_ID, &free_memory); + } + if (pin.fd >= 0) close(pin.fd); + pin = (struct pin) { .fd = -1 }; +} + +static bool submit_pin(void) { + struct kgsl_command_object object = { + .gpuaddr = pin.gpuaddr, + .size = 2 * sizeof(uint32_t), + .flags = KGSL_CMDLIST_IB, + .id = pin.memory, + }; + struct kgsl_gpu_command command = { + .flags = KGSL_CMDBATCH_PWR_CONSTRAINT, + .cmdlist = (uintptr_t)&object, + .cmdsize = sizeof(object), + .numcmds = 1, + .context_id = pin.context, + }; + if (ioctl(pin.fd, IOCTL_KGSL_GPU_COMMAND, &command) < 0) return false; + pin.timestamp = command.timestamp; + return true; +} + +static bool prepare_pin(void) { + pin.fd = open("/dev/kgsl-3d0", O_RDWR | O_CLOEXEC); + if (pin.fd < 0) return false; + struct kgsl_drawctxt_create context = { + .flags = KGSL_CONTEXT_NO_GMEM_ALLOC | KGSL_CONTEXT_PREAMBLE | KGSL_CONTEXT_PWR_CONSTRAINT, + }; + if (ioctl(pin.fd, IOCTL_KGSL_DRAWCTXT_CREATE, &context) < 0) return false; + pin.context = context.drawctxt_id; + struct kgsl_device_constraint_pwrlevel level = { .level = KGSL_CONSTRAINT_PWR_MAX }; + struct kgsl_device_constraint constraint = { + .type = KGSL_CONSTRAINT_PWRLEVEL, + .context_id = pin.context, + .data = &level, + .size = sizeof(level), + }; + struct kgsl_device_getproperty property = { + .type = KGSL_PROP_PWR_CONSTRAINT, + .value = &constraint, + .sizebytes = sizeof(constraint), + }; + if (ioctl(pin.fd, IOCTL_KGSL_SETPROPERTY, &property) < 0) return false; + struct kgsl_gpumem_alloc_id memory = { .size = 4096 }; + if (ioctl(pin.fd, IOCTL_KGSL_GPUMEM_ALLOC_ID, &memory) < 0) return false; + pin.memory = memory.id; + pin.gpuaddr = memory.gpuaddr; + pin.size = memory.mmapsize; + void *commands = mmap(NULL, pin.size, PROT_READ | PROT_WRITE, MAP_SHARED, pin.fd, + (off_t)pin.memory << 12); + if (commands == MAP_FAILED) return false; + pin.commands = commands; + // Type-7 CP_NOP, one payload dword; both odd-parity bits are zero. + uint32_t *words = commands; + words[0] = 0x70100001; + words[1] = 0; + struct kgsl_gpumem_sync_cache sync = { .id = pin.memory, .op = KGSL_GPUMEM_CACHE_CLEAN }; + if (ioctl(pin.fd, IOCTL_KGSL_GPUMEM_SYNC_CACHE, &sync) < 0) return false; + return submit_pin(); +} + +static void *hold_pin(void *unused) { + (void)unused; + while (atomic_load(&running)) { + struct kgsl_device_waittimestamp_ctxtid wait = { + .context_id = pin.context, + .timestamp = pin.timestamp, + .timeout = 100, + }; + if (ioctl(pin.fd, IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID, &wait) < 0) { + if (errno == EINTR || errno == ETIMEDOUT) continue; + break; + } + // Constraints expire after idle_timer (normally 80 ms); renew with a NOP, keeping devfreq alive. + usleep(25000); + if (atomic_load(&running) && !submit_pin()) break; + } + if (atomic_exchange(&running, false)) + __android_log_print(ANDROID_LOG_WARN, "GpuClockPin", "constraint stopped: %s", strerror(errno)); + release_pin(); + return NULL; +} + +bool gpu_clock_pin_set(bool on) { + pthread_mutex_lock(&lock); + if (joinable) { + if (on && atomic_load(&running)) { + pthread_mutex_unlock(&lock); + return true; + } + atomic_store(&running, false); + pthread_join(worker, NULL); + joinable = false; + } + bool ok = true; + if (on) { + ok = prepare_pin(); + if (ok) { + atomic_store(&running, true); + int error = pthread_create(&worker, NULL, hold_pin, NULL); + if (error) { + atomic_store(&running, false); + errno = error; + ok = false; + } else { + joinable = true; + } + } + if (!ok) { + int error = errno; + release_pin(); + errno = error; + } + } + pthread_mutex_unlock(&lock); + return ok; +} diff --git a/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.h b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.h new file mode 100644 index 0000000000..5fe17d102e --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.h @@ -0,0 +1,5 @@ +#pragma once + +#include + +bool gpu_clock_pin_set(bool on); diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index 6a407088bb..bc349cdf6c 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -16,6 +16,7 @@ #include "effects_chain.h" #include "cardboard.h" #include "droiddeck_color.h" +#include "gpu_clock_pin.h" extern int droiddeck_wayland_run(void); extern void droiddeck_wayland_set_scale_mode(int mode, int alignment); @@ -634,8 +635,14 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeTextInputDelete(JNIE extern void adrenotools_set_turbo(bool turbo); JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetGpuTurbo(JNIEnv *env, jclass clazz, jboolean on) { - (void)env; (void)clazz; - adrenotools_set_turbo(on == JNI_TRUE); + (void)clazz; + if (!gpu_clock_pin_set(on == JNI_TRUE)) { + int saved_errno = errno; + jclass error = (*env)->FindClass(env, "java/lang/IllegalStateException"); + if (error) (*env)->ThrowNew(env, error, strerror(saved_errno)); + } + // Clear a legacy global pin when recovering its marker after an app upgrade or crash. + if (on != JNI_TRUE) adrenotools_set_turbo(false); } JNIEXPORT jint JNICALL 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 7855c49590..40135f08de 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt @@ -26,6 +26,7 @@ object GpuClockPin { pinned = true "gpu clock: held at its top" } catch (t: Throwable) { + File(context.filesDir, MARKER).delete() Log.w(TAG, "pin", t) "gpu clock: pin failed" } diff --git a/tools/tests/test_gpu_clock_pin.c b/tools/tests/test_gpu_clock_pin.c new file mode 100644 index 0000000000..8e3f0b6a4c --- /dev/null +++ b/tools/tests/test_gpu_clock_pin.c @@ -0,0 +1,172 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../../app/src/main/cpp/adrenotools/src/hook/kgsl.h" +#include "../../app/src/main/cpp/waylandcomp/src/gpu_clock_pin.h" + +enum { NONE, OPEN, CONTEXT, CONSTRAINT, MEMORY, MAP, SYNC, SUBMIT, THREAD, WAIT }; +static atomic_int failure, descriptors, contexts, memories, mappings, submissions; +static atomic_bool timeout_wait; +static uint32_t commands[1024]; + +int __android_log_print(int priority, const char *tag, const char *format, ...) { + (void)priority; (void)tag; (void)format; + return 0; +} + +int __wrap_open(const char *path, int flags, ...) { + (void)flags; + assert(!strcmp(path, "/dev/kgsl-3d0")); + if (atomic_load(&failure) == OPEN) { errno = EACCES; return -1; } + assert(atomic_fetch_add(&descriptors, 1) == 0); + return 91; +} + +int __wrap_close(int fd) { + assert(fd == 91); + assert(atomic_fetch_sub(&descriptors, 1) == 1); + errno = EBADF; + return 0; +} + +void *__wrap_mmap(void *address, size_t size, int protection, int flags, int fd, off_t offset) { + (void)address; (void)protection; (void)flags; + assert(fd == 91 && size == sizeof(commands) && offset == (23 << 12)); + if (atomic_load(&failure) == MAP) { errno = EACCES; return MAP_FAILED; } + assert(atomic_fetch_add(&mappings, 1) == 0); + return commands; +} + +int __wrap_munmap(void *address, size_t size) { + assert(address == commands && size == sizeof(commands)); + assert(atomic_fetch_sub(&mappings, 1) == 1); + return 0; +} + +#ifdef __ANDROID__ +int __wrap_ioctl(int fd, int request, ...) { +#else +int __wrap_ioctl(int fd, unsigned long request, ...) { +#endif + assert(fd == 91); + va_list args; + va_start(args, request); + void *arg = va_arg(args, void *); + va_end(args); + int step = NONE; + switch ((unsigned int)request) { + case IOCTL_KGSL_DRAWCTXT_CREATE: step = CONTEXT; break; + case IOCTL_KGSL_SETPROPERTY: step = CONSTRAINT; break; + case IOCTL_KGSL_GPUMEM_ALLOC_ID: step = MEMORY; break; + case IOCTL_KGSL_GPUMEM_SYNC_CACHE: step = SYNC; break; + case IOCTL_KGSL_GPU_COMMAND: step = SUBMIT; break; + case IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID: step = WAIT; break; + } + if (step && atomic_load(&failure) == step) { errno = EACCES; return -1; } + switch ((unsigned int)request) { + case IOCTL_KGSL_DRAWCTXT_CREATE: { + struct kgsl_drawctxt_create *context = arg; + assert(context->flags & KGSL_CONTEXT_PWR_CONSTRAINT); + context->drawctxt_id = 17; + atomic_fetch_add(&contexts, 1); + break; + } + case IOCTL_KGSL_SETPROPERTY: { + struct kgsl_device_getproperty *property = arg; + assert(property->type == KGSL_PROP_PWR_CONSTRAINT); + struct kgsl_device_constraint *constraint = property->value; + assert(constraint->context_id == 17 && constraint->type == KGSL_CONSTRAINT_PWRLEVEL); + assert(((struct kgsl_device_constraint_pwrlevel *)constraint->data)->level == KGSL_CONSTRAINT_PWR_MAX); + break; + } + case IOCTL_KGSL_GPUMEM_ALLOC_ID: { + struct kgsl_gpumem_alloc_id *memory = arg; + memory->id = 23; memory->gpuaddr = 0x100000; memory->mmapsize = sizeof(commands); + atomic_fetch_add(&memories, 1); + break; + } + case IOCTL_KGSL_GPUMEM_SYNC_CACHE: + assert(((struct kgsl_gpumem_sync_cache *)arg)->op == KGSL_GPUMEM_CACHE_CLEAN); + break; + case IOCTL_KGSL_GPU_COMMAND: { + struct kgsl_gpu_command *command = arg; + struct kgsl_command_object *object = (void *)(uintptr_t)command->cmdlist; + assert(command->context_id == 17 && command->numcmds == 1); + assert(command->flags & KGSL_CMDBATCH_PWR_CONSTRAINT); + assert(object->id == 23 && object->gpuaddr == 0x100000 && object->size == 8); + assert(commands[0] == 0x70100001 && commands[1] == 0); + command->timestamp = atomic_fetch_add(&submissions, 1) + 1; + break; + } + case IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID: + if (atomic_load(&timeout_wait)) { errno = ETIMEDOUT; return -1; } + break; + case IOCTL_KGSL_DRAWCTXT_DESTROY: + assert(atomic_fetch_sub(&contexts, 1) == 1); + break; + case IOCTL_KGSL_GPUMEM_FREE_ID: + assert(atomic_fetch_sub(&memories, 1) == 1); + break; + default: assert(!"unexpected ioctl"); + } + return 0; +} + +int __real_pthread_create(pthread_t *, const pthread_attr_t *, void *(*)(void *), void *); +int __wrap_pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start)(void *), void *arg) { + if (atomic_load(&failure) == THREAD) return EAGAIN; + return __real_pthread_create(thread, attr, start, arg); +} + +static void assert_released(void) { + assert(!atomic_load(&descriptors) && !atomic_load(&contexts)); + assert(!atomic_load(&memories) && !atomic_load(&mappings)); +} + +int main(void) { + assert(gpu_clock_pin_set(false)); + assert_released(); + for (int step = OPEN; step <= THREAD; ++step) { + atomic_store(&failure, step); + assert(!gpu_clock_pin_set(true)); + assert(errno == (step == THREAD ? EAGAIN : EACCES)); + assert_released(); + } + atomic_store(&failure, NONE); + atomic_store(&submissions, 0); + assert(gpu_clock_pin_set(true)); + assert(gpu_clock_pin_set(true)); + usleep(80000); + assert(atomic_load(&submissions) > 1); + assert(gpu_clock_pin_set(false)); + assert(gpu_clock_pin_set(false)); + assert_released(); + + atomic_store(&timeout_wait, true); + atomic_store(&submissions, 0); + assert(gpu_clock_pin_set(true)); + usleep(80000); + assert(atomic_load(&submissions) == 1); + assert(gpu_clock_pin_set(false)); + assert_released(); + atomic_store(&timeout_wait, false); + + atomic_store(&failure, WAIT); + assert(gpu_clock_pin_set(true)); + for (int i = 0; i < 100 && atomic_load(&descriptors); ++i) usleep(10000); + assert_released(); + atomic_store(&failure, NONE); + assert(gpu_clock_pin_set(true)); + assert(gpu_clock_pin_set(false)); + assert_released(); + puts("gpu clock pin: failure cleanup, renewal, bounded queue and restart passed"); + return 0; +} diff --git a/tools/tests/test_gpu_clock_pin.py b/tools/tests/test_gpu_clock_pin.py new file mode 100644 index 0000000000..f6f4668719 --- /dev/null +++ b/tools/tests/test_gpu_clock_pin.py @@ -0,0 +1,30 @@ +import pathlib +import shutil +import subprocess +import sys +import tempfile +import unittest + + +ROOT = pathlib.Path(__file__).resolve().parents[2] + + +class GpuClockPinTest(unittest.TestCase): + @unittest.skipUnless(sys.platform.startswith('linux') and shutil.which('cc'), 'requires a Linux C compiler') + def test_constraint_lifecycle(self): + with tempfile.TemporaryDirectory() as tmp: + directory = pathlib.Path(tmp) + (directory / 'android').mkdir() + (directory / 'android/log.h').write_text( + '#define ANDROID_LOG_WARN 5\n' + 'int __android_log_print(int, const char *, const char *, ...);\n') + binary = directory / 'gpu-clock-pin-test' + subprocess.run([ + 'cc', '-std=c11', '-D_DEFAULT_SOURCE', '-D__user=', '-Wall', '-Wextra', '-Werror', + '-I', str(directory), '-pthread', + str(ROOT / 'tools/tests/test_gpu_clock_pin.c'), + str(ROOT / 'app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c'), + '-Wl,--wrap=open,--wrap=close,--wrap=mmap,--wrap=munmap,--wrap=ioctl,--wrap=pthread_create', + '-o', str(binary), + ], check=True) + subprocess.run([str(binary)], check=True, timeout=10) From 556bd96d5a77ecea65d7e6f13298c0b8c2d548f0 Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 15:01:04 -0400 Subject: [PATCH 046/174] ci: reuse build metadata and verified pack downloads --- .github/workflows/build.yml | 9 +++ app/build.gradle | 4 ++ tools/packs/build.sh | 9 +-- tools/packs/fetch-verified.sh | 29 ++++++++ tools/release/report-build.sh | 2 +- tools/release/runtime_inputs.py | 2 +- tools/tests/test_ci_checks.py | 25 +++++++ tools/tests/test_pack_downloads.py | 106 +++++++++++++++++++++++++++++ 8 files changed, 176 insertions(+), 10 deletions(-) create mode 100644 tools/packs/fetch-verified.sh create mode 100644 tools/tests/test_pack_downloads.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 265b1faee6..b1a585e3e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -484,6 +484,12 @@ jobs: name: xbox-arm64 path: app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox + - name: Cache checksum-pinned pack inputs + uses: actions/cache@v4 + with: + path: ~/.cache/droiddeck-pack-inputs + key: pack-inputs-v1-${{ hashFiles('tools/packs/build.sh', 'tools/packs/fetch-verified.sh', 'tools/packs/tracking/release.env') }} + restore-keys: pack-inputs-v1- - name: Build the add-on packs run: bash tools/packs/build.sh app/build/packs @@ -526,6 +532,9 @@ jobs: - name: Unit tests id: unit-tests + env: + DROIDDECK_BUILD_LABEL: ${{ steps.build-label.outputs.label }} + SGDB_API_KEY: ${{ secrets.SGDB_API_KEY }} run: | set -o pipefail mkdir -p app/build diff --git a/app/build.gradle b/app/build.gradle index e81b92711c..bdc9ed4d36 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -220,6 +220,10 @@ android { unitTests.returnDefaultValues = true unitTests.includeAndroidResources = true unitTests.all { + if (ciBuild) { + outputs.upToDateWhen { false } + outputs.doNotCacheIf('CI executes the test suite on every run') { true } + } // Robolectric keeps a sandbox per SDK level the tests ask for; seven no longer fit in Gradle's default 512 MB. maxHeapSize = '2g' def logTarget = providers.systemProperty('robolectric.logging').orNull diff --git a/tools/packs/build.sh b/tools/packs/build.sh index d06a4c8fb4..27611ab0b4 100755 --- a/tools/packs/build.sh +++ b/tools/packs/build.sh @@ -25,14 +25,7 @@ trap 'rm -rf "$work"' EXIT sha256() { if command -v sha256sum >/dev/null; then sha256sum "$1" | cut -d' ' -f1; else shasum -a 256 "$1" | cut -d' ' -f1; fi; } fetch() { - local url=$1 expected=$2 dest=$3 - curl -fsSL --retry 4 -o "$dest" "$url" - local actual - actual=$(sha256 "$dest") - if [ "$actual" != "$expected" ]; then - echo "checksum mismatch for $url: $actual" >&2 - exit 1 - fi + bash "$here/fetch-verified.sh" "$@" } pack() { diff --git a/tools/packs/fetch-verified.sh b/tools/packs/fetch-verified.sh new file mode 100644 index 0000000000..0b8c03977a --- /dev/null +++ b/tools/packs/fetch-verified.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +set -euo pipefail +url=${1:?URL required} +expected=${2:?SHA-256 required} +destination=${3:?destination required} +[[ "$expected" =~ ^[a-f0-9]{64}$ ]] || { echo 'Invalid download SHA-256' >&2; exit 1; } +cache=${DROIDDECK_PACK_CACHE:-"$HOME/.cache/droiddeck-pack-inputs"} +mkdir -p "$cache" "$(dirname "$destination")" +kept="$cache/$expected" +verify() { + if command -v sha256sum >/dev/null; then + echo "$expected $1" | sha256sum -c - >/dev/null 2>&1 + else + echo "$expected $1" | shasum -a 256 -c - >/dev/null 2>&1 + fi +} +if [ -f "$kept" ] && verify "$kept"; then + echo "Verified pack input cache hit: $expected" +else + part=$(mktemp "$cache/$expected.part.XXXXXX") + trap 'rm -f "$part"' EXIT + curl -fsSL --retry 4 --retry-all-errors --connect-timeout 15 --max-time 180 --retry-max-time 240 \ + -o "$part" "$url" + verify "$part" || { echo "Checksum mismatch for $url" >&2; exit 1; } + mv -f "$part" "$kept" + echo "Downloaded and verified pack input: $expected" +fi +cp "$kept" "$destination" +verify "$destination" || { echo 'Copied pack input checksum mismatch' >&2; exit 1; } diff --git a/tools/release/report-build.sh b/tools/release/report-build.sh index fc031c634f..75b16f666f 100644 --- a/tools/release/report-build.sh +++ b/tools/release/report-build.sh @@ -69,7 +69,7 @@ MARK="" echo } > /tmp/pr-report.md cat /tmp/pr-report.md >> "$GITHUB_STEP_SUMMARY" -ID=$(gh api "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" --paginate --jq ".[] | select(.body | startswith(\"$MARK\")) | .id" | head -1 || true) +ID=$(gh api "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" --paginate --jq ".[] | select(.user.login == \"github-actions[bot]\" and (.body | startswith(\"$MARK\"))) | .id" | head -1 || true) if [ -n "$ID" ]; then gh api -X PATCH "repos/${GITHUB_REPOSITORY}/issues/comments/${ID}" -F body=@/tmp/pr-report.md >/dev/null else diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index 83f87be033..ccce1f0f0d 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -21,7 +21,7 @@ PACKED_FILES = {'lib/arm64-v8a/libproot.so': ('proot', 'libproot.so'), PACKED_LIBRARIES = ['lib/arm64-v8a/libopencv_java4.so', 'lib/arm64-v8a/libmediapipe_tasks_jni.so'] PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet'] SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/assets/pulseaudio.tzst', - 'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', + 'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', 'tools/packs', 'tools/gamescope/release.env', 'tools/droiddeck-esync/release.env', 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/components', 'tools/ci', 'tools/build_local.sh', 'tools/release/runtime_inputs.py', 'app/src/main/assets/desktop-removal', diff --git a/tools/tests/test_ci_checks.py b/tools/tests/test_ci_checks.py index 3a0216d778..503b9fb5ba 100644 --- a/tools/tests/test_ci_checks.py +++ b/tools/tests/test_ci_checks.py @@ -1,6 +1,9 @@ import itertools +import json import os from pathlib import Path +import shlex +import shutil import subprocess import tempfile import unittest @@ -12,6 +15,28 @@ ROOT = Path(__file__).resolve().parents[2] class CiChecksTest(unittest.TestCase): + def test_report_comment_lookup_ignores_human_marker(self): + if not shutil.which('jq'): + self.skipTest('jq required to execute comment selection') + script = (ROOT / 'tools/release/report-build.sh').read_text() + line = next(line for line in script.splitlines() if line.startswith('ID=')) + arguments = shlex.split(line[len('ID=$('):].split(' | head', 1)[0]) + query = arguments[arguments.index('--jq') + 1].replace('$MARK', '') + comments = [dict(id=1, user=dict(login='someone'), body=' forged'), + dict(id=2, user=dict(login='github-actions[bot]'), body=' result')] + result = subprocess.check_output(['jq', '-r', query], input=json.dumps(comments), text=True) + self.assertEqual(result.strip(), '2') + + def test_build_and_tests_use_identical_generated_metadata(self): + jobs = yaml.safe_load((ROOT / '.github/workflows/build.yml').read_text())['jobs'] + steps = {step.get('id'): step for step in jobs['build']['steps']} + self.assertEqual(steps['build']['env'], steps['unit-tests']['env']) + self.assertIn('DROIDDECK_BUILD_LABEL', steps['unit-tests']['env']) + self.assertIn('SGDB_API_KEY', steps['unit-tests']['env']) + gradle = (ROOT / 'app/build.gradle').read_text() + self.assertIn("outputs.doNotCacheIf('CI executes the test suite on every run') { true }", gradle) + self.assertIn('outputs.upToDateWhen { false }', gradle) + def test_independent_jobs_wait_only_for_the_pinned_source(self): jobs = yaml.safe_load((ROOT / '.github/workflows/build.yml').read_text())['jobs'] for name in ('xbox', 'components', 'python-tests'): diff --git a/tools/tests/test_pack_downloads.py b/tools/tests/test_pack_downloads.py new file mode 100644 index 0000000000..20547c03bb --- /dev/null +++ b/tools/tests/test_pack_downloads.py @@ -0,0 +1,106 @@ +import hashlib +import http.server +import json +import os +from pathlib import Path +import shutil +import socket +import subprocess +import tempfile +import threading +import unittest + + +ROOT = Path(__file__).resolve().parents[2] +FETCH = ROOT / 'tools/packs/fetch-verified.sh' + + +class PackDownloadsTest(unittest.TestCase): + def setUp(self): + directory = tempfile.TemporaryDirectory() + self.addCleanup(directory.cleanup) + self.root = Path(directory.name) + self.cache = self.root / 'cache' + self.cache.mkdir() + self.destination = self.root / 'download' + self.remote = self.root / 'remote' + self.remote.write_bytes(b'verified input') + self.checksum = hashlib.sha256(self.remote.read_bytes()).hexdigest() + self.log = self.root / 'curl.log' + tool = self.root / 'bin/curl' + tool.parent.mkdir() + tool.write_text('#!/usr/bin/env python3\nimport json,os,shutil,sys\n' + 'args=sys.argv[1:]\n' + 'with open(os.environ["CURL_LOG"],"a") as f: f.write(json.dumps(args)+"\\n")\n' + 'shutil.copyfile(os.environ["REMOTE"],args[args.index("-o")+1])\n') + tool.chmod(0o755) + self.env = dict(os.environ, DROIDDECK_PACK_CACHE=str(self.cache), CURL_LOG=str(self.log), + REMOTE=str(self.remote), PATH=str(tool.parent) + os.pathsep + os.environ['PATH']) + + def fetch(self, checksum=None, url='https://example.test/pinned', env=None): + return subprocess.run(['bash', str(FETCH), url, checksum or self.checksum, str(self.destination)], + env=env or self.env, capture_output=True, text=True) + + def test_cold_download_then_warm_reuse_and_corruption_repair(self): + self.assertEqual(self.fetch().returncode, 0) + self.assertEqual(self.fetch().returncode, 0) + self.assertEqual(len(self.log.read_text().splitlines()), 1) + self.assertEqual(self.destination.read_bytes(), b'verified input') + (self.cache / self.checksum).write_bytes(b'corrupt') + self.assertEqual(self.fetch().returncode, 0) + self.assertEqual(len(self.log.read_text().splitlines()), 2) + self.assertEqual((self.cache / self.checksum).read_bytes(), b'verified input') + + def test_changed_pin_cannot_reuse_old_bytes(self): + self.assertEqual(self.fetch().returncode, 0) + self.remote.write_bytes(b'new approved input') + updated = hashlib.sha256(self.remote.read_bytes()).hexdigest() + self.assertEqual(self.fetch(updated).returncode, 0) + self.assertEqual(len(self.log.read_text().splitlines()), 2) + self.assertEqual(self.destination.read_bytes(), b'new approved input') + + def test_bad_download_is_not_cached_or_written(self): + self.remote.write_bytes(b'tampered download') + self.assertNotEqual(self.fetch().returncode, 0) + self.assertFalse((self.cache / self.checksum).exists()) + self.assertFalse(self.destination.exists()) + self.assertEqual(list(self.cache.iterdir()), []) + arguments = json.loads(self.log.read_text()) + self.assertIn('--retry-all-errors', arguments) + self.assertIn('--max-time', arguments) + self.assertIn('--retry-max-time', arguments) + + def test_connection_reset_retries_then_verifies_real_download(self): + if not shutil.which('curl'): + self.skipTest('curl required for transport test') + content = self.remote.read_bytes() + attempts = [] + + class Handler(http.server.BaseHTTPRequestHandler): + def do_GET(self): + attempts.append(True) + if len(attempts) == 1: + self.connection.shutdown(socket.SHUT_RDWR) + self.connection.close() + return + self.send_response(200) + self.send_header('Content-Length', str(len(content))) + self.end_headers() + self.wfile.write(content) + + def log_message(self, *args): + pass + + server = http.server.ThreadingHTTPServer(('127.0.0.1', 0), Handler) + thread = threading.Thread(target=server.serve_forever, daemon=True) + thread.start() + try: + env = dict(self.env, PATH=os.environ['PATH']) + result = self.fetch(url=f'http://127.0.0.1:{server.server_port}/input', env=env) + self.assertEqual(result.returncode, 0, result.stderr) + self.assertGreaterEqual(len(attempts), 2) + self.assertEqual(self.destination.read_bytes(), content) + finally: + server.shutdown() + server.server_close() + thread.join() From 9c66a1ac0a3f95eef6da438bf62271ee4ec7fc8a Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 15:04:50 -0400 Subject: [PATCH 047/174] fix: select NOP packets for older Adreno cores --- .../main/cpp/waylandcomp/src/gpu_clock_pin.c | 14 ++++++++++++-- tools/tests/test_gpu_clock_pin.c | 17 +++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c index 5b079da973..0f8e1f61bf 100644 --- a/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c +++ b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c @@ -24,6 +24,7 @@ struct pin { unsigned int memory; unsigned int timestamp; unsigned long gpuaddr; + uint32_t nop; void *commands; size_t size; }; @@ -66,6 +67,15 @@ static bool submit_pin(void) { static bool prepare_pin(void) { pin.fd = open("/dev/kgsl-3d0", O_RDWR | O_CLOEXEC); if (pin.fd < 0) return false; + struct kgsl_devinfo info = {0}; + struct kgsl_device_getproperty device_info = { + .type = KGSL_PROP_DEVICE_INFO, .value = &info, .sizebytes = sizeof(info), + }; + if (ioctl(pin.fd, IOCTL_KGSL_DEVICE_GETPROPERTY, &device_info) < 0) return false; + unsigned int core = info.chip_id >> 24; + if (!core) core = info.gpu_id / 100; + if (core < 3) { errno = ENODEV; return false; } + pin.nop = core >= 5 ? 0x70100001 : 0xc0001000; struct kgsl_drawctxt_create context = { .flags = KGSL_CONTEXT_NO_GMEM_ALLOC | KGSL_CONTEXT_PREAMBLE | KGSL_CONTEXT_PWR_CONSTRAINT, }; @@ -93,9 +103,9 @@ static bool prepare_pin(void) { (off_t)pin.memory << 12); if (commands == MAP_FAILED) return false; pin.commands = commands; - // Type-7 CP_NOP, one payload dword; both odd-parity bits are zero. + // A3xx/A4xx use type-3 CP_NOP; newer cores use type-7 with zero odd-parity bits. uint32_t *words = commands; - words[0] = 0x70100001; + words[0] = pin.nop; words[1] = 0; struct kgsl_gpumem_sync_cache sync = { .id = pin.memory, .op = KGSL_GPUMEM_CACHE_CLEAN }; if (ioctl(pin.fd, IOCTL_KGSL_GPUMEM_SYNC_CACHE, &sync) < 0) return false; diff --git a/tools/tests/test_gpu_clock_pin.c b/tools/tests/test_gpu_clock_pin.c index 8e3f0b6a4c..b20a6e6fc9 100644 --- a/tools/tests/test_gpu_clock_pin.c +++ b/tools/tests/test_gpu_clock_pin.c @@ -12,9 +12,10 @@ #include "../../app/src/main/cpp/adrenotools/src/hook/kgsl.h" #include "../../app/src/main/cpp/waylandcomp/src/gpu_clock_pin.h" -enum { NONE, OPEN, CONTEXT, CONSTRAINT, MEMORY, MAP, SYNC, SUBMIT, THREAD, WAIT }; +enum { NONE, OPEN, DEVICE, CONTEXT, CONSTRAINT, MEMORY, MAP, SYNC, SUBMIT, THREAD, WAIT }; static atomic_int failure, descriptors, contexts, memories, mappings, submissions; static atomic_bool timeout_wait; +static bool legacy_core; static uint32_t commands[1024]; int __android_log_print(int priority, const char *tag, const char *format, ...) { @@ -63,6 +64,7 @@ int __wrap_ioctl(int fd, unsigned long request, ...) { va_end(args); int step = NONE; switch ((unsigned int)request) { + case IOCTL_KGSL_DEVICE_GETPROPERTY: step = DEVICE; break; case IOCTL_KGSL_DRAWCTXT_CREATE: step = CONTEXT; break; case IOCTL_KGSL_SETPROPERTY: step = CONSTRAINT; break; case IOCTL_KGSL_GPUMEM_ALLOC_ID: step = MEMORY; break; @@ -72,6 +74,12 @@ int __wrap_ioctl(int fd, unsigned long request, ...) { } if (step && atomic_load(&failure) == step) { errno = EACCES; return -1; } switch ((unsigned int)request) { + case IOCTL_KGSL_DEVICE_GETPROPERTY: { + struct kgsl_device_getproperty *property = arg; + assert(property->type == KGSL_PROP_DEVICE_INFO); + ((struct kgsl_devinfo *)property->value)->chip_id = legacy_core ? 0x04030000 : 0x07030000; + break; + } case IOCTL_KGSL_DRAWCTXT_CREATE: { struct kgsl_drawctxt_create *context = arg; assert(context->flags & KGSL_CONTEXT_PWR_CONSTRAINT); @@ -102,7 +110,7 @@ int __wrap_ioctl(int fd, unsigned long request, ...) { assert(command->context_id == 17 && command->numcmds == 1); assert(command->flags & KGSL_CMDBATCH_PWR_CONSTRAINT); assert(object->id == 23 && object->gpuaddr == 0x100000 && object->size == 8); - assert(commands[0] == 0x70100001 && commands[1] == 0); + assert(commands[0] == (legacy_core ? 0xc0001000 : 0x70100001) && commands[1] == 0); command->timestamp = atomic_fetch_add(&submissions, 1) + 1; break; } @@ -134,6 +142,11 @@ static void assert_released(void) { int main(void) { assert(gpu_clock_pin_set(false)); assert_released(); + legacy_core = true; + assert(gpu_clock_pin_set(true)); + assert(gpu_clock_pin_set(false)); + assert_released(); + legacy_core = false; for (int step = OPEN; step <= THREAD; ++step) { atomic_store(&failure, step); assert(!gpu_clock_pin_set(true)); From 6cc289f7d3f74eaa3c187e2ea0edaed6b7e2da3d Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 15:06:27 -0400 Subject: [PATCH 048/174] test: avoid GPU pin scheduling races --- tools/tests/test_gpu_clock_pin.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/tests/test_gpu_clock_pin.c b/tools/tests/test_gpu_clock_pin.c index b20a6e6fc9..5fdbe60330 100644 --- a/tools/tests/test_gpu_clock_pin.c +++ b/tools/tests/test_gpu_clock_pin.c @@ -13,7 +13,7 @@ #include "../../app/src/main/cpp/waylandcomp/src/gpu_clock_pin.h" enum { NONE, OPEN, DEVICE, CONTEXT, CONSTRAINT, MEMORY, MAP, SYNC, SUBMIT, THREAD, WAIT }; -static atomic_int failure, descriptors, contexts, memories, mappings, submissions; +static atomic_int failure, descriptors, contexts, memories, mappings, submissions, waits; static atomic_bool timeout_wait; static bool legacy_core; static uint32_t commands[1024]; @@ -115,6 +115,7 @@ int __wrap_ioctl(int fd, unsigned long request, ...) { break; } case IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID: + atomic_fetch_add(&waits, 1); if (atomic_load(&timeout_wait)) { errno = ETIMEDOUT; return -1; } break; case IOCTL_KGSL_DRAWCTXT_DESTROY: @@ -157,7 +158,7 @@ int main(void) { atomic_store(&submissions, 0); assert(gpu_clock_pin_set(true)); assert(gpu_clock_pin_set(true)); - usleep(80000); + for (int i = 0; i < 100 && atomic_load(&submissions) < 2; ++i) usleep(10000); assert(atomic_load(&submissions) > 1); assert(gpu_clock_pin_set(false)); assert(gpu_clock_pin_set(false)); @@ -165,8 +166,10 @@ int main(void) { atomic_store(&timeout_wait, true); atomic_store(&submissions, 0); + atomic_store(&waits, 0); assert(gpu_clock_pin_set(true)); - usleep(80000); + for (int i = 0; i < 100 && atomic_load(&waits) < 2; ++i) usleep(10000); + assert(atomic_load(&waits) >= 2); assert(atomic_load(&submissions) == 1); assert(gpu_clock_pin_set(false)); assert_released(); From 5a806b35f15f0d36a44680dc8ad7a29f7426b3f4 Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 15:22:01 -0400 Subject: [PATCH 049/174] test: support configured artwork key --- .../droiddeck/launcher/frontend/AddedGameArtLookupTest.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt index 1f1e30c816..f481462014 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.frontend +import com.droiddeck.launcher.BuildConfig import com.droiddeck.launcher.stores.CredentialCipher import org.json.JSONArray import org.json.JSONObject @@ -92,8 +93,9 @@ class AddedGameArtLookupTest { assertEquals("build", SteamGridDb.pick("", "build")) assertEquals("build", SteamGridDb.pick(" ", "build")) assertEquals("", SteamGridDb.pick("", "")) - assertEquals("", SteamGridDb.builtInKey()) - assertEquals("", SteamGridDb.key(app)) + val builtIn = SteamGridDb.builtInKey() + assertTrue(builtIn == BuildConfig.SGDB_API_KEY.trim()) + assertTrue(SteamGridDb.key(app) == builtIn) } @Test fun theUsersKeyIsSealedOnDiskAndClears() { @@ -106,7 +108,7 @@ class AddedGameArtLookupTest { assertEquals("abcdef0123456789secretkey", SteamGridDb.key(app)) SteamGridDb.setUserKey(app, "") assertFalse(file.exists()) - assertEquals("", SteamGridDb.key(app)) + assertTrue(SteamGridDb.key(app) == SteamGridDb.builtInKey()) } @Test fun aFailedLookupIsNotRememberedAsNoMatch() { From a7d6279ee3ce0b857b1a0b9b688f4a1f77830781 Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 15:22:12 -0400 Subject: [PATCH 050/174] test: check artwork key normalization --- .../droiddeck/launcher/frontend/AddedGameArtLookupTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt index f481462014..095cf9a5c5 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt @@ -94,8 +94,8 @@ class AddedGameArtLookupTest { assertEquals("build", SteamGridDb.pick(" ", "build")) assertEquals("", SteamGridDb.pick("", "")) val builtIn = SteamGridDb.builtInKey() - assertTrue(builtIn == BuildConfig.SGDB_API_KEY.trim()) - assertTrue(SteamGridDb.key(app) == builtIn) + assertTrue(builtIn == BuildConfig.SGDB_API_KEY) + assertTrue(SteamGridDb.key(app) == builtIn.trim()) } @Test fun theUsersKeyIsSealedOnDiskAndClears() { @@ -108,7 +108,7 @@ class AddedGameArtLookupTest { assertEquals("abcdef0123456789secretkey", SteamGridDb.key(app)) SteamGridDb.setUserKey(app, "") assertFalse(file.exists()) - assertTrue(SteamGridDb.key(app) == SteamGridDb.builtInKey()) + assertTrue(SteamGridDb.key(app) == SteamGridDb.builtInKey().trim()) } @Test fun aFailedLookupIsNotRememberedAsNoMatch() { From 9835c4e3e16b7a9695c13362bfa370f665645508 Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 15:39:22 -0400 Subject: [PATCH 051/174] ci: persist PR caches and stabilize build time --- .github/workflows/build.yml | 1 + app/build.gradle | 2 +- tools/tests/test_ci_checks.py | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1a585e3e6..146e7fe3bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -403,6 +403,7 @@ jobs: - uses: gradle/actions/setup-gradle@v4 with: + cache-read-only: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository }} cache-cleanup: on-success - name: Resolve the pinned Android NDK diff --git a/app/build.gradle b/app/build.gradle index bdc9ed4d36..1b1eb5ae7c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,7 +80,7 @@ def sourceCommit = providers.environmentVariable('DROIDDECK_SOURCE_COMMIT').getO def prNumber = (providers.environmentVariable('DROIDDECK_PR_NUMBER').getOrNull() ?: '0').with { it.isInteger() ? it : '0' } def ciBuild = providers.environmentVariable('GITHUB_ACTIONS').getOrNull() == 'true' def releaseSigner = rootProject.file('keystore/release-signer.sha256').text.trim() -def commitTime = (gitValue(['show', '-s', '--format=%ct', 'HEAD']) ?: '0').with { it.isLong() ? it : '0' } +def commitTime = (gitValue(['show', '-s', '--format=%ct', '--end-of-options', sourceCommit]) ?: '0').with { it.isLong() ? it : '0' } def desktopKde = rootProject.file('tools/desktop-kde/release.env').readLines() .findAll { it.contains('=') && !it.startsWith('#') } .collectEntries { def kv = it.split('=', 2); [(kv[0].trim()): kv[1].trim()] } diff --git a/tools/tests/test_ci_checks.py b/tools/tests/test_ci_checks.py index 503b9fb5ba..b7c29fceba 100644 --- a/tools/tests/test_ci_checks.py +++ b/tools/tests/test_ci_checks.py @@ -15,6 +15,15 @@ ROOT = Path(__file__).resolve().parents[2] class CiChecksTest(unittest.TestCase): + def test_pr_cache_writes_and_source_timestamp_policy(self): + jobs = yaml.safe_load((ROOT / '.github/workflows/build.yml').read_text())['jobs'] + cache = next(step for step in jobs['build']['steps'] + if step.get('uses') == 'gradle/actions/setup-gradle@v4')['with'] + self.assertEqual(cache['cache-read-only'], + "${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository }}") + gradle = (ROOT / 'app/build.gradle').read_text() + self.assertIn("gitValue(['show', '-s', '--format=%ct', '--end-of-options', sourceCommit])", gradle) + def test_report_comment_lookup_ignores_human_marker(self): if not shutil.which('jq'): self.skipTest('jq required to execute comment selection') From f909c7a69cc351de7063c048819191bf5b654359 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 15:44:35 -0400 Subject: [PATCH 052/174] fix: x86 Linux games under FEX keep LD_PRELOAD libraries given by name droiddeck-fex dropped every LD_PRELOAD entry that was not an existing path, so a bare soname the loader finds through LD_LIBRARY_PATH (MelonLoader's bootstrap in Drova, for one) never reached the game. Names without a slash are now kept; missing paths and arm64 libraries are still dropped. --- tools/linuxfs/overlay/usr/local/bin/droiddeck-fex | 3 ++- tools/tests/test_droiddeck_fex.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex index 331dcfecc2..545ea0d1a3 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex @@ -589,7 +589,8 @@ def guest_environment(fex, env): result["FEX_THUNKHOSTLIBS"] = fex["host_thunks"] result["FEX_THUNKGUESTLIBS"] = fex["guest_thunks"] result["FEX_THUNKCONFIG"] = os.path.join(CONFIG_DIR, "ThunksConfig.json") - preload = [part for part in split_paths(result.get("LD_PRELOAD")) if os.path.exists(part) and not is_arm(part)] + preload = [part for part in split_paths(result.get("LD_PRELOAD")) + if "/" not in part or (os.path.exists(part) and not is_arm(part))] library_path = [part for part in (result.get("LD_LIBRARY_PATH") or "").split(":") if part and "arm64" not in part and "aarch64" not in part] for name, parts in (("LD_PRELOAD", preload), ("LD_LIBRARY_PATH", library_path)): diff --git a/tools/tests/test_droiddeck_fex.py b/tools/tests/test_droiddeck_fex.py index fed546dddc..1ba2982dab 100644 --- a/tools/tests/test_droiddeck_fex.py +++ b/tools/tests/test_droiddeck_fex.py @@ -549,11 +549,12 @@ class LaunchTest(FexTestCase): def test_the_guest_environment(self): arm = self.write(self.tmp / "arm.so", elf(183)) x86 = self.write(self.tmp / "x86.so", elf(62)) - env = {"LD_PRELOAD": "%s:%s %s" % (arm, x86, self.tmp / "gone.so"), + env = {"LD_PRELOAD": "%s:%s %s libMelonLoader.Bootstrap.so" % (arm, x86, self.tmp / "gone.so"), "LD_LIBRARY_PATH": "/steam/steamrtarm64:/usr/lib/aarch64-linux-gnu:/game/lib:/steam/linuxarm64", "FEX_ROOTFS": "/usr/share/guestos/fex-mesa", "FEX_TSOENABLED": "1"} guest = FEX["guest_environment"]({"portable": True}, env) - self.assertEqual((guest["LD_PRELOAD"], guest["LD_LIBRARY_PATH"], guest["FEX_PORTABLE"]), (str(x86), "/game/lib", "1")) + self.assertEqual((guest["LD_PRELOAD"], guest["LD_LIBRARY_PATH"], guest["FEX_PORTABLE"]), + ("%s:libMelonLoader.Bootstrap.so" % x86, "/game/lib", "1")) self.assertNotIn("FEX_ROOTFS", guest) self.assertEqual(guest["FEX_TSOENABLED"], "1") self.assertTrue(guest["FEX_APP_CONFIG_LOCATION"].endswith("/config/")) From 6378c3f3d2e9e3450563853364146249ff0fdc3b Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 15:48:03 -0400 Subject: [PATCH 053/174] fix: the app follows automatic landscape rotation again unless an orientation was picked --- app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt | 2 +- .../main/java/com/droiddeck/launcher/session/SessionPrefs.kt | 4 ++-- app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt | 2 +- .../java/com/droiddeck/launcher/session/OrientationTest.kt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 52aed25cbc..d648f44e74 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -163,7 +163,7 @@ class FrontEndActivity : ComponentActivity() { private var directAudio by mutableStateOf(false) private var picturePosition by mutableStateOf("center") private var stretch16x9 by mutableStateOf(false) - private var orientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) + private var orientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) private var launcherFullscreen by mutableStateOf(true) private var downloadSource by mutableStateOf(DownloadSource.MODE_AUTO) private var downloadMirror by mutableStateOf("") 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 93df369004..aaf084c323 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -50,9 +50,9 @@ object SessionPrefs { ) fun orientation(context: Context): Int = - prefs(context).getInt("orientation", ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) + prefs(context).getInt("orientation", ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) .takeIf { value -> orientationOptions.any { it.first == value } } - ?: ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE + ?: ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE fun setOrientation(context: Context, orientation: Int) { require(orientationOptions.any { it.first == orientation }) 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 1840d0f077..6e44aca350 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -132,7 +132,7 @@ class FrontEndState( val controller: com.droiddeck.launcher.input.ControllerPrefs.Settings? = null, val phantomProcessStatus: PhantomProcessStatus = PhantomProcessStatus.NOT_APPLICABLE, val showPhantomGate: Boolean = false, - val orientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, + val orientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, val launcherFullscreen: Boolean = true, val downloadSource: String = DownloadSource.MODE_AUTO, val downloadMirror: String = "", diff --git a/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt b/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt index 5ce8030d5a..5d67d041a2 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt @@ -20,7 +20,7 @@ class OrientationTest { } @Test fun landscapeChoicesPersistGloballyAndCanRestoreAutomaticRotation() { - assertEquals(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, SessionPrefs.orientation(context)) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.orientation(context)) for (value in listOf( ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE, @@ -34,7 +34,7 @@ class OrientationTest { @Test fun invalidStoredOrientationFallsBackAndInvalidChoicePreservesTheSavedValue() { val prefs = context.getSharedPreferences("session", Context.MODE_PRIVATE) prefs.edit().putInt("orientation", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT).commit() - assertEquals(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, SessionPrefs.orientation(context)) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.orientation(context)) SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) assertThrows(IllegalArgumentException::class.java) { SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) From b6ca673d6edf5528c788e1cebda766d3ec2dc8ab Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 15:50:16 -0400 Subject: [PATCH 054/174] fix: Steam starts on ROMs that refuse the Android ID read --- .../runtime/LinuxNetworkLinkComponent.kt | 17 ++++++++------- .../launcher/runtime/SeededMacTest.kt | 21 +++++++++++++++++++ 2 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/SeededMacTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt index ac87bd0aa5..45f07471bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt @@ -301,15 +301,18 @@ class LinuxNetworkLinkComponent( } } - private fun seededMac(): String { - val id = Settings.Secure.getString(appContext.contentResolver, Settings.Secure.ANDROID_ID) ?: "bannerlator" - val bytes = java.security.MessageDigest.getInstance("SHA-1").digest(id.toByteArray()) - val b0 = (bytes[0].toInt() and 0xfc) or 0x02 - return listOf(b0, bytes[1].toInt(), bytes[2].toInt(), bytes[3].toInt(), bytes[4].toInt(), bytes[5].toInt()) - .joinToString(":") { "%02x".format(it and 0xff) } - } + private fun seededMac(): String = + seededMac { Settings.Secure.getString(appContext.contentResolver, Settings.Secure.ANDROID_ID) } companion object { + internal fun seededMac(readId: () -> String?): String { + val id = runCatching(readId).getOrNull() ?: "bannerlator" + val bytes = java.security.MessageDigest.getInstance("SHA-1").digest(id.toByteArray()) + val b0 = (bytes[0].toInt() and 0xfc) or 0x02 + return listOf(b0, bytes[1].toInt(), bytes[2].toInt(), bytes[3].toInt(), bytes[4].toInt(), bytes[5].toInt()) + .joinToString(":") { "%02x".format(it and 0xff) } + } + private const val TAG = "LinuxNetworkLink" private const val LINK_FILE = "etc/droiddeck-net" private const val LINK_INDEX = 2 diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/SeededMacTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/SeededMacTest.kt new file mode 100644 index 0000000000..e7a5212633 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/SeededMacTest.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.runtime + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotEquals +import org.junit.Test + +class SeededMacTest { + @Test + fun theAndroidIdSeedsAStableLocalMac() { + val mac = LinuxNetworkLinkComponent.seededMac { "0123456789abcdef" } + assertEquals(mac, LinuxNetworkLinkComponent.seededMac { "0123456789abcdef" }) + assertNotEquals(mac, LinuxNetworkLinkComponent.seededMac { null }) + assertEquals(0x02, mac.substringBefore(':').toInt(16) and 0x03) + } + + @Test + fun aRomThatThrowsOnTheAndroidIdReadFallsBackToTheDefaultSeed() { + val mac = LinuxNetworkLinkComponent.seededMac { throw IllegalArgumentException("Illegal char: - at offset 8") } + assertEquals(LinuxNetworkLinkComponent.seededMac { null }, mac) + } +} From 3e85e4a61410044b35c113339023ad81c8867774 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 15:51:06 -0400 Subject: [PATCH 055/174] chore: drop comments --- .../overlay/usr/local/bin/droiddeck-steam-compat | 1 - .../overlay/usr/local/bin/steam-compatibility | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 2793365bc8..1de4bcf1c9 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -617,7 +617,6 @@ class Helper: current[app] = "" elif not current.get(app): current.pop(app, None) - # The client's pick of a tool the app chose for a game wins once the app's choice was applied. requests = COMPAT["settled_game_requests"](state, current, catalog) overrides = COMPAT["requested_games"](requests or {}, catalog, [t["name"] for t in live]) overrides = {app: tool for app, tool in overrides.items() if app not in refused} diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 69030a6b09..29fe4f8e43 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -1117,7 +1117,6 @@ def game_requests(directory=None): def read_game_requests(directory=None): - """The app's per-game Proton choices, and the file's text so a rewrite can tell the app wrote it since.""" try: with open(state_path("games.json", directory), encoding="utf-8") as f: text = f.read() @@ -1130,7 +1129,6 @@ def read_game_requests(directory=None): def write_game_requests(requests, original, directory=None): - """Rewrites games.json unless the app replaced it after it was read; that newer choice wins.""" path = state_path("games.json", directory) try: with open(path, encoding="utf-8") as f: @@ -1149,17 +1147,10 @@ def valid_game_request(app, request): def settle_game_requests(requests, state, current, catalog, missing_is_cleared=False): - """Whichever side changed a game's tool last wins. A choice the app makes is applied once; after - that the client's own pick stands: a pick of one of our Protons becomes the app's choice too, any - other pick (FEX, a Steam Linux Runtime, clearing the forced tool) ends the app's choice. "Use the - default" (null, also what a profile reset writes) is applied once and then dropped, so the game - follows the default like one the app never touched. Returns the new requests and whether they changed.""" recorded = state.get("games_applied") if isinstance(recorded, dict): applied = dict(recorded) else: - # Builds before this one kept no record but had already applied every choice they found; a - # first start has applied nothing yet. applied = dict(requests) if "tools" in state else {} by_name = {t["name"]: t for t in catalog} out = dict(requests) @@ -1189,9 +1180,6 @@ def settle_game_requests(requests, state, current, catalog, missing_is_cleared=F def settled_game_requests(state, current, catalog, missing_is_cleared=False, directory=None): - """Reads the app's choices, settles them against the client's picks and stores the result. When the - app rewrote the file meanwhile, its newer choices are settled again; they are never overwritten. - None when the app kept rewriting it: this pass then applies no per-game choice and records nothing.""" for _ in range(2): requests, text = read_game_requests(directory) settled, moved = settle_game_requests(requests, state, current, catalog, missing_is_cleared) @@ -1201,8 +1189,6 @@ def settled_game_requests(state, current, catalog, missing_is_cleared=False, dir def applied_game_requests(requests, overrides, state): - """What the app asked for that is now in the mapping. A tool not installed yet stays unapplied, and a - game this pass did not handle (the client refused to report it) keeps what was applied before.""" recorded = state.get("games_applied") before = recorded if isinstance(recorded, dict) else {} if requests is None: @@ -1399,7 +1385,6 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non else: default = state.get("default") if state.get("default") in names else TOOL steam_root = os.path.dirname(os.path.dirname(os.path.abspath(config_path))) - # With the client stopped, config.vdf is what it last kept: an app missing from it has no forced tool. requests = settled_game_requests(state, current, catalog, not steam_running(), directory) overrides = requested_games(requests or {}, catalog) managed = state.get("auto", {}).keys() if isinstance(state.get("auto"), dict) else () From 06946fe8ae7fddff9e68ece65e23458f4595f6f8 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 16:01:41 -0400 Subject: [PATCH 056/174] chore: drop comments --- app/src/main/cpp/waylandcomp/src/compositor.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index fb15d50c32..1be637a7bb 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -807,12 +807,6 @@ static uint32_t nominal_refresh_ns(void) { return (uint32_t)(1000000000000LL / (int64_t)mhz); } -/* Gamescope paces from this timestamp (#717). The Choreographer tick is often still - * slightly ahead of this thread, because the UI thread queues the callback, and that - * used to throw the tick away (render_ns < tick) and report the draw time instead. - * Keep a tick within one refresh of the draw, ahead or behind. A missing tick, or one - * more than a refresh away, falls back to the draw time. Never report the next refresh: - * gamescope would wake a frame late. */ static int64_t presented_ns(int64_t render_ns) { int64_t tick = g_tick_vsync_ns; int64_t refresh = (int64_t)nominal_refresh_ns(); From 7eb4717d4c8919688d74b294d0db538a247e5b5d Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 16:16:10 -0400 Subject: [PATCH 057/174] chore: drop the comments added with the Unity TSO fix --- tools/linuxfs/overlay/usr/local/bin/droiddeck-fex | 1 - tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 3 --- 2 files changed, 4 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex index aaa4830cec..6ca792143d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex @@ -683,7 +683,6 @@ def game_environment(env, command): game = game_env["Game"](resolve(command[0], env), command[1:]) for check in game_env["FIXES"]: found = check(game) - # Environment fixes only: the launch arguments some fixes add were chosen for Windows builds. if found and found[0]: fixes.update(found[0]) say(found[2]) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 22b5248f36..75154ab6df 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -89,9 +89,6 @@ def dotnet_memory_ordering(game): @fix def unity_memory_ordering(game): - """A Unity player under FEX without TSO deadlocks or crashes: Megabonk (Linux, IL2CPP) froze with every - thread parked on a futex on about half of all launches, Crab Game (Windows under Proton, IL2CPP) died with - an access violation in UnityPlayer.dll. Presets that turn TSO off keep it on for Unity games.""" if {"unityplayer.so", "gameassembly.so", "unityplayer.dll"} & game.files: return {"FEX_TSOENABLED": "1"}, [], "Unity: FEX with TSO" From c95e114766adb7b2ef585302e9474c5cb2ed53bf Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 16:20:42 -0400 Subject: [PATCH 058/174] fix(ci): recover directory cache entries --- tools/packs/fetch-verified.sh | 3 +++ tools/tests/test_pack_downloads.py | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/tools/packs/fetch-verified.sh b/tools/packs/fetch-verified.sh index 0b8c03977a..41bba28190 100644 --- a/tools/packs/fetch-verified.sh +++ b/tools/packs/fetch-verified.sh @@ -22,6 +22,9 @@ else curl -fsSL --retry 4 --retry-all-errors --connect-timeout 15 --max-time 180 --retry-max-time 240 \ -o "$part" "$url" verify "$part" || { echo "Checksum mismatch for $url" >&2; exit 1; } + if [ -d "$kept" ]; then + rm -rf -- "$kept" + fi mv -f "$part" "$kept" echo "Downloaded and verified pack input: $expected" fi diff --git a/tools/tests/test_pack_downloads.py b/tools/tests/test_pack_downloads.py index 20547c03bb..0b5eb60602 100644 --- a/tools/tests/test_pack_downloads.py +++ b/tools/tests/test_pack_downloads.py @@ -51,6 +51,25 @@ class PackDownloadsTest(unittest.TestCase): self.assertEqual(len(self.log.read_text().splitlines()), 2) self.assertEqual((self.cache / self.checksum).read_bytes(), b'verified input') + def test_directory_cache_entry_is_replaced_only_after_verification(self): + entry = self.cache / self.checksum + entry.mkdir() + sentinel = entry / 'old-entry' + sentinel.write_bytes(b'preserve until verified') + self.remote.write_bytes(b'tampered download') + self.assertNotEqual(self.fetch().returncode, 0) + self.assertEqual(sentinel.read_bytes(), b'preserve until verified') + self.assertFalse(self.destination.exists()) + self.remote.write_bytes(b'verified input') + result = self.fetch() + self.assertEqual(result.returncode, 0, result.stderr) + self.assertTrue(entry.is_file()) + self.assertEqual(entry.read_bytes(), b'verified input') + self.assertEqual(self.destination.read_bytes(), b'verified input') + self.assertEqual(list(self.cache.iterdir()), [entry]) + self.assertEqual(self.fetch().returncode, 0) + self.assertEqual(len(self.log.read_text().splitlines()), 2) + def test_changed_pin_cannot_reuse_old_bytes(self): self.assertEqual(self.fetch().returncode, 0) self.remote.write_bytes(b'new approved input') From 992912fdf87c970a4c2a6135fe98bb4727f15a83 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 17:43:44 -0400 Subject: [PATCH 059/174] fix: other apps can record game audio --- app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fcd9b2e11b..286a9ee8ad 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,6 +34,7 @@ android:localeConfig="@xml/locales_config" android:networkSecurityConfig="@xml/network_security_config" android:allowBackup="false" + android:allowAudioPlaybackCapture="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/AppTheme" From 94b530ecb2a32efe6b92a67a97ea6cf6bc38e72a Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 18:28:35 -0400 Subject: [PATCH 060/174] fix: stored components can be deleted after a Proton update --- .../launcher/session/ComponentsManager.kt | 52 +++++++++++++------ .../session/ComponentsSelectionTest.kt | 32 ++++++++++++ 2 files changed, 67 insertions(+), 17 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/ComponentsSelectionTest.kt 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 d1aae9d720..d05ba28366 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -721,13 +721,19 @@ object ComponentsManager { class StoredOriginal(val protonId: String, val protonName: String?, val comp: String, val protonVersion: String, val size: Long, val kept: Boolean) class Stored(val packages: List, val originals: List) - private fun packagesInUse(state: JSONObject): Set { + internal fun liveSelection(key: String, entry: JSONObject, proton: Proton?): Boolean = + proton != null && (key == "queued" || entry.optString("protonVersion") == proton.version) + + private fun packagesInUse(state: JSONObject, installed: Map): Set { val names = HashSet() for (key in listOf("active", "queued")) { val byProton = state.optJSONObject(key) ?: continue for (pid in byProton.keys()) { val comps = byProton.optJSONObject(pid) ?: continue - for (comp in comps.keys()) comps.optJSONObject(comp)?.optString("file")?.takeIf { it.isNotEmpty() }?.let(names::add) + for (comp in comps.keys()) { + val entry = comps.optJSONObject(comp) ?: continue + if (liveSelection(key, entry, installed[pid])) entry.optString("file").takeIf { it.isNotEmpty() }?.let(names::add) + } } } val profiles = state.optJSONObject("profiles") @@ -747,8 +753,8 @@ object ComponentsManager { fun stored(context: Context): Stored = synchronized(lock) { val state = loadState(context) - val used = packagesInUse(state) val installed = protons(context).associateBy { it.id } + val used = packagesInUse(state, installed) val originals = originalsDir(context).listFiles()?.filter { it.isDirectory }?.flatMap { proton -> proton.listFiles()?.filter { it.isDirectory }?.flatMap { version -> COMPONENTS.mapNotNull { comp -> @@ -777,23 +783,35 @@ object ComponentsManager { fun deletePackage(context: Context, file: String): String = synchronized(lock) { val name = safeName(file) val state = loadState(context) - val queued = state.sub("queued") - for (pid in queued.keys()) { - val comps = queued.optJSONObject(pid) ?: continue - for (comp in comps.keys()) check(comps.optJSONObject(comp)?.optString("file") != name) { context.getString(R.string.cmgr_package_in_use, name, pid) } - } - val active = state.sub("active") - for (pid in active.keys()) { - val comps = active.optJSONObject(pid) ?: continue - for (comp in comps.keys()) check(comps.optJSONObject(comp)?.optString("file") != name) { context.getString(R.string.cmgr_package_in_use, name, pid) } - } - val profiles = state.sub("profiles") - for (scope in profiles.keys()) { - val profile = profiles.optJSONObject(scope) ?: continue - check(COMPONENTS.none { profile.optString(it) == name }) { context.getString(R.string.cmgr_package_in_use, name, scope) } + val installed = protons(context).associateBy { it.id } + var changed = false + for (key in listOf("queued", "active")) { + val byProton = state.sub(key) + for (pid in byProton.keys().asSequence().toList()) { + val comps = byProton.optJSONObject(pid) ?: continue + for (comp in comps.keys().asSequence().toList()) { + val entry = comps.optJSONObject(comp) ?: continue + if (entry.optString("file") != name) continue + check(!liveSelection(key, entry, installed[pid])) { context.getString(R.string.cmgr_package_in_use, name, installed[pid]?.name ?: pid) } + comps.remove(comp) + changed = true + } + if (comps.length() == 0) byProton.remove(pid) + } } val f = File(packagesDir(context), name) check(f.isFile) { context.getString(R.string.cmgr_package_not_stored, name) } + val profiles = state.sub("profiles") + for (scope in profiles.keys().asSequence().toList()) { + val profile = profiles.optJSONObject(scope) ?: continue + for (comp in COMPONENTS.filter { profile.optString(it) == name }) { + rememberProfiledComponent(state, comp) + profile.remove(comp) + changed = true + } + if (profile.length() == 0) profiles.remove(scope) + } + if (changed) saveState(context, state) f.delete() context.getString(R.string.cmgr_deleted, name) } diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentsSelectionTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentsSelectionTest.kt new file mode 100644 index 0000000000..517d6ad2b3 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentsSelectionTest.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.session + +import org.json.JSONObject +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import java.io.File + +@RunWith(RobolectricTestRunner::class) +class ComponentsSelectionTest { + private val proton = ComponentsManager.Proton("DroidDeck-Proton_11-11.1", "DroidDeck-Proton 11-11.1", File("/p"), "/p", "DroidDeck-Proton-11-11.1", false) + private val entry = JSONObject().put("file", "dxvk-low-latency-arm64ec-3.1.1-2-linux.wcp").put("protonVersion", "DroidDeck-Proton-11-11.1") + + @Test + fun `a package swapped into an installed Proton is in use`() { + assertTrue(ComponentsManager.liveSelection("active", entry, proton)) + assertTrue(ComponentsManager.liveSelection("queued", JSONObject().put("file", "x.wcp"), proton)) + } + + @Test + fun `a package left on a removed Proton is not in use`() { + assertFalse(ComponentsManager.liveSelection("active", entry, null)) + assertFalse(ComponentsManager.liveSelection("queued", entry, null)) + } + + @Test + fun `a package from before a Proton update is not in use`() { + assertFalse(ComponentsManager.liveSelection("active", JSONObject(entry.toString()).put("protonVersion", "DroidDeck-Proton-11-9.1"), proton)) + } +} From 70b8ec5de4abc2d8bceebc6d5beae87de0c80349 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 18:36:24 -0400 Subject: [PATCH 061/174] docs: add the Trendshift #1 daily and weekly badges to the README --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 7fd8cfbdbd..7d90815935 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,16 @@ DroidDeck brings the SteamOS experience to Android: Valve's Steam client in Big +

    + Droid-Deck%2FDroidDeck | Trendshift + Droid-Deck%2FDroidDeck | Trendshift +

    + +

    + Droid-Deck%2FDroidDeck | Trendshift + Droid-Deck%2FDroidDeck | Trendshift +

    +

    Tapping DroidDeck on the Android home screen and landing in Steam Big Picture

    > Note: DroidDeck does not have a stand-alone website. Do not click on any download links from websites claiming to be the DroidDeck team. From db9aae7b876a297eeed2c0ab5b6defb3a946b451 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 18:56:24 -0400 Subject: [PATCH 062/174] fix: delete the package before saving, and match Protons the same way --- .../com/droiddeck/launcher/session/ComponentsManager.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 d05ba28366..776a9f7a0f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -753,7 +753,7 @@ object ComponentsManager { fun stored(context: Context): Stored = synchronized(lock) { val state = loadState(context) - val installed = protons(context).associateBy { it.id } + val installed = protons(context).distinctBy { it.id }.associateBy { it.id } val used = packagesInUse(state, installed) val originals = originalsDir(context).listFiles()?.filter { it.isDirectory }?.flatMap { proton -> proton.listFiles()?.filter { it.isDirectory }?.flatMap { version -> @@ -783,7 +783,7 @@ object ComponentsManager { fun deletePackage(context: Context, file: String): String = synchronized(lock) { val name = safeName(file) val state = loadState(context) - val installed = protons(context).associateBy { it.id } + val installed = protons(context).distinctBy { it.id }.associateBy { it.id } var changed = false for (key in listOf("queued", "active")) { val byProton = state.sub(key) @@ -811,8 +811,8 @@ object ComponentsManager { } if (profile.length() == 0) profiles.remove(scope) } + check(f.delete()) { name } if (changed) saveState(context, state) - f.delete() context.getString(R.string.cmgr_deleted, name) } From 7261b262649ef02dac8b9f54e8da8ec8dadbb3ab Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 18:56:44 -0400 Subject: [PATCH 063/174] fix: a game started from another launcher returns to that launcher --- .../com/droiddeck/launcher/SessionActivity.kt | 18 ++++++++++++++---- 1 file changed, 14 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 4f159908bf..114ea81cdb 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -3549,17 +3549,27 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } return } - super.finish() if (!closeAtOnce && intent.getBooleanExtra(EXTRA_RETURN_HOME, false)) { com.droiddeck.launcher.ui.QuitFlood.take() com.droiddeck.launcher.ui.LaunchOrigin.flooding = null - startActivity(Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) - } + closeLinkTasks() + super.finishAndRemoveTask() + } else super.finish() if (quitFlooded) overridePendingTransition(0, 0) else overridePendingTransition(R.anim.session_hold, R.anim.session_sink) } + private fun closeLinkTasks() { + val tasks = runCatching { getSystemService(android.app.ActivityManager::class.java)?.appTasks }.getOrNull().orEmpty() + for (task in tasks) { + runCatching { + val base = task.taskInfo.baseIntent + if (base.component?.className == FrontEndActivity::class.java.name && + com.droiddeck.launcher.frontend.GameLaunchIntent.accepts(base.action)) task.finishAndRemoveTask() + } + } + } + private fun completeLeave() { if (isFinishing) return val signal = com.droiddeck.launcher.ui.Themes.current(this).signal From 69b2b8fcdfabc365a476846425fabc9284e52943 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 19:17:08 -0400 Subject: [PATCH 064/174] fix: only close the game-link task that started the session --- .../java/com/droiddeck/launcher/FrontEndActivity.kt | 12 ++++++++---- .../java/com/droiddeck/launcher/SessionActivity.kt | 12 ++++++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index d648f44e74..2852a4c52d 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -544,12 +544,12 @@ class FrontEndActivity : ComponentActivity() { } startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME) .putExtra(SessionActivity.EXTRA_STEAMVR, steamVr) - .putExtra(SessionActivity.EXTRA_RETURN_HOME, returnHome) + .returnTo(returnHome) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)) return true } return startSession(Intent(this, SessionActivity::class.java) - .putExtra(SessionActivity.EXTRA_RETURN_HOME, returnHome) + .returnTo(returnHome) .apply { if (game.gameIdString == com.droiddeck.launcher.gpu.SteamVr.APP_ID) { putExtra(SessionActivity.EXTRA_STEAMVR, true) @@ -560,6 +560,10 @@ class FrontEndActivity : ComponentActivity() { }, steamSession = true) } + private fun Intent.returnTo(returnHome: Boolean): Intent = + putExtra(SessionActivity.EXTRA_RETURN_HOME, returnHome) + .putExtra(SessionActivity.EXTRA_LINK_TASK, if (returnHome) taskId else -1) + private fun launchWithoutSteam(game: Library.SteamGame, returnHome: Boolean): Boolean { val app = applicationContext Thread({ @@ -573,7 +577,7 @@ class FrontEndActivity : ComponentActivity() { } com.droiddeck.launcher.session.NoSteamLaunch.remember(command) val next = Intent(this, SessionActivity::class.java) - .putExtra(SessionActivity.EXTRA_RETURN_HOME, returnHome) + .returnTo(returnHome) .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_RUN) .putExtra(SessionService.EXTRA_PROGRAM, command.program) .putExtra(SessionService.EXTRA_PROGRAM_ARGS, command.args.toTypedArray()) @@ -582,7 +586,7 @@ class FrontEndActivity : ComponentActivity() { SessionState.stopRequested -> android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show() SessionState.mode == SessionService.MODE_RUN && SessionState.program == command.program && SessionState.programArgs == command.args -> startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME) - .putExtra(SessionActivity.EXTRA_RETURN_HOME, returnHome) + .returnTo(returnHome) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)) else -> pendingSwitch = next } diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 114ea81cdb..7c4a19b9a0 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1926,6 +1926,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionState.relaunch?.let { next -> SessionState.relaunch = null next.putExtra(EXTRA_RETURN_HOME, intent.getBooleanExtra(EXTRA_RETURN_HOME, false)) + next.putExtra(EXTRA_LINK_TASK, intent.getIntExtra(EXTRA_LINK_TASK, -1)) setIntent(next) recreate() return@runOnUiThread @@ -3027,6 +3028,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return } if (this.intent.getBooleanExtra(EXTRA_RETURN_HOME, false)) intent.putExtra(EXTRA_RETURN_HOME, true) + if (!intent.hasExtra(EXTRA_LINK_TASK)) intent.putExtra(EXTRA_LINK_TASK, this.intent.getIntExtra(EXTRA_LINK_TASK, -1)) setIntent(intent) if (intent.getBooleanExtra(EXTRA_STEAMVR, false) && SessionState.mode == SessionService.MODE_STEAM) { SessionState.steamVr = true @@ -3560,11 +3562,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun closeLinkTasks() { + val linkTask = intent.getIntExtra(EXTRA_LINK_TASK, -1) + if (linkTask == -1) return val tasks = runCatching { getSystemService(android.app.ActivityManager::class.java)?.appTasks }.getOrNull().orEmpty() for (task in tasks) { runCatching { - val base = task.taskInfo.baseIntent - if (base.component?.className == FrontEndActivity::class.java.name && + val info = task.taskInfo + @Suppress("DEPRECATION") + val id = if (android.os.Build.VERSION.SDK_INT >= 29) info.taskId else info.persistentId + val base = info.baseIntent + if (id == linkTask && base.component?.className == FrontEndActivity::class.java.name && com.droiddeck.launcher.frontend.GameLaunchIntent.accepts(base.action)) task.finishAndRemoveTask() } } @@ -3581,6 +3588,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { companion object { const val EXTRA_RETURN_HOME = "returnHome" + const val EXTRA_LINK_TASK = "linkTask" const val EXTRA_STEAMVR = "steamVr" const val EXTRA_REPAIR_RUNTIME = "repairRuntime" private const val LEAVE_TIMEOUT_MS = 1_500L From 8123d5b3612f6e9132e8817448f104332643ebcb Mon Sep 17 00:00:00 2001 From: superboo07 Date: Fri, 23 Oct 2026 23:39:27 +0000 Subject: [PATCH 065/174] xbox backend x86 to arm cross compilation --- tools/xbox/build-local.sh | 29 +++++++++++++++++++++-------- tools/xbox/build.sh | 2 +- tools/xbox/cross.Dockerfile | 28 ++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 tools/xbox/cross.Dockerfile diff --git a/tools/xbox/build-local.sh b/tools/xbox/build-local.sh index 6a3eb90ce5..979c95b12b 100755 --- a/tools/xbox/build-local.sh +++ b/tools/xbox/build-local.sh @@ -1,14 +1,7 @@ #!/usr/bin/env bash set -euo pipefail repo=$(cd "$(dirname "$0")/../.." && pwd) -cache=${DROIDDECK_XBOX_CACHE:-"${HOME}/.cache/droiddeck-xbox-build"} -mkdir -p "$cache" -docker run --rm --platform linux/arm64 -v "$repo:/src" -v "$cache:/work" -w /src \ - -e CARGO_HOME=/work/cargo -e RUSTUP_HOME=/work/rustup -e XBOX_BUILD_DIR=/work/build ubuntu:24.04 bash -lc ' - set -euo pipefail - apt-get update -qq - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends \ - build-essential pkg-config libssl-dev protobuf-compiler cmake curl git ca-certificates xz-utils python3 >/dev/null +build=' export PATH=/work/cargo/bin:$PATH if ! command -v rustup >/dev/null; then version=$(python3 -c '\''import json;print(json.load(open("tools/xbox/backend.lock.json"))["rust"])'\'') @@ -16,3 +9,23 @@ docker run --rm --platform linux/arm64 -v "$repo:/src" -v "$cache:/work" -w /src fi bash tools/xbox/build.sh ' +if [[ $(uname -m) = x86_64 ]]; then + 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) + docker image inspect "$image" >/dev/null 2>&1 \ + || docker build --platform "$platform" -t "$image" -f "$repo/tools/xbox/cross.Dockerfile" "$repo/tools/xbox" +else + cache=${DROIDDECK_XBOX_CACHE:-"${HOME}/.cache/droiddeck-xbox-build"} + platform=linux/arm64 + image=ubuntu:24.04 + build=' + apt-get update -qq + DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends \ + build-essential pkg-config libssl-dev protobuf-compiler cmake curl git ca-certificates xz-utils python3 >/dev/null +'"$build" +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" diff --git a/tools/xbox/build.sh b/tools/xbox/build.sh index f5598aee19..99bee8c76b 100755 --- a/tools/xbox/build.sh +++ b/tools/xbox/build.sh @@ -13,7 +13,7 @@ export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=${CARGO_TARGET_AARCH64_UNKN if [[ $(uname -m) = aarch64 ]]; then export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=cc; fi cd "$source_dir" cargo build --locked --release --no-default-features --target aarch64-unknown-linux-gnu -p xodus-cli -p xodus-service -if [[ $(uname -m) = aarch64 ]]; then +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_ diff --git a/tools/xbox/cross.Dockerfile b/tools/xbox/cross.Dockerfile new file mode 100644 index 0000000000..665dd17d71 --- /dev/null +++ b/tools/xbox/cross.Dockerfile @@ -0,0 +1,28 @@ +FROM ubuntu:24.04 + +ENV DEBIAN_FRONTEND=noninteractive + +RUN dpkg --add-architecture arm64 \ + && sed -i '/^Types:/a Architectures: amd64' /etc/apt/sources.list.d/ubuntu.sources \ + && printf '%s\n' \ + 'Types: deb' \ + 'URIs: http://ports.ubuntu.com/ubuntu-ports/' \ + 'Suites: noble noble-updates noble-security' \ + 'Components: main universe restricted multiverse' \ + 'Architectures: arm64' \ + 'Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg' \ + > /etc/apt/sources.list.d/ubuntu-ports.sources \ + && apt-get update -qq \ + && apt-get install -y -qq --no-install-recommends \ + build-essential pkg-config protobuf-compiler cmake curl git ca-certificates xz-utils python3 \ + gcc-aarch64-linux-gnu g++-aarch64-linux-gnu qemu-user \ + libssl-dev:arm64 libstdc++6:arm64 \ + && rm -rf /var/lib/apt/lists/* + +ENV CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \ + CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \ + AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar \ + PKG_CONFIG_ALLOW_CROSS=1 \ + PKG_CONFIG_LIBDIR_aarch64_unknown_linux_gnu=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig \ + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \ + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER=qemu-aarch64 From caaf6b3a011c7d27db573f0d1d0ccb2cefa3b6ca Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 19:47:32 -0400 Subject: [PATCH 066/174] fix: keep the link task id when an in-app resume reaches the session --- .../main/java/com/droiddeck/launcher/FrontEndActivity.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 2852a4c52d..943b07be83 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -560,9 +560,11 @@ class FrontEndActivity : ComponentActivity() { }, steamSession = true) } - private fun Intent.returnTo(returnHome: Boolean): Intent = - putExtra(SessionActivity.EXTRA_RETURN_HOME, returnHome) - .putExtra(SessionActivity.EXTRA_LINK_TASK, if (returnHome) taskId else -1) + private fun Intent.returnTo(returnHome: Boolean): Intent { + val task = taskId + return putExtra(SessionActivity.EXTRA_RETURN_HOME, returnHome) + .apply { if (returnHome) putExtra(SessionActivity.EXTRA_LINK_TASK, task) } + } private fun launchWithoutSteam(game: Library.SteamGame, returnHome: Boolean): Boolean { val app = applicationContext From c7bcd8278216ed5632cb852b31b0b4ec468220cf Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 19:47:41 -0400 Subject: [PATCH 067/174] fix: Snapdragon 8 Gen 2 no longer pins Steam to one core by default --- .../launcher/core/CpuAllocationDefaults.kt | 27 ------------ .../launcher/session/SessionPrefs.kt | 18 ++------ .../core/CpuAllocationDefaultsTest.kt | 42 ------------------- .../session/CoreAllocationPrefsTest.kt | 37 +++++----------- 4 files changed, 14 insertions(+), 110 deletions(-) delete mode 100644 app/src/main/java/com/droiddeck/launcher/core/CpuAllocationDefaults.kt delete mode 100644 app/src/test/java/com/droiddeck/launcher/core/CpuAllocationDefaultsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/core/CpuAllocationDefaults.kt b/app/src/main/java/com/droiddeck/launcher/core/CpuAllocationDefaults.kt deleted file mode 100644 index adaa106a02..0000000000 --- a/app/src/main/java/com/droiddeck/launcher/core/CpuAllocationDefaults.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.droiddeck.launcher.core - -import com.droiddeck.launcher.gpu.GpuInfo -import com.droiddeck.launcher.gpu.SocNames - -object CpuAllocationDefaults { - data class Allocation(val client: String, val game: String) - - val device: Allocation? by lazy { - forDevice(SocNames.model(), GpuInfo.systemProperty("ro.board.platform"), - CpuCores.all.associateWith(CpuCores::maxGhz)) - } - - fun forDevice(model: String, platform: String, frequencies: Map): Allocation? { - val chip = model.trim().uppercase().substringBefore('-') - val gen2 = chip in setOf("SM8550", "QCS8550") || - (chip.isEmpty() && platform.trim().equals("kalama", ignoreCase = true)) - if (!gen2 || frequencies.size != 8 || frequencies.keys.any { it < 0 } || - frequencies.values.any { it == null || !it.isFinite() || it <= 0.0 }) return null - val clusters = frequencies.entries.groupBy { it.value }.toSortedMap(compareBy { it ?: 0.0 }).values.toList() - if (clusters.map { it.size } != listOf(3, 4, 1)) return null - return Allocation( - client = CpuCores.format(clusters[2].map { it.key }.toSet()), - game = CpuCores.format(clusters[1].map { it.key }.toSet()), - ) - } -} 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 aaf084c323..e8041fe0b8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -4,7 +4,6 @@ import android.content.Context import android.content.pm.ActivityInfo import androidx.annotation.StringRes import com.droiddeck.launcher.R -import com.droiddeck.launcher.core.CpuAllocationDefaults import com.droiddeck.launcher.core.GameEnvironment import com.droiddeck.launcher.core.TextureFiltering import com.droiddeck.launcher.gpu.Cardboard @@ -382,30 +381,19 @@ object SessionPrefs { prefs(context).edit().putBoolean("wifiDiscoveryAsked", true).apply() } - internal data class CoreAllocation(val clientOverride: Boolean, val clientCpus: String, val gameCpus: String) - - internal fun coreAllocation(context: Context, defaults: CpuAllocationDefaults.Allocation? = CpuAllocationDefaults.device): CoreAllocation { - val saved = prefs(context) - return CoreAllocation( - saved.getBoolean("clientCpusOverride", defaults != null && !saved.contains("clientCpus")), - saved.getString("clientCpus", defaults?.client.orEmpty()).orEmpty(), - saved.getString("gameCpus", defaults?.game.orEmpty()).orEmpty(), - ) - } - - fun clientCpusOverride(context: Context): Boolean = coreAllocation(context).clientOverride + fun clientCpusOverride(context: Context): Boolean = prefs(context).getBoolean("clientCpusOverride", false) fun setClientCpusOverride(context: Context, on: Boolean) { prefs(context).edit().putBoolean("clientCpusOverride", on).apply() } - fun clientCpus(context: Context): String = coreAllocation(context).clientCpus + fun clientCpus(context: Context): String = prefs(context).getString("clientCpus", "").orEmpty() fun setClientCpus(context: Context, list: String) { prefs(context).edit().putString("clientCpus", list).apply() } - fun gameCpus(context: Context): String = coreAllocation(context).gameCpus + fun gameCpus(context: Context): String = prefs(context).getString("gameCpus", "").orEmpty() fun setGameCpus(context: Context, list: String) { prefs(context).edit().putString("gameCpus", list).apply() diff --git a/app/src/test/java/com/droiddeck/launcher/core/CpuAllocationDefaultsTest.kt b/app/src/test/java/com/droiddeck/launcher/core/CpuAllocationDefaultsTest.kt deleted file mode 100644 index ba6e31a10f..0000000000 --- a/app/src/test/java/com/droiddeck/launcher/core/CpuAllocationDefaultsTest.kt +++ /dev/null @@ -1,42 +0,0 @@ -package com.droiddeck.launcher.core - -import org.junit.Assert.* -import org.junit.Test - -class CpuAllocationDefaultsTest { - private val thor = (0..7).associateWith { when (it) { in 0..2 -> 2.016; in 3..6 -> 2.8032; else -> 3.1872 } } - - @Test fun gen2UsesTheFourMiddleCoresAndOnePrime() { - for (model in listOf("SM8550", "QCS8550", "sm8550-ac")) { - assertEquals(CpuAllocationDefaults.Allocation("7", "3,4,5,6"), CpuAllocationDefaults.forDevice(model, "", thor)) - } - assertEquals(CpuAllocationDefaults.Allocation("7", "3,4,5,6"), CpuAllocationDefaults.forDevice("", "kalama", thor)) - } - - @Test fun coreNumbersAndClockVariantsAreDetectedInsteadOfHardcoded() { - val reordered = mapOf(0 to 3.36, 1 to 2.0, 2 to 2.0, 3 to 2.0, 4 to 2.8, 5 to 2.8, 6 to 2.8, 7 to 2.8) - assertEquals(CpuAllocationDefaults.Allocation("0", "4,5,6,7"), CpuAllocationDefaults.forDevice("SM8550-AC", "kalama", reordered)) - } - - @Test fun anotherOrUnknownChipDoesNotAcquireThisDefault() { - assertNull(CpuAllocationDefaults.forDevice("SM8650", "pineapple", thor)) - assertNull(CpuAllocationDefaults.forDevice("SM8650", "kalama", thor)) - assertNull(CpuAllocationDefaults.forDevice("", "", thor)) - } - - @Test fun missingOrUnexpectedTopologyKeepsTheSchedulerDefault() { - assertNull(CpuAllocationDefaults.forDevice("SM8550", "kalama", thor - 7)) - assertNull(CpuAllocationDefaults.forDevice("SM8550", "kalama", thor + (7 to null))) - assertNull(CpuAllocationDefaults.forDevice("SM8550", "kalama", thor + (7 to 0.0))) - assertNull(CpuAllocationDefaults.forDevice("SM8550", "kalama", thor + (7 to Double.NaN))) - assertNull(CpuAllocationDefaults.forDevice("SM8550", "kalama", (0..7).associateWith { 2.8 })) - } - - @Test fun allCoreGamesUndoTheClientsInheritedRestriction() { - val all = CpuCores.listOrAll("") - assertEquals(all, CpuCores.gameLaunchList("", clientPinned = true)) - assertEquals(all, CpuCores.gameLaunchList(all, clientPinned = true)) - assertEquals("", CpuCores.gameLaunchList("", clientPinned = false)) - assertEquals("0", CpuCores.gameLaunchList("0", clientPinned = true)) - } -} diff --git a/app/src/test/java/com/droiddeck/launcher/session/CoreAllocationPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/CoreAllocationPrefsTest.kt index 8a25bf4e72..901a82d3ff 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/CoreAllocationPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/CoreAllocationPrefsTest.kt @@ -1,7 +1,6 @@ package com.droiddeck.launcher.session import android.content.Context -import com.droiddeck.launcher.core.CpuAllocationDefaults import org.junit.Assert.* import org.junit.Before import org.junit.Test @@ -14,36 +13,22 @@ import org.robolectric.annotation.Config @Config(sdk = [33]) class CoreAllocationPrefsTest { private val app get() = RuntimeEnvironment.getApplication() - private val defaults = CpuAllocationDefaults.Allocation("7", "3,4,5,6") private val saved get() = app.getSharedPreferences("session", Context.MODE_PRIVATE) @Before fun clear() { saved.edit().clear().commit() } - @Test fun absentPreferencesUseTheDeviceDefaultWithoutWritingIt() { - assertEquals(SessionPrefs.CoreAllocation(true, "7", "3,4,5,6"), SessionPrefs.coreAllocation(app, defaults)) - assertTrue(saved.all.isEmpty()) - assertEquals(SessionPrefs.CoreAllocation(false, "", ""), SessionPrefs.coreAllocation(app, null)) + @Test fun absentPreferencesLeaveEveryCoreToTheScheduler() { + assertFalse(SessionPrefs.clientCpusOverride(app)) + assertEquals("", SessionPrefs.clientCpus(app)) + assertEquals("", SessionPrefs.gameCpus(app)) } - @Test fun explicitDisableAndAllCoreChoicesSurviveAnUpdate() { - saved.edit().putBoolean("clientCpusOverride", false).putString("clientCpus", "").putString("gameCpus", "").commit() - assertEquals(SessionPrefs.CoreAllocation(false, "", ""), SessionPrefs.coreAllocation(app, defaults)) - } - - @Test fun existingCustomMasksArePreserved() { - saved.edit().putBoolean("clientCpusOverride", true).putString("clientCpus", "0,1").putString("gameCpus", "2,7").commit() - assertEquals(SessionPrefs.CoreAllocation(true, "0,1", "2,7"), SessionPrefs.coreAllocation(app, defaults)) - } - - @Test fun anOldClientMaskIsNotEnabledWithoutAnOverrideChoice() { - saved.edit().putString("clientCpus", "0,1").commit() - assertEquals(SessionPrefs.CoreAllocation(false, "0,1", "3,4,5,6"), SessionPrefs.coreAllocation(app, defaults)) - } - - @Test fun changingOneChoiceDoesNotReplaceTheOtherDefaults() { - SessionPrefs.setGameCpus(app, "0,1,2,3,4,5,6,7") - assertEquals(SessionPrefs.CoreAllocation(true, "7", "0,1,2,3,4,5,6,7"), SessionPrefs.coreAllocation(app, defaults)) - SessionPrefs.setClientCpusOverride(app, false) - assertEquals(SessionPrefs.CoreAllocation(false, "7", "0,1,2,3,4,5,6,7"), SessionPrefs.coreAllocation(app, defaults)) + @Test fun savedChoicesAreKept() { + SessionPrefs.setClientCpusOverride(app, true) + SessionPrefs.setClientCpus(app, "7") + SessionPrefs.setGameCpus(app, "3,4,5,6") + assertTrue(SessionPrefs.clientCpusOverride(app)) + assertEquals("7", SessionPrefs.clientCpus(app)) + assertEquals("3,4,5,6", SessionPrefs.gameCpus(app)) } } From a0c6545e77c75bcf61cff5329d148d3387dc007c Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 20:22:05 -0400 Subject: [PATCH 068/174] fix: a link that joins DroidDeck's open task still returns to the caller --- app/src/main/java/com/droiddeck/launcher/SessionActivity.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 7c4a19b9a0..0d87bc1f10 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -3555,6 +3555,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { com.droiddeck.launcher.ui.QuitFlood.take() com.droiddeck.launcher.ui.LaunchOrigin.flooding = null closeLinkTasks() + if (!isTaskRoot) moveTaskToBack(true) super.finishAndRemoveTask() } else super.finish() if (quitFlooded) overridePendingTransition(0, 0) From 4a57c6f6f1e4a6758cfabb4216ff0631b3ea882b Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 20:45:14 -0400 Subject: [PATCH 069/174] chore: drop the comments this change added --- .../launcher/session/LoadingState.kt | 4 ---- .../launcher/session/SessionService.kt | 11 ----------- .../launcher/session/SteamDownloadMonitor.kt | 6 ------ .../launcher/session/LoadingStateTest.kt | 1 - .../session/SteamDownloadMonitorTest.kt | 1 - .../overlay/usr/local/bin/droiddeck-session | 2 -- .../usr/local/bin/droiddeck-steam-install | 19 ------------------- tools/tests/test_steam_install.py | 2 -- 8 files changed, 46 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt index e7a32fbad2..0180d67b74 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt @@ -131,10 +131,6 @@ class LoadingState(context: Context, private val steam: Boolean = true) { } } - /** - * What a Steam client download line says to show and how far it is: megabytes when the - * runtime counts them (" (2/17), 45 of 360 MB"), else the part and its number. - */ internal fun clientDownload(line: String): Pair? { val count = INSTALL_COUNT.find(line) ?: return null val mb = INSTALL_MEGABYTES.find(line.substring(count.range.last + 1)) 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 558e978e0a..e81fa0f12c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -71,11 +71,6 @@ class SessionService : Service() { private val steamDownloadMonitor = SteamDownloadMonitor() private var downloadMonitorTask: Runnable? = null private var downloadActive = false - /** - * The runtime is fetching the Steam client itself (a first run, a repair), before anything is on - * screen. That download keeps the session awake whatever the downloads setting says: paused, a - * first run never gets as far as showing Steam. - */ private var clientInstallActive = false @Volatile private var steamLibraryMounts = emptyMap() private var suspendDownloadNow = false @@ -647,7 +642,6 @@ class SessionService : Service() { } }, ) - // Watching first: a first run's client download must be known before anything is paused. updateDownloadMonitoring() mainHandler.post { updateSuspendPolicy() } } @@ -1863,15 +1857,10 @@ class SessionService : Service() { getSystemService(NotificationManager::class.java)?.notify(NOTIFICATION_ID, buildNotification()) } - /** A download is under way that holds the session awake while it is out of sight. */ private fun downloadsKeepAwake(): Boolean = downloadActive && (steamDownloadsInBackground || clientInstallActive) && SessionState.mode == MODE_STEAM && suspendPolicy != SessionPrefs.SUSPEND_NEVER - /** - * Steam's own downloads with the downloads setting on, and the Steam client's download until the - * session shows its first frame whatever the setting: once Steam is on screen it was fetched. - */ private fun downloadWatchWanted(): Boolean = SessionState.running && SessionState.mode == MODE_STEAM && suspendPolicy != SessionPrefs.SUSPEND_NEVER && (steamDownloadsInBackground || !SessionState.firstFrameSeen) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt index 007b0b27a3..c125e59b80 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt @@ -139,11 +139,6 @@ internal class SteamDownloadMonitor { Regex("\"$key\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1) companion object { - /** - * The runtime has yet to fetch the Steam client: a first run, or a repair asked for or begun - * (droiddeck-steam-install drops its stamp as it starts one). That download runs before - * anything is on screen, and a paused session pauses it with the rest. - */ fun clientInstallPending(runtimeRoot: File): Boolean { val home = File(runtimeRoot, "root") val steam = File(home, ".local/share/Steam") @@ -153,7 +148,6 @@ internal class SteamDownloadMonitor { } private const val MANIFEST_PROGRESS_GRACE_MS = 8_000L - // Longer than Steam's ~60 s between rate lines, for when no traffic counter is available. private const val CONTENT_ACTIVITY_GRACE_MS = 90_000L private const val MIN_RECEIVE_BYTES_PER_SEC = 64L * 1024L private val PATH = Regex("\"path\"\\s+\"([^\"]+)\"") diff --git a/app/src/test/java/com/droiddeck/launcher/session/LoadingStateTest.kt b/app/src/test/java/com/droiddeck/launcher/session/LoadingStateTest.kt index dd545f1f51..c062823494 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/LoadingStateTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/LoadingStateTest.kt @@ -27,7 +27,6 @@ class LoadingStateTest { "bins_linuxarm64_linuxarm64" to 11, LoadingState.clientDownload("== STEP 17:38:17 downloading Steam: bins_linuxarm64_linuxarm64 (2/17)"), ) - // Under a megabyte in all: nothing to count yet. assertEquals("a_all" to 50, LoadingState.clientDownload("== STEP 00:00:00 downloading Steam: a_all (1/2), 0 of 0 MB")) } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt index db9639f7af..4da943020d 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt @@ -210,7 +210,6 @@ class SteamDownloadMonitorTest { assertTrue(SteamDownloadMonitor.clientInstallPending(root)) File(steam, "steamrtarm64").mkdirs() File(steam, "steamrtarm64/steam").writeText("client") - // Unpacked but not finished: droiddeck-steam-install stamps the client last. assertTrue(SteamDownloadMonitor.clientInstallPending(root)) File(steam, "package").mkdirs() File(steam, "package/droiddeck-installed").writeText("1791686101\n") diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 3eb5ff17ab..d8a44be52f 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -397,8 +397,6 @@ case $mode in steam_cef_gpu=0 fi else - # A first run downloads the client (about 360 MB in 2026): minutes on a slow connection, with - # the progress in megabytes on the loading screen. step "checking the Steam client (first run downloads it, ~1-2 min with nothing on screen)" droiddeck-steam-install || steam_setup_failed $? step "Steam client ready" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install index 291ec8ed43..334ac8f051 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install @@ -25,8 +25,6 @@ stamp=$steam_root/package/droiddeck-installed legacy_stamp=$steam_root/package/bannerlator-installed unconfirmed=$steam_root/package/droiddeck-unconfirmed repair_request=$HOME/.bl-steam-repair -# The parts of an unfinished download: a session that ends, or loses its connection, part way -# through picks up where it stopped instead of fetching the whole client again. parts=$steam_root/package/droiddeck-download if [ -f "$legacy_stamp" ] && [ ! -f "$stamp" ]; then mv -f "$legacy_stamp" "$stamp" || true @@ -50,7 +48,6 @@ if [ -n "$fallback" ]; then fi if [ -n "$repair" ]; then echo "== STEP $(date -u +%H:%M:%S) repairing the Steam client ($repair)" - # A repair unpacks every part again - once: an interrupted one keeps what it has redone. if [ ! -f "$parts/.repair" ]; then rm -rf "$parts" mkdir -p "$parts" && : > "$parts/.repair" @@ -78,7 +75,6 @@ fi work=$(mktemp -d) trap 'rm -rf "$work"' EXIT -# A sleep that starts no process (droiddeck-session's nap): read -t on a pipe nothing writes to. nap() { [ -n "${nap_fd:-}" ] || exec {nap_fd}<> <(:) read -r -t "$1" -u "$nap_fd" _ 2>/dev/null || : @@ -88,16 +84,10 @@ size_of() { [ -f "$1" ] && n=$(wc -c < "$1") echo $((n)) } -# A connection can stall without closing (Wi-Fi power save, a phone changing networks), and -# curl's default then is to wait for ever with nothing on screen. A transfer under 4 KB/s for a -# minute is dropped and resumed from the bytes already on disk. limits=(--connect-timeout 30 --speed-limit 4096 --speed-time 60) -# Seconds between attempts that made no progress; the download fails after the last one. read -r -a delays <<< "${BL_STEAM_RETRY_DELAYS:-5 10 20 30 30}" step() { echo "== STEP $(date -u +%H:%M:%S) $*"; } -# The line the app's loading screen reads: the part, its number, and megabytes overall. A third -# argument is said after it (a stall), and is always said; otherwise only a change is. progress() { local mb=$(( (done_bytes + $(size_of "$1")) / 1000000 )) [ -z "${3:-}" ] && [ "$mb" = "${shown_mb:-}" ] && [ "$2" = "${shown_part:-}" ] && return 0 @@ -105,21 +95,16 @@ progress() { step "downloading Steam: $2 ($i/$total), $mb of $((total_bytes / 1000000)) MB${3:+ - $3}" } -# fetch URL FILE SIZE SHA256 PART: FILE complete and checked, resuming whatever is already there. fetch() { local url=$1 dest=$2 size=$3 sum=$4 part=$5 failures=0 bad=0 finished=0 before rc fd wait while :; do - # Whole once it is as long as the manifest says, or (no size given) once curl finished it. if [ -f "$dest" ] && { [ "$finished" = 1 ] || { [ "$size" -gt 0 ] && [ "$(size_of "$dest")" -ge "$size" ]; }; }; then echo "$sum $dest" | sha256sum -c --quiet 2>/dev/null && return 0 - # Bytes that do not check out are fetched whole again, a few times at most. rm -f "$dest" finished=0 bad=$((bad + 1)) [ "$bad" -lt 3 ] || { echo "droiddeck-steam-install: $part does not match its checksum" >&2; return 1; } fi before=$(size_of "$dest") - # curl's status comes back through the pipe (|| keeps set -e from ending the subshell before it - # is said); until then a progress line every 5 s. exec {fd}< <(curl -fsSL "${limits[@]}" -C - -o "$dest" "$url" && echo 0 || echo $?) until read -r -t 5 -u "$fd" rc; do if [ $? -le 128 ]; then rc=1; break; fi @@ -127,7 +112,6 @@ fetch() { done exec {fd}<&- if [ "$rc" = 0 ]; then finished=1; continue; fi - # 33: the server would not resume. Start the part over. [ "$rc" = 33 ] && rm -f "$dest" if [ "$(size_of "$dest")" -gt "$before" ]; then failures=0; else failures=$((failures + 1)); fi if [ "$failures" -gt "${#delays[@]}" ]; then @@ -189,8 +173,6 @@ total=$(grep -c . "$work/parts" 2>/dev/null || echo 0) total_bytes=$(awk '{ n += $4 } END { print n + 0 }' "$work/parts") mkdir -p "$parts" -# What an earlier attempt left for another client version is no use to this one. A part's file -# name carries its own hash, so a name still listed is the same part. for left in "$parts"/*; do [ -e "$left" ] || continue name=${left##*/} @@ -218,7 +200,6 @@ while read -r block file sum size; do rm -f "$parts/$file" done_bytes=$((done_bytes + size)) done < "$work/parts" -# Some entries are zipped with Windows separators; unzip keeps the backslash in the file name. find "$steam_root" -depth -name '*\\*' | while read -r odd; do fixed=${odd//\\//} mkdir -p "$(dirname "$fixed")" diff --git a/tools/tests/test_steam_install.py b/tools/tests/test_steam_install.py index 75bc1c5e91..54028187ca 100644 --- a/tools/tests/test_steam_install.py +++ b/tools/tests/test_steam_install.py @@ -343,7 +343,6 @@ sys.exit(28 if end < len(data) else 0) self.requests.unlink() Path(str(self.requests) + '.offsets').unlink() self.assertEqual(0, self.install().returncode) - # The next session asks only for the rest of the part it did not finish. self.assertEqual(['steam_client_steamdeck_publicbeta_linuxarm64', client], self.requested()) self.assertEqual([400000], self.offsets(client)) self.assertFalse(self.download.exists()) @@ -383,7 +382,6 @@ sys.exit(28 if end < len(data) else 0) self.assertNotEqual(0, self.install().returncode) self.assertIn(files['a_all'], self.requested()) self.requests.unlink() - # Still a repair, but what the interrupted one redid is not done a third time. self.assertEqual(0, self.install().returncode) self.assertEqual(['steam_client_steamdeck_publicbeta_linuxarm64', files['client_linuxarm64_linuxarm64']], self.requested()) From 96e2bf992d4864baa8f546734554bf51107f2afe Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 21:20:50 -0400 Subject: [PATCH 070/174] fix: an HTTP 4xx part hands over to the next CDN at once --- .../usr/local/bin/droiddeck-steam-install | 12 +++++-- tools/tests/test_steam_install.py | 36 ++++++++++++++++--- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install index 334ac8f051..45bd96c259 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install @@ -105,14 +105,20 @@ fetch() { [ "$bad" -lt 3 ] || { echo "droiddeck-steam-install: $part does not match its checksum" >&2; return 1; } fi before=$(size_of "$dest") - exec {fd}< <(curl -fsSL "${limits[@]}" -C - -o "$dest" "$url" && echo 0 || echo $?) - until read -r -t 5 -u "$fd" rc; do + exec {fd}< <(code=$(curl -fsSL "${limits[@]}" -w '%{http_code}' -C - -o "$dest" "$url") && echo "0 $code" || echo "$? $code") + until read -r -t 5 -u "$fd" rc http; do if [ $? -le 128 ]; then rc=1; break; fi progress "$dest" "$part" done exec {fd}<&- if [ "$rc" = 0 ]; then finished=1; continue; fi - [ "$rc" = 33 ] && rm -f "$dest" + case "$rc:${http:-}" in + 22:416 | 33:*) rm -f "$dest" ;; + 22:4??) + echo "droiddeck-steam-install: $part: HTTP $http from ${url%/*}" >&2 + return 1 + ;; + esac if [ "$(size_of "$dest")" -gt "$before" ]; then failures=0; else failures=$((failures + 1)); fi if [ "$failures" -gt "${#delays[@]}" ]; then echo "droiddeck-steam-install: could not download $part (curl exit $rc); what arrived is kept for the next try" >&2 diff --git a/tools/tests/test_steam_install.py b/tools/tests/test_steam_install.py index 54028187ca..6a02bcb0ae 100644 --- a/tools/tests/test_steam_install.py +++ b/tools/tests/test_steam_install.py @@ -37,9 +37,13 @@ with open(os.environ['TEST_REQUESTS'], 'a') as log: log.write(url + '\\n') with open(os.environ['TEST_REQUESTS'] + '.offsets', 'a') as log: log.write(f'{name} {offset}\\n') +def done(status, code='200'): + if '-w' in args: + sys.stdout.write(code) + sys.exit(status) host_fail = os.environ.get('TEST_FAIL_HOST') if host_fail and host_fail in url: - sys.exit(22) + done(22, '000') action = [] plan = os.environ.get('TEST_PLAN') if plan and os.path.exists(plan): @@ -51,14 +55,16 @@ if plan and os.path.exists(plan): open(plan, 'w').write(''.join(l + '\\n' for l in lines)) break if action[:1] == ['fail']: - sys.exit(int(action[1])) + done(int(action[1]), '000') +if action[:1] == ['http']: + done(22, action[1]) if action[:1] == ['norange'] and offset: - sys.exit(33) + done(33) data = open(os.path.join(os.environ['TEST_CDN'], name), 'rb').read() end = int(action[1]) if action[:1] == ['cut'] else len(data) with open(out, 'ab' if offset else 'wb') as target: target.write(data[offset:end]) -sys.exit(28 if end < len(data) else 0) +done(28 if end < len(data) else 0) ''') curl.chmod(0o755) self.plan = self.root / 'plan' @@ -355,6 +361,28 @@ sys.exit(28 if end < len(data) else 0) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual([0, 400000, 0], self.offsets(client)) + def test_a_missing_part_hands_over_to_the_next_cdn_at_once(self): + files = self.two_parts() + client = files['client_linuxarm64_linuxarm64'] + self.plan_for(client, 'http 404') + result = self.install() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual(['https://client-update.steamstatic.com/' + client, + 'https://client-update.akamai.steamstatic.com/' + client], + [line for line in self.requests.read_text().splitlines() if line.endswith(client)]) + self.assertIn('HTTP 404 from https://client-update.steamstatic.com', result.stderr) + self.assertNotIn('trying again', result.stdout) + + def test_a_server_error_is_retried_on_the_same_cdn(self): + files = self.two_parts() + client = files['client_linuxarm64_linuxarm64'] + self.plan_for(client, 'http 503') + result = self.install() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual(['https://client-update.steamstatic.com/' + client] * 2, + [line for line in self.requests.read_text().splitlines() if line.endswith(client)]) + self.assertIn('interrupted (curl exit 22), trying again in 0 s', result.stdout) + def test_bytes_that_do_not_check_out_are_fetched_again(self): files = self.two_parts() client = files['client_linuxarm64_linuxarm64'] From 7419ba114f80fe2ab19793d5d4028e61ad638a80 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 22:22:14 -0400 Subject: [PATCH 071/174] fix: the client install stays awake until Steam's first frame and its end is recorded --- .../java/com/droiddeck/launcher/session/SessionService.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 e81fa0f12c..762de4f93b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -1872,6 +1872,7 @@ class SessionService : Service() { downloadMonitorTask = null steamDownloadMonitor.reset() downloadActive = false + if (clientInstallActive) SessionEvents.record("steam.client_download", mapOf("active" to false)) clientInstallActive = false if (wasActive) refreshNotification() return @@ -1889,7 +1890,8 @@ class SessionService : Service() { val root = LinuxRuntime.rootDir(this@SessionService) val wasActive = downloadActive val wasInstalling = clientInstallActive - clientInstallActive = !SessionState.firstFrameSeen && SteamDownloadMonitor.clientInstallPending(root) + clientInstallActive = !SessionState.firstFrameSeen && + (clientInstallActive || SteamDownloadMonitor.clientInstallPending(root)) downloadActive = clientInstallActive || steamDownloadsInBackground && steamDownloadMonitor.poll( root, receivedBytes = TrafficStats.getUidRxBytes(android.os.Process.myUid()), From 5981bbb1e2d8f7f6af7d7134d9c512109a9b76c8 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 22:51:28 -0400 Subject: [PATCH 072/174] fix: an oversized install step count falls back to the step text --- .../main/java/com/droiddeck/launcher/session/LoadingState.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt index 0180d67b74..f580b0af0e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt @@ -139,7 +139,9 @@ class LoadingState(context: Context, private val steam: Boolean = true) { if (done != null && total != null && total > 0) { return "$done / $total MB" to (done * 100 / total).toInt().coerceIn(0, 100) } - return count.groupValues[1] to count.groupValues[2].toInt() * 100 / maxOf(1, count.groupValues[3].toInt()) + val part = count.groupValues[2].toIntOrNull() ?: return null + val all = count.groupValues[3].toIntOrNull() ?: return null + return count.groupValues[1] to part * 100 / maxOf(1, all) } internal fun readableScriptStep(scriptStep: String): Boolean { From 132f40ac97ac3acb9b41e3b21f5d65f093f882f3 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 23:11:34 -0400 Subject: [PATCH 073/174] fix: install step progress cannot overflow --- .../main/java/com/droiddeck/launcher/session/LoadingState.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt index f580b0af0e..f69983f0db 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt @@ -141,7 +141,7 @@ class LoadingState(context: Context, private val steam: Boolean = true) { } val part = count.groupValues[2].toIntOrNull() ?: return null val all = count.groupValues[3].toIntOrNull() ?: return null - return count.groupValues[1] to part * 100 / maxOf(1, all) + return count.groupValues[1] to (part.toLong() * 100 / maxOf(1, all)).coerceIn(0L, 100L).toInt() } internal fun readableScriptStep(scriptStep: String): Boolean { From 2c8ae3753c8c69704891f4453e1dfcc847f9031c Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 17:30:54 -0400 Subject: [PATCH 074/174] fix(xbox): mount external storage for downloads --- .../launcher/stores/StoreInstallRoot.kt | 22 +++++++++++++++--- .../launcher/stores/xbox/XboxInstaller.kt | 3 ++- .../launcher/stores/xbox/XboxRuntime.kt | 2 +- .../droiddeck/launcher/stores/xbox/Xodus.kt | 4 +++- .../launcher/stores/StoreInstallRootTest.kt | 23 +++++++++++++++++++ 5 files changed, 48 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt index 611b7f3dba..ad17bd8172 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt @@ -104,6 +104,15 @@ object StoreInstallRoot { .map { it to guestFor(context, it) } } + fun externalBindSpecs(context: Context): List = externalBindSpecs(externalRoots(context), LinuxRuntime.rootDir(context)) + + internal fun externalBindSpecs(roots: List>, guestRoot: File): List = + roots.mapNotNull { (host, guest) -> + if (!host.isDirectory || !host.canRead()) return@mapNotNull null + val target = File(guestRoot, guest.removePrefix("/")) + if (target.isDirectory || target.mkdirs()) "${host.path}:$guest" else null + } + private fun guestFor(context: Context, root: File): String { val sm = context.getSystemService(StorageManager::class.java) val uuid = runCatching { sm?.getStorageVolume(root)?.uuid }.getOrNull()?.takeIf { it.isNotBlank() }?.replace(Regex("[^A-Za-z0-9-]"), "") @@ -114,11 +123,18 @@ object StoreInstallRoot { fun isInternal(context: Context, root: File): Boolean = root.absolutePath == internalRoot(context).absolutePath fun externalGuestPath(context: Context, host: File): String? { + return externalGuestPath(host, externalRoots(context)) + } + + fun guestPath(context: Context, host: File): String = externalGuestPath(context, host) ?: host.path + + internal fun externalGuestPath(host: File, roots: List>): String? { val path = host.absolutePath - for ((root, guest) in externalRoots(context)) { - val dir = root.absolutePath + for ((root, guest) in roots.sortedByDescending { it.first.absolutePath.length }) { + val dir = root.absolutePath.trimEnd(File.separatorChar) if (path == dir) return guest - if (path.startsWith("$dir/")) return guest + "/" + path.removePrefix("$dir/") + val prefix = dir + File.separator + if (path.startsWith(prefix)) return guest + "/" + path.removePrefix(prefix).replace(File.separatorChar, '/') } return null } 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 44e9ceff33..09e5561588 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 @@ -39,8 +39,9 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog var sequence = -1L try { val source = if (content) selected else item.id + val guestFolder = StoreInstallRoot.guestPath(app, folder) val selection = if (content) emptyList() else listOf("--selected-content-id", selected) - Xodus.start(app, listOf("streaming", source, folder.path, "--market", market, + Xodus.start(app, listOf("streaming", source, guestFolder, "--market", market, "--progress-json", "--control-stdin") + selection).use { process -> child = process val diagnostics = Xodus.diagnostics(process) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt index 28d6c12d99..3263dcb33b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt @@ -46,7 +46,7 @@ internal object XboxRuntime { val market = game.second.extra["market"]?.takeIf { it.matches(Regex("[A-Z]{2}")) } ?: Xodus.market() val directory = views.create(app.filesDir) val process = try { - Xodus.start(app, listOf("run", game.first.path, "droiddeck:prepare", "--exe", game.second.exe, + Xodus.start(app, listOf("run", StoreInstallRoot.guestPath(app, game.first), "droiddeck:prepare", "--exe", game.second.exe, "--materialize-chain", "--market", market), launchDirectory = directory, credentialGeneration = credentials) } catch (e: Exception) { XboxLaunchViews.remove(directory); throw e } if (!launches.attach(token, process)) { process.close(); error("Xbox launch was cancelled") } 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 fde5b0650c..0444acfef4 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 @@ -6,6 +6,7 @@ import com.droiddeck.launcher.core.AddonPack import com.droiddeck.launcher.runtime.LinuxNetworkLinkComponent import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.StoreInstallRoot import org.json.JSONObject import java.io.Closeable import java.io.File @@ -79,7 +80,8 @@ internal object Xodus { networkLink.publish() networkLink.start() val runtime = (runtimeDirectory ?: File(app.filesDir, "xbox-runtime")).apply { mkdirs() } - val command = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), listOf( + val command = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), + StoreInstallRoot.externalBindSpecs(app), listOf( "/usr/bin/env", "HOME=/root", "XODUS_LOG=off", "RUST_LOG=off", "XDG_RUNTIME_DIR=${runtime.path}", "DROIDDECK_XBOX_CREDENTIAL_SOCKET=${credentials.name}", binary, ) + args) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt index c40ef5b201..4a4611374f 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt @@ -38,6 +38,29 @@ class StoreInstallRootTest { assertEquals(1, StoreInstallRoot.targets(app).size) } + @Test fun externalStoreInstallPathsMapIntoTheirGuestMountWithoutPrefixCollisions() { + val cardRoot = File(app.filesDir, "card/Games").apply { mkdirs() } + val guestRoot = "/mnt/droiddeck-stores/card" + val roots = listOf(cardRoot to guestRoot) + + assertEquals("$guestRoot/Stores/Xbox/Doom", StoreInstallRoot.externalGuestPath( + File(cardRoot, "Stores/Xbox/Doom"), roots)) + assertEquals(null, StoreInstallRoot.externalGuestPath( + File(cardRoot.parentFile, "Games-old/Stores/Xbox/Doom"), roots)) + } + + @Test fun externalStoreBindsCreateGuestTargetsAndSkipUnavailableVolumes() { + val host = File(app.filesDir, "card/Games").apply { mkdirs() } + val guestRoot = "/mnt/droiddeck-stores/card" + val guestFs = File(app.filesDir, "linuxfs").apply { mkdirs() } + val missing = File(app.filesDir, "missing/Games") + + assertEquals(listOf("${host.path}:$guestRoot"), StoreInstallRoot.externalBindSpecs( + listOf(host to guestRoot, missing to "/mnt/droiddeck-stores/missing"), guestFs)) + assertTrue(File(guestFs, "mnt/droiddeck-stores/card").isDirectory) + assertFalse(File(guestFs, "mnt/droiddeck-stores/missing").exists()) + } + @Test fun anExistingInstallWinsOverAFreshFolderUnderTheChosenRoot() { SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") val existing = File(StoreInstallRoot.storeDir(StoreInstallRoot.internalRoot(app), Store.GOG), "Old Name").apply { mkdirs() } From 4a0eb14d1fac305494b5a9c6aa2908d8160ad41a Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 19:24:45 -0400 Subject: [PATCH 075/174] fix(xbox): mount selected SD library in Xodus --- .../launcher/stores/StoreInstallRoot.kt | 17 +++++++++++++++++ .../launcher/stores/xbox/XboxInstaller.kt | 2 +- .../launcher/stores/xbox/XboxRuntime.kt | 2 +- .../com/droiddeck/launcher/stores/xbox/Xodus.kt | 2 +- .../launcher/stores/StoreInstallRootTest.kt | 14 ++++++++++++++ 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt index ad17bd8172..91a0f96f5b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt @@ -104,8 +104,22 @@ object StoreInstallRoot { .map { it to guestFor(context, it) } } + /** Xodus has its own PRoot mount table and cannot see the selected Steam library's SD bind. */ + fun externalRootsForXodus(context: Context): List> { + val roots = externalRoots(context).toMutableList() + val selectedLibrary = GameStorage.effective(context)?.let { File(it.path, ON_VOLUME) } + ?.takeUnless { isInternal(context, it) } + if (selectedLibrary != null && roots.none { it.first.absolutePath == selectedLibrary.absolutePath }) { + roots += selectedLibrary to guestFor(context, selectedLibrary) + } + return roots + } + fun externalBindSpecs(context: Context): List = externalBindSpecs(externalRoots(context), LinuxRuntime.rootDir(context)) + fun externalBindSpecsForXodus(context: Context): List = + externalBindSpecs(externalRootsForXodus(context), LinuxRuntime.rootDir(context)) + internal fun externalBindSpecs(roots: List>, guestRoot: File): List = roots.mapNotNull { (host, guest) -> if (!host.isDirectory || !host.canRead()) return@mapNotNull null @@ -128,6 +142,9 @@ object StoreInstallRoot { fun guestPath(context: Context, host: File): String = externalGuestPath(context, host) ?: host.path + fun guestPathForXodus(context: Context, host: File): String = + externalGuestPath(host, externalRootsForXodus(context)) ?: host.path + internal fun externalGuestPath(host: File, roots: List>): String? { val path = host.absolutePath for ((root, guest) in roots.sortedByDescending { it.first.absolutePath.length }) { 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 09e5561588..296ff050b8 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 @@ -39,7 +39,7 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog var sequence = -1L try { val source = if (content) selected else item.id - val guestFolder = StoreInstallRoot.guestPath(app, folder) + 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 -> diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt index 3263dcb33b..d1ba4a52e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt @@ -46,7 +46,7 @@ internal object XboxRuntime { val market = game.second.extra["market"]?.takeIf { it.matches(Regex("[A-Z]{2}")) } ?: Xodus.market() val directory = views.create(app.filesDir) val process = try { - Xodus.start(app, listOf("run", StoreInstallRoot.guestPath(app, game.first), "droiddeck:prepare", "--exe", game.second.exe, + Xodus.start(app, listOf("run", StoreInstallRoot.guestPathForXodus(app, game.first), "droiddeck:prepare", "--exe", game.second.exe, "--materialize-chain", "--market", market), launchDirectory = directory, credentialGeneration = credentials) } catch (e: Exception) { XboxLaunchViews.remove(directory); throw e } if (!launches.attach(token, process)) { process.close(); error("Xbox launch was cancelled") } 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 0444acfef4..c7f706d268 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 @@ -81,7 +81,7 @@ internal object Xodus { networkLink.start() val runtime = (runtimeDirectory ?: File(app.filesDir, "xbox-runtime")).apply { mkdirs() } val command = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), - StoreInstallRoot.externalBindSpecs(app), listOf( + StoreInstallRoot.externalBindSpecsForXodus(app), listOf( "/usr/bin/env", "HOME=/root", "XODUS_LOG=off", "RUST_LOG=off", "XDG_RUNTIME_DIR=${runtime.path}", "DROIDDECK_XBOX_CREDENTIAL_SOCKET=${credentials.name}", binary, ) + args) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt index 4a4611374f..78e9bbc0d0 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt @@ -49,6 +49,20 @@ class StoreInstallRootTest { File(cardRoot.parentFile, "Games-old/Stores/Xbox/Doom"), roots)) } + @Test fun xodusMapsTheSelectedSteamLibraryOnAnExternalVolume() { + val library = File(app.filesDir, "card/steam").apply { mkdirs() } + val storeRoot = File(library, "Games").apply { mkdirs() } + SessionPrefs.setGameStorage(app, library.path, "Card") + + val xodusRoot = StoreInstallRoot.externalRootsForXodus(app).single { it.first.absolutePath == storeRoot.absolutePath } + val gameFolder = File(storeRoot, "Xbox/Doom") + assertEquals("${xodusRoot.second}/Xbox/Doom", StoreInstallRoot.guestPathForXodus(app, gameFolder)) + + val bindSpecs = StoreInstallRoot.externalBindSpecsForXodus(app) + assertTrue(bindSpecs.contains("${storeRoot.path}:${xodusRoot.second}")) + assertTrue(File(LinuxRuntime.rootDir(app), xodusRoot.second.removePrefix("/")).isDirectory) + } + @Test fun externalStoreBindsCreateGuestTargetsAndSkipUnavailableVolumes() { val host = File(app.filesDir, "card/Games").apply { mkdirs() } val guestRoot = "/mnt/droiddeck-stores/card" From b1ab55856ed761cf9686ce0e2c39452190843f89 Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 19:36:15 -0400 Subject: [PATCH 076/174] fix(ui): clear search focus and use store accents --- .../java/com/droiddeck/launcher/ui/StoresPage.kt | 16 +++++++++++++--- .../droiddeck/launcher/ui/WirelessAdbFixPage.kt | 6 ++++++ 2 files changed, 19 insertions(+), 3 deletions(-) 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 175cbecd85..db9fe6ed08 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -128,6 +128,7 @@ import androidx.compose.ui.graphics.lerp import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.contentDescription @@ -172,6 +173,7 @@ private data class PaneKey(val chip: String, val tab: String, val signedIn: Bool @Composable internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { val ctx = LocalContext.current + val focusManager = LocalFocusManager.current com.droiddeck.launcher.stores.xbox.XboxContent.plan?.let { content -> androidx.compose.material3.AlertDialog( onDismissRequest = { com.droiddeck.launcher.stores.xbox.XboxContent.dismiss() }, @@ -279,7 +281,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier val heroFocus = remember { androidx.compose.ui.focus.FocusRequester() } var detailFocused by remember { mutableStateOf(false) } fun move(kind: String) { focusMove = kind to (focusMove?.second ?: 0) + 1 } - fun open(key: String) { lastOpened = key; openGame = key; move("detail") } + fun open(key: String) { focusManager.clearFocus(force = true); lastOpened = key; openGame = key; move("detail") } fun closeGame() { openGame = null; move("card") } fun switchTab(to: String) { tab = to; move("first") } val pickChip: (String) -> Unit = { id -> @@ -477,7 +479,11 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier androidx.compose.material3.LinearProgressIndicator(Modifier.fillMaxWidth().height(3.dp)) } !k.signedIn -> Box(Modifier.fillMaxWidth().verticalScroll(scroll).padding(top = 4.dp, bottom = 16.dp)) { SignInCard(st, viewportH - 20.dp) } - else -> Storefront(st, k.tab, query, s, a, grids.getOrPut(k) { LazyGridState() }, onQuery = { query = it }, onOpen = { open(it) }, onTab = { switchTab(it) }) + else -> Storefront( + st, k.tab, query, s, a, grids.getOrPut(k) { LazyGridState() }, + clearSearchFocus = openGame != null, + onQuery = { query = it }, onOpen = { open(it) }, onTab = { switchTab(it) }, + ) } } } @@ -538,7 +544,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier seenActive.clear(); seenActive.addAll(activeKeys) if (fresh.isNotEmpty()) StoresMotion.takeInstall()?.let { StoresMotion.fly(it) } } - StoresState.pendingInstall?.let { item -> InstallWhere(item) } + StoresState.pendingInstall?.let { item -> StoreTheme(item.store) { InstallWhere(item) } } } @Composable @@ -937,6 +943,7 @@ internal fun StoreLogo(store: Store, size: Dp) { private fun Storefront( store: Store, tab: String, query: String, s: FrontEndState, a: FrontEndActions, grid: LazyGridState, + clearSearchFocus: Boolean, onQuery: (String) -> Unit, onOpen: (String) -> Unit, onTab: (String) -> Unit, ) { val ctx = LocalContext.current @@ -1072,6 +1079,7 @@ private fun Storefront( libraryLabel, query, onQuery, placeholder = if (tab == "store") stringResource(R.string.stores_search_catalog, store.label) else stringResource(R.string.stores_search_library), + clearSearchFocus = clearSearchFocus, lead = if (tabs.size < 2) null else { { val labels = tabs.map { if (it == "store") stringResource(R.string.stores_tab_store) else libraryLabel } HeaderTabs(labels, tabs.indexOf(tab).coerceAtLeast(0)) { onTab(tabs[it]) } @@ -1172,6 +1180,7 @@ private fun HeaderTabs(labels: List, selected: Int, onSelect: (Int) -> U @Composable internal fun ModeHeader( title: String, query: String, onQuery: (String) -> Unit, placeholder: String, + clearSearchFocus: Boolean = false, lead: (@Composable () -> Unit)? = null, trailing: @Composable () -> Unit, ) { val colors = MaterialTheme.colorScheme @@ -1193,6 +1202,7 @@ internal fun ModeHeader( AdbTextField( value = query, onValueChange = onQuery, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, placeholder = placeholder, compact = true, focusOnShow = focusOnOpen, + clearFocus = clearSearchFocus, onFocusChange = { focused -> if (!focused && query.isEmpty()) { searching = false; focusOnOpen = false } }, ) } 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 8117c3ee5e..5c719ca90d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt @@ -356,6 +356,7 @@ internal fun AdbTextField( placeholder: String? = null, compact: Boolean = false, onFocusChange: (Boolean) -> Unit = {}, + clearFocus: Boolean = false, onNext: (() -> Unit)? = null, onDone: (() -> Unit)? = null, focusOnShow: Boolean = false, @@ -444,6 +445,11 @@ internal fun AdbTextField( ?.showSoftInput(editText, android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT) } } + if (clearFocus && editText.hasFocus()) { + editText.clearFocus() + (editText.context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager) + ?.hideSoftInputFromWindow(editText.windowToken, 0) + } editText.setTextColor(colors.onBackground.toArgb()) editText.setHintTextColor(colors.onSurfaceVariant.toArgb()) editText.hint = placeholder From 546574e982806a9ff8042987cbd6d18a7cbcf7ed Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 20:58:25 -0400 Subject: [PATCH 077/174] fix(xbox): enable proot fast path in Xodus --- .../launcher/runtime/LinuxRuntime.java | 5 +++++ .../droiddeck/launcher/stores/xbox/Xodus.kt | 21 ++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index 11be5bf9b4..6d17f2d75a 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -110,6 +110,11 @@ public final class LinuxRuntime { File root = rootDir(context); List binds = binds(context, sessionRoot, runtimeDir, externalStorage, extraBinds); if (sessionRoot != null) lastBinds = binds; + return commandWithBinds(context, root, binds, guestCommand); + } + + public static List commandWithBinds(Context context, File root, List binds, + List guestCommand) { List cmd = prootPrefix(context, root, "/root"); for (String spec : binds) bind(cmd, spec); cmd.addAll(guestCommand); 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 c7f706d268..94b8138253 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 @@ -5,6 +5,7 @@ import android.os.Environment import com.droiddeck.launcher.core.AddonPack import com.droiddeck.launcher.runtime.LinuxNetworkLinkComponent import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.runtime.ProotFastPath import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.stores.StoreInstallRoot import org.json.JSONObject @@ -80,11 +81,24 @@ internal object Xodus { networkLink.publish() networkLink.start() val runtime = (runtimeDirectory ?: File(app.filesDir, "xbox-runtime")).apply { mkdirs() } - val command = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), - StoreInstallRoot.externalBindSpecsForXodus(app), listOf( + val root = LinuxRuntime.rootDir(app) + val external = Environment.getExternalStorageDirectory() + val extraBinds = StoreInstallRoot.externalBindSpecsForXodus(app) + val binds = LinuxRuntime.binds(app, null, null, external, extraBinds) + val fastPathPreloaded = runCatching { + File(root, "etc/ld.so.preload").useLines { lines -> lines.any { it.trim() == ProotFastPath.LIBRARY } } + }.getOrDefault(false) + val fastPathKey = if (ProotFastPath.enabled(app) && fastPathPreloaded && + File(root, ProotFastPath.LIBRARY.removePrefix("/")).isFile) ProotFastPath.key(root, binds) else null + val guestCommand = mutableListOf( "/usr/bin/env", "HOME=/root", "XODUS_LOG=off", "RUST_LOG=off", "XDG_RUNTIME_DIR=${runtime.path}", "DROIDDECK_XBOX_CREDENTIAL_SOCKET=${credentials.name}", binary, - ) + args) + ) + fastPathKey?.let { key -> + guestCommand.addAll(guestCommand.lastIndex, ProotFastPath.guestEnv(root, binds, key)) + } + guestCommand.addAll(args) + val command = LinuxRuntime.commandWithBinds(app, root, binds, guestCommand) val builder = ProcessBuilder(command).directory(LinuxRuntime.rootDir(app)) if (launchDirectory != null) builder.environment()["TMPDIR"] = launchDirectory.path builder.environment().apply { @@ -92,6 +106,7 @@ internal object Xodus { put("PROOT_LOADER", LinuxRuntime.prootLoader(app).path) put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(app).path) if (SessionPrefs.prootNoSeccomp(app)) put("PROOT_NO_SECCOMP", "1") + fastPathKey?.let { ProotFastPath.hostEnv(it).let { (key, value) -> put(key, value) } } LinuxRuntime.prootLibraryPath(app).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } } val digest = java.security.MessageDigest.getInstance("SHA-256") From 6e1621fe535deb18e8146606e4d7cee5128c31d5 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 23:41:22 -0400 Subject: [PATCH 078/174] fix: Steam's Ubisoft games install Ubisoft Connect again The redistributable seeder marked every process in a game's install scripts as already run, so the Ubisoft Connect installer that Ubisoft games list was skipped and they stopped with "Unable to locate Uplay PC". It is now left to run like the Vulkan runtime installer, and a marker an earlier seeding wrote is taken back out. --- .../usr/local/bin/droiddeck-seed-redists | 4 +- tools/tests/test_seed_redists.py | 48 +++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists index 831a0e4cee..86d3f1c31a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists @@ -24,7 +24,7 @@ read_scripts() { xargs -0 -r awk -v want="${1:-redists}" ' proc[depth] = 1 program = tolower(part[4]) sub(/.*[\\\/]/, "", program) - if (program ~ /vulkan/) vulkan[depth] = 1 + if (program ~ /vulkan|uplay|ubisoft/) vulkan[depth] = 1 next } if (n == 3) pending = part[2] @@ -243,7 +243,7 @@ for system in "${regs[@]}"; do had=() for line in "${kept[@]}"; do had[$line]=1; done printf '%s\n' "${other[@]}" "${kept[@]}" >"$seeded" - echo "== took Vulkan runtime markers out of $reg" + echo "== took Vulkan runtime and Ubisoft Connect markers out of $reg" fi if [ ${#had[@]} -gt 0 ] && { [ -z "$id" ] || [ "$id" != "$prev" ]; }; then declare -A held=() diff --git a/tools/tests/test_seed_redists.py b/tools/tests/test_seed_redists.py index 042ab87d4e..bc71403f8b 100644 --- a/tools/tests/test_seed_redists.py +++ b/tools/tests/test_seed_redists.py @@ -45,6 +45,26 @@ VULKAN_SCRIPT = r'''"InstallScript" ''' +UBISOFT_SCRIPT = r'''"installscript" +{ + "Run Process" + { + "Ubisoft Connect PC Client" + { + "process 1" "%INSTALLDIR%\\UbisoftConnectInstaller.exe" + "command 1" "/S" + } + "easyanticheat" + { + "HasRunKey" "HKEY_CURRENT_USER\\SOFTWARE\\Ubisoft\\WatchDogs2EAC" + "process 1" "%INSTALLDIR%\\EasyAntiCheat\\InstallWD2EAC.cmd" + "command 1" "" + } + } +} +''' + + class SeedRedistsTest(unittest.TestCase): def setUp(self): self.tmp = Path(tempfile.mkdtemp()) @@ -353,5 +373,33 @@ class SeedRedistsTest(unittest.TestCase): self.assertEqual(self.reg.read_text().count('"Vulkan111080"'), 2) + def ubisoft(self): + script = self.tmp / "legacycompat/evaluatorscript_447040.vdf" + script.parent.mkdir(parents=True) + script.write_text('"evaluatorscript"\n{\n\t"appid"\t\t"447040"\n\t"1"\n' + + "\n".join("\t" + line for line in UBISOFT_SCRIPT.splitlines()) + "\n}\n") + env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_SCRIPTS=str(script)) + return subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, text=True, check=True) + + def test_the_ubisoft_connect_installer_is_left_to_run(self): + self.ubisoft() + self.assertIn('"easyanticheat"=dword:00000001', self.user.read_text()) + self.assertNotIn("Ubisoft Connect PC Client", self.reg.read_text()) + self.assertNotIn("Ubisoft Connect PC Client", (self.reg.parent / ".droiddeck-redists").read_text()) + + def test_a_ubisoft_connect_marker_an_earlier_seeding_wrote_comes_out(self): + marker = "HKEY_LOCAL_MACHINE\\\\Software\\\\Valve\\\\Steam\\\\Apps\\\\447040\tUbisoft Connect PC Client" + self.reg.write_text( + "WINE REGISTRY Version 2\n" + "\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\447040] 1791729070\n" + '"Ubisoft Connect PC Client"=dword:00000001\n' + "\n[Software\\\\Wow6432Node\\\\Valve\\\\Steam\\\\Apps\\\\447040] 1791729070\n" + '"Ubisoft Connect PC Client"=dword:00000001\n') + (self.reg.parent / ".droiddeck-redists").write_text(marker + "\n") + result = self.ubisoft() + self.assertNotIn("Ubisoft Connect PC Client", self.reg.read_text()) + self.assertNotIn("Ubisoft Connect PC Client", (self.reg.parent / ".droiddeck-redists").read_text()) + self.assertIn("Ubisoft Connect markers out", result.stdout) + if __name__ == "__main__": unittest.main() From 46cd8e17776d311e81bf493f50a6ac4df5e4e02f Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 22:37:45 -0400 Subject: [PATCH 079/174] fix: Epic games get their manifest launch command Epic manifests carry a launch command next to the launch executable, which the Epic launcher passes to the game. It was read and dropped, so Caravan SandWitch never got -PCStore=EGS and quit with "started outside of any known PC store". The manifest's launch command now joins the game's arguments, including for games already installed. --- .../launcher/stores/epic/EpicClientLibrary.kt | 23 ++++++++++- app/src/main/rust/stores/JNI.md | 3 +- app/src/main/rust/stores/src/epic/launch.rs | 40 +++++++++++++++++++ app/src/main/rust/stores/src/epic/manifest.rs | 11 ++++- app/src/main/rust/stores/src/epic/service.rs | 4 ++ .../launcher/stores/epic/EpicClientTest.kt | 17 ++++++++ 6 files changed, 94 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt index 8521a90f5d..65b5b5614c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt @@ -358,7 +358,11 @@ internal object EpicClientLibrary { write(File(manifests, "$guid.item"), item(install, tags, ownership == true).toString(2)) runCatching { egstore(install, guid) { token } }.onFailure { Log.w(TAG, "${install.appName}: .egstore not written (${it.javaClass.simpleName})") } after.put(install.appName, JSONObject().put("guid", guid).put("signature", install.signature).apply { if (ownership != null) put("ownership", ownership) }) - StoreGameSidecar.read(install.folder)?.let { StoreLaunch.refreshLauncher(install.folder, it) } + StoreGameSidecar.read(install.folder)?.let { sidecar -> + val next = runCatching { manifestArgs(install, guid) }.getOrNull()?.let { withLaunchArgs(sidecar, it) } ?: sidecar + if (next !== sidecar) next.write(install.folder) + StoreLaunch.refreshLauncher(install.folder, next) + } } for (name in before.keys().asSequence().toList()) { if (after.has(name)) continue @@ -376,6 +380,23 @@ internal object EpicClientLibrary { return changed } + private const val LAUNCH_ARGS = "launchArgs" + + private fun manifestArgs(install: Install, guid: String): List? { + val manifest = File(install.folder, ".egstore/$guid.manifest").takeIf { it.isFile } ?: return null + val args = EpicNative.inspect(manifest.readBytes(), JSONObject().put("op", "launch"))?.optJSONArray("args") ?: return null + return List(args.length()) { args.optString(it) }.filter { it.isNotEmpty() } + } + + internal fun withLaunchArgs(sidecar: StoreGameSidecar, args: List): StoreGameSidecar { + val previous = sidecar.extra[LAUNCH_ARGS]?.split('\n')?.filter { it.isNotEmpty() }.orEmpty() + val kept = sidecar.args.filterNot { it in previous } + val next = kept + args.filterNot { it in kept } + val extra = LinkedHashMap(sidecar.extra).apply { if (args.isEmpty()) remove(LAUNCH_ARGS) else put(LAUNCH_ARGS, args.joinToString("\n")) } + if (next == sidecar.args && extra == sidecar.extra) return sidecar + return sidecar.copy(args = next, extra = extra) + } + private fun ownershipToken(token: String, install: Install): Boolean? = runCatching { EpicApiClient.getCustomAttribute(token, install.namespace, install.catalogItemId, "OwnershipToken") } .getOrNull()?.trim()?.lowercase()?.let { it == "true" } diff --git a/app/src/main/rust/stores/JNI.md b/app/src/main/rust/stores/JNI.md index c5cd077443..9ea0ae8305 100644 --- a/app/src/main/rust/stores/JNI.md +++ b/app/src/main/rust/stores/JNI.md @@ -166,7 +166,8 @@ synchronous on the calling thread (network calls block: call them off the main t `cloud.read` (`url`) → the file. `null` = failed. `nativeSend` op: `cloud.write` (`url`) with the body → `{"ok": true}` or an error. `nativeInspect` parses manifest bytes: `{"op":"summary"}` → `buildVersion`, `launchExe`, `prereqName`, `prereqPath`, `prereqRead`, `files[]` (`path`, `size`, -`tags`); `{"op":"select","tags":[…]}` → `indices[]` of the files an install with those tags gets. +`tags`); `{"op":"select","tags":[…]}` → `indices[]` of the files an install with those tags gets; +`{"op":"launch"}` → the manifest's `command` line and its `args[]`. ### `nativeInstall` diff --git a/app/src/main/rust/stores/src/epic/launch.rs b/app/src/main/rust/stores/src/epic/launch.rs index 481e9b8255..d2afe582a2 100644 --- a/app/src/main/rust/stores/src/epic/launch.rs +++ b/app/src/main/rust/stores/src/epic/launch.rs @@ -39,10 +39,50 @@ pub fn arguments(d: &LaunchData) -> Vec { args } +pub fn split_command(command: &str) -> Vec { + let mut args = Vec::new(); + let mut current = String::new(); + let mut quoted = false; + let mut started = false; + for c in command.chars().map(|c| if c == '\t' { ' ' } else { c }).filter(|&c| c >= ' ' && c != '\u{7f}') { + match c { + '"' => { + quoted = !quoted; + started = true; + } + ' ' if !quoted => { + if started { + args.push(std::mem::take(&mut current)); + started = false; + } + } + _ => { + current.push(c); + started = true; + } + } + } + if started { + args.push(current); + } + args.retain(|a| !a.is_empty()); + args +} + #[cfg(test)] mod tests { use super::*; + #[test] + fn launch_command_splits_like_a_command_line() { + assert_eq!(split_command("-PCStore=EGS"), vec!["-PCStore=EGS"]); + assert_eq!( + split_command(" -a\t-b=\"c d\" \"-e f\" \"\" -g\r\n"), + vec!["-a", "-b=c d", "-e f", "-g"] + ); + assert!(split_command(" ").is_empty()); + } + #[test] fn arguments_in_order() { let args = arguments(&LaunchData { diff --git a/app/src/main/rust/stores/src/epic/manifest.rs b/app/src/main/rust/stores/src/epic/manifest.rs index 2690e0f19d..98d31f3d9d 100644 --- a/app/src/main/rust/stores/src/epic/manifest.rs +++ b/app/src/main/rust/stores/src/epic/manifest.rs @@ -68,6 +68,7 @@ pub struct Manifest { pub version: i64, pub build_version: String, pub launch_exe: String, + pub launch_command: String, pub prereq_name: String, pub prereq_path: String, pub prereq_read: bool, @@ -279,6 +280,7 @@ fn parse_binary(bytes: &[u8]) -> Result { version, build_version: meta.build_version, launch_exe: meta.launch_exe, + launch_command: meta.launch_command, prereq_name: meta.prereq_name, prereq_path: meta.prereq_path, prereq_read: meta.complete, @@ -292,6 +294,7 @@ fn parse_binary(bytes: &[u8]) -> Result { struct Meta { build_version: String, launch_exe: String, + launch_command: String, prereq_name: String, prereq_path: String, complete: bool, @@ -308,7 +311,7 @@ fn read_meta(data: &[u8]) -> Meta { r.fstring()?; meta.build_version = r.fstring()?; meta.launch_exe = normalise_path(&r.fstring()?); - r.fstring()?; + meta.launch_command = r.fstring()?; let ids = r.count(4)?; for _ in 0..ids { r.fstring()?; @@ -548,6 +551,7 @@ fn parse_json(bytes: &[u8]) -> Result { version, build_version: str_field("BuildVersionString"), launch_exe: normalise_path(launch), + launch_command: str_field("LaunchCommand"), prereq_name: str_field("PrereqName"), prereq_path: normalise_path(&str_field("PrereqPath")), prereq_read: true, @@ -611,7 +615,7 @@ pub mod testing { fstring(&mut meta, "App"); fstring(&mut meta, &m.build); fstring(&mut meta, &m.exe); - fstring(&mut meta, ""); + fstring(&mut meta, "-PCStore=EGS \"-log=a b.txt\""); if let Some((name, path)) = &m.prereq { meta.extend_from_slice(&1i32.to_le_bytes()); fstring(&mut meta, "prereq-id"); @@ -763,6 +767,7 @@ mod tests { assert_eq!(m.chunk_folder(), "ChunksV4"); assert_eq!(m.build_version, "1.2.3-CL-99"); assert_eq!(m.launch_exe, "Binaries/Win64/Game.exe"); + assert_eq!(m.launch_command, "-PCStore=EGS \"-log=a b.txt\""); assert_eq!(m.prereq_name, "UE4 Prerequisites (x64)"); assert_eq!(m.prereq_path, "Engine/Extras/UE4PrereqSetup_x64.exe"); assert!(m.prereq_read); @@ -851,6 +856,7 @@ mod tests { let doc = r#"{ "ManifestFileVersion": "013000000000", "LaunchExeString": "Bin\\Game.exe", + "LaunchCommand": "-PCStore=EGS", "BuildVersionString": "++Game+Release-1.0", "PrereqName": "Redist", "PrereqPath": "Redist\\setup.exe", "ChunkHashList": { @@ -872,6 +878,7 @@ mod tests { assert_eq!(m.version, 13); assert_eq!(m.chunk_folder(), "ChunksV3"); assert_eq!(m.launch_exe, "Bin/Game.exe"); + assert_eq!(m.launch_command, "-PCStore=EGS"); assert!(m.prereq_read); assert_eq!(m.prereq_path, "Redist/setup.exe"); assert_eq!(m.chunks.len(), 2); diff --git a/app/src/main/rust/stores/src/epic/service.rs b/app/src/main/rust/stores/src/epic/service.rs index 67c1995bdf..79cd29d3fd 100644 --- a/app/src/main/rust/stores/src/epic/service.rs +++ b/app/src/main/rust/stores/src/epic/service.rs @@ -160,6 +160,7 @@ pub fn inspect(bytes: &[u8], request: &str) -> String { .map(|a| a.iter().filter_map(|t| t.as_str()).map(str::to_string).collect()); json!({ "indices": locale::select(&m.files, tags.as_deref()) }) } + "launch" => json!({ "command": m.launch_command, "args": launch::split_command(&m.launch_command) }), _ => json!({ "buildVersion": m.build_version, "launchExe": m.launch_exe, @@ -210,6 +211,9 @@ mod tests { assert_eq!(v["files"].as_array().unwrap().len(), 2); let v: Value = serde_json::from_str(&inspect(&bytes, r#"{"op":"select","tags":["English"]}"#)).unwrap(); assert_eq!(v["indices"], json!([0])); + let v: Value = serde_json::from_str(&inspect(&bytes, r#"{"op":"launch"}"#)).unwrap(); + assert_eq!(v["command"], "-PCStore=EGS \"-log=a b.txt\""); + assert_eq!(v["args"], json!(["-PCStore=EGS", "-log=a b.txt"])); let v: Value = serde_json::from_str(&inspect(b"nonsense", "{}")).unwrap(); assert!(v["error"].is_string()); } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt index 720e122c19..de8a440283 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt @@ -285,6 +285,23 @@ class EpicClientTest { assertTrue(EpicClient.loopback("http://localhost:5/launcher/authorized?code=1")) } + @Test fun theManifestLaunchCommandJoinsTheGameArguments() { + val store = com.droiddeck.launcher.stores.Store.EPIC + val epicArgs = listOf("-EpicPortal", "-epicapp=Fig", "-epicenv=Prod") + val installed = com.droiddeck.launcher.stores.StoreGameSidecar(store, "Fig", "Fig Game", exe = "Fig.exe", args = epicArgs) + val first = EpicClientLibrary.withLaunchArgs(installed, listOf("-PCStore=EGS")) + assertEquals(epicArgs + "-PCStore=EGS", first.args) + assertTrue(EpicClientLibrary.withLaunchArgs(first, listOf("-PCStore=EGS")) === first) + val updated = EpicClientLibrary.withLaunchArgs(first, listOf("-PCStore=EGS", "-log=a b.txt")) + assertEquals(epicArgs + listOf("-PCStore=EGS", "-log=a b.txt"), updated.args) + val dropped = EpicClientLibrary.withLaunchArgs(updated, emptyList()) + assertEquals(epicArgs, dropped.args) + assertFalse(dropped.extra.containsKey("launchArgs")) + val reinstalled = first.copy(args = epicArgs) + assertEquals(epicArgs + "-PCStore=EGS", EpicClientLibrary.withLaunchArgs(reinstalled, listOf("-PCStore=EGS")).args) + assertTrue(EpicClientLibrary.withLaunchArgs(installed, emptyList()) === installed) + } + @Test fun itemsDescribeTheInstallForTheLauncher() { val install = EpicClientLibrary.Install( "Fig", "ns1", "item1", "Fig Game", "1.0.5", "Binaries/Win64/Fig.exe", "/root/Games/Stores/Epic/Fig Game", From 8209a707f4708be78440d9a386f390bba5de5357 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 22:37:45 -0400 Subject: [PATCH 080/174] fix: Caravan SandWitch and Cyberpunk 2077 run at D3D12 feature level 12_1 Feature level 12_2 makes vkd3d-proton report mesh shaders and ray tracing that Turnip doesn't provide. Caravan SandWitch (Unreal Engine 5) then builds mesh shader pipelines without a pipeline layout and the driver crashes; Cyberpunk 2077 stops at ray tracing initialization. Only these two games get 12_1, and a value set in a game's own settings still wins. --- .../overlay/usr/local/bin/droiddeck-game-env | 12 ++++++++ tools/tests/test_game_environment.py | 28 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 75154ab6df..03707c1d70 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -120,6 +120,18 @@ def arkham_city_x87(game): return {"FEX_X87REDUCEDPRECISION": "0"}, [], "Batman: Arkham City: FEX with full x87 precision" + +@fix +def caravan_sandwitch_feature_level(game): + if "caravansandwitch.exe" in game.files or game.stem == "caravansandwitch-win64-shipping": + return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "Caravan SandWitch: D3D12 feature level 12_1 (12_2 hands it mesh shader pipelines vkd3d-proton cannot build)" + + +@fix +def cyberpunk_feature_level(game): + if game.stem in ("cyberpunk2077", "redprelauncher"): + return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "Cyberpunk 2077: D3D12 feature level 12_1" + def skip_red_launcher(command): """Cyberpunk 2077's prelauncher opens REDlauncher, a Qt WebEngine window that hands over to the game half a minute later and then stays up beside it, well over a core busy for as long as the diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index bbae1b3a7d..5e7cf1b56e 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -357,6 +357,34 @@ class GameEnvironmentTest(unittest.TestCase): (asylum / name).touch() self.assertEqual(MODULE["engine_fixes"](str(asylum / "BmLauncher.exe"), []), ({}, [], [])) + def test_caravan_sandwitch_and_cyberpunk_run_at_feature_level_12_1(self): + with tempfile.TemporaryDirectory() as tmp: + caravan = Path(tmp) / "Caravan SandWitch" + shipping = caravan / "CaravanSandWitch/Binaries/Win64" + shipping.mkdir(parents=True) + for name in ("CaravanSandWitch.exe", ".droiddeck-launch.bat"): + (caravan / name).touch() + (shipping / "CaravanSandWitch-Win64-Shipping.exe").touch() + cyberpunk = Path(tmp) / "Cyberpunk 2077" + (cyberpunk / "bin/x64").mkdir(parents=True) + for name in ("REDprelauncher.exe", "bin/x64/Cyberpunk2077.exe"): + (cyberpunk / name).touch() + games = [caravan / "CaravanSandWitch.exe", caravan / ".droiddeck-launch.bat", + shipping / "CaravanSandWitch-Win64-Shipping.exe", + cyberpunk / "REDprelauncher.exe", cyberpunk / "bin/x64/Cyberpunk2077.exe"] + for exe in games: + env, extra, notes = MODULE["engine_fixes"](str(exe), []) + self.assertEqual((env, extra), ({"VKD3D_FEATURE_LEVEL": "12_1"}, []), exe) + self.assertTrue(notes) + config = {"version": 1, "shared": {"VKD3D_FEATURE_LEVEL": "12_2"}} + self.assertEqual(MODULE["apply_config"]({}, config, "1582650", env)["VKD3D_FEATURE_LEVEL"], "12_1") + config["games"] = {"1582650": {"VKD3D_FEATURE_LEVEL": "12_2"}} + self.assertEqual(MODULE["apply_config"]({}, config, "1582650", env)["VKD3D_FEATURE_LEVEL"], "12_2") + other = Path(tmp) / "Other/Binaries/Win64" + other.mkdir(parents=True) + (other / "Other-Win64-Shipping.exe").touch() + self.assertEqual(MODULE["engine_fixes"](str(other / "Other-Win64-Shipping.exe"), []), ({}, [], [])) + def test_unity_players_keep_tso_over_the_preset(self): with tempfile.TemporaryDirectory() as tmp: def game(*names): From 42026b382f6e0ea0c022a7647ea92d7383f70098 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 23:11:17 -0400 Subject: [PATCH 081/174] fix: keep manifest launch arguments to the installed build and their own additions The manifest's arguments apply only when its build matches the installed version, only arguments the merge inserted are tracked as its own, escaped quotes split like a Windows command line, and the REDprelauncher rule needs Cyberpunk2077.exe beside it. --- .../launcher/stores/epic/EpicClientLibrary.kt | 10 +++-- app/src/main/rust/stores/JNI.md | 2 +- app/src/main/rust/stores/src/epic/launch.rs | 41 +++++++++++++------ app/src/main/rust/stores/src/epic/service.rs | 7 +++- .../launcher/stores/epic/EpicClientTest.kt | 5 +++ .../overlay/usr/local/bin/droiddeck-game-env | 5 ++- tools/tests/test_game_environment.py | 4 ++ 7 files changed, 56 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt index 65b5b5614c..4591b12e43 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt @@ -384,15 +384,19 @@ internal object EpicClientLibrary { private fun manifestArgs(install: Install, guid: String): List? { val manifest = File(install.folder, ".egstore/$guid.manifest").takeIf { it.isFile } ?: return null - val args = EpicNative.inspect(manifest.readBytes(), JSONObject().put("op", "launch"))?.optJSONArray("args") ?: return null + val launch = EpicNative.inspect(manifest.readBytes(), JSONObject().put("op", "launch")) ?: return null + val build = launch.optString("buildVersion") + if (install.version.isNotEmpty() && build.isNotEmpty() && build != install.version) return null + val args = launch.optJSONArray("args") ?: return null return List(args.length()) { args.optString(it) }.filter { it.isNotEmpty() } } internal fun withLaunchArgs(sidecar: StoreGameSidecar, args: List): StoreGameSidecar { val previous = sidecar.extra[LAUNCH_ARGS]?.split('\n')?.filter { it.isNotEmpty() }.orEmpty() val kept = sidecar.args.filterNot { it in previous } - val next = kept + args.filterNot { it in kept } - val extra = LinkedHashMap(sidecar.extra).apply { if (args.isEmpty()) remove(LAUNCH_ARGS) else put(LAUNCH_ARGS, args.joinToString("\n")) } + val added = args.filterNot { it in kept } + val next = kept + added + val extra = LinkedHashMap(sidecar.extra).apply { if (added.isEmpty()) remove(LAUNCH_ARGS) else put(LAUNCH_ARGS, added.joinToString("\n")) } if (next == sidecar.args && extra == sidecar.extra) return sidecar return sidecar.copy(args = next, extra = extra) } diff --git a/app/src/main/rust/stores/JNI.md b/app/src/main/rust/stores/JNI.md index 9ea0ae8305..b160ace3c1 100644 --- a/app/src/main/rust/stores/JNI.md +++ b/app/src/main/rust/stores/JNI.md @@ -167,7 +167,7 @@ synchronous on the calling thread (network calls block: call them off the main t body → `{"ok": true}` or an error. `nativeInspect` parses manifest bytes: `{"op":"summary"}` → `buildVersion`, `launchExe`, `prereqName`, `prereqPath`, `prereqRead`, `files[]` (`path`, `size`, `tags`); `{"op":"select","tags":[…]}` → `indices[]` of the files an install with those tags gets; -`{"op":"launch"}` → the manifest's `command` line and its `args[]`. +`{"op":"launch"}` → the manifest's `buildVersion`, its `command` line and the `args[]` split from it. ### `nativeInstall` diff --git a/app/src/main/rust/stores/src/epic/launch.rs b/app/src/main/rust/stores/src/epic/launch.rs index d2afe582a2..24e35db608 100644 --- a/app/src/main/rust/stores/src/epic/launch.rs +++ b/app/src/main/rust/stores/src/epic/launch.rs @@ -44,24 +44,37 @@ pub fn split_command(command: &str) -> Vec { let mut current = String::new(); let mut quoted = false; let mut started = false; + let mut slashes = 0usize; for c in command.chars().map(|c| if c == '\t' { ' ' } else { c }).filter(|&c| c >= ' ' && c != '\u{7f}') { - match c { - '"' => { + if c == '\\' { + slashes += 1; + started = true; + continue; + } + if c == '"' { + current.extend(std::iter::repeat('\\').take(slashes / 2)); + if slashes % 2 == 1 { + current.push('"'); + } else { quoted = !quoted; - started = true; } - ' ' if !quoted => { - if started { - args.push(std::mem::take(&mut current)); - started = false; - } - } - _ => { - current.push(c); - started = true; + slashes = 0; + started = true; + continue; + } + current.extend(std::iter::repeat('\\').take(slashes)); + slashes = 0; + if c == ' ' && !quoted { + if started { + args.push(std::mem::take(&mut current)); + started = false; } + } else { + current.push(c); + started = true; } } + current.extend(std::iter::repeat('\\').take(slashes)); if started { args.push(current); } @@ -80,6 +93,10 @@ mod tests { split_command(" -a\t-b=\"c d\" \"-e f\" \"\" -g\r\n"), vec!["-a", "-b=c d", "-e f", "-g"] ); + assert_eq!( + split_command(r#"-name="a\" b" -dir=C:\Games\ "-q=\\" -r"#), + vec![r#"-name=a" b"#, r"-dir=C:\Games\", r"-q=\", "-r"] + ); assert!(split_command(" ").is_empty()); } diff --git a/app/src/main/rust/stores/src/epic/service.rs b/app/src/main/rust/stores/src/epic/service.rs index 79cd29d3fd..7248342866 100644 --- a/app/src/main/rust/stores/src/epic/service.rs +++ b/app/src/main/rust/stores/src/epic/service.rs @@ -160,7 +160,11 @@ pub fn inspect(bytes: &[u8], request: &str) -> String { .map(|a| a.iter().filter_map(|t| t.as_str()).map(str::to_string).collect()); json!({ "indices": locale::select(&m.files, tags.as_deref()) }) } - "launch" => json!({ "command": m.launch_command, "args": launch::split_command(&m.launch_command) }), + "launch" => json!({ + "buildVersion": m.build_version, + "command": m.launch_command, + "args": launch::split_command(&m.launch_command), + }), _ => json!({ "buildVersion": m.build_version, "launchExe": m.launch_exe, @@ -212,6 +216,7 @@ mod tests { let v: Value = serde_json::from_str(&inspect(&bytes, r#"{"op":"select","tags":["English"]}"#)).unwrap(); assert_eq!(v["indices"], json!([0])); let v: Value = serde_json::from_str(&inspect(&bytes, r#"{"op":"launch"}"#)).unwrap(); + assert_eq!(v["buildVersion"], "b"); assert_eq!(v["command"], "-PCStore=EGS \"-log=a b.txt\""); assert_eq!(v["args"], json!(["-PCStore=EGS", "-log=a b.txt"])); let v: Value = serde_json::from_str(&inspect(b"nonsense", "{}")).unwrap(); diff --git a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt index de8a440283..c0687db98c 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt @@ -300,6 +300,11 @@ class EpicClientTest { val reinstalled = first.copy(args = epicArgs) assertEquals(epicArgs + "-PCStore=EGS", EpicClientLibrary.withLaunchArgs(reinstalled, listOf("-PCStore=EGS")).args) assertTrue(EpicClientLibrary.withLaunchArgs(installed, emptyList()) === installed) + val own = installed.copy(args = epicArgs + "-PCStore=EGS") + assertTrue(EpicClientLibrary.withLaunchArgs(own, listOf("-PCStore=EGS")) === own) + val ownUpdated = EpicClientLibrary.withLaunchArgs(own, listOf("-PCStore=EGS", "-log=a b.txt")) + assertEquals(epicArgs + listOf("-PCStore=EGS", "-log=a b.txt"), ownUpdated.args) + assertEquals(epicArgs + "-PCStore=EGS", EpicClientLibrary.withLaunchArgs(ownUpdated, emptyList()).args) } @Test fun itemsDescribeTheInstallForTheLauncher() { diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 03707c1d70..53537c072f 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -129,7 +129,10 @@ def caravan_sandwitch_feature_level(game): @fix def cyberpunk_feature_level(game): - if game.stem in ("cyberpunk2077", "redprelauncher"): + if game.stem == "cyberpunk2077" or ( + game.stem == "redprelauncher" + and os.path.isfile(os.path.join(os.path.dirname(game.exe), "bin", "x64", "Cyberpunk2077.exe")) + ): return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "Cyberpunk 2077: D3D12 feature level 12_1" def skip_red_launcher(command): diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 5e7cf1b56e..13b31f7435 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -384,6 +384,10 @@ class GameEnvironmentTest(unittest.TestCase): other.mkdir(parents=True) (other / "Other-Win64-Shipping.exe").touch() self.assertEqual(MODULE["engine_fixes"](str(other / "Other-Win64-Shipping.exe"), []), ({}, [], [])) + witcher = Path(tmp) / "The Witcher 3" + witcher.mkdir() + (witcher / "REDprelauncher.exe").touch() + self.assertNotIn("VKD3D_FEATURE_LEVEL", MODULE["engine_fixes"](str(witcher / "REDprelauncher.exe"), [])[0]) def test_unity_players_keep_tso_over_the_preset(self): with tempfile.TemporaryDirectory() as tmp: From b0e405ebf33ae5de6a611b6bb6169f69303881fd Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 23:30:21 -0400 Subject: [PATCH 082/174] fix: Epic client imports get the launch command, versioned installs need a matching manifest build Games the Epic client installed now carry their LaunchCommand arguments too, split by a new launch.split op. A doubled quote inside a quoted argument is one literal quote, and an install with a version ignores a manifest without the same build. --- .../launcher/stores/epic/EpicClientLibrary.kt | 13 ++++++++++--- app/src/main/rust/stores/JNI.md | 1 + app/src/main/rust/stores/src/epic/launch.rs | 7 ++++++- app/src/main/rust/stores/src/epic/service.rs | 3 +++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt index 4591b12e43..e5ea933d83 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt @@ -251,7 +251,7 @@ internal object EpicClientLibrary { SessionPrefs.addedGameStoredAppId(app, oldFolder.path)?.let { SteamLiveShortcuts.remove(app, it) } changed = true } - val next = StoreGameSidecar( + val next = withLaunchArgs(StoreGameSidecar( Store.EPIC, appName, item.optString("DisplayName").ifEmpty { appName }, exe, installVersion = item.optString("AppVersionString"), installedAt = existing?.installedAt?.takeIf { it > 0 } ?: folder.lastModified(), cover = existing?.cover, hero = existing?.hero, @@ -260,7 +260,7 @@ internal object EpicClientLibrary { epic = existing?.epic ?: com.droiddeck.launcher.stores.EpicOptions(), cloud = existing?.cloud ?: true, launcher = StoreLaunch.LAUNCHER, - ) + ), commandArgs(item.optString("LaunchCommand"))) val sidecarChanged = existing?.toJson()?.toString(2) != next.toJson().toString(2) val launcher = File(folder, StoreLaunch.LAUNCHER) if (sidecarChanged || runCatching { launcher.readText() }.getOrNull() != StoreLaunch.launcherText(next)) { @@ -328,6 +328,7 @@ internal object EpicClientLibrary { .put("CatalogItemId", record.optString("itemId")) .put("InstallLocation", dir) .put("LaunchExecutable", record.optString("launchExecutable")) + .put("LaunchCommand", record.optString("launchCommand")) .put("AppVersionString", record.optString("version")) .put("SidecarDeploymentId", record.optJSONObject("sidecar")?.optString("deploymentId").orEmpty()) .put("DisplayName", title?.takeIf(String::isNotBlank) ?: dir.substringAfterLast('/')) @@ -386,11 +387,17 @@ internal object EpicClientLibrary { val manifest = File(install.folder, ".egstore/$guid.manifest").takeIf { it.isFile } ?: return null val launch = EpicNative.inspect(manifest.readBytes(), JSONObject().put("op", "launch")) ?: return null val build = launch.optString("buildVersion") - if (install.version.isNotEmpty() && build.isNotEmpty() && build != install.version) return null + if (install.version.isNotEmpty() && build != install.version) return null val args = launch.optJSONArray("args") ?: return null return List(args.length()) { args.optString(it) }.filter { it.isNotEmpty() } } + private fun commandArgs(command: String): List { + if (command.isBlank()) return emptyList() + val args = EpicNative.call("launch.split", JSONObject().put("command", command))?.optJSONArray("args") ?: return emptyList() + return List(args.length()) { args.optString(it) }.filter { it.isNotEmpty() } + } + internal fun withLaunchArgs(sidecar: StoreGameSidecar, args: List): StoreGameSidecar { val previous = sidecar.extra[LAUNCH_ARGS]?.split('\n')?.filter { it.isNotEmpty() }.orEmpty() val kept = sidecar.args.filterNot { it in previous } diff --git a/app/src/main/rust/stores/JNI.md b/app/src/main/rust/stores/JNI.md index b160ace3c1..0d2308fa27 100644 --- a/app/src/main/rust/stores/JNI.md +++ b/app/src/main/rust/stores/JNI.md @@ -160,6 +160,7 @@ synchronous on the calling thread (network calls block: call them off the main t | `cloud.list` | `accessToken`, `accountId`, `appName` | `files[]` of `name`, `modified` (ms, -1 unknown), `hash`, `readLink` | | `cloud.writeLinks` | `accessToken`, `accountId`, `appName`, `names[]` | `links`: name → write link | | `launch.args` | `displayName`, `accountId`, `namespace`, `locale`, `appName`, `deploymentId`, `additional` | `args[]` | +| `launch.split` | `command` | `args[]` | | `locale` | `language`, `region` | `key`, `tags[]`, `launchLocale` | `nativeFetch` ops: `manifest.download` (`info`, optional `cdns`) → the manifest bytes; diff --git a/app/src/main/rust/stores/src/epic/launch.rs b/app/src/main/rust/stores/src/epic/launch.rs index 24e35db608..8c5a104999 100644 --- a/app/src/main/rust/stores/src/epic/launch.rs +++ b/app/src/main/rust/stores/src/epic/launch.rs @@ -45,7 +45,8 @@ pub fn split_command(command: &str) -> Vec { let mut quoted = false; let mut started = false; let mut slashes = 0usize; - for c in command.chars().map(|c| if c == '\t' { ' ' } else { c }).filter(|&c| c >= ' ' && c != '\u{7f}') { + let mut chars = command.chars().map(|c| if c == '\t' { ' ' } else { c }).filter(|&c| c >= ' ' && c != '\u{7f}').peekable(); + while let Some(c) = chars.next() { if c == '\\' { slashes += 1; started = true; @@ -55,6 +56,9 @@ pub fn split_command(command: &str) -> Vec { current.extend(std::iter::repeat('\\').take(slashes / 2)); if slashes % 2 == 1 { current.push('"'); + } else if quoted && chars.peek() == Some(&'"') { + chars.next(); + current.push('"'); } else { quoted = !quoted; } @@ -97,6 +101,7 @@ mod tests { split_command(r#"-name="a\" b" -dir=C:\Games\ "-q=\\" -r"#), vec![r#"-name=a" b"#, r"-dir=C:\Games\", r"-q=\", "-r"] ); + assert_eq!(split_command("-name=\"a\"\" b\" -s=\"\"\""), vec!["-name=a\" b", "-s=\""]); assert!(split_command(" ").is_empty()); } diff --git a/app/src/main/rust/stores/src/epic/service.rs b/app/src/main/rust/stores/src/epic/service.rs index 7248342866..2264f6c775 100644 --- a/app/src/main/rust/stores/src/epic/service.rs +++ b/app/src/main/rust/stores/src/epic/service.rs @@ -113,6 +113,7 @@ fn dispatch(op: &str, req: &Value) -> Value { }; json!({ "args": launch::arguments(&data) }) } + "launch.split" => json!({ "args": launch::split_command(str_of(req, "command")) }), "locale" => { let key = locale::language_key(str_of(req, "language"), str_of(req, "region")); json!({ "key": key, "tags": locale::tags_for_key(key), "launchLocale": locale::launch_locale(key) }) @@ -192,6 +193,8 @@ mod tests { assert!(v["error"].is_string()); let v: Value = serde_json::from_str(&call("launch.args", r#"{"namespace":"ns","appName":"A"}"#)).unwrap(); assert_eq!(v["args"][0], "-EpicPortal"); + let v: Value = serde_json::from_str(&call("launch.split", r#"{"command":"-PCStore=EGS \"-log=a b.txt\""}"#)).unwrap(); + assert_eq!(v["args"], json!(["-PCStore=EGS", "-log=a b.txt"])); } #[test] From dd79f44b3a05b858c6801da2d69f49f3785b7b9a Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 00:09:16 -0400 Subject: [PATCH 083/174] fix: the Steam download monitor no longer stalls the main thread on a long content log The content log was read with RandomAccessFile.readLine, one byte per read, on the main thread. A 4 MB log took about 2 s on the first poll, enough for an ANR on slower devices while a download runs. It is now read through a buffered reader with the same Latin-1 lines and offset, and the per-line regexes only run on lines that can match. --- .../launcher/session/SteamDownloadMonitor.kt | 16 ++++++++------ .../session/SteamDownloadMonitorTest.kt | 22 +++++++++++++++++++ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt index c125e59b80..ff3602c1bd 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt @@ -1,7 +1,7 @@ package com.droiddeck.launcher.session import java.io.File -import java.io.RandomAccessFile +import java.io.FileInputStream internal class SteamDownloadMonitor { private data class ManifestState( @@ -63,16 +63,17 @@ internal class SteamDownloadMonitor { lastContentActivityAt = 0L } runCatching { - RandomAccessFile(log, "r").use { input -> - input.seek(contentLogOffset) + FileInputStream(log).use { input -> + input.channel.position(contentLogOffset) + val reader = input.bufferedReader(Charsets.ISO_8859_1) while (true) { - val line = input.readLine() ?: break + val line = reader.readLine() ?: break when { "Client version:" in line -> { activeContentUpdates.clear() lastContentActivityAt = 0L } - CONTENT_UPDATE.find(line)?.let { match -> + " update changed : " in line && CONTENT_UPDATE.find(line)?.let { match -> val appId = match.groupValues[1] val updateType = match.groupValues[2] val state = match.groupValues[3] @@ -85,14 +86,15 @@ internal class SteamDownloadMonitor { } true } == true -> Unit - CURRENT_RATE.find(line)?.groupValues?.get(1)?.toDoubleOrNull()?.let { it > 0.0 } == true -> + "Current download rate: " in line && + CURRENT_RATE.find(line)?.groupValues?.get(1)?.toDoubleOrNull()?.let { it > 0.0 } == true -> lastContentActivityAt = now "Downloading " in line && " chunks for depot " in line -> lastContentActivityAt = now } if (activeContentUpdates.isNotEmpty()) lastContentActivityAt = now } - contentLogOffset = input.filePointer + contentLogOffset = input.channel.position() } } return activeContentUpdates.isNotEmpty() && lastContentActivityAt > 0L && diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt index 4da943020d..52920aefca 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt @@ -101,6 +101,28 @@ class SteamDownloadMonitorTest { } } + @Test fun aLongLogIsFollowedFromWhereTheLastPollStopped() { + val root = Files.createTempDirectory("droiddeck-steam-download-").toFile() + try { + val contentLog = File(root, "root/.local/share/Steam/logs/content_log.txt").apply { + check(parentFile?.mkdirs() != false) + writeText(buildString { + repeat(5_000) { append("[2026-10-06 14:40:00] Detected write gap 64 MB in file \"data_$it.dat\"\r\n") } + append("[2026-10-06 14:44:17] AppID 44 App update changed : Running Update,Downloading,\r\n") + }) + } + val monitor = SteamDownloadMonitor() + + assertTrue(monitor.poll(root, now = 1_000L)) + contentLog.appendText("[2026-10-06 14:45:03] AppID 44 App update changed : None\r\n") + assertFalse(monitor.poll(root, now = 2_000L)) + contentLog.appendText("[2026-10-06 14:46:00] AppID 45 App update changed : Running Update,Downloading,\r\n") + assertTrue(monitor.poll(root, now = 3_000L)) + } finally { + root.deleteRecursively() + } + } + @Test fun theOtherClientsLogIsReadFromItsStart() { val root = Files.createTempDirectory("droiddeck-steam-download-").toFile() try { From f89dc0407231a3144b7d207d5276b7eae74bcc27 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 00:26:47 -0400 Subject: [PATCH 084/174] fix: Proton's EasyAntiCheat and BattlEye runtimes are not listed as games Steam installs Proton EasyAntiCheat Runtime (1826330) and Proton BattlEye Runtime (1161040) as tool depots. The launcher's Games tab and the desktop's game entries now skip them like the other runtimes. --- app/src/main/java/com/droiddeck/launcher/frontend/Library.kt | 2 ++ tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games | 2 +- tools/tests/test_steam_libraries.py | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) 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 91691cb1e7..e3fa25ac59 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -46,12 +46,14 @@ object Library { 1054830, 1070560, 1113280, + 1161040, 1245040, 1391110, 1420170, 1493710, 1580130, 1628350, + 1826330, 1887720, 2180100, 228980, diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games index d86d10b6cc..fe1cf0d971 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games @@ -8,7 +8,7 @@ X64 = os.environ.get("BL_STEAM_CLIENT_ARCH") == "x86_64" CLIENT_HOME = (os.environ.get("BL_X64_HOME") or os.path.join(HOME, ".droiddeck-x64")) if X64 else HOME STEAM_ROOT = sys.argv[1] if len(sys.argv) > 1 else os.path.join(CLIENT_HOME, ".local/share/Steam") LIBRARIES = ((STEAM_ROOT, "Steam Games"), ("/mnt/droiddeck-sd/x86-64" if X64 else "/mnt/droiddeck-sd", "SD Games")) -NOT_GAMES = {228980, 1070560, 1391110, 1493710, 1628350, 3127680, 4183110, 4185400, 4427310, 4628740} +NOT_GAMES = {228980, 1070560, 1161040, 1391110, 1493710, 1628350, 1826330, 3127680, 4183110, 4185400, 4427310, 4628740} APPS_DIR = os.path.join(HOME, ".local/share/applications") PREFIX = "droiddeck-game-" NAME = re.compile(r'^\s*"name"\s*"([^"]*)"', re.M) diff --git a/tools/tests/test_steam_libraries.py b/tools/tests/test_steam_libraries.py index 4f416a8401..95ae20c24a 100644 --- a/tools/tests/test_steam_libraries.py +++ b/tools/tests/test_steam_libraries.py @@ -153,6 +153,8 @@ class DesktopGamesTest(unittest.TestCase): steam = root / "Steam" manifest(steam / "steamapps", 40, name="Game") manifest(steam / "steamapps", 1628350, name="Steam Linux Runtime 3.0 (sniper)", installdir="SteamLinuxRuntime_sniper") + manifest(steam / "steamapps", 1826330, name="Proton EasyAntiCheat Runtime", installdir="Proton EasyAntiCheat Runtime") + manifest(steam / "steamapps", 1161040, name="Proton BattlEye Runtime", installdir="Proton BattlEye Runtime") manifest(steam / "steamapps", 5000, name="Some Proton", installdir="Some Proton") (steam / "steamapps/common/Some Proton").mkdir(parents=True) (steam / "steamapps/common/Some Proton/toolmanifest.vdf").write_text('"manifest"\n{\n}\n') From cc0a4f5aa96551422909c2e163a663c239a91807 Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Sat, 24 Oct 2026 07:49:05 +0300 Subject: [PATCH 085/174] itch.io: browse the Store tab by sort and price, with paging and a disk cache The Store tab only had four fixed shelves and a title search. A row of sort (Popular, New, Top rated, Top sellers) and price (Any, Free, On sale) chips now sets a BrowseQuery; anything but the defaults swaps the shelves for that query's games, loaded page by page as the grid scrolls. ItchBrowse builds itch's listing-feed URL (platform and tag segments are in the builder for the next change), tries each spelling of a price filter until one answers, spaces requests 1.2 s apart, backs off once on a 429, and keeps pages in the app cache for three hours. Every request is logged with its status and game count so a wrong URL guess can be fixed from a device. Owned games replace their browse copy so Install and the owned markers are right, and the detail page finds browse results. Strings for all 33 locales; URL-builder tests; docs/development/itch-browse.md. --- .../droiddeck/launcher/stores/StoresState.kt | 4 +- .../launcher/stores/itch/ItchBrowse.kt | 197 ++++++++++++++++++ .../launcher/stores/itch/ItchShelves.kt | 2 +- .../droiddeck/launcher/ui/ItchBrowseBar.kt | 107 ++++++++++ .../com/droiddeck/launcher/ui/StoresPage.kt | 25 ++- app/src/main/res/values-ar/strings.xml | 9 + app/src/main/res/values-b+es+419/strings.xml | 9 + app/src/main/res/values-bg/strings.xml | 9 + app/src/main/res/values-cs/strings.xml | 9 + app/src/main/res/values-da/strings.xml | 9 + app/src/main/res/values-de/strings.xml | 9 + app/src/main/res/values-el/strings.xml | 9 + app/src/main/res/values-es/strings.xml | 9 + app/src/main/res/values-fi/strings.xml | 9 + app/src/main/res/values-fr/strings.xml | 9 + app/src/main/res/values-hi/strings.xml | 9 + app/src/main/res/values-hu/strings.xml | 9 + app/src/main/res/values-in/strings.xml | 9 + app/src/main/res/values-it/strings.xml | 9 + app/src/main/res/values-ja/strings.xml | 9 + app/src/main/res/values-ko/strings.xml | 9 + app/src/main/res/values-ms/strings.xml | 9 + app/src/main/res/values-nb/strings.xml | 9 + app/src/main/res/values-nl/strings.xml | 9 + app/src/main/res/values-pl/strings.xml | 9 + app/src/main/res/values-pt-rPT/strings.xml | 9 + app/src/main/res/values-pt/strings.xml | 9 + app/src/main/res/values-ro/strings.xml | 9 + app/src/main/res/values-ru/strings.xml | 9 + app/src/main/res/values-sv/strings.xml | 9 + app/src/main/res/values-th/strings.xml | 9 + app/src/main/res/values-tr/strings.xml | 9 + app/src/main/res/values-uk/strings.xml | 9 + app/src/main/res/values-vi/strings.xml | 9 + app/src/main/res/values-zh-rCN/strings.xml | 9 + app/src/main/res/values-zh-rHK/strings.xml | 9 + app/src/main/res/values-zh-rTW/strings.xml | 9 + app/src/main/res/values/strings.xml | 9 + .../launcher/stores/itch/ItchBrowseTest.kt | 54 +++++ docs/development/itch-browse.md | 30 +++ 40 files changed, 708 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt create mode 100644 docs/development/itch-browse.md diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index 317757a8bf..482619e6f1 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -126,7 +126,9 @@ object StoresState { fun installedGame(store: Store, id: String): InstalledStoreGame? = installed.firstOrNull { it.sidecar.store == store && it.sidecar.id == id } fun detailItem(store: Store, id: String): CatalogItem? = detailCatalogItem( - store, id, library[store].orEmpty(), found[store].orEmpty(), shelves[store], + store, id, library[store].orEmpty(), + found[store].orEmpty() + if (store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchBrowseState.items else emptyList(), + shelves[store], ) fun open(context: Context, store: Store, force: Boolean = false) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt new file mode 100644 index 0000000000..ba0d2e88c0 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt @@ -0,0 +1,197 @@ +package com.droiddeck.launcher.stores.itch + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONArray +import java.io.File +import java.security.MessageDigest + +/** What the Store tab is showing: an order, a price filter and, later, platforms and tags. The default is the front page. */ +internal data class BrowseQuery( + val sort: String = ItchBrowse.SORT_POPULAR, + val price: String = ItchBrowse.PRICE_ANY, + val platforms: Set = emptySet(), + val tags: List = emptyList(), +) { + val isDefault: Boolean get() = this == BrowseQuery() +} + +internal class BrowsePage(val items: List, val code: Int, val cached: Boolean) + +internal object ItchBrowse { + const val SORT_POPULAR = "popular" + const val SORT_NEW = "new" + const val SORT_TOP_RATED = "top-rated" + const val SORT_TOP_SELLERS = "top-sellers" + val sorts = listOf(SORT_POPULAR, SORT_NEW, SORT_TOP_RATED, SORT_TOP_SELLERS) + + const val PRICE_ANY = "any" + const val PRICE_FREE = "free" + const val PRICE_SALE = "sale" + val prices = listOf(PRICE_ANY, PRICE_FREE, PRICE_SALE) + + private const val BASE = "https://itch.io/games" + private const val FRESH_MS = 3 * 60 * 60 * 1000L + private const val GAP_MS = 1_200L + private const val RETRY_MS = 8_000L + private const val FOLDER = "itch-browse" + + @Volatile private var lastRequestAt = 0L + private val lock = Any() + + private fun sortSegment(sort: String): String? = when (sort) { + SORT_NEW -> "newest" + SORT_TOP_RATED -> "top-rated" + SORT_TOP_SELLERS -> "top-sellers" + else -> null + } + + /** The ways itch spells a price filter; the first that answers is used, so one wrong guess does not empty the tab. */ + private fun priceSegments(price: String): List = when (price) { + PRICE_FREE -> listOf("free", "price-free") + PRICE_SALE -> listOf("on-sale") + else -> listOf(null) + } + + /** Every feed URL that could answer [query] for [page], most likely first. */ + fun urls(query: BrowseQuery, page: Int): List = priceSegments(query.price).map { price -> + val segments = listOfNotNull(sortSegment(query.sort), price) + + query.platforms.sorted().map { "platform-$it" } + + query.tags.map { "tag-" + tagSlug(it) } + val path = if (segments.isEmpty()) BASE else BASE + "/" + segments.joinToString("/") + path + ".xml" + if (page > 1) "?page=$page" else "" + } + + fun tagSlug(tag: String): String = tag.trim().lowercase().replace(Regex("[^a-z0-9]+"), "-").trim('-') + + /** Page [page] of [query]: the disk copy when it is fresh, otherwise the feed, one request at a time and spaced out. */ + fun page(context: Context, query: BrowseQuery, page: Int, force: Boolean = false): BrowsePage { + val app = context.applicationContext + val candidates = urls(query, page) + if (!force) for (url in candidates) { + val stored = read(app, url) ?: continue + return BrowsePage(stored, 200, true) + } + var code = 0 + for (url in candidates) { + val (status, body) = fetch(url) + code = status + if (status !in 200..299 || body == null) continue + val items = ItchShelves.parse(body) + StoresState.logLine("itch.io browse: $url answered $status with ${items.size} games") + if (items.isEmpty()) continue + write(app, url, items) + return BrowsePage(items, status, false) + } + StoresState.logLine("itch.io browse: ${candidates.first()} gave nothing (last status $code)") + return BrowsePage(emptyList(), code, false) + } + + private fun fetch(url: String): Pair { + synchronized(lock) { + pause() + var answer = ItchShelves.open(url) + if (answer.first == 429) { + StoresState.logLine("itch.io browse: 429, waiting before one more try") + Thread.sleep(RETRY_MS) + pause() + answer = ItchShelves.open(url) + } + lastRequestAt = System.currentTimeMillis() + return answer + } + } + + private fun pause() { + val gap = GAP_MS - (System.currentTimeMillis() - lastRequestAt) + if (gap > 0) Thread.sleep(gap) + } + + private fun file(context: Context, url: String): File { + val digest = MessageDigest.getInstance("SHA-1").digest(url.toByteArray()).joinToString("") { "%02x".format(it) } + return File(File(context.cacheDir, FOLDER), "$digest.json") + } + + private fun read(context: Context, url: String): List? { + val file = file(context, url) + if (!file.isFile || System.currentTimeMillis() - file.lastModified() > FRESH_MS) return null + return runCatching { ItchCatalog.list(JSONArray(file.readText())) }.getOrNull()?.takeIf { it.isNotEmpty() } + } + + private fun write(context: Context, url: String, items: List) { + val file = file(context, url) + runCatching { + file.parentFile?.mkdirs() + file.writeText(ItchCatalog.array(items).toString()) + } + } +} + +/** The Store tab's result list: the query, the games loaded so far, and whether more can be asked for. */ +internal object ItchBrowseState { + var query by mutableStateOf(BrowseQuery()) + private set + var items by mutableStateOf>(emptyList()) + private set + var loading by mutableStateOf(false) + private set + var ended by mutableStateOf(false) + private set + var failed by mutableStateOf(false) + private set + + private var next = 1 + private var generation = 0 + + /** Whether the tab shows these results instead of the front page shelves. */ + val active: Boolean get() = !query.isDefault + + fun choose(context: Context, wanted: BrowseQuery) { + if (wanted == query) return + generation++ + query = wanted + items = emptyList() + ended = false + failed = false + loading = false + next = 1 + if (active) more(context) + } + + fun more(context: Context) { + if (loading || ended || !active) return + loading = true + failed = false + val app = context.applicationContext + val mine = generation + val asked = query + val page = next + Thread({ + val answer = runCatching { ItchBrowse.page(app, asked, page) }.getOrNull() + StoresState.post { + if (mine != generation) return@post + loading = false + if (answer == null) { + failed = items.isEmpty() + ended = items.isNotEmpty() + return@post + } + if (answer.items.isEmpty()) { + failed = items.isEmpty() && answer.code !in 200..299 + ended = true + return@post + } + val known = items.mapTo(HashSet()) { it.id } + val fresh = answer.items.filter { known.add(it.id) } + if (fresh.isEmpty()) ended = true else { + items = items + fresh + next = page + 1 + } + } + }, "itch-browse").start() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchShelves.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchShelves.kt index 0fd783ed66..acf3324315 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchShelves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchShelves.kt @@ -108,7 +108,7 @@ internal object ItchShelves { return shelves.takeUnless { it.isEmpty } } - private fun open(url: String): Pair { + internal fun open(url: String): Pair { var conn: HttpURLConnection? = null return try { conn = (URL(url).openConnection() as HttpURLConnection).apply { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt new file mode 100644 index 0000000000..44852c4df8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -0,0 +1,107 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.horizontalScroll +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.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.selection.selectable +import androidx.compose.foundation.selection.selectableGroup +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.remember +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.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.itch.ItchBrowse +import com.droiddeck.launcher.stores.itch.ItchBrowseState + +/** Sort and price chips above the itch Store tab; picking anything but the defaults swaps the shelves for results. */ +@Composable +internal fun ItchBrowseBar() { + val ctx = LocalContext.current + val query = ItchBrowseState.query + Column(Modifier.fillMaxWidth().padding(top = 6.dp, bottom = 8.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + ChipRow { + for (sort in ItchBrowse.sorts) BrowseChip(sortLabel(sort), query.sort == sort) { ItchBrowseState.choose(ctx, query.copy(sort = sort)) } + } + ChipRow { + for (price in ItchBrowse.prices) BrowseChip(priceLabel(price), query.price == price) { ItchBrowseState.choose(ctx, query.copy(price = price)) } + } + } +} + +/** The end of the result list: it asks for the next page as it scrolls into view. */ +@Composable +internal fun ItchLoadMore() { + val ctx = LocalContext.current + val count = ItchBrowseState.items.size + LaunchedEffect(count) { ItchBrowseState.more(ctx) } + if (ItchBrowseState.loading) LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 12.dp)) + else if (!ItchBrowseState.ended && count > 0) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { + BrowseChip(stringResource(R.string.stores_itch_load_more), false) { ItchBrowseState.more(ctx) } + } +} + +@Composable +private fun ChipRow(content: @Composable () -> Unit) { + Row( + horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).selectableGroup(), + ) { content() } +} + +@Composable +private fun BrowseChip(label: String, selected: Boolean, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shape = RoundedCornerShape(8.dp) + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Text( + label, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, + color = if (selected) pal.onSignal else if (hot) colors.onBackground else colors.onSurfaceVariant, + modifier = Modifier.clip(shape).background(if (selected) pal.signal else colors.surfaceVariant) + .glideBorder(hot, shape, pal.signal) + .hoverable(src).selectable(selected = selected, interactionSource = src, indication = LocalIndication.current, role = Role.Tab, onClick = onClick) + .controllerConfirm(onClick = onClick) + .padding(horizontal = 12.dp, vertical = 7.dp), + ) +} + +@Composable +private fun sortLabel(sort: String): String = stringResource( + when (sort) { + ItchBrowse.SORT_NEW -> R.string.stores_itch_sort_new + ItchBrowse.SORT_TOP_RATED -> R.string.stores_itch_sort_top_rated + ItchBrowse.SORT_TOP_SELLERS -> R.string.stores_itch_sort_top_sellers + else -> R.string.stores_itch_sort_popular + }, +) + +@Composable +private fun priceLabel(price: String): String = stringResource( + when (price) { + ItchBrowse.PRICE_FREE -> R.string.stores_itch_price_free + ItchBrowse.PRICE_SALE -> R.string.stores_itch_price_sale + else -> R.string.stores_itch_price_any + }, +) 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 175cbecd85..3b70318edd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -145,6 +145,7 @@ import com.droiddeck.launcher.R import com.droiddeck.launcher.frontend.Library import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.itch.ItchBrowseState import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreTab import com.droiddeck.launcher.stores.StoresState @@ -954,7 +955,8 @@ private fun Storefront( val everything = remember(library, shelves, found) { (found + library + (shelves?.all ?: emptyList())).distinctBy { it.id } } LaunchedEffect(store, q) { StoresState.search(ctx, store, q) } val loaded = StoresState.library.containsKey(store) - val showGrid = tab != "store" || q.isNotEmpty() + val browsing = store == Store.ITCH && tab == "store" && q.isEmpty() && ItchBrowseState.active + val showGrid = tab != "store" || q.isNotEmpty() || browsing val sort = s.storesSort val lastPlayedFor = remember(s.steamGames) { val byKey = s.steamGames.associate { "${it.source}:${it.storeId}" to it.lastPlayed } @@ -967,8 +969,13 @@ private fun Storefront( lookup } val isSizeSort = tab == "library" && (sort == "sizeAsc" || sort == "sizeDesc") - val candidates = remember(library, everything, tab, q, s.storesShowMature) { - if (tab == "library") library.filter(::matches) else everything.filter { matches(it) && shown(it) } + val browseItems = if (browsing) ItchBrowseState.items else emptyList() + val candidates = remember(library, everything, tab, q, s.storesShowMature, browsing, browseItems) { + if (tab == "library") library.filter(::matches) + else if (browsing) { + val owned = library.associateBy { it.id } + browseItems.map { owned[it.id] ?: it }.filter(::shown) + } else everything.filter { matches(it) && shown(it) } } val candidateKeys = remember(candidates) { candidates.map { it.key } } var resolvedSizeSortKey by remember(store, tab) { mutableStateOf?>(null) } @@ -1006,6 +1013,8 @@ private fun Storefront( } val empty = stringResource(when { tab == "library" && library.isEmpty() && StoresState.status[store] != null -> R.string.stores_library_loading + browsing && ItchBrowseState.loading -> R.string.stores_shelves_loading + browsing && ItchBrowseState.failed -> R.string.stores_itch_browse_failed else -> R.string.stores_nothing_matches }) var firstPlaced = false @@ -1016,8 +1025,9 @@ private fun Storefront( // A bar only where the tab has nothing else on it: shelves, the shelf of owned games, or a grid still loading. val gridEmpty = if (showGrid) visible.isEmpty() else (shelves == null || shelves.isEmpty) && library.isEmpty() val barLine = StoresState.status[store]?.takeIf { gridEmpty && syncCount(it) != null } + val itchBar = store == Store.ITCH && tab == "store" && q.isEmpty() val headerItems = 1 + (if (sizeSortPending) 1 else 0) + (if (barLine != null) 1 else 0) + - (if (StoresState.problems[store] != null) 1 else 0) + (if (StoresState.problems[store] != null) 1 else 0) + (if (itchBar) 1 else 0) val listMode = s.storesView == "list" && tab == "library" val capsules = s.storesView == "capsules" && tab == "library" val tileWidth = if (capsules) CapsuleWidth else CardWidth @@ -1102,6 +1112,7 @@ private fun Storefront( } barLine?.let { line -> item(key = "sync", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { SyncBar(line) } } } StoresState.problems[store]?.let { line -> item(key = "problem", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { Box(Modifier.padding(bottom = 8.dp)) { Note(line) } } } } + if (itchBar) item(key = "itch-browse-bar", span = { GridItemSpan(maxLineSpan) }) { ItchBrowseBar() } when (tab) { "library" -> if (!loaded) Unit else if (split == 0) storeGrid(visible, empty, card) @@ -1112,8 +1123,10 @@ private fun Storefront( storeGrid(visible.drop(split), empty, card) } else -> { - if (q.isNotEmpty()) storeGrid(visible, empty, card) - else { + if (q.isNotEmpty() || browsing) { + storeGrid(visible, empty, card) + if (browsing) item(key = "itch-more", span = { GridItemSpan(maxLineSpan) }) { ItchLoadMore() } + } else { item(key = "shelves", span = { GridItemSpan(maxLineSpan) }) { Column { Shelf(stringResource(R.string.stores_shelf_new), shelf(shelves?.whatsNew), card) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 932827b750..3492498909 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2088,6 +2088,15 @@ لم يتم العثور على لعبة Windows في التنزيل تعذر استخراج التنزيل (رمز الخروج %1$d) لم يستجب itch.io + الأكثر شعبية + الجديد + الأعلى تقييمًا + الأكثر مبيعًا + أي سعر + مجاني + مخفّض + تحميل المزيد + تعذّر تحميل الألعاب من itch.io أرشيفات %1$s غير مدعومة استجاب itch.io بـ HTTP %1$d مجاني 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 411747242c..e2aec713e2 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2771,6 +2771,15 @@ No se encontró un juego de Windows en la descarga No se pudo extraer la descarga (salida %1$d) itch.io no respondió + Populares + Nuevos + Mejor valorados + Más vendidos + Cualquier precio + Gratis + En oferta + Cargar más + No se pudieron cargar los juegos de itch.io Los archivos %1$s no son compatibles itch.io respondió HTTP %1$d Cámaras Luma Ultra — Experimental diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 6eab6e3e52..6dd5993d7d 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2004,6 +2004,15 @@ В изтеглянето не е намерена игра за Windows Изтеглянето не можа да бъде разархивирано (код %1$d) itch.io не отговори + Популярни + Нови + Най-високо оценени + Най-продавани + Всякаква цена + Безплатни + С намаление + Зареди още + Игрите от itch.io не можаха да се заредят Архивите %1$s не се поддържат itch.io отговори HTTP %1$d Безплатна diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index ae2a289530..44a0d027dd 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2046,6 +2046,15 @@ Ve stahování nebyla nalezena hra pro Windows Stažený soubor nelze rozbalit (kód %1$d) itch.io neodpovědělo + Populární + Nové + Nejlépe hodnocené + Nejprodávanější + Jakákoli cena + Zdarma + Ve slevě + Načíst další + Hry z itch.io se nepodařilo načíst Archivy %1$s nejsou podporovány itch.io odpovědělo HTTP %1$d Zdarma diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 98d0bca466..a3b601a3d7 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2004,6 +2004,15 @@ Der blev ikke fundet et Windows-spil i downloaden Downloaden kunne ikke udpakkes (kode %1$d) itch.io svarede ikke + Populære + Nye + Bedst bedømte + Mest solgte + Alle priser + Gratis + På tilbud + Indlæs flere + Kunne ikke hente spil fra itch.io %1$s-arkiver understøttes ikke itch.io svarede HTTP %1$d Gratis diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1b0ae75cdf..3b8c8162d7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1996,6 +1996,15 @@ Im Download wurde kein Windows-Spiel gefunden Download konnte nicht entpackt werden (Code %1$d) itch.io hat nicht geantwortet + Beliebt + Neu + Bestbewertet + Meistverkauft + Beliebiger Preis + Kostenlos + Im Angebot + Mehr laden + Spiele von itch.io konnten nicht geladen werden %1$s-Archive werden nicht unterstützt itch.io antwortete mit HTTP %1$d Kostenlos diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 709eb2244f..ae4e0063dd 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2004,6 +2004,15 @@ Δεν βρέθηκε παιχνίδι Windows στη λήψη Δεν ήταν δυνατή η αποσυμπίεση της λήψης (κωδικός %1$d) Το itch.io δεν απάντησε + Δημοφιλή + Νέα + Κορυφαία βαθμολογία + Μπεστ σέλερ + Οποιαδήποτε τιμή + Δωρεάν + Σε προσφορά + Φόρτωση περισσότερων + Δεν ήταν δυνατή η φόρτωση παιχνιδιών από το itch.io Τα αρχεία %1$s δεν υποστηρίζονται Το itch.io απάντησε HTTP %1$d Δωρεάν diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 38019dade7..bc25285eab 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2027,6 +2027,15 @@ No se ha encontrado un juego de Windows en la descarga No se ha podido extraer la descarga (código %1$d) itch.io no respondió + Populares + Novedades + Mejor valorados + Más vendidos + Cualquier precio + Gratis + En oferta + Cargar más + No se pudieron cargar los juegos de itch.io Los archivos %1$s no son compatibles itch.io respondió HTTP %1$d Gratis diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 6aafc85b61..1555212462 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2004,6 +2004,15 @@ Latauksesta ei löytynyt Windows-peliä Latausta ei voitu purkaa (koodi %1$d) itch.io ei vastannut + Suositut + Uudet + Parhaiten arvioidut + Myydyimmät + Mikä tahansa hinta + Ilmaiset + Alennuksessa + Lataa lisää + Pelien lataaminen itch.io:sta epäonnistui %1$s-arkistot eivät ole tuettuja itch.io vastasi HTTP %1$d Ilmainen diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f345150b61..5f4354c2ee 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2027,6 +2027,15 @@ Aucun jeu Windows trouvé dans le téléchargement Impossible d\'extraire le téléchargement (code %1$d) itch.io n\'a pas répondu + Populaires + Nouveautés + Les mieux notés + Meilleures ventes + Tous les prix + Gratuits + En promotion + Charger plus + Impossible de charger les jeux d\'itch.io Les archives %1$s ne sont pas prises en charge itch.io a répondu HTTP %1$d Gratuit diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d74e5c0d63..e0dc7e02ce 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2004,6 +2004,15 @@ डाउनलोड में कोई Windows गेम नहीं मिला डाउनलोड एक्सट्रैक्ट नहीं हो सका (कोड %1$d) itch.io ने जवाब नहीं दिया + लोकप्रिय + नए + सबसे ऊँची रेटिंग + सबसे ज़्यादा बिकने वाले + कोई भी कीमत + मुफ़्त + सेल में + और लोड करें + itch.io से गेम लोड नहीं हो सके %1$s आर्काइव समर्थित नहीं हैं itch.io ने HTTP %1$d लौटाया फ़्री diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e8571e4927..59c1587ffd 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2004,6 +2004,15 @@ A letöltésben nem található Windows-játék A letöltés nem bontható ki (kód: %1$d) Az itch.io nem válaszolt + Népszerű + Új + Legjobbra értékelt + Legkelendőbb + Bármilyen ár + Ingyenes + Akciós + Továbbiak betöltése + Nem sikerült betölteni a játékokat az itch.io-ról A(z) %1$s archívumok nem támogatottak Az itch.io HTTP %1$d választ adott Ingyenes diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 80927811f0..73e4d0758a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1983,6 +1983,15 @@ Tidak ada game Windows di unduhan Tidak dapat mengekstrak unduhan (kode %1$d) itch.io tidak menjawab + Populer + Baru + Rating tertinggi + Terlaris + Harga apa saja + Gratis + Diskon + Muat lebih banyak + Tidak dapat memuat game dari itch.io Arsip %1$s tidak didukung itch.io menjawab HTTP %1$d Gratis diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e5aa836ade..d7d25d20ea 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2017,6 +2017,15 @@ Nessun gioco Windows trovato nel download Impossibile estrarre il download (codice %1$d) itch.io non ha risposto + Popolari + Novità + I più votati + I più venduti + Qualsiasi prezzo + Gratis + In offerta + Carica altri + Impossibile caricare i giochi da itch.io Gli archivi %1$s non sono supportati itch.io ha risposto HTTP %1$d Gratis diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 03e8ae2002..4c71bac1bf 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1985,6 +1985,15 @@ ダウンロードに Windows 版のゲームが見つかりません ダウンロードを展開できませんでした (終了コード %1$d) itch.io から応答がありません + 人気 + 新着 + 高評価 + 売れ筋 + すべての価格 + 無料 + セール中 + さらに読み込む + itch.io のゲームを読み込めませんでした %1$s 形式のアーカイブには対応していません itch.io が HTTP %1$d を返しました 無料 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 5096684e2c..ef455c2632 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1985,6 +1985,15 @@ 다운로드에서 Windows 게임을 찾을 수 없습니다 다운로드한 파일의 압축을 풀 수 없습니다(코드 %1$d) itch.io가 응답하지 않았습니다 + 인기 + 신규 + 평점 높은 순 + 베스트셀러 + 모든 가격 + 무료 + 할인 중 + 더 불러오기 + itch.io에서 게임을 불러오지 못했습니다 %1$s 압축 파일은 지원하지 않습니다 itch.io가 HTTP %1$d을(를) 반환했습니다 무료 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 82f9e7b2c2..f8ce63780e 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1983,6 +1983,15 @@ Tiada permainan Windows ditemui dalam muat turun Tidak dapat mengekstrak muat turun (kod %1$d) itch.io tidak menjawab + Popular + Baharu + Penilaian tertinggi + Terlaris + Sebarang harga + Percuma + Diskaun + Muat lagi + Tidak dapat memuatkan permainan daripada itch.io Arkib %1$s tidak disokong itch.io menjawab HTTP %1$d Percuma diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index af48f21a98..302f38673f 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2004,6 +2004,15 @@ Fant ikke noe Windows-spill i nedlastingen Kunne ikke pakke ut nedlastingen (kode %1$d) itch.io svarte ikke + Populære + Nye + Best vurdert + Mest solgt + Alle priser + Gratis + På salg + Last inn flere + Kunne ikke laste spill fra itch.io %1$s-arkiver støttes ikke itch.io svarte HTTP %1$d Gratis diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d591de6ddf..1b294f91a1 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2004,6 +2004,15 @@ Geen Windows-game gevonden in de download Download kan niet worden uitgepakt (code %1$d) itch.io gaf geen antwoord + Populair + Nieuw + Hoogst beoordeeld + Bestverkocht + Elke prijs + Gratis + In de aanbieding + Meer laden + Games van itch.io konden niet worden geladen %1$s-archieven worden niet ondersteund itch.io antwoordde HTTP %1$d Gratis diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b1cdccf7be..8b1057f1dc 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2046,6 +2046,15 @@ W pobranych plikach nie znaleziono gry na Windows Nie można rozpakować pobranego pliku (kod %1$d) itch.io nie odpowiedziało + Popularne + Nowe + Najwyżej oceniane + Najlepiej sprzedające się + Dowolna cena + Za darmo + Na wyprzedaży + Wczytaj więcej + Nie udało się wczytać gier z itch.io Archiwa %1$s nie są obsługiwane itch.io odpowiedziało HTTP %1$d Bezpłatna diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 0d5d739f32..d6cacfcb65 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2017,6 +2017,15 @@ Não foi encontrado nenhum jogo para Windows na transferência Não foi possível extrair a transferência (código %1$d) O itch.io não respondeu + Populares + Novos + Mais bem avaliados + Mais vendidos + Qualquer preço + Grátis + Em promoção + Carregar mais + Não foi possível carregar os jogos do itch.io Ficheiros %1$s não são suportados O itch.io respondeu HTTP %1$d Grátis diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3e5cd06e73..6db4712e69 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2017,6 +2017,15 @@ Nenhum jogo para Windows encontrado no download Não foi possível extrair o download (código %1$d) O itch.io não respondeu + Populares + Novos + Mais bem avaliados + Mais vendidos + Qualquer preço + Grátis + Em promoção + Carregar mais + Não foi possível carregar os jogos do itch.io Arquivos %1$s não são suportados O itch.io respondeu HTTP %1$d Grátis diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 60f025f872..6a818b9060 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2025,6 +2025,15 @@ Nu s-a găsit niciun joc Windows în descărcare Descărcarea nu a putut fi extrasă (cod %1$d) itch.io nu a răspuns + Populare + Noi + Cele mai bine cotate + Cele mai vândute + Orice preț + Gratuite + La reducere + Încarcă mai multe + Nu s-au putut încărca jocurile de pe itch.io Arhivele %1$s nu sunt acceptate itch.io a răspuns HTTP %1$d Gratuit diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 39582774ca..baedc0addc 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2048,6 +2048,15 @@ В загрузке не найдена игра для Windows Не удалось распаковать загрузку (код %1$d) itch.io не ответил + Популярные + Новые + С лучшими оценками + Бестселлеры + Любая цена + Бесплатные + Со скидкой + Загрузить ещё + Не удалось загрузить игры с itch.io Архивы %1$s не поддерживаются itch.io ответил HTTP %1$d Бесплатно diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d245c20a00..40e8f30019 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2004,6 +2004,15 @@ Inget Windows-spel hittades i nedladdningen Det gick inte att packa upp nedladdningen (kod %1$d) itch.io svarade inte + Populära + Nya + Högst betyg + Mest sålda + Alla priser + Gratis + På rea + Ladda fler + Det gick inte att läsa in spel från itch.io %1$s-arkiv stöds inte itch.io svarade HTTP %1$d Gratis diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index ae74b6e9f3..0bbbc29f94 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1983,6 +1983,15 @@ ไม่พบเกม Windows ในไฟล์ที่ดาวน์โหลด แตกไฟล์ที่ดาวน์โหลดไม่ได้ (รหัส %1$d) itch.io ไม่ตอบสนอง + ยอดนิยม + ใหม่ + คะแนนสูงสุด + ขายดี + ทุกราคา + ฟรี + ลดราคา + โหลดเพิ่มเติม + โหลดเกมจาก itch.io ไม่ได้ ไม่รองรับไฟล์ %1$s itch.io ตอบกลับ HTTP %1$d ฟรี diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 146f57d80c..1cee39be2e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1998,6 +1998,15 @@ İndirmede Windows oyunu bulunamadı İndirme ayıklanamadı (kod %1$d) itch.io yanıt vermedi + Popüler + Yeni + En yüksek puanlı + En çok satanlar + Herhangi bir fiyat + Ücretsiz + İndirimde + Daha fazla yükle + itch.io oyunları yüklenemedi %1$s arşivleri desteklenmiyor itch.io HTTP %1$d yanıtı verdi Ücretsiz diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5b8bfd4c43..2bb20ce206 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2046,6 +2046,15 @@ У завантаженні не знайдено гри для Windows Не вдалося розпакувати завантаження (код %1$d) itch.io не відповів + Популярні + Нові + З найвищими оцінками + Бестселери + Будь-яка ціна + Безкоштовні + Зі знижкою + Завантажити ще + Не вдалося завантажити ігри з itch.io Архіви %1$s не підтримуються itch.io відповів HTTP %1$d Безкоштовно diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 3effbb2a0f..44cec9e4d6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1983,6 +1983,15 @@ Không tìm thấy trò chơi Windows trong bản tải xuống Không thể giải nén bản tải xuống (mã %1$d) itch.io không phản hồi + Phổ biến + Mới + Đánh giá cao nhất + Bán chạy nhất + Mọi mức giá + Miễn phí + Đang giảm giá + Tải thêm + Không tải được game từ itch.io Không hỗ trợ tệp %1$s itch.io trả về HTTP %1$d Miễn phí diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d7c20634c3..3e526c9bdc 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2062,6 +2062,15 @@ 下载内容中未找到 Windows 游戏 无法解压下载内容(代码 %1$d) itch.io 没有响应 + 热门 + 最新 + 评分最高 + 热销 + 任意价格 + 免费 + 特价 + 加载更多 + 无法从 itch.io 加载游戏 不支持 %1$s 压缩包 itch.io 返回 HTTP %1$d 免费 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index e021df01e0..9762b520fd 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1986,6 +1986,15 @@ 下載內容中找不到 Windows 遊戲 無法解壓下載內容(代碼 %1$d) itch.io 沒有回應 + 熱門 + 最新 + 評分最高 + 熱賣 + 任何價格 + 免費 + 特價 + 載入更多 + 無法從 itch.io 載入遊戲 不支援 %1$s 壓縮檔 itch.io 回應 HTTP %1$d 免費 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 44e41ea6ab..c5535bea76 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1986,6 +1986,15 @@ 下載內容中找不到 Windows 遊戲 無法解壓縮下載內容(代碼 %1$d) itch.io 沒有回應 + 熱門 + 最新 + 評分最高 + 熱銷 + 任何價格 + 免費 + 特價 + 載入更多 + 無法從 itch.io 載入遊戲 不支援 %1$s 壓縮檔 itch.io 回應 HTTP %1$d 免費 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bbe2d6fc36..3c6a8f85d0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2081,6 +2081,15 @@ No Windows game found in the download Could not extract the download (exit %1$d) itch.io did not answer + Popular + New + Top rated + Top sellers + Any price + Free + On sale + Load more + Could not load games from itch.io %1$s archives are not supported itch.io answered HTTP %1$d Free diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt new file mode 100644 index 0000000000..c8df0bbbe6 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.stores.itch + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class ItchBrowseTest { + @Test fun theDefaultQueryIsTheFrontPage() { + assertTrue(BrowseQuery().isDefault) + assertFalse(BrowseQuery(sort = ItchBrowse.SORT_NEW).isDefault) + assertFalse(BrowseQuery(price = ItchBrowse.PRICE_FREE).isDefault) + } + + @Test fun sortsMapToTheirFeedPaths() { + assertEquals(listOf("https://itch.io/games.xml"), ItchBrowse.urls(BrowseQuery(), 1)) + assertEquals(listOf("https://itch.io/games/newest.xml"), ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_NEW), 1)) + assertEquals(listOf("https://itch.io/games/top-rated.xml"), ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_TOP_RATED), 1)) + assertEquals(listOf("https://itch.io/games/top-sellers.xml"), ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_TOP_SELLERS), 1)) + } + + @Test fun pagesAfterTheFirstCarryThePageNumber() { + assertEquals(listOf("https://itch.io/games/newest.xml?page=3"), ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_NEW), 3)) + } + + @Test fun aPriceFilterOffersEverySpellingInOrder() { + val free = ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_TOP_RATED, price = ItchBrowse.PRICE_FREE), 1) + assertEquals(listOf("https://itch.io/games/top-rated/free.xml", "https://itch.io/games/top-rated/price-free.xml"), free) + assertEquals(listOf("https://itch.io/games/on-sale.xml"), ItchBrowse.urls(BrowseQuery(price = ItchBrowse.PRICE_SALE), 1)) + } + + @Test fun platformsAndTagsFollowTheSortAndPriceInAFixedOrder() { + val query = BrowseQuery( + sort = ItchBrowse.SORT_NEW, price = ItchBrowse.PRICE_SALE, + platforms = setOf("web", "linux"), tags = listOf("Pixel Art", "Horror"), + ) + assertEquals( + listOf("https://itch.io/games/newest/on-sale/platform-linux/platform-web/tag-pixel-art/tag-horror.xml"), + ItchBrowse.urls(query, 1), + ) + } + + @Test fun tagsBecomeSlugs() { + assertEquals("pixel-art", ItchBrowse.tagSlug(" Pixel Art ")) + assertEquals("2d", ItchBrowse.tagSlug("2D")) + assertEquals("sci-fi", ItchBrowse.tagSlug("Sci-Fi!")) + } + + @Test fun theSamePlatformsInAnyOrderGiveTheSameUrl() { + val a = ItchBrowse.urls(BrowseQuery(platforms = setOf("web", "linux")), 1) + val b = ItchBrowse.urls(BrowseQuery(platforms = setOf("linux", "web")), 1) + assertEquals(a, b) + } +} diff --git a/docs/development/itch-browse.md b/docs/development/itch-browse.md new file mode 100644 index 0000000000..de5929afcf --- /dev/null +++ b/docs/development/itch-browse.md @@ -0,0 +1,30 @@ +# itch.io browsing + +The itch Store tab opens on the front page shelves. A row of chips above them (`ui/ItchBrowseBar.kt`) +sets an order (Popular, New, Top rated, Top sellers) and a price (Any, Free, On sale). Leave both at +their defaults and the shelves stay; pick anything else and the tab shows that query's games as a grid +that loads the next page as it scrolls into view. + +## Data + +`ItchBrowse` (`stores/itch/ItchBrowse.kt`) turns a `BrowseQuery` into itch's listing feed: + +``` +https://itch.io/games[/][/][/platform-...][/tag-...].xml[?page=N] +``` + +`BrowseQuery` already carries platforms and tags, so the URL builder is complete; the controls for them +come in a later change. A price filter has more than one spelling on itch, so `urls()` returns every +candidate and `page()` takes the first that answers with games. Every request is logged +(`itch.io browse: answered with games`), which is how a wrong guess is found and fixed +from a device. + +Requests go out one at a time, at least 1.2 s apart. A 429 waits 8 s and tries once more; if that fails +the games already on screen stay. Each page is kept under the app cache for three hours, so going back to +a query does not ask itch again. Results are parsed by `ItchShelves.parse`, the same reader the shelves +use, so a game looks the same wherever it appears. + +`ItchBrowseState` holds the query, the games loaded so far and whether more can be asked for. A newer +query bumps a generation counter, so a slow answer for an older one is dropped. A game already in the +library replaces its browse copy on the grid, so Install and the owned markers are right; the detail page +looks browse results up through `StoresState.detailItem`. From 473ac666b3ef461b5be0f0dc608a3f1052045b67 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 00:46:59 -0400 Subject: [PATCH 086/174] Take over Steam's Default startup movie pick --- .../droiddeck/launcher/session/BootMovie.kt | 12 ++++---- .../launcher/session/BootMovieLibrary.kt | 16 +++++++---- .../launcher/session/SessionFiles.kt | 6 ++-- .../launcher/session/BootMovieLibraryTest.kt | 28 +++++++++++++++++-- 4 files changed, 46 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt index 8267edd57a..953196900c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt @@ -51,7 +51,7 @@ object BootMovie { SessionPrefs.setBootMovieApplyNext(context, true) BootMovieReport.note(context, "picked $id here; Steam names ${SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context))}") // Whatever Steam names right now is about to be replaced, so it is not a pick to adopt later. - SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context))?.let { SessionPrefs.setBootMovieSteamSeen(context, it) } + SessionFiles.startupMovieLocalPath(BootMovieLibrary.steamConfig(context))?.let { SessionPrefs.setBootMovieSteamSeen(context, it) } } fun customName(context: Context): String? = @@ -167,10 +167,12 @@ object BootMovie { * that movie becomes the choice here. Steam already plays it, so nothing is staged over it. True when the choice changed. */ fun syncFromSteam(context: Context): Boolean { - val path = SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context)) ?: return false - if (path == SessionPrefs.bootMovieSteamSeen(context)) return false - SessionPrefs.setBootMovieSteamSeen(context, path) - if (path == SessionFiles.BOOT_MOVIE_PATH) return false + val named = SessionFiles.startupMovieLocalPath(BootMovieLibrary.steamConfig(context)) ?: return false + val seen = SessionPrefs.bootMovieSteamSeen(context) + if (named == seen) return false + SessionPrefs.setBootMovieSteamSeen(context, named) + if (named == SessionFiles.BOOT_MOVIE_PATH || (named.isEmpty() && seen == null)) return false + val path = named.ifEmpty { "/movies/steam_os_startup.webm" } val prefix = "/uioverrides/movies/" // The list names a bought movie from the Steam folder (/config/communityitemscache/...), Steam's config from its config folder. val id = if (path.startsWith(prefix)) BootMovieLibrary.idOf(path.removePrefix(prefix)) else { diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt index 7c125e8196..0dd7a0fadf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt @@ -79,8 +79,9 @@ object BootMovieLibrary { return customMovieDirs(context).map { File(it, name) }.firstOrNull { it.isFile && it.length() > 0L } } - private fun isMovie(file: File) = file.isFile && file.length() > 0L && file.name.endsWith(".webm", ignoreCase = true) && - file.name !in STAGED && !file.name.startsWith(".") + private fun isMovie(file: File) = isWebm(file) && file.name !in STAGED + + private fun isWebm(file: File) = file.isFile && file.length() > 0L && file.name.endsWith(".webm", ignoreCase = true) && !file.name.startsWith(".") private fun readMeta(context: Context): JSONObject = runCatching { JSONObject(metaFile(context).readText()) }.getOrDefault(JSONObject()) @@ -136,7 +137,7 @@ object BootMovieLibrary { } val bought = HashMap() for (root in steamRoots(context)) { - File(root, "steamui/movies").listFiles { f -> isMovie(f) && f.nameWithoutExtension.lowercase() in NATIVE }.orEmpty() + File(root, "steamui/movies").listFiles { f -> isWebm(f) && f.nameWithoutExtension.lowercase() in NATIVE }.orEmpty() .sortedBy { it.name.lowercase() }.forEach { steam.putIfAbsent(STEAM_PREFIX + "/movies/" + it.name, it) } val scan = pointShopMovies(root) bought.putAll(scan.titles) @@ -144,8 +145,8 @@ object BootMovieLibrary { } val seen = HashSet() for ((id, file) in steam) { - if (file.name in STAGED || !seen.add(file.canonicalPath)) continue val native = file.nameWithoutExtension.lowercase() in NATIVE + if ((file.name in STAGED && !native) || !seen.add(file.canonicalPath)) continue // Steam names a bought movie by an item number and a hash; the points shop's own title is shown when Steam has it. val title = if (native) NATIVE[file.nameWithoutExtension.lowercase()] ?: file.nameWithoutExtension else bought[file.path] ?: boughtId(file)?.let { "#$it" } ?: file.nameWithoutExtension out.add(Entry(id, title, if (native) SOURCE_STEAM else SOURCE_POINTSHOP, file, removable = false)) @@ -153,8 +154,11 @@ object BootMovieLibrary { return out } - /** The three startup movies Steam ships with; Steam's movies folder holds many more videos that are not startup movies. */ - private val NATIVE = mapOf("deck_startup" to "Deck startup", "oled_startup" to "Oled startup", "startup_machine" to "Machine startup") + /** The four startup movies Steam ships with; Steam's movies folder holds many more videos that are not startup movies. */ + private val NATIVE = mapOf( + "deck_startup" to "Deck startup", "oled_startup" to "Oled startup", "startup_machine" to "Machine startup", + "steam_os_startup" to "SteamOS startup", + ) private val skippedFolders = setOf("uioverrides", "steamapps", "librarycache", "httpcache", "logs", "compatdata", "shadercache") 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 4824a44424..8cd846513d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -390,10 +390,12 @@ object SessionFiles { private fun activeStartupMovie(text: String): VdfBlock? = customizationMovie(text) ?: olderMovie(text) /** The movie Steam's config selects, as a path like `/uioverrides/movies/x.webm`; null when none is named. */ - internal fun startupMoviePath(config: File): String? { + internal fun startupMoviePath(config: File): String? = startupMovieLocalPath(config)?.takeIf { it.isNotEmpty() } + + internal fun startupMovieLocalPath(config: File): String? { val text = runCatching { config.readText() }.getOrNull() ?: return null val movie = activeStartupMovie(text) ?: return null - return scalar(text.substring(movie.keyStart, movie.close + 1), "LocalPath")?.takeIf { it.isNotEmpty() } + return scalar(text.substring(movie.keyStart, movie.close + 1), "LocalPath") } /** Both `StartupMovie` sections of Steam's config as written there, for the report; null when there is none. */ diff --git a/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt index ca68f58678..2c1d90ca0c 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt @@ -178,17 +178,39 @@ class BootMovieLibraryTest { assertNull(SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(app))) } - @Test fun onlyTheThreeStartupMoviesOfSteamAreListed() { - listOf("deck_startup", "oled_startup", "startup_machine", "controller_generic_thumbstick_move").forEach { + @Test fun onlyTheStartupMoviesOfSteamAreListed() { + listOf("deck_startup", "oled_startup", "startup_machine", "steam_os_startup", "controller_generic_thumbstick_move").forEach { File(BootMovieLibrary.steamRoot(app), "steamui/movies/$it.webm").also { f -> f.parentFile!!.mkdirs(); f.writeText("movie") } } val ids = BootMovieLibrary.list(app).map { it.id }.filter { it.startsWith("steam:") } assertEquals( - listOf("steam:/movies/deck_startup.webm", "steam:/movies/oled_startup.webm", "steam:/movies/startup_machine.webm"), + listOf( + "steam:/movies/deck_startup.webm", "steam:/movies/oled_startup.webm", "steam:/movies/startup_machine.webm", + "steam:/movies/steam_os_startup.webm", + ), ids.sorted(), ) } + @Test fun steamsDefaultPickIsTakenOverAsItsOwnStartupMovie() { + val native = File(BootMovieLibrary.steamRoot(app), "steamui/movies/steam_os_startup.webm").also { it.parentFile!!.mkdirs(); it.writeText("movie") } + movie("a.webm") + steamPicksAt(SessionFiles.BOOT_MOVIE_PATH) + BootMovie.select(app, "file:a.webm") + steamPicksAt("") + assertTrue(BootMovie.syncFromSteam(app)) + assertEquals("steam:/movies/steam_os_startup.webm", BootMovie.choice(app)) + assertEquals(native, BootMovie.currentFile(app)) + assertFalse(BootMovie.syncFromSteam(app)) + } + + @Test fun anEmptySteamPickThatWasNeverSeenChangesNothing() { + File(BootMovieLibrary.steamRoot(app), "steamui/movies/steam_os_startup.webm").also { it.parentFile!!.mkdirs(); it.writeText("movie") } + steamPicksAt("") + assertFalse(BootMovie.syncFromSteam(app)) + assertEquals(BootMovie.DROIDDECK_30, BootMovie.choice(app)) + } + @Test fun aMovieBoughtInThePointsShopIsListedAndAdopted() { val file = File(BootMovieLibrary.steamRoot(app), "appcache/startupmovies/Bought.webm").also { it.parentFile!!.mkdirs(); it.writeText("movie") } val entry = BootMovieLibrary.list(app).first { it.id == "steam:/appcache/startupmovies/Bought.webm" } From 8c86b718a0694d5f562d06627d3355e15dc64637 Mon Sep 17 00:00:00 2001 From: Nikolay Nadorichev Date: Fri, 23 Oct 2026 15:59:59 +0300 Subject: [PATCH 087/174] fix: find the signed-in Steam account when loginusers.vdf has no MostRecent droiddeck-steam-shortcuts and AddedGames.accountConfig took the account marked "MostRecent" in loginusers.vdf, else the only userdata folder. The arm64 client here writes no MostRecent, so with two accounts in one install nothing was picked: no added or store game reached shortcuts.vdf ("no signed-in account yet; nothing written") and Steam answered their launch with "App configuration unavailable". Without MostRecent, take the account marked AutoLogin, then the one with the latest timestamp. Both sides use the same order so the app reads the config the guest script writes. --- .../droiddeck/launcher/frontend/AddedGames.kt | 13 ++++-- .../frontend/AddedGamesAccountTest.kt | 43 +++++++++++++++++++ .../usr/local/bin/droiddeck-steam-shortcuts | 13 ++++-- tools/tests/test_steam_shortcuts.py | 24 +++++++++++ 4 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesAccountTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index 2a83d57e5b..93ddf80ed1 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -387,11 +387,18 @@ object AddedGames { } } + private class LoginUser(val id: String, val mostRecent: Boolean, val autoLogin: Boolean, val timestamp: Long) + + /** The signed-in account's config, chosen as droiddeck-steam-shortcuts chooses it: MostRecent, else AutoLogin, else the latest timestamp. */ internal fun accountConfig(root: File): File? { val users = runCatching { File(root, "config/loginusers.vdf").readText() }.getOrDefault("") - val recent = Regex(""""(\d{5,})"\s*\{([^}]*)\}""").findAll(users) - .lastOrNull { Regex(""""MostRecent"\s*"1"""").containsMatchIn(it.groupValues[2]) } - val account = recent?.groupValues?.get(1)?.toLongOrNull()?.let { (it - 76561197960265728L).toString() } + val recent = Regex(""""(\d{5,})"\s*\{([^}]*)\}""").findAll(users).map { + val body = it.groupValues[2] + LoginUser(it.groupValues[1], Regex(""""MostRecent"\s*"1"""").containsMatchIn(body), Regex(""""AutoLogin"\s*"1"""").containsMatchIn(body), + Regex(""""timestamp"\s*"(\d+)"""").find(body)?.groupValues?.get(1)?.toLongOrNull() ?: 0L) + }.filter { it.mostRecent || it.autoLogin || it.timestamp > 0 }.toList().asReversed() + .maxWithOrNull(compareBy({ it.mostRecent }, { it.autoLogin }, { it.timestamp })) + val account = recent?.id?.toLongOrNull()?.let { (it - 76561197960265728L).toString() } ?: File(root, "userdata").list()?.filter { it.isNotEmpty() && it.all(Char::isDigit) && it != "0" }?.singleOrNull() return account?.let { File(root, "userdata/$it/config") } } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesAccountTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesAccountTest.kt new file mode 100644 index 0000000000..610f00bb4e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesAccountTest.kt @@ -0,0 +1,43 @@ +package com.droiddeck.launcher.frontend + +import java.io.File +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class AddedGamesAccountTest { + @get:Rule val tmp = TemporaryFolder() + + private fun steamRoot(vararg blocks: Pair>): File = tmp.newFolder("Steam").also { root -> + File(root, "config").mkdirs() + File(root, "userdata/123/config").mkdirs() + File(root, "userdata/456/config").mkdirs() + val body = blocks.joinToString("") { (account, keys) -> + "\t\"${76561197960265728L + account}\"\n\t{\n" + keys.entries.joinToString("") { "\t\t\"${it.key}\"\t\t\"${it.value}\"\n" } + "\t}\n" + } + File(root, "config/loginusers.vdf").writeText("\"users\"\n{\n$body}\n") + } + + @Test fun theAccountMarkedMostRecentIsUsed() { + val root = steamRoot(123L to mapOf("MostRecent" to "1", "AutoLogin" to "0", "timestamp" to "100"), + 456L to mapOf("MostRecent" to "0", "AutoLogin" to "1", "timestamp" to "200")) + assertEquals(File(root, "userdata/123/config"), AddedGames.accountConfig(root)) + } + + @Test fun withoutMostRecentTheAccountThatSignsInIsUsed() { + val root = steamRoot(123L to mapOf("AutoLogin" to "1", "timestamp" to "100"), 456L to mapOf("AutoLogin" to "0", "timestamp" to "200")) + assertEquals(File(root, "userdata/123/config"), AddedGames.accountConfig(root)) + } + + @Test fun withoutEitherMarkTheAccountUsedLastIsUsed() { + val root = steamRoot(456L to mapOf("AutoLogin" to "0", "timestamp" to "100"), 123L to mapOf("AutoLogin" to "0", "timestamp" to "200")) + assertEquals(File(root, "userdata/123/config"), AddedGames.accountConfig(root)) + } + + @Test fun twoAccountsWithoutAnyMarkGiveNoAccount() { + val root = steamRoot(123L to mapOf("AccountName" to "a"), 456L to mapOf("AccountName" to "b")) + assertNull(AddedGames.accountConfig(root)) + } +} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts index 3764e4a92c..68cf8f775b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts @@ -16,15 +16,20 @@ TAG = "droiddeck-app" def account_dir(steam_root): - """The most recent account's userdata folder, else the only one that is not 0.""" + """The signed-in account's userdata folder, else the only one that is not 0. Clients that do not + write MostRecent still mark that account AutoLogin; the latest timestamp breaks the remaining ties.""" users = os.path.join(steam_root, "config", "loginusers.vdf") - recent = None + recent, best = None, None try: with open(users, encoding="utf-8", errors="replace") as f: text = f.read() for block in re.finditer(r'"(\d{5,})"\s*\{([^}]*)\}', text): - if re.search(r'"MostRecent"\s*"1"', block.group(2)): - recent = int(block.group(1)) + stamp = re.search(r'"timestamp"\s*"(\d+)"', block.group(2)) + rank = (bool(re.search(r'"MostRecent"\s*"1"', block.group(2))), + bool(re.search(r'"AutoLogin"\s*"1"', block.group(2))), + int(stamp.group(1)) if stamp else 0) + if any(rank) and (best is None or rank >= best): + recent, best = int(block.group(1)), rank except OSError: pass userdata = os.path.join(steam_root, "userdata") diff --git a/tools/tests/test_steam_shortcuts.py b/tools/tests/test_steam_shortcuts.py index 60a2998a60..a927d4db07 100644 --- a/tools/tests/test_steam_shortcuts.py +++ b/tools/tests/test_steam_shortcuts.py @@ -203,6 +203,30 @@ class ShortcutsTest(unittest.TestCase): self.assertEqual('-vulkan', steam['LaunchOptions']) self.assertEqual('Mine', steam['AppName']) + def users(self, *blocks): + body = ''.join('\t"%d"\n\t{\n%s\t}\n' % (76561197960265728 + acct, ''.join('\t\t"%s"\t\t"%s"\n' % kv for kv in keys.items())) + for acct, keys in blocks) + (self.steam / 'config').mkdir(exist_ok=True) + (self.steam / 'config/loginusers.vdf').write_text('"users"\n{\n%s}\n' % body) + (self.steam / 'userdata/456/config').mkdir(parents=True, exist_ok=True) + + def test_the_account_marked_most_recent_is_used(self): + self.users((123, dict(MostRecent='1', AutoLogin='0', timestamp='100')), (456, dict(MostRecent='0', AutoLogin='1', timestamp='200'))) + self.assertEqual(str(self.steam / 'userdata/123'), shortcuts.account_dir(str(self.steam))) + + def test_without_most_recent_the_account_that_signs_in_is_used(self): + self.users((123, dict(AutoLogin='1', timestamp='100')), (456, dict(AutoLogin='0', timestamp='200'))) + self.assertEqual(str(self.steam / 'userdata/123'), shortcuts.account_dir(str(self.steam))) + self.assertIn(APPID, self.run_writer(self.game())) + + def test_without_either_mark_the_account_used_last_is_used(self): + self.users((456, dict(AutoLogin='0', timestamp='100')), (123, dict(AutoLogin='0', timestamp='200'))) + self.assertEqual(str(self.steam / 'userdata/123'), shortcuts.account_dir(str(self.steam))) + + def test_two_accounts_without_any_mark_write_nothing(self): + self.users((123, dict(AccountName='a')), (456, dict(AccountName='b'))) + self.assertIsNone(shortcuts.account_dir(str(self.steam))) + def test_an_older_record_without_launch_options_still_takes_the_apps(self): self.run_writer(self.game()) record = self.record() From 476642be7168a1c9e872b8644231c68b52b1d100 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 00:11:55 -0400 Subject: [PATCH 088/174] chore: drop the added comments --- .../main/java/com/droiddeck/launcher/frontend/AddedGames.kt | 1 - tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index 93ddf80ed1..340bc83ce0 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -389,7 +389,6 @@ object AddedGames { private class LoginUser(val id: String, val mostRecent: Boolean, val autoLogin: Boolean, val timestamp: Long) - /** The signed-in account's config, chosen as droiddeck-steam-shortcuts chooses it: MostRecent, else AutoLogin, else the latest timestamp. */ internal fun accountConfig(root: File): File? { val users = runCatching { File(root, "config/loginusers.vdf").readText() }.getOrDefault("") val recent = Regex(""""(\d{5,})"\s*\{([^}]*)\}""").findAll(users).map { diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts index 68cf8f775b..0910cf6faf 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts @@ -16,8 +16,7 @@ TAG = "droiddeck-app" def account_dir(steam_root): - """The signed-in account's userdata folder, else the only one that is not 0. Clients that do not - write MostRecent still mark that account AutoLogin; the latest timestamp breaks the remaining ties.""" + """The most recent account's userdata folder, else the only one that is not 0.""" users = os.path.join(steam_root, "config", "loginusers.vdf") recent, best = None, None try: From dbcbf0b6fa17ed2042dc8c32902a59edcc1ed971 Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Sat, 24 Oct 2026 09:27:49 +0300 Subject: [PATCH 089/174] itch.io browse: use itch's own sort, price and platform paths The sort and price chips now cover everything itch's browse page offers, with the paths copied from its links: new-and-popular, top-sellers, top-rated and newest for sorts; free, on-sale, store, 5-dollars-or-less and 15-dollars-or-less for prices; platform-windows, -osx, -linux, -android, -ios, -web and -mobile-web. The guessed alternative spelling of the free filter is gone, so a query is one address. The tests assert the addresses itch itself uses. New and reworded strings in all 33 locales. --- .../launcher/stores/itch/ItchBrowse.kt | 69 ++++++++----------- .../droiddeck/launcher/ui/ItchBrowseBar.kt | 8 ++- app/src/main/res/values-ar/strings.xml | 6 +- app/src/main/res/values-b+es+419/strings.xml | 6 +- app/src/main/res/values-bg/strings.xml | 6 +- app/src/main/res/values-cs/strings.xml | 6 +- app/src/main/res/values-da/strings.xml | 6 +- app/src/main/res/values-de/strings.xml | 6 +- app/src/main/res/values-el/strings.xml | 6 +- app/src/main/res/values-es/strings.xml | 6 +- app/src/main/res/values-fi/strings.xml | 6 +- app/src/main/res/values-fr/strings.xml | 6 +- app/src/main/res/values-hi/strings.xml | 6 +- app/src/main/res/values-hu/strings.xml | 6 +- app/src/main/res/values-in/strings.xml | 6 +- app/src/main/res/values-it/strings.xml | 6 +- app/src/main/res/values-ja/strings.xml | 6 +- app/src/main/res/values-ko/strings.xml | 6 +- app/src/main/res/values-ms/strings.xml | 6 +- app/src/main/res/values-nb/strings.xml | 6 +- app/src/main/res/values-nl/strings.xml | 6 +- app/src/main/res/values-pl/strings.xml | 6 +- app/src/main/res/values-pt-rPT/strings.xml | 6 +- app/src/main/res/values-pt/strings.xml | 6 +- app/src/main/res/values-ro/strings.xml | 6 +- app/src/main/res/values-ru/strings.xml | 6 +- app/src/main/res/values-sv/strings.xml | 6 +- app/src/main/res/values-th/strings.xml | 6 +- app/src/main/res/values-tr/strings.xml | 6 +- app/src/main/res/values-uk/strings.xml | 6 +- app/src/main/res/values-vi/strings.xml | 6 +- app/src/main/res/values-zh-rCN/strings.xml | 6 +- app/src/main/res/values-zh-rHK/strings.xml | 6 +- app/src/main/res/values-zh-rTW/strings.xml | 6 +- app/src/main/res/values/strings.xml | 6 +- .../launcher/stores/itch/ItchBrowseTest.kt | 65 +++++++++-------- docs/development/itch-browse.md | 10 +-- 37 files changed, 244 insertions(+), 106 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt index ba0d2e88c0..d64855f508 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt @@ -24,15 +24,22 @@ internal class BrowsePage(val items: List, val code: Int, val cache internal object ItchBrowse { const val SORT_POPULAR = "popular" - const val SORT_NEW = "new" - const val SORT_TOP_RATED = "top-rated" + const val SORT_NEW_POPULAR = "new-and-popular" const val SORT_TOP_SELLERS = "top-sellers" - val sorts = listOf(SORT_POPULAR, SORT_NEW, SORT_TOP_RATED, SORT_TOP_SELLERS) + const val SORT_TOP_RATED = "top-rated" + const val SORT_NEWEST = "newest" + val sorts = listOf(SORT_POPULAR, SORT_NEW_POPULAR, SORT_TOP_SELLERS, SORT_TOP_RATED, SORT_NEWEST) const val PRICE_ANY = "any" const val PRICE_FREE = "free" - const val PRICE_SALE = "sale" - val prices = listOf(PRICE_ANY, PRICE_FREE, PRICE_SALE) + const val PRICE_SALE = "on-sale" + const val PRICE_PAID = "store" + const val PRICE_UNDER_5 = "5-dollars-or-less" + const val PRICE_UNDER_15 = "15-dollars-or-less" + val prices = listOf(PRICE_ANY, PRICE_FREE, PRICE_SALE, PRICE_PAID, PRICE_UNDER_5, PRICE_UNDER_15) + + /** Platform names as itch spells them in `platform-`. */ + val platformNames = listOf("windows", "osx", "linux", "android", "ios", "web", "mobile-web") private const val BASE = "https://itch.io/games" private const val FRESH_MS = 3 * 60 * 60 * 1000L @@ -43,52 +50,34 @@ internal object ItchBrowse { @Volatile private var lastRequestAt = 0L private val lock = Any() - private fun sortSegment(sort: String): String? = when (sort) { - SORT_NEW -> "newest" - SORT_TOP_RATED -> "top-rated" - SORT_TOP_SELLERS -> "top-sellers" - else -> null - } + /** The path piece itch uses for each choice; the default sort and price have none. */ + private fun sortSegment(sort: String): String? = sort.takeIf { it != SORT_POPULAR && it in sorts } - /** The ways itch spells a price filter; the first that answers is used, so one wrong guess does not empty the tab. */ - private fun priceSegments(price: String): List = when (price) { - PRICE_FREE -> listOf("free", "price-free") - PRICE_SALE -> listOf("on-sale") - else -> listOf(null) - } + private fun priceSegment(price: String): String? = price.takeIf { it != PRICE_ANY && it in prices } - /** Every feed URL that could answer [query] for [page], most likely first. */ - fun urls(query: BrowseQuery, page: Int): List = priceSegments(query.price).map { price -> - val segments = listOfNotNull(sortSegment(query.sort), price) + + /** The address of [query]'s page on itch: sort, price, platforms, then tags, as itch's own links spell them. */ + fun path(query: BrowseQuery): String { + val segments = listOfNotNull(sortSegment(query.sort), priceSegment(query.price)) + query.platforms.sorted().map { "platform-$it" } + query.tags.map { "tag-" + tagSlug(it) } - val path = if (segments.isEmpty()) BASE else BASE + "/" + segments.joinToString("/") - path + ".xml" + if (page > 1) "?page=$page" else "" + return if (segments.isEmpty()) BASE else BASE + "/" + segments.joinToString("/") } + /** The listing feed for [query]'s [page]. */ + fun url(query: BrowseQuery, page: Int): String = path(query) + ".xml" + if (page > 1) "?page=$page" else "" + fun tagSlug(tag: String): String = tag.trim().lowercase().replace(Regex("[^a-z0-9]+"), "-").trim('-') /** Page [page] of [query]: the disk copy when it is fresh, otherwise the feed, one request at a time and spaced out. */ fun page(context: Context, query: BrowseQuery, page: Int, force: Boolean = false): BrowsePage { val app = context.applicationContext - val candidates = urls(query, page) - if (!force) for (url in candidates) { - val stored = read(app, url) ?: continue - return BrowsePage(stored, 200, true) - } - var code = 0 - for (url in candidates) { - val (status, body) = fetch(url) - code = status - if (status !in 200..299 || body == null) continue - val items = ItchShelves.parse(body) - StoresState.logLine("itch.io browse: $url answered $status with ${items.size} games") - if (items.isEmpty()) continue - write(app, url, items) - return BrowsePage(items, status, false) - } - StoresState.logLine("itch.io browse: ${candidates.first()} gave nothing (last status $code)") - return BrowsePage(emptyList(), code, false) + val url = url(query, page) + if (!force) read(app, url)?.let { return BrowsePage(it, 200, true) } + val (status, body) = fetch(url) + val items = if (status in 200..299 && body != null) ItchShelves.parse(body) else emptyList() + StoresState.logLine("itch.io browse: $url answered $status with ${items.size} games") + if (items.isNotEmpty()) write(app, url, items) + return BrowsePage(items, status, false) } private fun fetch(url: String): Pair { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt index 44852c4df8..896d1b37f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -90,9 +90,10 @@ private fun BrowseChip(label: String, selected: Boolean, onClick: () -> Unit) { @Composable private fun sortLabel(sort: String): String = stringResource( when (sort) { - ItchBrowse.SORT_NEW -> R.string.stores_itch_sort_new - ItchBrowse.SORT_TOP_RATED -> R.string.stores_itch_sort_top_rated + ItchBrowse.SORT_NEW_POPULAR -> R.string.stores_itch_sort_new_popular ItchBrowse.SORT_TOP_SELLERS -> R.string.stores_itch_sort_top_sellers + ItchBrowse.SORT_TOP_RATED -> R.string.stores_itch_sort_top_rated + ItchBrowse.SORT_NEWEST -> R.string.stores_itch_sort_new else -> R.string.stores_itch_sort_popular }, ) @@ -102,6 +103,9 @@ private fun priceLabel(price: String): String = stringResource( when (price) { ItchBrowse.PRICE_FREE -> R.string.stores_itch_price_free ItchBrowse.PRICE_SALE -> R.string.stores_itch_price_sale + ItchBrowse.PRICE_PAID -> R.string.stores_itch_price_paid + ItchBrowse.PRICE_UNDER_5 -> R.string.stores_itch_price_under_5 + ItchBrowse.PRICE_UNDER_15 -> R.string.stores_itch_price_under_15 else -> R.string.stores_itch_price_any }, ) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 3492498909..e183c155c5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2089,7 +2089,11 @@ تعذر استخراج التنزيل (رمز الخروج %1$d) لم يستجب itch.io الأكثر شعبية - الجديد + الأحدث + جديد ورائج + مدفوع + 5 دولارات أو أقل + 15 دولارًا أو أقل الأعلى تقييمًا الأكثر مبيعًا أي سعر 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 e2aec713e2..6ecfbabd88 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2772,7 +2772,11 @@ No se pudo extraer la descarga (salida %1$d) itch.io no respondió Populares - Nuevos + Más recientes + Nuevos y populares + De pago + $5 o menos + $15 o menos Mejor valorados Más vendidos Cualquier precio diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 6dd5993d7d..f2f5d740d9 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2005,7 +2005,11 @@ Изтеглянето не можа да бъде разархивирано (код %1$d) itch.io не отговори Популярни - Нови + Най-нови + Нови и популярни + Платени + До $5 + До $15 Най-високо оценени Най-продавани Всякаква цена diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 44a0d027dd..595045bfe5 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2047,7 +2047,11 @@ Stažený soubor nelze rozbalit (kód %1$d) itch.io neodpovědělo Populární - Nové + Nejnovější + Nové a populární + Placené + Do $5 + Do $15 Nejlépe hodnocené Nejprodávanější Jakákoli cena diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index a3b601a3d7..6ae7e6ef0d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2005,7 +2005,11 @@ Downloaden kunne ikke udpakkes (kode %1$d) itch.io svarede ikke Populære - Nye + Seneste + Nye og populære + Betalt + $5 eller mindre + $15 eller mindre Bedst bedømte Mest solgte Alle priser diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3b8c8162d7..37bbd2e361 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1997,7 +1997,11 @@ Download konnte nicht entpackt werden (Code %1$d) itch.io hat nicht geantwortet Beliebt - Neu + Neueste + Neu und beliebt + Kostenpflichtig + 5 $ oder weniger + 15 $ oder weniger Bestbewertet Meistverkauft Beliebiger Preis diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index ae4e0063dd..cfdd79e025 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2005,7 +2005,11 @@ Δεν ήταν δυνατή η αποσυμπίεση της λήψης (κωδικός %1$d) Το itch.io δεν απάντησε Δημοφιλή - Νέα + Πιο πρόσφατα + Νέα και δημοφιλή + Επί πληρωμή + $5 ή λιγότερο + $15 ή λιγότερο Κορυφαία βαθμολογία Μπεστ σέλερ Οποιαδήποτε τιμή diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bc25285eab..b1d492c4be 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2028,7 +2028,11 @@ No se ha podido extraer la descarga (código %1$d) itch.io no respondió Populares - Novedades + Más recientes + Nuevos y populares + De pago + 5 $ o menos + 15 $ o menos Mejor valorados Más vendidos Cualquier precio diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 1555212462..3bcb194b94 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2005,7 +2005,11 @@ Latausta ei voitu purkaa (koodi %1$d) itch.io ei vastannut Suositut - Uudet + Uusimmat + Uudet ja suositut + Maksulliset + Enintään 5 $ + Enintään 15 $ Parhaiten arvioidut Myydyimmät Mikä tahansa hinta diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5f4354c2ee..3d2e421738 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2028,7 +2028,11 @@ Impossible d\'extraire le téléchargement (code %1$d) itch.io n\'a pas répondu Populaires - Nouveautés + Plus récents + Nouveautés populaires + Payants + 5 $ ou moins + 15 $ ou moins Les mieux notés Meilleures ventes Tous les prix diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index e0dc7e02ce..3635c47b51 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2005,7 +2005,11 @@ डाउनलोड एक्सट्रैक्ट नहीं हो सका (कोड %1$d) itch.io ने जवाब नहीं दिया लोकप्रिय - नए + सबसे हाल के + नए और लोकप्रिय + सशुल्क + $5 या कम + $15 या कम सबसे ऊँची रेटिंग सबसे ज़्यादा बिकने वाले कोई भी कीमत diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 59c1587ffd..26681d702c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2005,7 +2005,11 @@ A letöltés nem bontható ki (kód: %1$d) Az itch.io nem válaszolt Népszerű - Új + Legfrissebb + Új és népszerű + Fizetős + Legfeljebb 5 $ + Legfeljebb 15 $ Legjobbra értékelt Legkelendőbb Bármilyen ár diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 73e4d0758a..30d3ffddb4 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1984,7 +1984,11 @@ Tidak dapat mengekstrak unduhan (kode %1$d) itch.io tidak menjawab Populer - Baru + Terbaru + Baru dan populer + Berbayar + $5 atau kurang + $15 atau kurang Rating tertinggi Terlaris Harga apa saja diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d7d25d20ea..e0f8dcff02 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2018,7 +2018,11 @@ Impossibile estrarre il download (codice %1$d) itch.io non ha risposto Popolari - Novità + Più recenti + Nuovi e popolari + A pagamento + 5 $ o meno + 15 $ o meno I più votati I più venduti Qualsiasi prezzo diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 4c71bac1bf..13b5330173 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1986,7 +1986,11 @@ ダウンロードを展開できませんでした (終了コード %1$d) itch.io から応答がありません 人気 - 新着 + 新着順 + 新着&人気 + 有料 + 5ドル以下 + 15ドル以下 高評価 売れ筋 すべての価格 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ef455c2632..082d66e92c 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1986,7 +1986,11 @@ 다운로드한 파일의 압축을 풀 수 없습니다(코드 %1$d) itch.io가 응답하지 않았습니다 인기 - 신규 + 최신순 + 신규 및 인기 + 유료 + $5 이하 + $15 이하 평점 높은 순 베스트셀러 모든 가격 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index f8ce63780e..542c2dd34f 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1984,7 +1984,11 @@ Tidak dapat mengekstrak muat turun (kod %1$d) itch.io tidak menjawab Popular - Baharu + Terkini + Baharu dan popular + Berbayar + $5 atau kurang + $15 atau kurang Penilaian tertinggi Terlaris Sebarang harga diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 302f38673f..475da964da 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2005,7 +2005,11 @@ Kunne ikke pakke ut nedlastingen (kode %1$d) itch.io svarte ikke Populære - Nye + Nyeste + Nye og populære + Betalt + $5 eller mindre + $15 eller mindre Best vurdert Mest solgt Alle priser diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1b294f91a1..abef2e0e7b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2005,7 +2005,11 @@ Download kan niet worden uitgepakt (code %1$d) itch.io gaf geen antwoord Populair - Nieuw + Meest recent + Nieuw en populair + Betaald + $5 of minder + $15 of minder Hoogst beoordeeld Bestverkocht Elke prijs diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8b1057f1dc..13c4442d11 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2047,7 +2047,11 @@ Nie można rozpakować pobranego pliku (kod %1$d) itch.io nie odpowiedziało Popularne - Nowe + Najnowsze + Nowe i popularne + Płatne + Do 5 $ + Do 15 $ Najwyżej oceniane Najlepiej sprzedające się Dowolna cena diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index d6cacfcb65..7cb4db950c 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2018,7 +2018,11 @@ Não foi possível extrair a transferência (código %1$d) O itch.io não respondeu Populares - Novos + Mais recentes + Novos e populares + Pagos + 5 $ ou menos + 15 $ ou menos Mais bem avaliados Mais vendidos Qualquer preço diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 6db4712e69..69ff257a76 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2018,7 +2018,11 @@ Não foi possível extrair o download (código %1$d) O itch.io não respondeu Populares - Novos + Mais recentes + Novos e populares + Pagos + US$ 5 ou menos + US$ 15 ou menos Mais bem avaliados Mais vendidos Qualquer preço diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 6a818b9060..0e3af22a0f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2026,7 +2026,11 @@ Descărcarea nu a putut fi extrasă (cod %1$d) itch.io nu a răspuns Populare - Noi + Cele mai recente + Noi și populare + Cu plată + 5 $ sau mai puțin + 15 $ sau mai puțin Cele mai bine cotate Cele mai vândute Orice preț diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index baedc0addc..45bd91d497 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2049,7 +2049,11 @@ Не удалось распаковать загрузку (код %1$d) itch.io не ответил Популярные - Новые + Самые новые + Новые и популярные + Платные + До $5 + До $15 С лучшими оценками Бестселлеры Любая цена diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 40e8f30019..845f2e1156 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2005,7 +2005,11 @@ Det gick inte att packa upp nedladdningen (kod %1$d) itch.io svarade inte Populära - Nya + Senaste + Nya och populära + Betalda + $5 eller mindre + $15 eller mindre Högst betyg Mest sålda Alla priser diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 0bbbc29f94..abef80667f 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1984,7 +1984,11 @@ แตกไฟล์ที่ดาวน์โหลดไม่ได้ (รหัส %1$d) itch.io ไม่ตอบสนอง ยอดนิยม - ใหม่ + ล่าสุด + ใหม่และยอดนิยม + เสียเงิน + ไม่เกิน $5 + ไม่เกิน $15 คะแนนสูงสุด ขายดี ทุกราคา diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1cee39be2e..a6b779155e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1999,7 +1999,11 @@ İndirme ayıklanamadı (kod %1$d) itch.io yanıt vermedi Popüler - Yeni + En yeniler + Yeni ve popüler + Ücretli + $5 veya altı + $15 veya altı En yüksek puanlı En çok satanlar Herhangi bir fiyat diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2bb20ce206..b2afcec56f 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2047,7 +2047,11 @@ Не вдалося розпакувати завантаження (код %1$d) itch.io не відповів Популярні - Нові + Найновіші + Нові й популярні + Платні + До $5 + До $15 З найвищими оцінками Бестселери Будь-яка ціна diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 44cec9e4d6..d0f0f0f838 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1984,7 +1984,11 @@ Không thể giải nén bản tải xuống (mã %1$d) itch.io không phản hồi Phổ biến - Mới + Mới nhất + Mới và phổ biến + Trả phí + Từ $5 trở xuống + Từ $15 trở xuống Đánh giá cao nhất Bán chạy nhất Mọi mức giá diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3e526c9bdc..b3f20f0a3b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2063,7 +2063,11 @@ 无法解压下载内容(代码 %1$d) itch.io 没有响应 热门 - 最新 + 最新发布 + 新品与热门 + 付费 + 5 美元以下 + 15 美元以下 评分最高 热销 任意价格 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 9762b520fd..dd8fce4d8a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1987,7 +1987,11 @@ 無法解壓下載內容(代碼 %1$d) itch.io 沒有回應 熱門 - 最新 + 最新發布 + 新品與熱門 + 付費 + 5 美元以下 + 15 美元以下 評分最高 熱賣 任何價格 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c5535bea76..186da38ef7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1987,7 +1987,11 @@ 無法解壓縮下載內容(代碼 %1$d) itch.io 沒有回應 熱門 - 最新 + 最新發布 + 新品與熱門 + 付費 + 5 美元以下 + 15 美元以下 評分最高 熱銷 任何價格 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3c6a8f85d0..67e247971e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2082,7 +2082,11 @@ Could not extract the download (exit %1$d) itch.io did not answer Popular - New + Most recent + New & popular + Paid + $5 or less + $15 or less Top rated Top sellers Any price diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt index c8df0bbbe6..8ee4f83346 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt @@ -5,50 +5,61 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test +/** Every address here was copied from itch.io's own links, not worked out. */ class ItchBrowseTest { + private fun path(sort: String = ItchBrowse.SORT_POPULAR, price: String = ItchBrowse.PRICE_ANY, platforms: Set = emptySet(), tags: List = emptyList()) = + ItchBrowse.path(BrowseQuery(sort, price, platforms, tags)) + @Test fun theDefaultQueryIsTheFrontPage() { assertTrue(BrowseQuery().isDefault) - assertFalse(BrowseQuery(sort = ItchBrowse.SORT_NEW).isDefault) + assertFalse(BrowseQuery(sort = ItchBrowse.SORT_NEWEST).isDefault) assertFalse(BrowseQuery(price = ItchBrowse.PRICE_FREE).isDefault) } - @Test fun sortsMapToTheirFeedPaths() { - assertEquals(listOf("https://itch.io/games.xml"), ItchBrowse.urls(BrowseQuery(), 1)) - assertEquals(listOf("https://itch.io/games/newest.xml"), ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_NEW), 1)) - assertEquals(listOf("https://itch.io/games/top-rated.xml"), ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_TOP_RATED), 1)) - assertEquals(listOf("https://itch.io/games/top-sellers.xml"), ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_TOP_SELLERS), 1)) + @Test fun sortsUseItchsOwnPaths() { + assertEquals("https://itch.io/games", path()) + assertEquals("https://itch.io/games/new-and-popular", path(sort = ItchBrowse.SORT_NEW_POPULAR)) + assertEquals("https://itch.io/games/top-sellers", path(sort = ItchBrowse.SORT_TOP_SELLERS)) + assertEquals("https://itch.io/games/top-rated", path(sort = ItchBrowse.SORT_TOP_RATED)) + assertEquals("https://itch.io/games/newest", path(sort = ItchBrowse.SORT_NEWEST)) } - @Test fun pagesAfterTheFirstCarryThePageNumber() { - assertEquals(listOf("https://itch.io/games/newest.xml?page=3"), ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_NEW), 3)) + @Test fun pricesUseItchsOwnPaths() { + assertEquals("https://itch.io/games/free", path(price = ItchBrowse.PRICE_FREE)) + assertEquals("https://itch.io/games/on-sale", path(price = ItchBrowse.PRICE_SALE)) + assertEquals("https://itch.io/games/store", path(price = ItchBrowse.PRICE_PAID)) + assertEquals("https://itch.io/games/5-dollars-or-less", path(price = ItchBrowse.PRICE_UNDER_5)) + assertEquals("https://itch.io/games/15-dollars-or-less", path(price = ItchBrowse.PRICE_UNDER_15)) } - @Test fun aPriceFilterOffersEverySpellingInOrder() { - val free = ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_TOP_RATED, price = ItchBrowse.PRICE_FREE), 1) - assertEquals(listOf("https://itch.io/games/top-rated/free.xml", "https://itch.io/games/top-rated/price-free.xml"), free) - assertEquals(listOf("https://itch.io/games/on-sale.xml"), ItchBrowse.urls(BrowseQuery(price = ItchBrowse.PRICE_SALE), 1)) - } - - @Test fun platformsAndTagsFollowTheSortAndPriceInAFixedOrder() { - val query = BrowseQuery( - sort = ItchBrowse.SORT_NEW, price = ItchBrowse.PRICE_SALE, - platforms = setOf("web", "linux"), tags = listOf("Pixel Art", "Horror"), + @Test fun platformsUseItchsOwnNames() { + val expected = mapOf( + "windows" to "platform-windows", "osx" to "platform-osx", "linux" to "platform-linux", "android" to "platform-android", + "ios" to "platform-ios", "web" to "platform-web", "mobile-web" to "platform-mobile-web", ) + assertEquals(expected.keys.toList(), ItchBrowse.platformNames) + for ((name, segment) in expected) assertEquals("https://itch.io/games/$segment", path(platforms = setOf(name))) + } + + @Test fun aSortAPriceAndAPlatformCombineInThatOrder() { assertEquals( - listOf("https://itch.io/games/newest/on-sale/platform-linux/platform-web/tag-pixel-art/tag-horror.xml"), - ItchBrowse.urls(query, 1), + "https://itch.io/games/top-rated/free/platform-windows", + path(ItchBrowse.SORT_TOP_RATED, ItchBrowse.PRICE_FREE, setOf("windows")), ) } - @Test fun tagsBecomeSlugs() { + @Test fun aTagIsItsLowercaseNameWithHyphens() { + assertEquals("https://itch.io/games/tag-pixel-art", path(tags = listOf("Pixel Art"))) assertEquals("pixel-art", ItchBrowse.tagSlug(" Pixel Art ")) - assertEquals("2d", ItchBrowse.tagSlug("2D")) - assertEquals("sci-fi", ItchBrowse.tagSlug("Sci-Fi!")) } - @Test fun theSamePlatformsInAnyOrderGiveTheSameUrl() { - val a = ItchBrowse.urls(BrowseQuery(platforms = setOf("web", "linux")), 1) - val b = ItchBrowse.urls(BrowseQuery(platforms = setOf("linux", "web")), 1) - assertEquals(a, b) + @Test fun theSamePlatformsInAnyOrderGiveTheSameAddress() { + assertEquals(path(platforms = setOf("web", "linux")), path(platforms = setOf("linux", "web"))) + } + + @Test fun laterPagesAskForThePageNumberAndTheFirstDoesNot() { + val query = BrowseQuery(sort = ItchBrowse.SORT_TOP_RATED) + assertEquals("https://itch.io/games/top-rated.xml", ItchBrowse.url(query, 1)) + assertEquals("https://itch.io/games/top-rated.xml?page=2", ItchBrowse.url(query, 2)) } } diff --git a/docs/development/itch-browse.md b/docs/development/itch-browse.md index de5929afcf..78c056300b 100644 --- a/docs/development/itch-browse.md +++ b/docs/development/itch-browse.md @@ -14,10 +14,12 @@ https://itch.io/games[/][/][/platform-...][/tag-...].xm ``` `BrowseQuery` already carries platforms and tags, so the URL builder is complete; the controls for them -come in a later change. A price filter has more than one spelling on itch, so `urls()` returns every -candidate and `page()` takes the first that answers with games. Every request is logged -(`itch.io browse: answered with games`), which is how a wrong guess is found and fixed -from a device. +come in a later change. The path pieces are itch's own, copied from its links: sorts `new-and-popular`, `top-sellers`, `top-rated`, +`newest` (Popular has none); prices `free`, `on-sale`, `store` (Paid), `5-dollars-or-less`, +`15-dollars-or-less`; platforms `platform-windows`, `-osx`, `-linux`, `-android`, `-ios`, `-web`, +`-mobile-web`; a tag is `tag-` and its lowercase name with hyphens. `ItchBrowse.path()` builds the page +address, `url()` adds `.xml` and `?page=N`. Every request is logged +(`itch.io browse: answered with games`). Requests go out one at a time, at least 1.2 s apart. A 429 waits 8 s and tries once more; if that fails the games already on screen stay. Each page is kept under the app cache for three hours, so going back to From 583858763992f1fd99e2f4a9265561b4e4240f0c Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Sat, 24 Oct 2026 13:02:17 +0300 Subject: [PATCH 090/174] itch.io browse: let a failed page be retried instead of ending the list --- .../com/droiddeck/launcher/stores/itch/ItchBrowse.kt | 12 ++++++------ .../java/com/droiddeck/launcher/ui/ItchBrowseBar.kt | 3 +++ docs/development/itch-browse.md | 4 ++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt index d64855f508..781f918ec9 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt @@ -151,8 +151,9 @@ internal object ItchBrowseState { if (active) more(context) } - fun more(context: Context) { - if (loading || ended || !active) return + /** Asks for the next page. A page that failed is only asked for again when [retry] is set, so scrolling can't loop on it. */ + fun more(context: Context, retry: Boolean = false) { + if (loading || ended || !active || (failed && !retry)) return loading = true failed = false val app = context.applicationContext @@ -164,13 +165,12 @@ internal object ItchBrowseState { StoresState.post { if (mine != generation) return@post loading = false - if (answer == null) { - failed = items.isEmpty() - ended = items.isNotEmpty() + // A thrown or non-2xx fetch leaves the list open so the same page can be asked for again. + if (answer == null || answer.code !in 200..299) { + failed = true return@post } if (answer.items.isEmpty()) { - failed = items.isEmpty() && answer.code !in 200..299 ended = true return@post } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt index 896d1b37f8..da53f7ebf8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -56,6 +56,9 @@ internal fun ItchLoadMore() { val count = ItchBrowseState.items.size LaunchedEffect(count) { ItchBrowseState.more(ctx) } if (ItchBrowseState.loading) LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 12.dp)) + else if (ItchBrowseState.failed) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { + BrowseChip(stringResource(R.string.stores_dl_retry), false) { ItchBrowseState.more(ctx, retry = true) } + } else if (!ItchBrowseState.ended && count > 0) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { BrowseChip(stringResource(R.string.stores_itch_load_more), false) { ItchBrowseState.more(ctx) } } diff --git a/docs/development/itch-browse.md b/docs/development/itch-browse.md index 78c056300b..241b508537 100644 --- a/docs/development/itch-browse.md +++ b/docs/development/itch-browse.md @@ -30,3 +30,7 @@ use, so a game looks the same wherever it appears. query bumps a generation counter, so a slow answer for an older one is dropped. A game already in the library replaces its browse copy on the grid, so Install and the owned markers are right; the detail page looks browse results up through `StoresState.detailItem`. + +## When a page fails + +A fetch that throws or answers with a non-2xx status marks the list as failed but leaves it open. The end of the list then shows a Retry button that asks for the same page again. Scrolling does not retry on its own, so a failing page cannot loop. Only a successful page with no new games ends the list. From dc57f367e1609c9c21e6a4d424def4cd7588a1e6 Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Sat, 24 Oct 2026 13:07:16 +0300 Subject: [PATCH 091/174] itch.io browse: don't re-fire the load-more trigger when a page is appended --- app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt index da53f7ebf8..fd73344512 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -54,7 +54,8 @@ internal fun ItchBrowseBar() { internal fun ItchLoadMore() { val ctx = LocalContext.current val count = ItchBrowseState.items.size - LaunchedEffect(count) { ItchBrowseState.more(ctx) } + // Keyed on nothing that changes with a page, so appending games never re-fires it while this end item stays composed; scrolling it back into view does. + LaunchedEffect(Unit) { ItchBrowseState.more(ctx) } if (ItchBrowseState.loading) LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 12.dp)) else if (ItchBrowseState.failed) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { BrowseChip(stringResource(R.string.stores_dl_retry), false) { ItchBrowseState.more(ctx, retry = true) } From 26c3dcc88572cd98da508393eecf8aa49212c322 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 01:36:27 -0400 Subject: [PATCH 092/174] fix: turn off the Ubisoft Connect overlay so Ubisoft games stop crashing at start --- .../overlay/usr/local/bin/droiddeck-game-env | 46 +++++++++++++++++++ tools/tests/test_game_environment.py | 33 +++++++++++++ 2 files changed, 79 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 53537c072f..4d453b380e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -148,6 +148,51 @@ def skip_red_launcher(command): return command +UBISOFT_LAUNCHER = "drive_c/Program Files (x86)/Ubisoft/Ubisoft Game Launcher" +UBISOFT_SETTINGS = "drive_c/users/steamuser/AppData/Local/Ubisoft Game Launcher/settings.yaml" + + +def overlay_off(text): + lines = text.splitlines() + try: + start = lines.index("overlay:") + except ValueError: + if lines and not lines[-1].strip(): + lines.pop() + return "\n".join(lines + ["overlay:", " enabled: false", " warning_enabled: false"]) + "\n" + end = start + 1 + while end < len(lines) and lines[end].startswith(" "): + end += 1 + block = lines[start + 1:end] + for key in ("enabled", "warning_enabled"): + entry = " %s: false" % key + found = [i for i, line in enumerate(block) if line.split(":", 1)[0] == " " + key] + if found: + block[found[0]] = entry + else: + block.append(entry) + return "\n".join(lines[:start + 1] + block + lines[end:]) + "\n" + + +def ubisoft_overlay_off(env): + prefix = Path(env.get("STEAM_COMPAT_DATA_PATH", "/nonexistent")) / "pfx" + if not (prefix / UBISOFT_LAUNCHER).is_dir(): + return + settings = prefix / UBISOFT_SETTINGS + try: + text = settings.read_text(encoding="utf-8") if settings.exists() else "" + updated = overlay_off(text) + if updated == text: + return + settings.parent.mkdir(parents=True, exist_ok=True) + staged = settings.with_name(settings.name + ".tmp") + staged.write_text(updated, encoding="utf-8") + staged.replace(settings) + print("droiddeck-game-env: Ubisoft Connect overlay turned off", file=sys.stderr) + except (OSError, UnicodeDecodeError) as error: + print("droiddeck-game-env: Ubisoft Connect overlay left as is (%s)" % error, file=sys.stderr) + + def offline_without_anticheat(command, env): """Start the configured game executable when the player opts into launching without EAC.""" if (env.get("DROIDDECK_ANTICHEAT_OFFLINE") != "1" or len(command) <= 2 @@ -464,6 +509,7 @@ def main(): fixes = {} if waiting: command = skip_red_launcher(command) + ubisoft_overlay_off(env) fixes, extra, notes = engine_fixes(command[2], command[3:]) if len(command) > 2 else ({}, [], []) for note in notes: print("droiddeck-game-env: " + note, file=sys.stderr) diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 13b31f7435..2841ddf9e4 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1216,6 +1216,39 @@ class DirectAudioPrefixTest(unittest.TestCase): self.assertIsNone(self.link("system32")) +class UbisoftOverlayTest(unittest.TestCase): + SETTINGS = ( + "language:\n code: en-US\n" + "overlay:\n enabled: true\n forceunhookgame: false\n fps_enabled: false\n warning_enabled: true\n" + "patchTrigger:\n source: USER_RESTART\n" + ) + + def test_the_overlay_and_its_prompt_are_turned_off_and_the_rest_is_kept(self): + got = MODULE["overlay_off"](self.SETTINGS) + self.assertEqual(got, self.SETTINGS.replace("enabled: true", "enabled: false")) + self.assertEqual(MODULE["overlay_off"](got), got) + + def test_missing_keys_or_section_are_added(self): + self.assertEqual(MODULE["overlay_off"]("overlay:\n fps_enabled: true\nmisc:\n a: 1\n"), + "overlay:\n fps_enabled: true\n enabled: false\n warning_enabled: false\nmisc:\n a: 1\n") + self.assertEqual(MODULE["overlay_off"](""), "overlay:\n enabled: false\n warning_enabled: false\n") + + def test_only_prefixes_with_ubisoft_connect_are_touched(self): + with tempfile.TemporaryDirectory() as tmp: + prefix = Path(tmp) / "447040/pfx" + env = {"STEAM_COMPAT_DATA_PATH": str(prefix.parent)} + settings = prefix / MODULE["UBISOFT_SETTINGS"] + prefix.mkdir(parents=True) + MODULE["ubisoft_overlay_off"](env) + self.assertFalse(settings.exists()) + (prefix / MODULE["UBISOFT_LAUNCHER"]).mkdir(parents=True) + MODULE["ubisoft_overlay_off"](env) + self.assertEqual(settings.read_text(), "overlay:\n enabled: false\n warning_enabled: false\n") + settings.write_text(self.SETTINGS) + MODULE["ubisoft_overlay_off"](env) + self.assertEqual(settings.read_text(), self.SETTINGS.replace("enabled: true", "enabled: false")) + + if __name__ == "__main__": unittest.main() From 31cead9b32ee76cb1102997f399e681ecd389912 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 03:17:44 -0400 Subject: [PATCH 093/174] fix: keep blank lines inside the overlay section and stage settings under a unique name --- .../overlay/usr/local/bin/droiddeck-game-env | 19 ++++++++++++++----- tools/tests/test_game_environment.py | 6 ++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 4d453b380e..8271b6551a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -6,6 +6,7 @@ import re import runpy import subprocess import sys +import tempfile from pathlib import Path GAME_TU_DEBUG = "DROIDDECK_GAME_TU_DEBUG" @@ -161,8 +162,11 @@ def overlay_off(text): lines.pop() return "\n".join(lines + ["overlay:", " enabled: false", " warning_enabled: false"]) + "\n" end = start + 1 - while end < len(lines) and lines[end].startswith(" "): - end += 1 + for index in range(start + 1, len(lines)): + if lines[index].strip() and not lines[index].startswith(" "): + break + if lines[index].strip(): + end = index + 1 block = lines[start + 1:end] for key in ("enabled", "warning_enabled"): entry = " %s: false" % key @@ -185,9 +189,14 @@ def ubisoft_overlay_off(env): if updated == text: return settings.parent.mkdir(parents=True, exist_ok=True) - staged = settings.with_name(settings.name + ".tmp") - staged.write_text(updated, encoding="utf-8") - staged.replace(settings) + handle, staged = tempfile.mkstemp(prefix=".settings-", dir=settings.parent) + try: + with os.fdopen(handle, "w", encoding="utf-8") as target: + target.write(updated) + os.replace(staged, settings) + except BaseException: + os.unlink(staged) + raise print("droiddeck-game-env: Ubisoft Connect overlay turned off", file=sys.stderr) except (OSError, UnicodeDecodeError) as error: print("droiddeck-game-env: Ubisoft Connect overlay left as is (%s)" % error, file=sys.stderr) diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 2841ddf9e4..b936556e56 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1233,6 +1233,12 @@ class UbisoftOverlayTest(unittest.TestCase): "overlay:\n fps_enabled: true\n enabled: false\n warning_enabled: false\nmisc:\n a: 1\n") self.assertEqual(MODULE["overlay_off"](""), "overlay:\n enabled: false\n warning_enabled: false\n") + def test_blank_lines_inside_the_overlay_section_do_not_end_it(self): + text = "overlay:\n enabled: true\n\n warning_enabled: true\n\nmisc:\n a: 1\n" + self.assertEqual(MODULE["overlay_off"](text), text.replace("true", "false")) + self.assertEqual(MODULE["overlay_off"]("overlay:\n fps_enabled: true\n\nmisc:\n a: 1\n"), + "overlay:\n fps_enabled: true\n enabled: false\n warning_enabled: false\n\nmisc:\n a: 1\n") + def test_only_prefixes_with_ubisoft_connect_are_touched(self): with tempfile.TemporaryDirectory() as tmp: prefix = Path(tmp) / "447040/pfx" From 0b671b2144ee270cd1ea9828450dde8e3ecce642 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 04:52:54 -0400 Subject: [PATCH 094/174] fix: match an annotated overlay header and keep the settings file's mode --- tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 6 ++++-- tools/tests/test_game_environment.py | 7 +++++++ 2 files changed, 11 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 8271b6551a..505b75e02c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -156,8 +156,8 @@ UBISOFT_SETTINGS = "drive_c/users/steamuser/AppData/Local/Ubisoft Game Launcher/ def overlay_off(text): lines = text.splitlines() try: - start = lines.index("overlay:") - except ValueError: + start = next(i for i, line in enumerate(lines) if re.fullmatch(r"overlay:\s*(#.*)?", line)) + except StopIteration: if lines and not lines[-1].strip(): lines.pop() return "\n".join(lines + ["overlay:", " enabled: false", " warning_enabled: false"]) + "\n" @@ -193,6 +193,8 @@ def ubisoft_overlay_off(env): try: with os.fdopen(handle, "w", encoding="utf-8") as target: target.write(updated) + if settings.exists(): + os.chmod(staged, settings.stat().st_mode & 0o7777) os.replace(staged, settings) except BaseException: os.unlink(staged) diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index b936556e56..208e4b1dd1 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1239,6 +1239,10 @@ class UbisoftOverlayTest(unittest.TestCase): self.assertEqual(MODULE["overlay_off"]("overlay:\n fps_enabled: true\n\nmisc:\n a: 1\n"), "overlay:\n fps_enabled: true\n enabled: false\n warning_enabled: false\n\nmisc:\n a: 1\n") + def test_an_annotated_overlay_header_is_the_same_section(self): + self.assertEqual(MODULE["overlay_off"]("overlay: # in-game\n enabled: true\n"), + "overlay: # in-game\n enabled: false\n warning_enabled: false\n") + def test_only_prefixes_with_ubisoft_connect_are_touched(self): with tempfile.TemporaryDirectory() as tmp: prefix = Path(tmp) / "447040/pfx" @@ -1251,8 +1255,11 @@ class UbisoftOverlayTest(unittest.TestCase): MODULE["ubisoft_overlay_off"](env) self.assertEqual(settings.read_text(), "overlay:\n enabled: false\n warning_enabled: false\n") settings.write_text(self.SETTINGS) + settings.chmod(0o644) MODULE["ubisoft_overlay_off"](env) self.assertEqual(settings.read_text(), self.SETTINGS.replace("enabled: true", "enabled: false")) + self.assertEqual(settings.stat().st_mode & 0o777, 0o644) + self.assertEqual(sorted(p.name for p in settings.parent.iterdir()), ["settings.yaml"]) if __name__ == "__main__": From ad6d8d824a3fe80d0b29e2ea5a8064a96e1cc406 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 07:47:30 -0400 Subject: [PATCH 095/174] fix: removing a Proton also deletes its stored component originals --- .../launcher/session/ComponentsManager.kt | 11 ++++++++ .../launcher/session/ProtonExtras.kt | 6 ++++- .../launcher/session/ProtonExtrasTest.kt | 27 +++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) 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 776a9f7a0f..ae405a80ae 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -780,6 +780,17 @@ object ComponentsManager { true } + 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 deletePackage(context: Context, file: String): String = synchronized(lock) { val name = safeName(file) val state = loadState(context) 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 42c0deeb6f..a361baabb6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -137,10 +137,14 @@ object ProtonExtras { fun remove(context: Context, tool: Tool, dir: String? = null) { val name = if (dir != null) dir.takeIf { it in installedAll(context, tool) } ?: return else installed(context, tool) ?: return File(toolsDir(context), name).deleteRecursively() + ComponentsManager.forgetProton(context, name) } fun removeOlder(context: Context, tool: Tool) { - installedAll(context, tool).dropLast(1).forEach { File(toolsDir(context), it).deleteRecursively() } + installedAll(context, tool).dropLast(1).forEach { + File(toolsDir(context), it).deleteRecursively() + ComponentsManager.forgetProton(context, it) + } } @Synchronized 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 0e0f16cf20..63dc1efd61 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -171,4 +171,31 @@ class ProtonExtrasTest { assertEquals(listOf("DroidDeck-Proton 11-7.10"), ProtonExtras.installedAll(context, tool("droiddeck"))) assertEquals("DroidDeck-Proton 11-7.10", ProtonExtras.installed(context, tool("droiddeck"))) } + + @Test + fun removingABuildDropsItsStoredOriginalsAndSelections() { + val context = RuntimeEnvironment.getApplication() + val tools = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/compatibilitytools.d") + File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-components").mkdirs() + installTool(tools, "GE-Proton11-7") + val kept = installTool(tools, "GE-Proton11-8").apply { + File(this, "files/lib/wine").mkdirs() + File(this, "proton").writeText("") + } + val originals = File(context.filesDir, "components/originals") + for (id in listOf("GE-Proton11-7", "GE-Proton11-8")) File(originals, "$id/$id/dxvk.wcp").apply { parentFile?.mkdirs(); writeText("x") } + val pick = JSONObject().put("dxvk", JSONObject().put("file", "dxvk.wcp").put("protonVersion", "GE-Proton11-7")) + File(context.filesDir, "components/state.json").writeText(JSONObject() + .put("active", JSONObject().put("GE-Proton11-7", pick).put("GE-Proton11-8", pick)) + .put("queued", JSONObject().put("GE-Proton11-7", pick)).toString()) + ProtonExtras.remove(context, tool("ge"), "GE-Proton11-7") + assertFalse(File(originals, "GE-Proton11-7").exists()) + assertTrue(File(originals, "GE-Proton11-8/GE-Proton11-8/dxvk.wcp").isFile) + val state = JSONObject(File(context.filesDir, "components/state.json").readText()) + 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(File(originals, "GE-Proton11-8/GE-Proton11-8/dxvk.wcp").isFile) + } } From 0790cb4390627ea79fb7c9aef3d1acc98b941bdb Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 08:04:14 -0400 Subject: [PATCH 096/174] fix: keep a Proton's originals when its folder could not be fully removed --- .../java/com/droiddeck/launcher/session/ProtonExtras.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 a361baabb6..20714ba95a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -136,14 +136,12 @@ object ProtonExtras { fun remove(context: Context, tool: Tool, dir: String? = null) { val name = if (dir != null) dir.takeIf { it in installedAll(context, tool) } ?: return else installed(context, tool) ?: return - File(toolsDir(context), name).deleteRecursively() - ComponentsManager.forgetProton(context, name) + if (File(toolsDir(context), name).deleteRecursively()) ComponentsManager.forgetProton(context, name) } fun removeOlder(context: Context, tool: Tool) { installedAll(context, tool).dropLast(1).forEach { - File(toolsDir(context), it).deleteRecursively() - ComponentsManager.forgetProton(context, it) + if (File(toolsDir(context), it).deleteRecursively()) ComponentsManager.forgetProton(context, it) } } From 2bd279a0f31a111ca541975b3a87c87f36c89abf Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 24 Oct 2026 08:38:41 -0400 Subject: [PATCH 097/174] fix: read Steam shader settings off the main thread --- .../droiddeck/launcher/FrontEndActivity.kt | 19 ++++- .../frontend/ModeSettingsLoadingTest.kt | 72 +++++++++++++++++++ 2 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/ModeSettingsLoadingTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 943b07be83..83e0468f06 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -120,7 +120,7 @@ class FrontEndActivity : ComponentActivity() { private var glThread by mutableStateOf(true) private var noGlError by mutableStateOf(true) private var returnAfterGame by mutableStateOf(true) - private var shaderPrecache by mutableStateOf(true) + private var shaderPrecache by mutableStateOf(null) private var steamRepairQueued by mutableStateOf(false) private var mangoapp by mutableStateOf(true) private var steamController by mutableStateOf(SessionPrefs.CONTROLLER_DECK) @@ -1733,7 +1733,7 @@ class FrontEndActivity : ComponentActivity() { onSteamClientArch = { id -> SessionPrefs.setSteamClientArch(this, id) steamClientArch = id - shaderPrecache = SessionPrefs.shaderPrecache(this) + loadShaderPrecache(mode) refresh() }, onMangoapp = { on -> SessionPrefs.setMangoapp(this, on); mangoapp = on }, @@ -1895,6 +1895,19 @@ class FrontEndActivity : ComponentActivity() { private var pipAutoEnter by mutableStateOf(false) private var unfoldedControls by mutableStateOf(false) private var unfoldedControlsWithController by mutableStateOf(false) + private var shaderPrecacheGeneration = 0 + + private fun loadShaderPrecache(mode: String) { + val generation = ++shaderPrecacheGeneration + shaderPrecache = null + if (mode != SessionService.MODE_STEAM) return + Thread({ + val precache = SessionPrefs.shaderPrecache(this) + ui.post { + if (!isDestroyed && generation == shaderPrecacheGeneration) shaderPrecache = precache + } + }, "shader-precache").start() + } private fun loadModeSettings(mode: String) { pipAutoEnter = SessionPrefs.pipAutoEnter(this) @@ -1910,7 +1923,7 @@ class FrontEndActivity : ComponentActivity() { steamRepairQueued = SteamRepair.queued(this) mangoapp = SessionPrefs.mangoapp(this) returnAfterGame = SessionPrefs.returnAfterGame(this) - shaderPrecache = SessionPrefs.shaderPrecache(this) + loadShaderPrecache(mode) steamController = SessionPrefs.steamController(this) runSteamAtStartup = SessionPrefs.runSteamAtStartup(this) loadBootMovie() diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/ModeSettingsLoadingTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/ModeSettingsLoadingTest.kt new file mode 100644 index 0000000000..d9c0dd8f38 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/ModeSettingsLoadingTest.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.frontend + +import android.os.Looper +import com.droiddeck.launcher.FrontEndActivity +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.annotation.LooperMode +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +@LooperMode(LooperMode.Mode.PAUSED) +class ModeSettingsLoadingTest { + @Test fun steamPublishesItsShaderChoiceThroughTheMainQueue() { + val activity = Robolectric.buildActivity(FrontEndActivity::class.java).get() + SessionPrefs.setShaderPrecache(activity, false) + load(activity, SessionService.MODE_STEAM) + awaitRead() + assertNull(value(activity)) + shadowOf(Looper.getMainLooper()).idle() + assertEquals(false, value(activity)) + } + + @Test fun desktopDoesNotConsumeSteamsAppliedShaderChoice() { + val activity = Robolectric.buildActivity(FrontEndActivity::class.java).get() + SessionPrefs.setShaderPrecache(activity, false) + val applied = File(LinuxRuntime.rootDir(activity), "root/.bl-shader-precache-applied") + applied.parentFile!!.mkdirs() + applied.writeText("0") + load(activity, SessionService.MODE_DESKTOP) + awaitRead() + shadowOf(Looper.getMainLooper()).idle() + assertTrue(applied.isFile) + assertNull(value(activity)) + } + + @Test fun switchingToDesktopDiscardsAQueuedSteamResult() { + val activity = Robolectric.buildActivity(FrontEndActivity::class.java).get() + load(activity, SessionService.MODE_STEAM) + awaitRead() + load(activity, SessionService.MODE_DESKTOP) + shadowOf(Looper.getMainLooper()).idle() + assertNull(value(activity)) + } + + private fun load(activity: FrontEndActivity, mode: String) { + FrontEndActivity::class.java.getDeclaredMethod("loadShaderPrecache", String::class.java) + .apply { isAccessible = true }.invoke(activity, mode) + } + + private fun value(activity: FrontEndActivity): Boolean? = + FrontEndActivity::class.java.getDeclaredMethod("getShaderPrecache") + .apply { isAccessible = true }.invoke(activity) as Boolean? + + private fun awaitRead() { + Thread.getAllStackTraces().keys.filter { it.name == "shader-precache" }.forEach { + it.join(5_000) + assertFalse("Shader settings read did not finish", it.isAlive) + } + } +} From a66d7d74a4f2d85f2a774b0e8b673d928fc3290e Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 08:51:08 -0400 Subject: [PATCH 098/174] fix: Steam Input mouse clicks, scrolling and pointer moves reach games again --- tools/linuxfs/preload/rptouch.c | 11 +++++++++-- tools/tests/test_venc_emulator.py | 30 ++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/tools/linuxfs/preload/rptouch.c b/tools/linuxfs/preload/rptouch.c index 3d6f584edc..7d39f286e0 100644 --- a/tools/linuxfs/preload/rptouch.c +++ b/tools/linuxfs/preload/rptouch.c @@ -51,9 +51,16 @@ static void rt_send(void *dpy, uint32_t action) { } } +static void *rt_xtst(const char *name) { + void *fn = dlsym(RTLD_NEXT, name); + if (fn) return fn; + void *lib = dlopen("libXtst.so.6", RTLD_LAZY | RTLD_NOLOAD); + return lib ? dlsym(lib, name) : NULL; +} + int XTestFakeMotionEvent(void *dpy, int screen, int x, int y, unsigned long delay) { static int (*real)(void *, int, int, int, unsigned long); - if (!real) real = (int (*)(void *, int, int, int, unsigned long))dlsym(RTLD_NEXT, "XTestFakeMotionEvent"); + if (!real) real = (int (*)(void *, int, int, int, unsigned long))rt_xtst("XTestFakeMotionEvent"); if (rt_enabled()) { pthread_mutex_lock(&rt_lock); rt_x = x; @@ -69,7 +76,7 @@ int XTestFakeMotionEvent(void *dpy, int screen, int x, int y, unsigned long dela int XTestFakeButtonEvent(void *dpy, unsigned int button, int press, unsigned long delay) { static int (*real)(void *, unsigned int, int, unsigned long); - if (!real) real = (int (*)(void *, unsigned int, int, unsigned long))dlsym(RTLD_NEXT, "XTestFakeButtonEvent"); + if (!real) real = (int (*)(void *, unsigned int, int, unsigned long))rt_xtst("XTestFakeButtonEvent"); if (button == 1) { pthread_mutex_lock(&rt_lock); int handled = 0; diff --git a/tools/tests/test_venc_emulator.py b/tools/tests/test_venc_emulator.py index 9fcf1f10de..416f6b61b0 100644 --- a/tools/tests/test_venc_emulator.py +++ b/tools/tests/test_venc_emulator.py @@ -223,5 +223,35 @@ class VencEmulatorTest(unittest.TestCase): self.assertEqual(server.touches, [(0, 65535, 32767), (1, 32767, 0), (2, 32767, 0)]) + def test_xtest_calls_from_a_locally_loaded_library_still_reach_libxtst(self): + with tempfile.TemporaryDirectory() as tmp: + tmp = Path(tmp) + (tmp / 'xtst.c').write_text( + 'int XTestFakeButtonEvent(void *d, unsigned b, int p, unsigned long t) { return 7; }\n' + 'int XTestFakeMotionEvent(void *d, int s, int x, int y, unsigned long t) { return 7; }\n') + (tmp / 'ui.c').write_text( + 'int XTestFakeButtonEvent(void *, unsigned, int, unsigned long);\n' + 'int XTestFakeMotionEvent(void *, int, int, int, unsigned long);\n' + 'int ui_click(void) { return XTestFakeButtonEvent(0, 1, 1, 0) + XTestFakeButtonEvent(0, 3, 0, 0); }\n' + 'int ui_move(void) { return XTestFakeMotionEvent(0, 0, 10, 20, 0); }\n') + (tmp / 'main.c').write_text( + '#include \n#include \n' + 'int main(int argc, char **argv) {\n' + ' void *ui = dlopen(argv[1], RTLD_NOW | RTLD_LOCAL);\n' + ' if (!ui) return 2;\n' + ' int (*click)(void) = dlsym(ui, "ui_click"), (*move)(void) = dlsym(ui, "ui_move");\n' + ' printf("%d %d\\n", click(), move());\n' + ' return click() == 14 && move() == 7 ? 0 : 1;\n' + '}\n') + run = lambda *a: subprocess.run(['cc', *a], check=True, cwd=tmp) + run('-shared', '-fPIC', '-Wl,-soname,libXtst.so.6', '-o', 'libXtst.so.6', 'xtst.c') + run('-shared', '-fPIC', '-o', 'libui.so', 'ui.c', '-L.', '-l:libXtst.so.6', "-Wl,-rpath,$ORIGIN") + run('-shared', '-fPIC', '-pthread', '-o', 'libhook.so', str(VENC), str(TOUCH), '-ldl') + run('-o', 'main', 'main.c', '-ldl') + done = subprocess.run([str(tmp / 'main'), str(tmp / 'libui.so')], + env=dict(os.environ, LD_PRELOAD=str(tmp / 'libhook.so')), + capture_output=True, text=True, timeout=20) + self.assertEqual(done.returncode, 0, done.stdout + done.stderr) + if __name__ == '__main__': unittest.main() From 6855dd4467533f7568b042c539e199e8f23eb030 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 08:43:54 -0400 Subject: [PATCH 099/174] fix(xbox): say to sign in again when Microsoft rejects the download's licenses --- .../launcher/stores/xbox/XboxInstaller.kt | 8 +++++++- .../droiddeck/launcher/stores/xbox/Xodus.kt | 4 +++- 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 + .../stores/xbox/XodusDiagnosticsTest.kt | 19 +++++++++++++++++++ 36 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt 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 296ff050b8..3d02e4db57 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 @@ -44,7 +44,12 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog Xodus.start(app, listOf("streaming", source, guestFolder, "--market", market, "--progress-json", "--control-stdin") + selection).use { process -> child = process - val diagnostics = Xodus.diagnostics(process) + val rejected = AtomicBoolean(false) + val rejectedLine = Regex(Xodus.SIGN_IN_REJECTED) + val diagnostics = Xodus.diagnostics(process) { line -> + StoresState.logLine("Xbox: $line") + if (line.matches(rejectedLine)) rejected.set(true) + } if (cancelled.get()) process.process.destroy() process.process.inputStream.bufferedReader().useLines { lines -> lines.forEach { line -> if (line.startsWith("NEXUS_PROGRESS ")) { @@ -63,6 +68,7 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog check(process.process.waitFor(15, TimeUnit.SECONDS)) { "Xbox installer did not exit." } 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." } } if (content) { 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 94b8138253..51bb3c714a 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 @@ -150,11 +150,13 @@ internal object Xodus { } } + const val SIGN_IN_REJECTED = "Microsoft content licensing rejected sign-in \\(HTTP [0-9]{3}\\)\\. Sign in again in Settings\\." + /** Passes the backend's known stderr diagnostics to [report]; other stderr text never leaves the process. */ 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\\."))) + 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"))) report(line) } } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 932827b750..07212eeae1 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2242,6 +2242,7 @@ إغلاق حاوِل مرة أخرى جارٍ إنهاء تسجيل الدخول… + رفضت Microsoft تسجيل الدخول إلى Xbox. سجّل الخروج من Xbox في المتاجر، ثم سجّل الدخول مجددًا، ثم استأنف. تعذّر تحميل صفحة تسجيل الدخول: %1$s يرفض هذا المزوّد تسجيل الدخول من صفحة مضمَّنة. سجِّل الدخول باستخدام كلمة مرور المتجر بدلاً من ذلك. استجابت صفحة تسجيل الدخول بخطأ (HTTP %1$d). 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 411747242c..8c795fcc2b 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2194,6 +2194,7 @@ Cerrar Reintentar Terminando de iniciar sesión… + Microsoft rechazó el inicio de sesión de Xbox. Cierra sesión de Xbox en Tiendas, vuelve a iniciar sesión y luego reanuda. No se pudo cargar la página de inicio de sesión: %1$s Este proveedor no permite iniciar sesión desde una página integrada. Inicia sesión con la contraseña de la tienda. La página de inicio de sesión respondió con un error (HTTP %1$d). diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 6eab6e3e52..191e0254cd 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2158,6 +2158,7 @@ Затвори Опитай отново Завършване на входа… + Microsoft отхвърли входа в Xbox. Излезте от Xbox в Магазини, влезте отново и след това продължете. Страницата за вход не можа да се зареди: %1$s Този доставчик отказва вход от вградена страница. Впиши се с паролата си за магазина. Страницата за вход отговори с грешка (HTTP %1$d). diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index ae2a289530..f183eb12ac 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2200,6 +2200,7 @@ Zavřít Zkusit znovu Dokončování přihlášení… + Microsoft odmítl přihlášení k Xboxu. V Obchodech se z Xboxu odhlaste, znovu se přihlaste a pak pokračujte. Přihlašovací stránku se nepodařilo načíst: %1$s Tento poskytovatel odmítá přihlášení ze vložené stránky. Přihlaste se místo toho heslem k obchodu. Přihlašovací stránka odpověděla chybou (HTTP %1$d). diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 98d0bca466..48c47c1776 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2158,6 +2158,7 @@ Luk Forsøg igen Afslutter login… + Microsoft afviste Xbox-login. Log ud af Xbox under Butikker, log ind igen, og genoptag derefter. Loginsiden kunne ikke indlæses: %1$s Denne udbyder afviser login fra en indlejret side. Log i stedet ind med din butikskodeord. Loginsiden svarede med en fejl (HTTP %1$d). diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1b0ae75cdf..6613633fe9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2147,6 +2147,7 @@ Schließen Erneut versuchen Anmeldung wird abgeschlossen… + Microsoft hat die Xbox-Anmeldung abgelehnt. Melde dich unter Stores von Xbox ab, melde dich erneut an und setze dann fort. Die Anmeldeseite konnte nicht geladen werden: %1$s Dieser Anbieter lässt keine Anmeldung über eine eingebettete Seite zu. Melde dich stattdessen mit deinem Store-Passwort an. Die Anmeldeseite antwortete mit einem Fehler (HTTP %1$d). diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 709eb2244f..c65a0da054 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2158,6 +2158,7 @@ Κλείσιμο Δοκιμάστε ξανά Ολοκλήρωση σύνδεσης… + Η Microsoft απέρριψε τη σύνδεση στο Xbox. Αποσυνδεθείτε από το Xbox στα Καταστήματα, συνδεθείτε ξανά και μετά συνεχίστε. Δεν ήταν δυνατή η φόρτωση της σελίδας σύνδεσης: %1$s Αυτός ο πάροχος αρνείται να συνδεθεί από μια ενσωματωμένη σελίδα. Συνδεθείτε με τον κωδικό πρόσβασης του καταστήματός σας αντ\' αυτού. Η σελίδα σύνδεσης απάντησε με σφάλμα (HTTP %1$d). diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 38019dade7..e0faa4ec1b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2178,6 +2178,7 @@ Cerrar Reintentar Terminando de iniciar sesión… + Microsoft ha rechazado el inicio de sesión de Xbox. Cierra sesión de Xbox en Tiendas, vuelve a iniciar sesión y reanuda. No se pudo cargar la página de inicio de sesión: %1$s Este proveedor no permite iniciar sesión desde una página integrada. Inicia sesión con la contraseña de la tienda. La página de inicio de sesión respondió con un error (HTTP %1$d). diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 6aafc85b61..5cfb6fdae5 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2158,6 +2158,7 @@ Sulje Yritä uudelleen Viimeistellään kirjautumista… + Microsoft hylkäsi Xbox-kirjautumisen. Kirjaudu ulos Xboxista Kaupoissa, kirjaudu uudelleen sisään ja jatka sitten. Kirjautumissivua ei voitu latata: %1$s Tämä palveluntarjoaja ei salli kirjautumista upotetulta sivulta. Kirjaudu sisään kaupan salasanalla sen sijaan. Kirjautumissivu vastasi virheellä (HTTP %1$d). diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f345150b61..1cd1c9be5b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2178,6 +2178,7 @@ Fermer Réessayer Finalisation de la connexion… + Microsoft a refusé la connexion Xbox. Déconnectez-vous de Xbox dans Boutiques, reconnectez-vous, puis reprenez. Impossible de charger la page de connexion : %1$s Ce fournisseur refuse la connexion depuis une page intégrée. Connectez-vous plutôt avec le mot de passe de la boutique. La page de connexion a renvoyé une erreur (HTTP %1$d). diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d74e5c0d63..c30f55bd8b 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2158,6 +2158,7 @@ बंद करें फिर कोशिश करें साइन-इन पूरा हो रहा है… + Microsoft ने Xbox साइन-इन अस्वीकार कर दिया। स्टोर्स में Xbox से साइन आउट करें, फिर से साइन इन करें, फिर जारी रखें। साइन-इन पेज लोड नहीं हो सका: %1$s यह प्रोवाइडर एम्बेडेड पेज से साइन इन करने से मना करता है। इसके बदले अपने स्टोर पासवर्ड से साइन इन करें। साइन-इन पेज ने एक एरर के साथ जवाब दिया (HTTP %1$d)। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e8571e4927..2d54db9ada 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2158,6 +2158,7 @@ Bezárás Próbálja újra A bejelentkezés befejezése… + A Microsoft elutasította az Xbox-bejelentkezést. Az Áruházakban jelentkezz ki az Xboxból, jelentkezz be újra, majd folytasd. Nem sikerült betölteni a bejelentkezési oldalt: %1$s Ez a szolgáltató nem engedi a bejelentkezést egy beágyazott oldalról. Jelentkezzen be helyette az áruház jelszavával. A bejelentkezési oldal hibával válaszolt (HTTP %1$d). diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 80927811f0..ac15bce259 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2137,6 +2137,7 @@ Tutup Coba lagi Menyelesaikan proses masuk… + Microsoft menolak masuk Xbox. Keluar dari Xbox di Toko, masuk lagi, lalu lanjutkan. Halaman masuk tidak dapat dimuat: %1$s Penyedia ini menolak proses masuk dari halaman tersemat. Masuk dengan kata sandi toko Anda sebagai gantinya. Halaman masuk merespons dengan kesalahan (HTTP %1$d). diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e5aa836ade..db64b04afc 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2168,6 +2168,7 @@ Chiudi Riprova Completamento dell\'accesso… + Microsoft ha rifiutato l\'accesso a Xbox. Esci da Xbox in Negozi, accedi di nuovo, poi riprendi. Impossibile caricare la pagina di accesso: %1$s Questo provider non consente l\'accesso da una pagina incorporata. Accedi invece con la password del negozio. La pagina di accesso ha risposto con un errore (HTTP %1$d). diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 03e8ae2002..5cd48e61c1 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2139,6 +2139,7 @@ 閉じる 再試行 ログインを完了しています… + Microsoft が Xbox のサインインを拒否しました。ストアで Xbox からサインアウトし、もう一度サインインしてから再開してください。 ログインページを読み込めませんでした:%1$s このプロバイダーは埋め込みページからのログインを拒否しています。代わりにストアのパスワードでログインしてください。 ログインページがエラーを返しました(HTTP %1$d)。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 5096684e2c..2f52cf77ea 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2139,6 +2139,7 @@ 닫기 다시 시도 로그인 완료 중… + Microsoft에서 Xbox 로그인을 거부했습니다. 스토어에서 Xbox 로그아웃 후 다시 로그인한 다음 재개하세요. 로그인 페이지를 불러올 수 없습니다: %1$s 이 제공업체는 앱에 포함된 페이지에서 로그인을 허용하지 않습니다. 대신 스토어 비밀번호로 로그인하세요. 로그인 페이지에서 오류를 반환했습니다(HTTP %1$d). diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 82f9e7b2c2..b6c533da91 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2137,6 +2137,7 @@ Tutup Cuba lagi Menyelesaikan log masuk… + Microsoft menolak log masuk Xbox. Log keluar daripada Xbox di Kedai, log masuk semula, kemudian sambung. Halaman log masuk tidak dapat dimuatkan: %1$s Penyedia ini menolak log masuk daripada halaman terbenam. Log masuk dengan kata laluan kedai anda sebaliknya. Halaman log masuk menjawab dengan ralat (HTTP %1$d). diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index af48f21a98..10ee3fea0d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2158,6 +2158,7 @@ Lukk Prøv igjen Fullfører innlogging… + Microsoft avviste Xbox-påloggingen. Logg ut av Xbox under Butikker, logg på igjen, og fortsett deretter. Innloggingssiden kunne ikke lastes: %1$s Denne leverandøren tillater ikke innlogging fra en innebygd side. Logg inn med butikkpassordet ditt i stedet. Innloggingssiden svarte med en feil (HTTP %1$d). diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d591de6ddf..866d126333 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2158,6 +2158,7 @@ Sluiten Probeer het opnieuw Aanmelden afronden… + Microsoft heeft de Xbox-aanmelding geweigerd. Meld je af bij Xbox in Winkels, meld je opnieuw aan en hervat daarna. De aanmeldpagina kon niet worden geladen: %1$s Deze provider staat geen aanmelding via een ingesloten pagina toe. Meld je in plaats daarvan aan met je winkelwachtwoord. De aanmeldpagina gaf een foutmelding (HTTP %1$d). diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b1cdccf7be..774f207d49 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2203,6 +2203,7 @@ Zamknij Spróbuj ponownie Kończenie logowania… + Microsoft odrzucił logowanie do Xbox. Wyloguj się z Xbox w Sklepach, zaloguj się ponownie, a potem wznów. Nie udało się wczytać strony logowania: %1$s Ten dostawca odmawia logowania z osadzonej strony. Zaloguj się za pomocą hasła do sklepu. Strona logowania odpowiedziała błędem (HTTP %1$d). diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 0d5d739f32..26ec662c27 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2168,6 +2168,7 @@ Fechar Tentar novamente A concluir o início de sessão… + A Microsoft recusou o início de sessão da Xbox. Termine a sessão da Xbox em Lojas, inicie sessão novamente e retome. Não foi possível carregar a página de início de sessão: %1$s Este fornecedor recusa o início de sessão a partir de uma página incorporada. Inicie sessão com a palavra-passe da loja. A página de início de sessão respondeu com um erro (HTTP %1$d). diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3e5cd06e73..e45878dc95 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2168,6 +2168,7 @@ Fechar Tentar de novo Concluindo o login… + A Microsoft recusou o login do Xbox. Saia do Xbox em Lojas, entre novamente e depois retome. Não foi possível carregar a página de login: %1$s Este provedor não permite login a partir de uma página incorporada. Faça login com a senha da loja. A página de login respondeu com um erro (HTTP %1$d). diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 60f025f872..997fd9352b 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2179,6 +2179,7 @@ Închide Încearcă din nou Se finalizează autentificarea… + Microsoft a respins conectarea la Xbox. Deconectează-te de la Xbox în Magazine, conectează-te din nou, apoi reia. Pagina de autentificare nu a putut fi încărcată: %1$s Acest furnizor refuză autentificarea dintr-o pagină încorporată. Autentifică-te cu parola magazinului în schimb. Pagina de autentificare a răspuns cu o eroare (HTTP %1$d). diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 39582774ca..fb845b999b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2199,6 +2199,7 @@ Закрыть Повторить Завершение входа… + Microsoft отклонила вход в Xbox. Выйдите из Xbox в разделе «Магазины», войдите снова и продолжите. Не удалось загрузить страницу входа: %1$s Этот сервис не разрешает вход со встроенной страницы. Войдите с паролем от магазина. Страница входа вернула ошибку (HTTP %1$d). diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d245c20a00..f4cf34256c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2158,6 +2158,7 @@ Stäng Försök igen Slutför inloggningen… + Microsoft avvisade Xbox-inloggningen. Logga ut från Xbox under Butiker, logga in igen och återuppta sedan. Inloggningssidan kunde inte läsas in: %1$s Den här leverantören vägrar logga in från en inbäddad sida. Logga in med ditt butikslösenord istället. Inloggningssidan svarade med ett fel (HTTP %1$d). diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index ae74b6e9f3..1d998b751d 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2137,6 +2137,7 @@ ปิด ลองใหม่ กำลังเสร็จสิ้นการลงชื่อเข้าใช้… + Microsoft ปฏิเสธการลงชื่อเข้าใช้ Xbox ลงชื่อออกจาก Xbox ในสโตร์ ลงชื่อเข้าใช้อีกครั้ง แล้วดำเนินการต่อ ไม่สามารถโหลดหน้าลงชื่อเข้าใช้ได้: %1$s ผู้ให้บริการนี้ปฏิเสธการลงชื่อเข้าใช้จากหน้าที่ฝังอยู่ ให้ลงชื่อเข้าใช้ด้วยรหัสผ่านของสโตร์แทน หน้าลงชื่อเข้าใช้ตอบกลับด้วยข้อผิดพลาด (HTTP %1$d) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 146f57d80c..fdd392dd94 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2149,6 +2149,7 @@ Kapat Yeniden dene Oturum açma tamamlanıyor… + Microsoft, Xbox oturum açmayı reddetti. Mağazalar\'da Xbox oturumunu kapatın, yeniden oturum açın ve devam edin. Oturum açma sayfası yüklenemedi: %1$s Bu sağlayıcı yerleşik bir sayfadan oturum açmayı reddediyor. Bunun yerine mağaza parolanızla oturum açın. Oturum açma sayfası bir hatayla yanıt verdi (HTTP %1$d). diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5b8bfd4c43..bb5d65d254 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2200,6 +2200,7 @@ Закрити Спробувати ще раз Завершення входу… + Microsoft відхилила вхід у Xbox. Вийдіть з Xbox у розділі «Магазини», увійдіть знову й продовжте. Не вдалося завантажити сторінку входу: %1$s Цей провайдер не дозволяє вхід із вбудованої сторінки. Увійдіть за допомогою пароля магазину. Сторінка входу відповіла помилкою (HTTP %1$d). diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 3effbb2a0f..8246e796b5 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2137,6 +2137,7 @@ Đóng Thử lại Đang hoàn tất đăng nhập… + Microsoft đã từ chối đăng nhập Xbox. Hãy đăng xuất Xbox trong Cửa hàng game, đăng nhập lại rồi tiếp tục. Không thể tải trang đăng nhập: %1$s Nhà cung cấp này từ chối đăng nhập từ một trang nhúng. Hãy đăng nhập bằng mật khẩu store của bạn thay vào đó. Trang đăng nhập trả về lỗi (HTTP %1$d). diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d7c20634c3..5b22e5b777 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2213,6 +2213,7 @@ 关闭 重试 正在完成登录… + Microsoft 拒绝了 Xbox 登录。请在游戏商店中退出 Xbox,重新登录,然后继续。 无法加载登录页面:%1$s 该第三方登录方式不允许在内嵌页面中登录。请改用商店密码登录。 登录页面返回了错误(HTTP %1$d)。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index e021df01e0..e0c2b1d021 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2140,6 +2140,7 @@ 關閉 再試一次 正在完成登入… + Microsoft 拒絕了 Xbox 登入。請在商店中登出 Xbox,重新登入,然後繼續。 無法載入登入頁面:%1$s 此提供者不允許從內嵌頁面登入。請改用商店密碼登入。 登入頁面回應錯誤(HTTP %1$d)。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 44e41ea6ab..2f2f66e1de 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2140,6 +2140,7 @@ 關閉 再試一次 正在完成登入… + Microsoft 拒絕了 Xbox 登入。請在遊戲商店中登出 Xbox,重新登入,然後繼續。 無法載入登入頁面:%1$s 此提供者拒絕從內嵌頁面登入。請改用商店密碼登入。 登入頁面回應錯誤(HTTP %1$d)。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bbe2d6fc36..1bd64ac04b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2249,6 +2249,7 @@ Close Try again Finishing sign-in… + 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. The sign-in page answered with an error (HTTP %1$d). 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 new file mode 100644 index 0000000000..71627850a1 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt @@ -0,0 +1,19 @@ +package com.droiddeck.launcher.stores.xbox + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class XodusDiagnosticsTest { + private val rejected = Regex(Xodus.SIGN_IN_REJECTED) + + @Test fun aContentLicenseRejectionIsRecognised() { + assertTrue("Microsoft content licensing rejected sign-in (HTTP 401). Sign in again in Settings.".matches(rejected)) + assertTrue("Microsoft content licensing rejected sign-in (HTTP 403). Sign in again in Settings.".matches(rejected)) + } + + @Test fun otherStderrTextIsNotTakenForARejection() { + assertFalse("Microsoft content licensing rejected sign-in (HTTP 401). Sign in again in Settings. token=abc".matches(rejected)) + assertFalse("NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 content-http 401".matches(rejected)) + } +} From bcb18e3fb7895dbc0ca5f6a34d014311d32c26e3 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 08:52:23 -0400 Subject: [PATCH 100/174] fix(xbox): match only the 401 rejection Xodus prints --- app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt | 2 +- .../com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 51bb3c714a..22ce89ffb2 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 @@ -150,7 +150,7 @@ internal object Xodus { } } - const val SIGN_IN_REJECTED = "Microsoft content licensing rejected sign-in \\(HTTP [0-9]{3}\\)\\. Sign in again in Settings\\." + const val SIGN_IN_REJECTED = "Microsoft content licensing rejected sign-in \\(HTTP 401\\)\\. Sign in again in Settings\\." /** Passes the backend's known stderr diagnostics to [report]; other stderr text never leaves the process. */ fun diagnostics(child: Child, report: (String) -> Unit = { com.droiddeck.launcher.stores.StoresState.logLine("Xbox: $it") }): Thread = Thread({ 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 71627850a1..c2d723f7b6 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 @@ -9,11 +9,11 @@ class XodusDiagnosticsTest { @Test fun aContentLicenseRejectionIsRecognised() { assertTrue("Microsoft content licensing rejected sign-in (HTTP 401). Sign in again in Settings.".matches(rejected)) - assertTrue("Microsoft content licensing rejected sign-in (HTTP 403). Sign in again in Settings.".matches(rejected)) } @Test fun otherStderrTextIsNotTakenForARejection() { assertFalse("Microsoft content licensing rejected sign-in (HTTP 401). Sign in again in Settings. token=abc".matches(rejected)) + 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)) } } From fee8ce91f36385034539b6ffd1c853da0c2c433d Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 10:35:25 -0400 Subject: [PATCH 101/174] fix(xbox): register the runtime's WinRT classes and load its wintypes so Minecraft starts --- README.md | 2 +- .../overlay/usr/local/bin/droiddeck-xbox | 36 ++++++++++++++++++- tools/tests/test_xbox_launch.py | 25 +++++++++++++ tools/xbox/runtime.lock.json | 3 +- 4 files changed, 63 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7d90815935..9b5dc82b8d 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ Compatibility and performance vary by device; hardware validation is limited. De ## Credits and licence -GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. +GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. XR glasses support builds on WinNative's VITURE glasses work. VITURE protocol details were checked against [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) by [@wheaney](https://github.com/wheaney), including the VITURE protocol header it ships, [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) by [@badicsalex](https://github.com/badicsalex) and the [go-macos/iokit VITURE package](https://pkg.go.dev/github.com/go-macos/iokit/viture); the optional VITURE SDK belongs to VITURE and is not included. RayNeo support adapts [@informalTechCode](https://github.com/informalTechCode)'s [RayNeo-Air-Series-3DoF-Scaffold](https://github.com/informalTechCode/RayNeo-Air-Series-3DoF-Scaffold) (Apache-2.0) and references [@verncat](https://github.com/verncat)'s [RayNeo-Air-3S-Pro-OpenVR](https://github.com/verncat/RayNeo-Air-3S-Pro-OpenVR) (MIT) and [Monado](https://gitlab.freedesktop.org/monado/monado) (BSL-1.0); see [docs/third-party/rayneo](docs/third-party/rayneo/README.md). XREAL 1S support references [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) by [@rohitsangwan01](https://github.com/rohitsangwan01) (MIT) and [xr-tools](https://github.com/0xcaff/xr-tools) by [@0xcaff](https://github.com/0xcaff). Rokid support follows the Rokid protocol notes in [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/), and [Monado](https://gitlab.freedesktop.org/monado/monado)'s Rokid driver. The REDMAGIC glasses-display findings draw on [@mekhontsev](https://github.com/mekhontsev)'s [MagicDesk investigation](https://github.com/mekhontsev/magicdesk/blob/main/docs/xr-resolution-fix.md) and [@Coding-BR](https://github.com/Coding-BR)'s [decompiled Nubia kernel](https://github.com/Coding-BR/android_kernel_nubia_sm8850_qwjujube). VITURE, RayNeo, XREAL, Rokid and REDMAGIC are trademarks of their owners; this project is not affiliated with them. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index c07a6d8334..2fa1199a10 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -15,7 +15,18 @@ import threading BIN = Path(__file__).resolve().parent RUNTIME = Path('/usr/local/lib/droiddeck-xbox') -DLLS = ('xgameruntime.dll', 'winhttp.dll', 'windows.web.dll', 'twinapi.appcore.dll', 'libnghttp2.dll') +DLLS = ('xgameruntime.dll', 'winhttp.dll', 'windows.web.dll', 'twinapi.appcore.dll', 'wintypes.dll', 'libnghttp2.dll') +CLASSES = { + 'twinapi.appcore.dll': ('Windows.ApplicationModel.DataTransfer.DataTransferManager', + 'Windows.Security.ExchangeActiveSyncProvisioning.EasClientDeviceInformation', + 'Windows.System.Profile.AnalyticsInfo', 'Windows.System.UserProfile.AdvertisingManager', + 'Windows.UI.ViewManagement.ApplicationView'), + 'windows.web.dll': ('Windows.Data.Json.JsonArray', 'Windows.Data.Json.JsonObject', 'Windows.Data.Json.JsonValue'), + 'wintypes.dll': ('Windows.Foundation.PropertyValue', 'Windows.Foundation.Collections.PropertySet', + 'Windows.Foundation.Metadata.ApiInformation', 'Windows.Storage.Streams.Buffer', + 'Windows.Storage.Streams.DataWriter'), +} +CLASS_KEY = 'Software\\Microsoft\\WindowsRuntime\\ActivatableClassId\\' def bridge(upstream): @@ -102,6 +113,28 @@ def bridge(upstream): return server.getsockname()[1], key.decode('ascii'), close +def register_classes(proton, prefix, env): + try: + registry = (prefix / 'system.reg').read_text(encoding='utf-8', errors='replace') + except OSError: + return + missing = [(name, dll) for dll, names in CLASSES.items() for name in names + if '[%s]' % (CLASS_KEY + name).replace('\\', '\\\\') not in registry] + if not missing: + return + text = 'Windows Registry Editor Version 5.00\r\n\r\n' + ''.join( + '[HKEY_LOCAL_MACHINE\\%s%s]\r\n"DllPath"="C:\\\\windows\\\\system32\\\\%s"\r\n\r\n' % (CLASS_KEY, name, dll) + for name, dll in missing) + with tempfile.TemporaryDirectory(prefix='droiddeck-xbox-') as temporary: + source = Path(temporary) / 'classes.reg' + source.write_bytes(b'\xff\xfe' + text.encode('utf-16-le')) + try: + subprocess.run([proton, 'run', 'reg.exe', 'import', 'Z:' + str(source).replace('/', '\\')], + stdout=sys.stderr, env=env, timeout=90) + except subprocess.TimeoutExpired: + print('droiddeck-xbox: Windows Runtime class registration timed out', file=sys.stderr) + + def wine(argv, source_env=None): source_env = os.environ if source_env is None else source_env with open(source_env['DROIDDECK_XBOX_COMMAND_FILE'], encoding='utf-8') as file: @@ -124,6 +157,7 @@ def wine(argv, source_env=None): if target.is_symlink(): target.unlink() shutil.copyfile(RUNTIME / 'windows' / name, target) + register_classes(command[0], prefix, env) overrides = ';'.join(name[:-4] + '=n' for name in DLLS if name != 'libnghttp2.dll') env['WINEDLLOVERRIDES'] = overrides + ';' + env.get('WINEDLLOVERRIDES', '') return subprocess.call([*command[:2], argv[0], *command[3:]], env=env) diff --git a/tools/tests/test_xbox_launch.py b/tools/tests/test_xbox_launch.py index fb7bfdc0de..f578ef0e57 100644 --- a/tools/tests/test_xbox_launch.py +++ b/tools/tests/test_xbox_launch.py @@ -129,3 +129,28 @@ class XboxLaunchTest(unittest.TestCase): self.assertNotIn('DROIDDECK_XBOX_CREDENTIAL_SOCKET', child_env) self.assertNotIn('DROIDDECK_XBOX_COMMAND_FILE', child_env) self.assertEqual(child_env['XODUS_BRIDGE_KEY'], 'runtime-key') + + def test_missing_runtime_classes_are_registered_once(self): + with tempfile.TemporaryDirectory() as root: + prefix = Path(root) + key = xbox['CLASS_KEY'].replace('\\', '\\\\') + present = [name for names in xbox['CLASSES'].values() for name in names + if name != 'Windows.ApplicationModel.DataTransfer.DataTransferManager'] + (prefix / 'system.reg').write_text(''.join('[%s%s] 1\n"DllPath"="x"\n\n' % (key, name) for name in present)) + imported = [] + def run(argv, **kwargs): + imported.append(Path(argv[4][2:].replace('\\', '/')).read_bytes()[2:].decode('utf-16-le')) + with patch('subprocess.run', side_effect=run) as child: + xbox['register_classes']('/selected/proton', prefix, {'A': '1'}) + self.assertEqual(child.call_args.args[0][:4], ['/selected/proton', 'run', 'reg.exe', 'import']) + self.assertEqual(child.call_args.kwargs['env'], {'A': '1'}) + self.assertEqual(imported, ['Windows Registry Editor Version 5.00\r\n\r\n[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\WindowsRuntime' + '\\ActivatableClassId\\Windows.ApplicationModel.DataTransfer.DataTransferManager]\r\n' + '"DllPath"="C:\\\\windows\\\\system32\\\\twinapi.appcore.dll"\r\n\r\n']) + with (prefix / 'system.reg').open('a') as file: + file.write('[%sWindows.ApplicationModel.DataTransfer.DataTransferManager] 1\n' % key) + with patch('subprocess.run') as child: + xbox['register_classes']('/selected/proton', prefix, {}) + (prefix / 'system.reg').unlink() + xbox['register_classes']('/selected/proton', prefix, {}) + child.assert_not_called() diff --git a/tools/xbox/runtime.lock.json b/tools/xbox/runtime.lock.json index d8e3de855b..eb3042fa45 100644 --- a/tools/xbox/runtime.lock.json +++ b/tools/xbox/runtime.lock.json @@ -12,6 +12,7 @@ "windows.web.dll": "1a510c73ca31475b163692337d3cf37fef3381078df9729662095fc92b2e4e83", "libnghttp2.dll": "2b171eba9296b207fe6016560e5381bc6e7405f3ad5ee5cd4add316358204ec0", "xgameruntime.dll": "060120e0ec6bccfbab516128315a0658b11d3e316f62a917c653daf1a1dd3e05", - "winhttp.dll": "81e1da7a731d83fbd24dbe2fa2ecb8f155bd477a9f9b6f4cc3932063cc326c27" + "winhttp.dll": "81e1da7a731d83fbd24dbe2fa2ecb8f155bd477a9f9b6f4cc3932063cc326c27", + "wintypes.dll": "7d06083e3d8b3a7e11555a91e7918f11c7d444a74755d41c8d1990db3697c895" } } From aefd8a3b60fb340eaae7eba9ce7f5a4106be2272 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 10:58:40 -0400 Subject: [PATCH 102/174] fix(xbox): report a failed class registration in the launch log --- tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox | 8 +++++--- tools/tests/test_xbox_launch.py | 13 +++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index 2fa1199a10..e9fd668ce4 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -129,10 +129,12 @@ def register_classes(proton, prefix, env): source = Path(temporary) / 'classes.reg' source.write_bytes(b'\xff\xfe' + text.encode('utf-16-le')) try: - subprocess.run([proton, 'run', 'reg.exe', 'import', 'Z:' + str(source).replace('/', '\\')], - stdout=sys.stderr, env=env, timeout=90) + failed = subprocess.run([proton, 'run', 'reg.exe', 'import', 'Z:' + str(source).replace('/', '\\')], + stdout=sys.stderr, env=env, timeout=90).returncode != 0 except subprocess.TimeoutExpired: - print('droiddeck-xbox: Windows Runtime class registration timed out', file=sys.stderr) + failed = True + if failed: + print('droiddeck-xbox: Windows Runtime class registration failed; launching without it', file=sys.stderr) def wine(argv, source_env=None): diff --git a/tools/tests/test_xbox_launch.py b/tools/tests/test_xbox_launch.py index f578ef0e57..2d7aaecd9a 100644 --- a/tools/tests/test_xbox_launch.py +++ b/tools/tests/test_xbox_launch.py @@ -1,8 +1,10 @@ +import io import json import os from pathlib import Path import runpy import socket +import subprocess import tempfile import threading import unittest @@ -140,6 +142,7 @@ class XboxLaunchTest(unittest.TestCase): imported = [] def run(argv, **kwargs): imported.append(Path(argv[4][2:].replace('\\', '/')).read_bytes()[2:].decode('utf-16-le')) + return subprocess.CompletedProcess(argv, 0) with patch('subprocess.run', side_effect=run) as child: xbox['register_classes']('/selected/proton', prefix, {'A': '1'}) self.assertEqual(child.call_args.args[0][:4], ['/selected/proton', 'run', 'reg.exe', 'import']) @@ -154,3 +157,13 @@ class XboxLaunchTest(unittest.TestCase): (prefix / 'system.reg').unlink() xbox['register_classes']('/selected/proton', prefix, {}) child.assert_not_called() + + def test_failed_class_registration_is_reported_and_launch_continues(self): + with tempfile.TemporaryDirectory() as root: + prefix = Path(root) + (prefix / 'system.reg').write_text('') + for outcome in ({'return_value': subprocess.CompletedProcess([], 1)}, + {'side_effect': subprocess.TimeoutExpired('reg.exe', 90)}): + with patch('subprocess.run', **outcome), patch('sys.stderr', new_callable=io.StringIO) as err: + self.assertIsNone(xbox['register_classes']('/selected/proton', prefix, {})) + self.assertIn('registration failed', err.getvalue()) From 1883a8c7cfd5ed013e169cfdedb63c49cb2616ad Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 11:15:35 -0400 Subject: [PATCH 103/174] itch.io browse: drop code comments --- .../com/droiddeck/launcher/stores/itch/ItchBrowse.kt | 10 ---------- .../java/com/droiddeck/launcher/ui/ItchBrowseBar.kt | 3 --- .../droiddeck/launcher/stores/itch/ItchBrowseTest.kt | 1 - 3 files changed, 14 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt index 781f918ec9..f820be6d23 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt @@ -10,7 +10,6 @@ import org.json.JSONArray import java.io.File import java.security.MessageDigest -/** What the Store tab is showing: an order, a price filter and, later, platforms and tags. The default is the front page. */ internal data class BrowseQuery( val sort: String = ItchBrowse.SORT_POPULAR, val price: String = ItchBrowse.PRICE_ANY, @@ -38,7 +37,6 @@ internal object ItchBrowse { const val PRICE_UNDER_15 = "15-dollars-or-less" val prices = listOf(PRICE_ANY, PRICE_FREE, PRICE_SALE, PRICE_PAID, PRICE_UNDER_5, PRICE_UNDER_15) - /** Platform names as itch spells them in `platform-`. */ val platformNames = listOf("windows", "osx", "linux", "android", "ios", "web", "mobile-web") private const val BASE = "https://itch.io/games" @@ -50,12 +48,10 @@ internal object ItchBrowse { @Volatile private var lastRequestAt = 0L private val lock = Any() - /** The path piece itch uses for each choice; the default sort and price have none. */ private fun sortSegment(sort: String): String? = sort.takeIf { it != SORT_POPULAR && it in sorts } private fun priceSegment(price: String): String? = price.takeIf { it != PRICE_ANY && it in prices } - /** The address of [query]'s page on itch: sort, price, platforms, then tags, as itch's own links spell them. */ fun path(query: BrowseQuery): String { val segments = listOfNotNull(sortSegment(query.sort), priceSegment(query.price)) + query.platforms.sorted().map { "platform-$it" } + @@ -63,12 +59,10 @@ internal object ItchBrowse { return if (segments.isEmpty()) BASE else BASE + "/" + segments.joinToString("/") } - /** The listing feed for [query]'s [page]. */ fun url(query: BrowseQuery, page: Int): String = path(query) + ".xml" + if (page > 1) "?page=$page" else "" fun tagSlug(tag: String): String = tag.trim().lowercase().replace(Regex("[^a-z0-9]+"), "-").trim('-') - /** Page [page] of [query]: the disk copy when it is fresh, otherwise the feed, one request at a time and spaced out. */ fun page(context: Context, query: BrowseQuery, page: Int, force: Boolean = false): BrowsePage { val app = context.applicationContext val url = url(query, page) @@ -120,7 +114,6 @@ internal object ItchBrowse { } } -/** The Store tab's result list: the query, the games loaded so far, and whether more can be asked for. */ internal object ItchBrowseState { var query by mutableStateOf(BrowseQuery()) private set @@ -136,7 +129,6 @@ internal object ItchBrowseState { private var next = 1 private var generation = 0 - /** Whether the tab shows these results instead of the front page shelves. */ val active: Boolean get() = !query.isDefault fun choose(context: Context, wanted: BrowseQuery) { @@ -151,7 +143,6 @@ internal object ItchBrowseState { if (active) more(context) } - /** Asks for the next page. A page that failed is only asked for again when [retry] is set, so scrolling can't loop on it. */ fun more(context: Context, retry: Boolean = false) { if (loading || ended || !active || (failed && !retry)) return loading = true @@ -165,7 +156,6 @@ internal object ItchBrowseState { StoresState.post { if (mine != generation) return@post loading = false - // A thrown or non-2xx fetch leaves the list open so the same page can be asked for again. if (answer == null || answer.code !in 200..299) { failed = true return@post diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt index fd73344512..e1e170fdeb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -34,7 +34,6 @@ import com.droiddeck.launcher.R import com.droiddeck.launcher.stores.itch.ItchBrowse import com.droiddeck.launcher.stores.itch.ItchBrowseState -/** Sort and price chips above the itch Store tab; picking anything but the defaults swaps the shelves for results. */ @Composable internal fun ItchBrowseBar() { val ctx = LocalContext.current @@ -49,12 +48,10 @@ internal fun ItchBrowseBar() { } } -/** The end of the result list: it asks for the next page as it scrolls into view. */ @Composable internal fun ItchLoadMore() { val ctx = LocalContext.current val count = ItchBrowseState.items.size - // Keyed on nothing that changes with a page, so appending games never re-fires it while this end item stays composed; scrolling it back into view does. LaunchedEffect(Unit) { ItchBrowseState.more(ctx) } if (ItchBrowseState.loading) LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 12.dp)) else if (ItchBrowseState.failed) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt index 8ee4f83346..6b73153345 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt @@ -5,7 +5,6 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test -/** Every address here was copied from itch.io's own links, not worked out. */ class ItchBrowseTest { private fun path(sort: String = ItchBrowse.SORT_POPULAR, price: String = ItchBrowse.PRICE_ANY, platforms: Set = emptySet(), tags: List = emptyList()) = ItchBrowse.path(BrowseQuery(sort, price, platforms, tags)) From 5a56d9f78548d4264d573afdd93500c000a5eac4 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 12:31:11 -0400 Subject: [PATCH 104/174] fix(steam): Browse buttons open a file chooser on the ARM64 client Steam's ARM64 client has no desktop-portal file chooser, so SteamClient.System.OpenFileDialog failed at once and every Browse button (Add a Non-Steam Game, shortcut target, library folder) did nothing. The Steam UI bridge now answers it with a GTK file chooser run under Steam's reaper, so gamescope shows it over Steam. --- README.md | 2 + .../usr/local/bin/droiddeck-steam-compat | 170 ++++++++++++++++++ tools/tests/test_steam_file_dialog.py | 134 ++++++++++++++ 3 files changed, 306 insertions(+) create mode 100644 tools/tests/test_steam_file_dialog.py diff --git a/README.md b/README.md index 9b5dc82b8d..653df9f720 100644 --- a/README.md +++ b/README.md @@ -66,3 +66,5 @@ Joy-Con VR controllers port the arm model of Google's [Google VR SDK for Unity]( Camera hand tracking runs Google's [MediaPipe](https://github.com/google-ai-edge/mediapipe) Tasks Vision library with its Pose Landmarker (Lite) model, BlazePose GHUM 3D, and its Hand Landmarker model (all Apache-2.0), on frames from AndroidX [CameraX](https://developer.android.com/jetpack/androidx/releases/camera) (Apache-2.0); MediaPipe's usage reports are switched off. The design was checked against [@F8LEFT](https://github.com/F8LEFT)'s [JoyConVr](https://github.com/F8LEFT/JoyConVr) camera app (MIT), and the short Joy-Con movements follow the accelerometer mode of the [Google VR SDK for Unity](https://github.com/googlevr/gvr-unity-sdk)'s arm model, Eric Foxlin's zero-velocity updates and Frosio, Pedersini and Borghese's accelerometer autocalibration, and the camera and Joy-Con are joined by a Kalman filter (R. E. Kalman, 1960). Bare camera hands take their gestures after [ALVR](https://github.com/alvr-org/ALVR)'s `hand_gestures.rs` (MIT) and Meta Quest's menu pinch, with distances checked on photos from the [HaGRID](https://github.com/hukenovs/hagrid) gesture set (CC BY-SA 4.0, not included), fit the palm with Horn's quaternion method (1987) and smooth it with the 1€ filter (Casiez, Roussel and Vogel, 2012); the white glove model follows Valve's OpenVR render model reference and Index controller poses, is meshed with surface nets (Gibson, 1998; Mikola Lysenko) and blends and shades it with Inigo Quilez's smooth minimum and distance-field ambient occlusion, porting his polygon distance (MIT); see [docs/third-party/handtracking](docs/third-party/handtracking/README.md). The Store installs and runs apps with [Flatpak](https://github.com/flatpak/flatpak) (LGPL-2.1). Its sandbox goes through DroidDeck's own bubblewrap shim, which follows how Flatpak hands bwrap its environment. Chromium and Electron apps from Flathub start their browser processes through [zypak](https://github.com/refi64/zypak) by [@refi64](https://github.com/refi64) (BSD-3-Clause); its source was read to see that it always spawns them through Flatpak's spawn portal, which is why DroidDeck starts them directly without Chromium's sandbox instead. + +Steam's Browse buttons open a GTK 3 file chooser through PyGObject (LGPL-2.1-or-later). It runs under Steam's own `reaper` with Steam's app ID, which [gamescope](https://github.com/ValveSoftware/gamescope) (BSD-2-Clause) reads from the process tree (`GetAppIdFromReaper` in `src/Utils/Process.cpp`) to show it over Steam. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 1de4bcf1c9..3127ace34a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -196,6 +196,43 @@ TOUR_JS = r""" return "off"; })() """ +FILE_BINDING = "droiddeckOpenFileDialog" +FILE_JS = r""" +(() => { + if (window.__droiddeckFiles) return "present"; + const self = { next: 0, pending: new Map() }; + const cancelled = () => ({ result: 2, message: "" }); + const open = function (options) { + return new Promise((resolve, reject) => { + if (typeof window.__BINDING__ !== "function") { reject(cancelled()); return; } + const id = ++self.next; + self.pending.set(id, { resolve, reject }); + try { window.__BINDING__(JSON.stringify({ id, options: options || {} })); } + catch (e) { self.pending.delete(id); reject(cancelled()); } + }); + }; + self.done = (id, path) => { + const item = self.pending.get(id); + if (!item) return false; + self.pending.delete(id); + if (typeof path === "string" && path) item.resolve(path); else item.reject(cancelled()); + return true; + }; + const patch = (w) => { + const system = w?.SteamClient?.System; + if (system && system.OpenFileDialog !== open) system.OpenFileDialog = open; + }; + patch(window); + if (SteamClient.System.OpenFileDialog !== open) throw new Error("Steam OpenFileDialog could not be redirected"); + const popups = window.g_PopupManager; + if (popups) { + for (const popup of popups.GetPopups?.() || []) patch(popup.window); + popups.AddPopupCreatedCallback?.((popup) => patch(popup.window)); + } + window.__droiddeckFiles = self; + return "installed"; +})() +""".replace("__BINDING__", FILE_BINDING) VR_BINDING = "droiddeckLaunchSteamVr" VR_HELPER = "/usr/local/bin/droiddeck-steamvr" VR_JS = r""" @@ -274,6 +311,62 @@ def launch_steamvr(): say("SteamVR library launch failed: %s" % e) +def choose_file(options): + import gi + gi.require_version("Gdk", "3.0") + gi.require_version("Gtk", "3.0") + from gi.repository import Gdk, Gtk + directory = bool(options.get("bChooseDirectory")) + save = bool(options.get("bSaveMode")) and not directory + action = (Gtk.FileChooserAction.SELECT_FOLDER if directory else + Gtk.FileChooserAction.SAVE if save else Gtk.FileChooserAction.OPEN) + dialog = Gtk.FileChooserDialog(title=str(options.get("strTitle") or ""), action=action) + dialog.add_buttons("gtk-cancel", Gtk.ResponseType.CANCEL, + "gtk-save" if save else "gtk-open", Gtk.ResponseType.ACCEPT) + dialog.set_default_response(Gtk.ResponseType.ACCEPT) + dialog.set_local_only(True) + dialog.set_do_overwrite_confirmation(True) + for folder in ("/root/Storage", "/mnt/droiddeck-sd"): + if os.path.isdir(folder): + try: + dialog.add_shortcut_folder(folder) + except Exception: + pass + if not directory: + for entry in options.get("rgFilters") or []: + patterns = [str(p) for p in entry.get("rFilePatterns") or [] if p] + if not patterns: + continue + chosen = Gtk.FileFilter() + chosen.set_name(str(entry.get("strFileTypeName") or ", ".join(patterns))) + for pattern in patterns: + pattern = "*" if pattern == "*.*" else pattern + chosen.add_pattern(pattern) + if pattern.lower() != pattern.upper(): + chosen.add_pattern(pattern.upper()) + dialog.add_filter(chosen) + if entry.get("bUseAsDefault"): + dialog.set_filter(chosen) + initial = str(options.get("strInitialFile") or "").strip('"') + if initial: + if os.path.isdir(initial): + dialog.set_current_folder(initial) + elif save: + if os.path.isdir(os.path.dirname(initial)): + dialog.set_current_folder(os.path.dirname(initial)) + dialog.set_current_name(os.path.basename(initial)) + elif os.path.exists(initial): + dialog.set_filename(initial) + elif os.path.isdir(os.path.dirname(initial)): + dialog.set_current_folder(os.path.dirname(initial)) + screen = Gdk.Screen.get_default() + if screen is not None: + dialog.set_default_size(screen.get_width(), screen.get_height()) + chosen_path = dialog.get_filename() if dialog.run() == Gtk.ResponseType.ACCEPT else None + dialog.destroy() + return chosen_path + + class Closed(Exception): pass @@ -530,6 +623,59 @@ class Helper: self.tools_asked = {} self.tools_checked = None self.vr_launch = None + self.chooser = None + + def open_chooser(self, payload): + try: + request = json.loads(payload) + ident = int(request["id"]) + options = request.get("options", {}) + if not isinstance(options, dict): + raise ValueError("options are not an object") + except (ValueError, KeyError, TypeError) as e: + say("ignored a file dialog request (%s)" % e) + return + if self.chooser is not None: + self.finish_chooser(ident, None) + return + command = [sys.executable, os.path.realpath(__file__), "--choose-file"] + reaper = os.path.join(self.steam_root, "steamrtarm64", "reaper") + if os.access(reaper, os.X_OK): + command = [reaper, "SteamLaunch", "AppId=769", "--"] + command + try: + proc = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL, start_new_session=True) + proc.stdin.write(json.dumps(options).encode("utf-8")) + proc.stdin.close() + except OSError as e: + say("could not open a file dialog (%s)" % e) + self.finish_chooser(ident, None) + return + say("file dialog open: %s" % (options.get("strTitle") or "untitled")) + self.chooser = (ident, proc) + + def chooser_done(self): + ident, proc = self.chooser + self.chooser = None + path = proc.stdout.read().decode("utf-8", "replace").strip() + proc.stdout.close() + proc.wait() + self.finish_chooser(ident, path if proc.returncode == 0 and path else None) + + def finish_chooser(self, ident, path): + say("file dialog %s" % ("chose " + path if path else "cancelled")) + self.page.evaluate("window.__droiddeckFiles?.done(%d, %s)" % (ident, json.dumps(path))) + + def close_chooser(self): + if self.chooser is not None: + _, proc = self.chooser + self.chooser = None + try: + os.killpg(proc.pid, signal.SIGTERM) + except OSError: + pass + proc.stdout.close() + proc.wait() def attach(self): path = shared_context(self.port) @@ -542,6 +688,8 @@ class Helper: page.call("Runtime.addBinding", {"name": BINDING}) page.call("Runtime.addBinding", {"name": VR_BINDING}) page.evaluate(VR_JS) + page.call("Runtime.addBinding", {"name": FILE_BINDING}) + page.evaluate(FILE_JS) try: page.evaluate(TOUR_JS) except RuntimeError: @@ -680,6 +828,9 @@ class Helper: if vr_games and (self.vr_launch is None or self.vr_launch.poll() is not None): say("preparing SteamVR for library app(s): " + ", ".join(sorted(vr_games))) self.vr_launch = launch_steamvr() + for e in events: + if called(e, FILE_BINDING) and isinstance(e.get("params", {}).get("payload"), str): + self.open_chooser(e["params"]["payload"]) return events def serve(self, watcher): @@ -690,7 +841,11 @@ class Helper: self.ensure_tools() while True: sources = [self.page.ws] + ([watcher] if watcher.fileno() >= 0 else []) + if self.chooser is not None: + sources.append(self.chooser[1].stdout) ready = [self.page.ws] if self.page.ws.pending() else select.select(sources, [], [], 30 if watcher.fileno() >= 0 else 2)[0] + if self.chooser is not None and self.chooser[1].stdout in ready: + self.chooser_done() due = False if self.page.ws in ready: due = any(called(e, BINDING) for e in self.drain()) @@ -718,6 +873,18 @@ def detach(): COMPAT["write_json"](state_file, state) +def chooser_main(): + try: + options = json.load(sys.stdin) + except ValueError: + return 1 + path = choose_file(options if isinstance(options, dict) else {}) + if not path: + return 1 + print(path) + return 0 + + def main(): steam_root = sys.argv[1] try: @@ -739,6 +906,7 @@ def main(): last = None helper.serve(watcher) except Exception as e: + helper.close_chooser() if helper.page is not None: say("lost the client (%s); reattaching" % e) helper.page.ws.close() @@ -752,6 +920,8 @@ def main(): if __name__ == "__main__": + if sys.argv[1:2] == ["--choose-file"]: + sys.exit(chooser_main()) signal.signal(signal.SIGTERM, lambda *_: sys.exit(0)) try: sys.exit(main()) diff --git a/tools/tests/test_steam_file_dialog.py b/tools/tests/test_steam_file_dialog.py new file mode 100644 index 0000000000..baff8914f7 --- /dev/null +++ b/tools/tests/test_steam_file_dialog.py @@ -0,0 +1,134 @@ +import io +import json +import os +import runpy +import subprocess +import sys +import tempfile +import unittest +from pathlib import Path +from unittest import mock + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +LIVE = runpy.run_path(str(BIN / "droiddeck-steam-compat")) + +HARNESS = r""" +const assert = require('assert'); +globalThis.window = globalThis; +const native = () => Promise.reject({ result: 2, message: '' }); +const popupCallbacks = []; +const popup = { window: { SteamClient: { System: { OpenFileDialog: native } } } }; +const later = { window: { SteamClient: { System: { OpenFileDialog: native } } } }; +globalThis.SteamClient = { System: { OpenFileDialog: native } }; +window.g_PopupManager = { GetPopups: () => [popup], AddPopupCreatedCallback: cb => popupCallbacks.push(cb) }; +const asked = []; +window.droiddeckOpenFileDialog = payload => asked.push(JSON.parse(payload)); +const script = require('fs').readFileSync(process.argv[2], 'utf8'); +(async () => { + assert.strictEqual(eval(script), 'installed'); + assert.strictEqual(eval(script), 'present'); + assert.notStrictEqual(SteamClient.System.OpenFileDialog, native); + assert.strictEqual(popup.window.SteamClient.System.OpenFileDialog, SteamClient.System.OpenFileDialog); + popupCallbacks.forEach(cb => cb(later)); + assert.strictEqual(later.window.SteamClient.System.OpenFileDialog, SteamClient.System.OpenFileDialog); + const options = { strTitle: 'Pick', bChooseDirectory: true }; + const chosen = SteamClient.System.OpenFileDialog(options); + const cancelled = later.window.SteamClient.System.OpenFileDialog({ strTitle: 'Other' }); + assert.deepStrictEqual(asked, [{ id: 1, options }, { id: 2, options: { strTitle: 'Other' } }]); + assert.strictEqual(window.__droiddeckFiles.done(1, '/root/Storage/Games'), true); + assert.strictEqual(window.__droiddeckFiles.done(1, '/again'), false); + assert.strictEqual(await chosen, '/root/Storage/Games'); + window.__droiddeckFiles.done(2, null); + await assert.rejects(cancelled, e => e.result === 2); + delete window.droiddeckOpenFileDialog; + await assert.rejects(SteamClient.System.OpenFileDialog({}), e => e.result === 2); +})().catch(e => { console.error(e); process.exit(1); }); +""" + + +def bound(payload): + return {"method": "Runtime.bindingCalled", "params": {"name": LIVE["FILE_BINDING"], "payload": payload}} + + +class FileDialogScriptTest(unittest.TestCase): + def test_every_window_asks_the_bridge_and_gets_the_path_or_a_cancel(self): + with tempfile.TemporaryDirectory() as tmp: + script = Path(tmp) / "files.js" + script.write_text(LIVE["FILE_JS"]) + harness = Path(tmp) / "harness.js" + harness.write_text(HARNESS) + result = subprocess.run(["node", str(harness), str(script)], capture_output=True, text=True, timeout=20) + self.assertEqual(result.returncode, 0, result.stderr) + + +class FileDialogBridgeTest(unittest.TestCase): + def setUp(self): + self.globals = LIVE["Helper"].attach.__globals__ + self.tmp = tempfile.TemporaryDirectory() + self.addCleanup(self.tmp.cleanup) + self.root = Path(self.tmp.name) + self.helper = LIVE["Helper"](str(self.root), 1) + self.helper.page = mock.Mock() + + def answer(self): + return self.helper.page.evaluate.call_args.args[0] + + def test_the_chooser_runs_under_a_steam_reaper_with_the_options_on_stdin(self): + reaper = self.root / "steamrtarm64/reaper" + reaper.parent.mkdir() + reaper.write_text("#!/bin/sh\n") + reaper.chmod(0o755) + proc = mock.Mock(stdin=io.BytesIO()) + proc.stdin.close = lambda: None + with mock.patch.object(self.globals["subprocess"], "Popen", return_value=proc) as popen: + self.helper.page.drain.return_value = [bound(json.dumps({"id": 3, "options": {"strTitle": "Pick"}}))] + self.helper.drain() + command = popen.call_args.args[0] + self.assertEqual(command[:4], [str(reaper), "SteamLaunch", "AppId=769", "--"]) + self.assertEqual(command[-1], "--choose-file") + self.assertEqual(json.loads(proc.stdin.getvalue()), {"strTitle": "Pick"}) + self.assertEqual(self.helper.chooser, (3, proc)) + + def test_a_second_request_while_one_is_open_is_cancelled(self): + first = mock.Mock() + self.helper.chooser = (1, first) + self.helper.open_chooser(json.dumps({"id": 2, "options": {}})) + self.assertEqual(self.answer(), "window.__droiddeckFiles?.done(2, null)") + self.assertEqual(self.helper.chooser, (1, first)) + + def test_the_chosen_path_or_a_cancel_goes_back_to_the_page(self): + for code, out, expected in ((0, b"/root/Storage/My Game/game.sh\n", '"/root/Storage/My Game/game.sh"'), + (1, b"", "null"), (0, b"\n", "null")): + proc = mock.Mock(stdout=io.BytesIO(out), returncode=code) + self.helper.chooser = (7, proc) + self.helper.chooser_done() + self.assertEqual(self.answer(), "window.__droiddeckFiles?.done(7, %s)" % expected) + self.assertIsNone(self.helper.chooser) + + def test_bad_requests_are_ignored(self): + with mock.patch.object(self.globals["subprocess"], "Popen") as popen: + for payload in ("not json", json.dumps({"options": {}}), json.dumps({"id": 1, "options": []})): + self.helper.open_chooser(payload) + popen.assert_not_called() + self.helper.page.evaluate.assert_not_called() + + def test_choose_file_mode_prints_the_path_and_fails_on_cancel(self): + for chosen, code, printed in (("/root/Storage/a.exe", 0, "/root/Storage/a.exe\n"), (None, 1, "")): + with mock.patch.dict(LIVE["chooser_main"].__globals__, {"choose_file": mock.Mock(return_value=chosen)}), \ + mock.patch.object(sys, "stdin", io.StringIO('{"strTitle": "Pick"}')), \ + mock.patch.object(sys, "stdout", io.StringIO()) as out: + self.assertEqual(LIVE["chooser_main"](), code) + self.assertEqual(out.getvalue(), printed) + + def test_attach_installs_the_file_dialog_bridge(self): + page = mock.Mock() + page.evaluate.return_value = True + with mock.patch.dict(self.globals, {"shared_context": lambda port: "/devtools/page/1", + "Page": mock.Mock(return_value=page)}): + self.helper.attach() + page.call.assert_any_call("Runtime.addBinding", {"name": LIVE["FILE_BINDING"]}) + page.evaluate.assert_any_call(LIVE["FILE_JS"]) + + +if __name__ == "__main__": + unittest.main() From 8d66570d334094ba2dfb2fdf735f5d286abf6980 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 12:54:03 -0400 Subject: [PATCH 105/174] Steam file dialog: keep spaces in the chosen path, cancel when GTK 3 is missing or the bridge reconnects --- .../usr/local/bin/droiddeck-steam-compat | 29 +++++++++++++++---- tools/tests/test_steam_file_dialog.py | 24 ++++++++++----- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 3127ace34a..73bf29c3e1 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -199,9 +199,12 @@ TOUR_JS = r""" FILE_BINDING = "droiddeckOpenFileDialog" FILE_JS = r""" (() => { - if (window.__droiddeckFiles) return "present"; - const self = { next: 0, pending: new Map() }; const cancelled = () => ({ result: 2, message: "" }); + if (window.__droiddeckFiles) { + window.__droiddeckFiles.cancelAll(); + return "present"; + } + const self = { next: 0, pending: new Map() }; const open = function (options) { return new Promise((resolve, reject) => { if (typeof window.__BINDING__ !== "function") { reject(cancelled()); return; } @@ -218,6 +221,11 @@ FILE_JS = r""" if (typeof path === "string" && path) item.resolve(path); else item.reject(cancelled()); return true; }; + self.cancelAll = () => { + const items = Array.from(self.pending.values()); + self.pending.clear(); + for (const item of items) item.reject(cancelled()); + }; const patch = (w) => { const system = w?.SteamClient?.System; if (system && system.OpenFileDialog !== open) system.OpenFileDialog = open; @@ -657,10 +665,16 @@ class Helper: def chooser_done(self): ident, proc = self.chooser self.chooser = None - path = proc.stdout.read().decode("utf-8", "replace").strip() + out = proc.stdout.read().decode("utf-8", "replace") proc.stdout.close() proc.wait() - self.finish_chooser(ident, path if proc.returncode == 0 and path else None) + if proc.returncode == 2: + say("file dialog needs GTK 3 and PyGObject, which come with the desktop") + try: + path = json.loads(out) if proc.returncode == 0 else None + except ValueError: + path = None + self.finish_chooser(ident, path if isinstance(path, str) and path else None) def finish_chooser(self, ident, path): say("file dialog %s" % ("chose " + path if path else "cancelled")) @@ -878,10 +892,13 @@ def chooser_main(): options = json.load(sys.stdin) except ValueError: return 1 - path = choose_file(options if isinstance(options, dict) else {}) + try: + path = choose_file(options if isinstance(options, dict) else {}) + except (ImportError, ValueError): + return 2 if not path: return 1 - print(path) + print(json.dumps(path)) return 0 diff --git a/tools/tests/test_steam_file_dialog.py b/tools/tests/test_steam_file_dialog.py index baff8914f7..f557b3557a 100644 --- a/tools/tests/test_steam_file_dialog.py +++ b/tools/tests/test_steam_file_dialog.py @@ -26,7 +26,11 @@ window.droiddeckOpenFileDialog = payload => asked.push(JSON.parse(payload)); const script = require('fs').readFileSync(process.argv[2], 'utf8'); (async () => { assert.strictEqual(eval(script), 'installed'); + const orphan = SteamClient.System.OpenFileDialog({ strTitle: 'Before reconnect' }); assert.strictEqual(eval(script), 'present'); + await assert.rejects(orphan, e => e.result === 2); + assert.strictEqual(window.__droiddeckFiles.done(1, '/late'), false); + asked.length = 0; assert.notStrictEqual(SteamClient.System.OpenFileDialog, native); assert.strictEqual(popup.window.SteamClient.System.OpenFileDialog, SteamClient.System.OpenFileDialog); popupCallbacks.forEach(cb => cb(later)); @@ -34,11 +38,11 @@ const script = require('fs').readFileSync(process.argv[2], 'utf8'); const options = { strTitle: 'Pick', bChooseDirectory: true }; const chosen = SteamClient.System.OpenFileDialog(options); const cancelled = later.window.SteamClient.System.OpenFileDialog({ strTitle: 'Other' }); - assert.deepStrictEqual(asked, [{ id: 1, options }, { id: 2, options: { strTitle: 'Other' } }]); - assert.strictEqual(window.__droiddeckFiles.done(1, '/root/Storage/Games'), true); - assert.strictEqual(window.__droiddeckFiles.done(1, '/again'), false); + assert.deepStrictEqual(asked, [{ id: 2, options }, { id: 3, options: { strTitle: 'Other' } }]); + assert.strictEqual(window.__droiddeckFiles.done(2, '/root/Storage/Games'), true); + assert.strictEqual(window.__droiddeckFiles.done(2, '/again'), false); assert.strictEqual(await chosen, '/root/Storage/Games'); - window.__droiddeckFiles.done(2, null); + window.__droiddeckFiles.done(3, null); await assert.rejects(cancelled, e => e.result === 2); delete window.droiddeckOpenFileDialog; await assert.rejects(SteamClient.System.OpenFileDialog({}), e => e.result === 2); @@ -97,8 +101,9 @@ class FileDialogBridgeTest(unittest.TestCase): self.assertEqual(self.helper.chooser, (1, first)) def test_the_chosen_path_or_a_cancel_goes_back_to_the_page(self): - for code, out, expected in ((0, b"/root/Storage/My Game/game.sh\n", '"/root/Storage/My Game/game.sh"'), - (1, b"", "null"), (0, b"\n", "null")): + for code, out, expected in ((0, b'"/root/Storage/My Game/game.sh"\n', '"/root/Storage/My Game/game.sh"'), + (0, b'" spaced name "\n', '" spaced name "'), + (1, b"", "null"), (2, b"", "null"), (0, b"\n", "null"), (0, b"not json\n", "null")): proc = mock.Mock(stdout=io.BytesIO(out), returncode=code) self.helper.chooser = (7, proc) self.helper.chooser_done() @@ -113,8 +118,11 @@ class FileDialogBridgeTest(unittest.TestCase): self.helper.page.evaluate.assert_not_called() def test_choose_file_mode_prints_the_path_and_fails_on_cancel(self): - for chosen, code, printed in (("/root/Storage/a.exe", 0, "/root/Storage/a.exe\n"), (None, 1, "")): - with mock.patch.dict(LIVE["chooser_main"].__globals__, {"choose_file": mock.Mock(return_value=chosen)}), \ + for chooser, code, printed in ((mock.Mock(return_value="/root/Storage/a.exe "), 0, '"/root/Storage/a.exe "\n'), + (mock.Mock(return_value=None), 1, ""), + (mock.Mock(side_effect=ValueError("Namespace Gtk not available for version 3.0")), 2, ""), + (mock.Mock(side_effect=ImportError("No module named 'gi'")), 2, "")): + with mock.patch.dict(LIVE["chooser_main"].__globals__, {"choose_file": chooser}), \ mock.patch.object(sys, "stdin", io.StringIO('{"strTitle": "Pick"}')), \ mock.patch.object(sys, "stdout", io.StringIO()) as out: self.assertEqual(LIVE["chooser_main"](), code) From 7b518d7e6a825c06afce102cb51303e5d3063cb9 Mon Sep 17 00:00:00 2001 From: FX1922 <120828496+FX192@users.noreply.github.com> Date: Sat, 24 Oct 2026 20:39:57 +0300 Subject: [PATCH 106/174] itch.io: platform and tag filters (#1497) --- .../launcher/stores/itch/ItchBrowse.kt | 2 +- .../droiddeck/launcher/ui/BootMovieSection.kt | 5 +-- .../droiddeck/launcher/ui/ItchBrowseBar.kt | 33 +++++++++++++++++++ app/src/main/res/values-ar/strings.xml | 4 +++ app/src/main/res/values-b+es+419/strings.xml | 4 +++ app/src/main/res/values-bg/strings.xml | 4 +++ app/src/main/res/values-cs/strings.xml | 4 +++ app/src/main/res/values-da/strings.xml | 4 +++ app/src/main/res/values-de/strings.xml | 4 +++ app/src/main/res/values-el/strings.xml | 4 +++ app/src/main/res/values-es/strings.xml | 4 +++ app/src/main/res/values-fi/strings.xml | 4 +++ app/src/main/res/values-fr/strings.xml | 4 +++ app/src/main/res/values-hi/strings.xml | 4 +++ app/src/main/res/values-hu/strings.xml | 4 +++ app/src/main/res/values-in/strings.xml | 4 +++ app/src/main/res/values-it/strings.xml | 4 +++ app/src/main/res/values-ja/strings.xml | 4 +++ app/src/main/res/values-ko/strings.xml | 4 +++ app/src/main/res/values-ms/strings.xml | 4 +++ app/src/main/res/values-nb/strings.xml | 4 +++ app/src/main/res/values-nl/strings.xml | 4 +++ app/src/main/res/values-pl/strings.xml | 4 +++ app/src/main/res/values-pt-rPT/strings.xml | 4 +++ app/src/main/res/values-pt/strings.xml | 4 +++ app/src/main/res/values-ro/strings.xml | 4 +++ app/src/main/res/values-ru/strings.xml | 4 +++ app/src/main/res/values-sv/strings.xml | 4 +++ app/src/main/res/values-th/strings.xml | 4 +++ app/src/main/res/values-tr/strings.xml | 4 +++ app/src/main/res/values-uk/strings.xml | 4 +++ app/src/main/res/values-vi/strings.xml | 4 +++ app/src/main/res/values-zh-rCN/strings.xml | 4 +++ app/src/main/res/values-zh-rHK/strings.xml | 4 +++ app/src/main/res/values-zh-rTW/strings.xml | 4 +++ app/src/main/res/values/strings.xml | 10 ++++++ .../launcher/stores/itch/ItchBrowseTest.kt | 19 +++++++++++ docs/development/itch-browse.md | 4 +++ 38 files changed, 198 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt index f820be6d23..d430d11434 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt @@ -54,7 +54,7 @@ internal object ItchBrowse { fun path(query: BrowseQuery): String { val segments = listOfNotNull(sortSegment(query.sort), priceSegment(query.price)) + - query.platforms.sorted().map { "platform-$it" } + + platformNames.filter { it in query.platforms }.map { "platform-$it" } + query.tags.map { "tag-" + tagSlug(it) } return if (segments.isEmpty()) BASE else BASE + "/" + segments.joinToString("/") } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt index a4227d4c28..c4d8053d98 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt @@ -676,14 +676,15 @@ private fun MoviePreview(url: String, modifier: Modifier = Modifier) { /** A dialog with one text box, for a search term or a page number; the Android keyboard comes up with it. */ @Composable -private fun TextEntryDialog( +internal fun TextEntryDialog( title: String, initial: String, number: Boolean, confirm: String, onSubmit: (String) -> Unit, onDismiss: () -> Unit, + id: String = "boot-movie-entry", ) { val shown = rememberShown(onDismiss) val close = { shown.targetState = false } var text by remember { mutableStateOf(initial) } val submit = { onSubmit(text.trim()); close() } - AppDialog(shown, close, "boot-movie-entry", wide = false, maxWidth = 460.dp) { + AppDialog(shown, close, id, wide = false, maxWidth = 460.dp) { DialogTitleRow(title, close) AdbTextField( value = text, onValueChange = { text = it }, label = "", keyboardType = if (number) KeyboardType.Number else KeyboardType.Text, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt index e1e170fdeb..276d131fee 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -20,7 +20,10 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +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 @@ -38,6 +41,7 @@ import com.droiddeck.launcher.stores.itch.ItchBrowseState internal fun ItchBrowseBar() { val ctx = LocalContext.current val query = ItchBrowseState.query + var picking by remember { mutableStateOf(false) } Column(Modifier.fillMaxWidth().padding(top = 6.dp, bottom = 8.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { ChipRow { for (sort in ItchBrowse.sorts) BrowseChip(sortLabel(sort), query.sort == sort) { ItchBrowseState.choose(ctx, query.copy(sort = sort)) } @@ -45,7 +49,23 @@ internal fun ItchBrowseBar() { ChipRow { for (price in ItchBrowse.prices) BrowseChip(priceLabel(price), query.price == price) { ItchBrowseState.choose(ctx, query.copy(price = price)) } } + ChipRow { + BrowseChip(stringResource(R.string.stores_itch_platform_any), query.platforms.isEmpty()) { ItchBrowseState.choose(ctx, query.copy(platforms = emptySet())) } + for (platform in ItchBrowse.platformNames) { + val on = platform in query.platforms + BrowseChip(platformLabel(platform), on) { ItchBrowseState.choose(ctx, query.copy(platforms = if (on) query.platforms - platform else query.platforms + platform)) } + } + } + ChipRow { + for (tag in query.tags) BrowseChip("$tag ✕", true) { ItchBrowseState.choose(ctx, query.copy(tags = query.tags - tag)) } + BrowseChip(stringResource(R.string.stores_itch_tag_add), false) { picking = true } + } } + if (picking) TextEntryDialog( + stringResource(R.string.stores_itch_tag_title), "", number = false, confirm = stringResource(R.string.common_ok), + onSubmit = { value -> ItchBrowse.tagSlug(value).takeIf { it.isNotEmpty() }?.let { ItchBrowseState.choose(ctx, query.copy(tags = (query.tags + it).distinct())) } }, + onDismiss = { picking = false }, id = "itch-tag", + ) } @Composable @@ -99,6 +119,19 @@ private fun sortLabel(sort: String): String = stringResource( }, ) +@Composable +private fun platformLabel(platform: String): String = stringResource( + when (platform) { + "windows" -> R.string.stores_itch_platform_windows + "osx" -> R.string.stores_itch_platform_macos + "linux" -> R.string.stores_itch_platform_linux + "android" -> R.string.stores_itch_platform_android + "ios" -> R.string.stores_itch_platform_ios + "web" -> R.string.stores_itch_platform_web + else -> R.string.stores_itch_platform_mobile_web + }, +) + @Composable private fun priceLabel(price: String): String = stringResource( when (price) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 041c6d4478..fd412f88b9 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2100,6 +2100,10 @@ مجاني مخفّض تحميل المزيد + أي منصة + ويب الجوال + إضافة وسم + التصفية حسب الوسم تعذّر تحميل الألعاب من itch.io أرشيفات %1$s غير مدعومة استجاب itch.io بـ HTTP %1$d 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 9ee23bd93f..168dd76127 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2784,6 +2784,10 @@ Gratis En oferta Cargar más + Cualquier plataforma + Web móvil + Agregar una etiqueta + Filtrar por etiqueta No se pudieron cargar los juegos de itch.io Los archivos %1$s no son compatibles itch.io respondió HTTP %1$d diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 01342132f4..be27b7ec1f 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2016,6 +2016,10 @@ Безплатни С намаление Зареди още + Всяка платформа + Мобилен уеб + Добавяне на таг + Филтриране по таг Игрите от itch.io не можаха да се заредят Архивите %1$s не се поддържат itch.io отговори HTTP %1$d diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index bf11dbf1b5..9ad560cc46 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2058,6 +2058,10 @@ Zdarma Ve slevě Načíst další + Libovolná platforma + Mobilní web + Přidat štítek + Filtrovat podle štítku Hry z itch.io se nepodařilo načíst Archivy %1$s nejsou podporovány itch.io odpovědělo HTTP %1$d diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index b13bcafa57..6fa7070bbf 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2016,6 +2016,10 @@ Gratis På tilbud Indlæs flere + Alle platforme + Mobilweb + Tilføj et tag + Filtrer efter tag Kunne ikke hente spil fra itch.io %1$s-arkiver understøttes ikke itch.io svarede HTTP %1$d diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 92f3b563b4..3a78db29a9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2008,6 +2008,10 @@ Kostenlos Im Angebot Mehr laden + Beliebige Plattform + Mobiles Web + Tag hinzufügen + Nach Tag filtern Spiele von itch.io konnten nicht geladen werden %1$s-Archive werden nicht unterstützt itch.io antwortete mit HTTP %1$d diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 7142c525c6..71fbfc6f05 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2016,6 +2016,10 @@ Δωρεάν Σε προσφορά Φόρτωση περισσότερων + Οποιαδήποτε πλατφόρμα + Mobile web + Προσθήκη ετικέτας + Φιλτράρισμα ανά ετικέτα Δεν ήταν δυνατή η φόρτωση παιχνιδιών από το itch.io Τα αρχεία %1$s δεν υποστηρίζονται Το itch.io απάντησε HTTP %1$d diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 2ffff046d5..a22c9a850f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2039,6 +2039,10 @@ Gratis En oferta Cargar más + Cualquier plataforma + Web móvil + Añadir una etiqueta + Filtrar por etiqueta No se pudieron cargar los juegos de itch.io Los archivos %1$s no son compatibles itch.io respondió HTTP %1$d diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index f6fdd4f3c2..61ca193899 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2016,6 +2016,10 @@ Ilmaiset Alennuksessa Lataa lisää + Mikä tahansa alusta + Mobiiliweb + Lisää tunniste + Suodata tunnisteella Pelien lataaminen itch.io:sta epäonnistui %1$s-arkistot eivät ole tuettuja itch.io vastasi HTTP %1$d diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9e7e2318dc..e13940f8df 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2039,6 +2039,10 @@ Gratuits En promotion Charger plus + Toute plateforme + Web mobile + Ajouter un tag + Filtrer par tag Impossible de charger les jeux d\'itch.io Les archives %1$s ne sont pas prises en charge itch.io a répondu HTTP %1$d diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index a1b084b658..971ebd34c6 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2016,6 +2016,10 @@ मुफ़्त सेल में और लोड करें + कोई भी प्लेटफ़ॉर्म + मोबाइल वेब + टैग जोड़ें + टैग के अनुसार फ़िल्टर करें itch.io से गेम लोड नहीं हो सके %1$s आर्काइव समर्थित नहीं हैं itch.io ने HTTP %1$d लौटाया diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 12f7aa12e9..5463a8a5c6 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2016,6 +2016,10 @@ Ingyenes Akciós Továbbiak betöltése + Bármely platform + Mobilweb + Címke hozzáadása + Szűrés címke szerint Nem sikerült betölteni a játékokat az itch.io-ról A(z) %1$s archívumok nem támogatottak Az itch.io HTTP %1$d választ adott diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 9d13ed5fd1..c04243615b 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1995,6 +1995,10 @@ Gratis Diskon Muat lebih banyak + Platform apa saja + Web seluler + Tambah tag + Filter berdasarkan tag Tidak dapat memuat game dari itch.io Arsip %1$s tidak didukung itch.io menjawab HTTP %1$d diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index edb694b919..db15c513c2 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2029,6 +2029,10 @@ Gratis In offerta Carica altri + Qualsiasi piattaforma + Web mobile + Aggiungi un tag + Filtra per tag Impossibile caricare i giochi da itch.io Gli archivi %1$s non sono supportati itch.io ha risposto HTTP %1$d diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 11eb16b146..e8f495fcb5 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1997,6 +1997,10 @@ 無料 セール中 さらに読み込む + すべてのプラットフォーム + モバイルWeb + タグを追加 + タグで絞り込む itch.io のゲームを読み込めませんでした %1$s 形式のアーカイブには対応していません itch.io が HTTP %1$d を返しました diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 0793360879..f38feeb162 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1997,6 +1997,10 @@ 무료 할인 중 더 불러오기 + 모든 플랫폼 + 모바일 웹 + 태그 추가 + 태그로 필터링 itch.io에서 게임을 불러오지 못했습니다 %1$s 압축 파일은 지원하지 않습니다 itch.io가 HTTP %1$d을(를) 반환했습니다 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 7efc8402e6..80b7d10fb1 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1995,6 +1995,10 @@ Percuma Diskaun Muat lagi + Mana-mana platform + Web mudah alih + Tambah tag + Tapis mengikut tag Tidak dapat memuatkan permainan daripada itch.io Arkib %1$s tidak disokong itch.io menjawab HTTP %1$d diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 374f329233..210c71f330 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2016,6 +2016,10 @@ Gratis På salg Last inn flere + Alle plattformer + Web på mobil + Legg til en tagg + Filtrer etter tagg Kunne ikke laste spill fra itch.io %1$s-arkiver støttes ikke itch.io svarte HTTP %1$d diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f10021f5fb..52f5fc5276 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2016,6 +2016,10 @@ Gratis In de aanbieding Meer laden + Elk platform + Mobiel web + Tag toevoegen + Filteren op tag Games van itch.io konden niet worden geladen %1$s-archieven worden niet ondersteund itch.io antwoordde HTTP %1$d diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index d98a637875..5d539ce78e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2058,6 +2058,10 @@ Za darmo Na wyprzedaży Wczytaj więcej + Dowolna platforma + Web mobilny + Dodaj tag + Filtruj według tagu Nie udało się wczytać gier z itch.io Archiwa %1$s nie są obsługiwane itch.io odpowiedziało HTTP %1$d diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 22150da672..af19c47e03 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2029,6 +2029,10 @@ Grátis Em promoção Carregar mais + Qualquer plataforma + Web móvel + Adicionar uma etiqueta + Filtrar por etiqueta Não foi possível carregar os jogos do itch.io Ficheiros %1$s não são suportados O itch.io respondeu HTTP %1$d diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 6530e82613..810cb1ab12 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2029,6 +2029,10 @@ Grátis Em promoção Carregar mais + Qualquer plataforma + Web mobile + Adicionar uma tag + Filtrar por tag Não foi possível carregar os jogos do itch.io Arquivos %1$s não são suportados O itch.io respondeu HTTP %1$d diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a94daa065f..bded086b4f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2037,6 +2037,10 @@ Gratuite La reducere Încarcă mai multe + Orice platformă + Web mobil + Adaugă o etichetă + Filtrează după etichetă Nu s-au putut încărca jocurile de pe itch.io Arhivele %1$s nu sunt acceptate itch.io a răspuns HTTP %1$d diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1fac9fca31..863ae944ec 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2060,6 +2060,10 @@ Бесплатные Со скидкой Загрузить ещё + Любая платформа + Мобильный веб + Добавить тег + Фильтр по тегу Не удалось загрузить игры с itch.io Архивы %1$s не поддерживаются itch.io ответил HTTP %1$d diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 87708ceb83..970c2f790f 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2016,6 +2016,10 @@ Gratis På rea Ladda fler + Alla plattformar + Mobilwebb + Lägg till en tagg + Filtrera efter tagg Det gick inte att läsa in spel från itch.io %1$s-arkiv stöds inte itch.io svarade HTTP %1$d diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index e8174559ba..c222677191 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1995,6 +1995,10 @@ ฟรี ลดราคา โหลดเพิ่มเติม + ทุกแพลตฟอร์ม + เว็บมือถือ + เพิ่มแท็ก + กรองตามแท็ก โหลดเกมจาก itch.io ไม่ได้ ไม่รองรับไฟล์ %1$s itch.io ตอบกลับ HTTP %1$d diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a07f0e3c28..e992ce67df 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2010,6 +2010,10 @@ Ücretsiz İndirimde Daha fazla yükle + Herhangi bir platform + Mobil web + Etiket ekle + Etikete göre filtrele itch.io oyunları yüklenemedi %1$s arşivleri desteklenmiyor itch.io HTTP %1$d yanıtı verdi diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 9eca24517b..d2de6b7869 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2058,6 +2058,10 @@ Безкоштовні Зі знижкою Завантажити ще + Будь-яка платформа + Мобільний веб + Додати тег + Фільтр за тегом Не вдалося завантажити ігри з itch.io Архіви %1$s не підтримуються itch.io відповів HTTP %1$d diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 89009d0495..57cca067a6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1995,6 +1995,10 @@ Miễn phí Đang giảm giá Tải thêm + Mọi nền tảng + Web di động + Thêm thẻ + Lọc theo thẻ Không tải được game từ itch.io Không hỗ trợ tệp %1$s itch.io trả về HTTP %1$d diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 43693ef692..8e188f2bc9 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2074,6 +2074,10 @@ 免费 特价 加载更多 + 任意平台 + 移动网页 + 添加标签 + 按标签筛选 无法从 itch.io 加载游戏 不支持 %1$s 压缩包 itch.io 返回 HTTP %1$d diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 029e860ed6..e271577a21 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1998,6 +1998,10 @@ 免費 特價 載入更多 + 任何平台 + 行動網頁 + 新增標籤 + 按標籤篩選 無法從 itch.io 載入遊戲 不支援 %1$s 壓縮檔 itch.io 回應 HTTP %1$d diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ae9617e457..f9f7cd52e8 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1998,6 +1998,10 @@ 免費 特價 載入更多 + 任何平台 + 行動網頁 + 新增標籤 + 依標籤篩選 無法從 itch.io 載入遊戲 不支援 %1$s 壓縮檔 itch.io 回應 HTTP %1$d diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 36d2e0dba0..f42580fff6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2093,6 +2093,16 @@ Free On sale Load more + Any platform + Mobile web + Add a tag + Filter by tag + Windows + macOS + Linux + Android + iOS + Web Could not load games from itch.io %1$s archives are not supported itch.io answered HTTP %1$d diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt index 6b73153345..d3ebf12e5c 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt @@ -52,6 +52,25 @@ class ItchBrowseTest { assertEquals("pixel-art", ItchBrowse.tagSlug(" Pixel Art ")) } + @Test fun aSortAPricePlatformAndTagCombineInThatOrder() { + assertEquals( + "https://itch.io/games/top-rated/free/platform-windows/tag-pixel-art.xml", + ItchBrowse.url(BrowseQuery(ItchBrowse.SORT_TOP_RATED, ItchBrowse.PRICE_FREE, setOf("windows"), listOf("pixel-art")), 1), + ) + } + + @Test fun severalPlatformsAndTagsAreAllInTheAddress() { + assertEquals( + "https://itch.io/games/platform-windows/platform-linux/tag-pixel-art/tag-2d", + path(platforms = setOf("linux", "windows"), tags = listOf("pixel-art", "2d")), + ) + } + + @Test fun aTypedTagBecomesItsSlug() { + assertEquals("visual-novel", ItchBrowse.tagSlug("Visual Novel!")) + assertEquals("", ItchBrowse.tagSlug(" !! ")) + } + @Test fun theSamePlatformsInAnyOrderGiveTheSameAddress() { assertEquals(path(platforms = setOf("web", "linux")), path(platforms = setOf("linux", "web"))) } diff --git a/docs/development/itch-browse.md b/docs/development/itch-browse.md index 241b508537..aa1f26a6b4 100644 --- a/docs/development/itch-browse.md +++ b/docs/development/itch-browse.md @@ -34,3 +34,7 @@ looks browse results up through `StoresState.detailItem`. ## When a page fails A fetch that throws or answers with a non-2xx status marks the list as failed but leaves it open. The end of the list then shows a Retry button that asks for the same page again. Scrolling does not retry on its own, so a failing page cannot loop. Only a successful page with no new games ends the list. + +## Platform and tag + +The platform and tag rows take several choices, and the address lists them as itch does (`platform-windows/platform-linux/tag-pixel-art/tag-2d`, platforms in the order of the chip row). A typed tag becomes its slug (`Pixel Art` is `pixel-art`) and the address gets `tag-`. From 8156a9649d10d4c2bf7d020391ead1b049ab19dc Mon Sep 17 00:00:00 2001 From: Thomas Lee <88711221+ddd-ms@users.noreply.github.com> Date: Sun, 25 Oct 2026 02:35:14 +0800 Subject: [PATCH 107/174] perf: reuse Steam artwork directory scans (#1466) --- .../droiddeck/launcher/frontend/Library.kt | 26 ++-- .../launcher/frontend/GameLogoTest.kt | 22 ++++ .../launcher/frontend/SteamCacheImagesTest.kt | 118 ++++++++++++++++++ docs/development/steam-game-imports.md | 9 ++ 4 files changed, 165 insertions(+), 10 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/SteamCacheImagesTest.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 e3fa25ac59..3e1a0e85eb 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -123,8 +123,9 @@ object Library { val name = NAME.find(text)?.groupValues?.get(1)?.trim().orEmpty() val flags = STATE.find(text)?.groupValues?.get(1)?.toIntOrNull() ?: 0 if (name.isEmpty() || flags and 4 == 0) return@forEach - val art = steamCacheImage(cache, appId, STEAM_CAPSULES) - val hero = steamCacheImage(cache, appId, STEAM_HEROES) + val images = SteamCacheImages(File(cache, appId.toString())) + val art = images.find(STEAM_CAPSULES) + val hero = images.find(STEAM_HEROES) val lastPlayed = LAST_PLAYED.find(text)?.groupValues?.get(1)?.toLongOrNull() ?: 0L val installDir = INSTALL_DIR.find(text)?.groupValues?.get(1)?.trim() ?.takeIf { it.isNotEmpty() && it != "." && it != ".." && '/' !in it && '\\' !in it } @@ -133,9 +134,8 @@ object Library { appId, name, art, label, hero = hero, lastPlayed = lastPlayed, gameFiles = gameFiles, protonPrefix = protonPrefix(context, appId.toLong(), library, roots), - icon = steamCacheImage(cache, appId, listOf("icon.jpg", "icon.png")) - ?: File(cache, appId.toString()).listFiles()?.firstOrNull { it.isFile && STEAM_ICON.matches(it.name) }, - logo = steamCacheImage(cache, appId, STEAM_LOGOS), + icon = images.icon(), + logo = images.find(STEAM_LOGOS), )) } } @@ -212,13 +212,19 @@ object Library { ) } - internal fun steamCacheImage(cache: File, appId: Int, names: List): File? { - val appDir = File(cache, appId.toString()) - val dirs = listOf(appDir) + appDir.listFiles() - .orEmpty().filter { it.isDirectory }.sortedBy { it.name } - return names.asSequence() + internal fun steamCacheImage(cache: File, appId: Int, names: List): File? = + SteamCacheImages(File(cache, appId.toString())).find(names) + + internal class SteamCacheImages(appDir: File) { + private val entries = appDir.listFiles().orEmpty() + private val dirs = listOf(appDir) + entries.filter { it.isDirectory }.sortedBy { it.name } + + fun find(names: List): File? = names.asSequence() .flatMap { name -> dirs.asSequence().map { File(it, name) } } .firstOrNull { it.isFile && it.length() > 0L } + + fun icon(): File? = find(listOf("icon.jpg", "icon.png")) + ?: entries.firstOrNull { it.isFile && STEAM_ICON.matches(it.name) } } private class Spec(val id: String, val name: String, val system: String, val program: String, val folders: List, val exts: Set, val atPanel: Boolean = false) diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameLogoTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameLogoTest.kt index 5a577f5b37..505249979c 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameLogoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameLogoTest.kt @@ -39,6 +39,28 @@ class GameLogoTest { assertNull(Library.steamCacheImage(cache, 730, Library.STEAM_LOGOS)) } + @Test fun aSteamScanKeepsEveryArtworkSlotAndSeesNewHashDirectories() { + val root = SessionPrefs.steamRoot(app, "arm64") + File(root, "steamapps/appmanifest_620.acf").apply { + parentFile!!.mkdirs() + writeText("\"AppState\"\n{\n\"name\" \"Portal 2\"\n\"StateFlags\" \"4\"\n}\n") + } + val cache = File(root, "appcache/librarycache/620") + fun cached(path: String) = File(cache, path).apply { + parentFile!!.mkdirs() + writeBytes(byteArrayOf(1)) + } + val cover = cached("library_capsule.jpg") + val hero = cached("hash/library_hero.jpg") + val icon = cached("${"a".repeat(40)}.jpg") + val game = Library.steamGames(app, arch = "arm64").single() + assertEquals(listOf(cover, hero, icon, null), listOf(game.art, game.hero, game.icon, game.logo)) + + val logo = cached("new-hash/logo.png") + val refreshed = Library.steamGames(app, arch = "arm64").single() + assertEquals(listOf(cover, hero, icon, logo), listOf(refreshed.art, refreshed.hero, refreshed.icon, refreshed.logo)) + } + @Test fun aChosenLogoWinsOverSteamsAndKeepsTheRest() { val stock = image("logo.png") val game = Library.SteamGame(620, "Portal 2", null, "Steam library", logo = stock) diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SteamCacheImagesTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SteamCacheImagesTest.kt new file mode 100644 index 0000000000..c64a11fcc9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamCacheImagesTest.kt @@ -0,0 +1,118 @@ +package com.droiddeck.launcher.frontend + +import java.io.File +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class SteamCacheImagesTest { + @get:Rule val tmp = TemporaryFolder() + + private fun image(path: String, bytes: ByteArray = byteArrayOf(1)): File = + File(tmp.root, path).apply { parentFile!!.mkdirs(); writeBytes(bytes) } + + private class CountingDirectory(directory: File) : File(directory.path) { + var listings = 0 + private set + + override fun listFiles(): Array? { + listings++ + return super.listFiles()?.sortedByDescending { it.name }?.toTypedArray() + } + } + + @Test fun allArtworkAndTheHashIconShareOneDirectoryListing() { + val cover = image("620/library_capsule.jpg") + val hero = image("620/b/library_hero.jpg") + val logo = image("620/a/logo.png") + val icon = image("620/${"a".repeat(40)}.png") + val directory = CountingDirectory(File(tmp.root, "620")) + val images = Library.SteamCacheImages(directory) + + assertEquals(cover, images.find(listOf("library_capsule.jpg", "library_600x900.jpg"))) + assertEquals(hero, images.find(listOf("library_hero.jpg"))) + assertEquals(logo, images.find(Library.STEAM_LOGOS)) + assertEquals(icon, images.icon()) + assertEquals(1, directory.listings) + } + + @Test fun preferredFilenamesWinEvenWhenOnlyTheAlternativeIsInTheRoot() { + image("620/library_600x900.jpg") + val preferred = image("620/hash/library_capsule.jpg") + + assertEquals(preferred, Library.steamCacheImage( + tmp.root, 620, listOf("library_capsule.jpg", "library_600x900.jpg"), + )) + } + + @Test fun theRootWinsOverHashDirectoriesForTheSameFilename() { + image("620/hash/logo.png") + val root = image("620/logo.png") + + assertEquals(root, Library.steamCacheImage(tmp.root, 620, Library.STEAM_LOGOS)) + } + + @Test fun hashDirectoriesAreSearchedByNameNotListingOrder() { + image("620/z/logo.png") + val first = image("620/a/logo.png") + val directory = CountingDirectory(File(tmp.root, "620")) + + assertEquals(first, Library.SteamCacheImages(directory).find(Library.STEAM_LOGOS)) + assertEquals(1, directory.listings) + } + + @Test fun emptyFilesAndDirectoriesAreNotArtwork() { + image("620/logo.png", byteArrayOf()) + File(tmp.root, "620/a/logo.png").mkdirs() + val valid = image("620/b/logo.png") + + assertEquals(valid, Library.steamCacheImage(tmp.root, 620, Library.STEAM_LOGOS)) + } + + @Test fun namedIconsKeepTheirFilenamePriorityOverHashIcons() { + image("620/${"a".repeat(40)}.png") + image("620/icon.png") + val preferred = image("620/hash/icon.jpg") + + assertEquals(preferred, Library.SteamCacheImages(File(tmp.root, "620")).icon()) + } + + @Test fun hashIconsKeepTheOriginalRootListingOrderAndAllowEmptyFiles() { + image("620/${"0".repeat(40)}.jpg") + val first = image("620/${"F".repeat(40)}.png", byteArrayOf()) + File(tmp.root, "620/${"z".repeat(40)}.png").mkdirs() + image("620/${"g".repeat(40)}.png") + val directory = CountingDirectory(File(tmp.root, "620")) + val images = Library.SteamCacheImages(directory) + + assertEquals(first, images.icon()) + assertEquals(1, directory.listings) + } + + @Test fun hashIconsOutsideTheRootAndInvalidHashesAreIgnored() { + image("620/hash/${"a".repeat(40)}.jpg") + image("620/${"g".repeat(40)}.png") + image("620/${"a".repeat(39)}.png") + + assertNull(Library.SteamCacheImages(File(tmp.root, "620")).icon()) + } + + @Test fun missingDirectoriesAreListedOnlyOnce() { + val directory = CountingDirectory(File(tmp.root, "missing")) + val images = Library.SteamCacheImages(directory) + + assertNull(images.find(Library.STEAM_LOGOS)) + assertNull(images.icon()) + assertEquals(1, directory.listings) + } + + @Test fun aNewLookupSeesHashDirectoriesAddedAfterThePreviousScan() { + image("620/unrelated.txt") + assertNull(Library.steamCacheImage(tmp.root, 620, Library.STEAM_LOGOS)) + val added = image("620/new-hash/logo.png") + + assertEquals(added, Library.steamCacheImage(tmp.root, 620, Library.STEAM_LOGOS)) + } +} diff --git a/docs/development/steam-game-imports.md b/docs/development/steam-game-imports.md index 7967dd6500..78ae2cc110 100644 --- a/docs/development/steam-game-imports.md +++ b/docs/development/steam-game-imports.md @@ -48,6 +48,15 @@ inherit those routes. Managed shortcuts are replaced; user-created shortcuts and unreadable shortcut files are preserved. Both routes use the existing ARM64 Proton registration. +## Launcher artwork + +The installed Steam game scan lists each game's `appcache/librarycache/` +directory once for its cover, background, icon and logo. Filename preference is +checked before directory preference: the app folder, then hash folders sorted by +name. Hash-named fallback icons are still taken only from the app folder in its +listing order. The directory snapshot is not kept between scans, so the next +scan sees new artwork folders. + ## Validation Run `python3 -m unittest discover -s tools/tests -p 'test_*.py'` and Android unit tests. From 4dda1c1e52dcac250ed7aae4d94f530900ca41ee Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 24 Oct 2026 14:47:18 -0400 Subject: [PATCH 108/174] fix(epic): a paused install keeps what it downloaded (#1504) --- app/src/main/rust/stores/JNI.md | 2 +- .../main/rust/stores/src/epic/install/mod.rs | 46 +++++- .../rust/stores/src/epic/install/staging.rs | 51 ++++++- .../rust/stores/src/epic/install/tests.rs | 81 ++++++++++ .../rust/stores/src/epic/install/writer.rs | 144 ++++++++++++++++-- docs/development/epic-cleanroom.md | 6 +- docs/development/stores.md | 14 +- 7 files changed, 319 insertions(+), 25 deletions(-) diff --git a/app/src/main/rust/stores/JNI.md b/app/src/main/rust/stores/JNI.md index 0d2308fa27..ee7e5a8278 100644 --- a/app/src/main/rust/stores/JNI.md +++ b/app/src/main/rust/stores/JNI.md @@ -198,7 +198,7 @@ completes. On-disk protocol: game files are staged in `/.droiddeck-epic-staging/*.stage` (owner marker `owner` = `DroidDeck Epic staging v1\n`) and renamed over their destination after size and -SHA-1 checks; reusable chunks live, decompressed, as `` (extra copies `.`, writes via +SHA-1 checks; a paused run keeps each unfinished file there as `*.part` with its written parts in `*.part.list`; reusable chunks live, decompressed, as `` (extra copies `.`, writes via `.part`) in `/.chunks` or the scratch directory. ## `com.droiddeck.launcher.stores.amazon.AmazonNative` diff --git a/app/src/main/rust/stores/src/epic/install/mod.rs b/app/src/main/rust/stores/src/epic/install/mod.rs index 426e3bdcf9..df20412aca 100644 --- a/app/src/main/rust/stores/src/epic/install/mod.rs +++ b/app/src/main/rust/stores/src/epic/install/mod.rs @@ -5,7 +5,7 @@ pub mod space; pub mod staging; pub mod writer; -use std::collections::HashMap; +use std::collections::{HashMap, HashSet}; use std::fs; use std::path::{Path, PathBuf}; use std::sync::atomic::{AtomicBool, Ordering}; @@ -140,6 +140,17 @@ pub fn fetch_manifest(info: &BuildInfo, log: &dyn Fn(&str)) -> Result Option> { + let meta = fs::symlink_metadata(stage).ok()?; + if !meta.is_file() || meta.len() > size { + return None; + } + let list = fs::read_to_string(staging::list_path(stage)).ok()?; + let kept: HashSet = list.lines().map(|l| l.parse().ok()).collect::>()?; + let fits = |o: &u64| parts.iter().any(|p| p.file_offset == *o && p.file_offset + p.size as u64 <= meta.len()); + (!kept.is_empty() && kept.iter().all(fits)).then_some(kept) +} + pub fn run(req: &Request, cancel: &AtomicBool, ev: &dyn Events) -> Result { let failed = |m: String| Stop::Failed(m); ev.status("Downloading the manifest…"); @@ -191,6 +202,7 @@ pub fn run(req: &Request, cancel: &AtomicBool, ev: &dyn Events) -> Result Result Result Result { + let bytes: u64 = parts.iter().filter(|p| kept.contains(&p.file_offset)).map(|p| p.size as u64).sum(); + ev.log(&format!("resuming {} with {bytes} of {} bytes written", f.path, f.size)); + resumed_bytes += bytes; + kept_size = bytes; + parts.retain(|p| !kept.contains(&p.file_offset)); + resume = Some(writer::Resume { stage, kept: kept.into_iter().collect() }); + } + None => staging::remove_partial(&stage), + } + } + kept_sizes.push(kept_size); plan_files.push(PlanFile { size: f.size, parts: parts.clone() }); engine_files.push(writer::EngineFile { path: f.path.clone(), @@ -242,8 +275,14 @@ pub fn run(req: &Request, cancel: &AtomicBool, ev: &dyn Events) -> Result 0, parts, + resume, }); } + for stale in partials.values() { + staging::remove_partial(stale); + } + let fresh = pending.iter().all(|&(_, old_size)| old_size == 0); + let progress_base = resumed_bytes + if fresh { disk_bytes - pending_bytes } else { 0 }; let scratch = req .scratch_dir @@ -252,7 +291,8 @@ pub fn run(req: &Request, cancel: &AtomicBool, ev: &dyn Events) -> Result = pending .iter() - .map(|&(i, old)| space::PendingSize { new_size: manifest.files[i].size, old_size: old }) + .zip(&kept_sizes) + .map(|(&(i, old), kept)| space::PendingSize { new_size: manifest.files[i].size - kept, old_size: old }) .collect(); let free_game = space::free_bytes(&req.game_dir); let scratch_space = scratch.as_ref().map(|s| space::Scratch { free: space::free_bytes(s) }); @@ -308,6 +348,8 @@ cache_budget_mib={} overlap_mib={} free_game={free_game} workers={} process_work process_workers: req.process_workers, ca_bundle: req.ca_bundle.clone(), user_agent: net::user_agent(), + progress_base, + progress_total: progress_base + pending_bytes - resumed_bytes, }; let stats = writer::run(&input, cancel, ev)?; finished.bytes_written = stats.bytes_written; diff --git a/app/src/main/rust/stores/src/epic/install/staging.rs b/app/src/main/rust/stores/src/epic/install/staging.rs index 31b0b4ab61..53be6ccebe 100644 --- a/app/src/main/rust/stores/src/epic/install/staging.rs +++ b/app/src/main/rust/stores/src/epic/install/staging.rs @@ -1,12 +1,19 @@ +use std::collections::HashMap; use std::fs; use std::io::Write; use std::path::{Path, PathBuf}; use std::sync::atomic::{AtomicU64, Ordering}; +use sha1::{Digest, Sha1}; + +use crate::epic::manifest::Sha1 as Hash; + pub const DIR_NAME: &str = ".droiddeck-epic-staging"; pub const OWNER_FILE: &str = "owner"; pub const OWNER_MARKER: &[u8] = b"DroidDeck Epic staging v1\n"; const SUFFIX: &str = ".stage"; +pub const PARTIAL_SUFFIX: &str = ".part"; +const LIST_SUFFIX: &str = ".part.list"; static SEQUENCE: AtomicU64 = AtomicU64::new(0); @@ -15,6 +22,37 @@ pub fn conflicts(manifest_path: &str) -> bool { first.eq_ignore_ascii_case(DIR_NAME) } +fn hex(bytes: &[u8]) -> String { + bytes.iter().map(|b| format!("{b:02x}")).collect() +} + +pub fn partial_name(path: &str, size: u64, sha1: Option) -> String { + let id: Hash = Sha1::digest(path.as_bytes()).into(); + let content = sha1.map(|h| hex(&h)).unwrap_or_else(|| "0".into()); + format!("{}-{content}-{size}{PARTIAL_SUFFIX}", hex(&id[..8])) +} + +pub fn list_path(partial: &Path) -> PathBuf { + let mut name = partial.as_os_str().to_owned(); + name.push(".list"); + PathBuf::from(name) +} + +pub fn remove_partial(partial: &Path) { + let _ = fs::remove_file(partial); + let _ = fs::remove_file(list_path(partial)); +} + +pub fn partials(dir: &Path) -> HashMap { + let Ok(entries) = fs::read_dir(dir) else { return HashMap::new() }; + entries + .flatten() + .map(|e| e.file_name().to_string_lossy().into_owned()) + .filter(|n| n.ends_with(PARTIAL_SUFFIX)) + .map(|n| (n.clone(), dir.join(n))) + .collect() +} + pub fn unique_name() -> String { let nanos = std::time::SystemTime::now() .duration_since(std::time::UNIX_EPOCH) @@ -82,6 +120,8 @@ pub fn recover(game_dir: &Path) -> Result { } else if name.ends_with(SUFFIX) { stale.push(path); others += 1; + } else if name.ends_with(PARTIAL_SUFFIX) || name.ends_with(LIST_SUFFIX) { + others += 1; } else { return refuse("it holds an unexpected file"); } @@ -130,8 +170,13 @@ mod tests { fs::write(dir.join("file-1.stage"), b"x").unwrap(); fs::write(dir.join("stream-1-2-3.stage"), b"y").unwrap(); fs::write(game.join("keep.stage"), b"z").unwrap(); + let partial = partial_name("Game/a.pak", 10, None); + fs::write(dir.join(&partial), b"p").unwrap(); + fs::write(list_path(&dir.join(&partial)), b"0\n").unwrap(); recover(&game).unwrap(); - assert_eq!(fs::read_dir(&dir).unwrap().count(), 1); + assert_eq!(fs::read_dir(&dir).unwrap().count(), 3); + assert_eq!(partials(&dir).into_keys().collect::>(), vec![partial.clone()]); + remove_partial(&dir.join(&partial)); assert!(game.join("keep.stage").exists()); remove_if_idle(&dir); assert!(!dir.exists()); @@ -170,5 +215,9 @@ mod tests { let (a, b) = (unique_name(), unique_name()); assert_ne!(a, b); assert!(a.ends_with(".stage")); + let p = partial_name("Game/a.pak", 10, Some([0xab; 20])); + assert!(p.ends_with(&format!("-{}-10.part", "ab".repeat(20)))); + assert_ne!(p, partial_name("Game/b.pak", 10, Some([0xab; 20]))); + assert_ne!(p, partial_name("Game/a.pak", 10, Some([0xac; 20]))); } } diff --git a/app/src/main/rust/stores/src/epic/install/tests.rs b/app/src/main/rust/stores/src/epic/install/tests.rs index 2a75fb8a66..127d772de7 100644 --- a/app/src/main/rust/stores/src/epic/install/tests.rs +++ b/app/src/main/rust/stores/src/epic/install/tests.rs @@ -59,6 +59,7 @@ struct Recorder { replaced: AtomicUsize, refuse: bool, last_progress: Mutex<(u64, u64)>, + first_progress: Mutex>, sizes: Mutex<(u64, u64)>, } @@ -72,6 +73,7 @@ impl Events for Recorder { *self.sizes.lock().unwrap() = (pending, disk); } fn progress(&self, written: u64, total: u64, _f: u32, _ft: u32) { + self.first_progress.lock().unwrap().get_or_insert((written, total)); let mut p = self.last_progress.lock().unwrap(); if written >= p.0 { *p = (written, total); @@ -262,6 +264,85 @@ fn a_cancelled_run_reports_cancel() { let _ = fs::remove_dir_all(&game); } +fn place_partial(fx: &Fixture, game: &Path, data: &[u8], list: &str) -> PathBuf { + let stage = staging::recover(game).unwrap(); + let a = &fx.expected[0].1; + let partial = stage.join(staging::partial_name("a.bin", 4000, Some(Sha1::digest(a).into()))); + fs::write(&partial, data).unwrap(); + fs::write(staging::list_path(&partial), list).unwrap(); + partial +} + +fn place_done_c(fx: &Fixture, game: &Path) { + fs::create_dir_all(game.join("b")).unwrap(); + fs::write(game.join("b/c.bin"), &fx.expected[1].1).unwrap(); +} + +#[test] +fn a_paused_install_resumes_from_its_written_parts() { + let fx = fixture(); + let game = temp_game("resume"); + place_done_c(&fx, &game); + place_partial(&fx, &game, &fx.expected[0].1[..3000], "0\n"); + let stage = game.join(staging::DIR_NAME); + fs::write(stage.join(staging::partial_name("gone.bin", 9, None)), b"old").unwrap(); + + let events = Recorder::default(); + run(&request(&fx, &game), &AtomicBool::new(false), &events).unwrap(); + for (path, bytes) in &fx.expected { + assert_eq!(&fs::read(game.join(path)).unwrap(), bytes, "{path}"); + } + assert_eq!(fx.hits.load(Ordering::Relaxed), 2, "the manifest and the one chunk still missing"); + assert_eq!(*events.first_progress.lock().unwrap(), Some((2096 + 3000, 6196))); + assert_eq!(*events.last_progress.lock().unwrap(), (6196, 6196)); + assert!(events.logs.lock().unwrap().iter().any(|l| l == "resuming a.bin with 3000 of 4000 bytes written")); + assert!(!stage.exists()); + let _ = fs::remove_dir_all(&game); +} + +#[test] +fn a_part_written_out_of_order_is_kept_too() { + let fx = fixture(); + let game = temp_game("resume-tail"); + place_done_c(&fx, &game); + let mut data = vec![0u8; 3000]; + data.extend_from_slice(&fx.expected[0].1[3000..]); + place_partial(&fx, &game, &data, "3000\n"); + let events = Recorder::default(); + run(&request(&fx, &game), &AtomicBool::new(false), &events).unwrap(); + assert_eq!(fs::read(game.join("a.bin")).unwrap(), fx.expected[0].1); + assert_eq!(*events.first_progress.lock().unwrap(), Some((2096 + 1000, 6196))); + assert!(!game.join(staging::DIR_NAME).exists()); + let _ = fs::remove_dir_all(&game); +} + +#[test] +fn a_partial_that_no_longer_matches_is_dropped() { + let fx = fixture(); + let game = temp_game("badpartial"); + place_partial(&fx, &game, &fx.expected[0].1[..1234], "1234\n"); + let events = Recorder::default(); + run(&request(&fx, &game), &AtomicBool::new(false), &events).unwrap(); + assert_eq!(fs::read(game.join("a.bin")).unwrap(), fx.expected[0].1); + assert_eq!(*events.first_progress.lock().unwrap(), Some((0, 6196))); + assert!(!game.join(staging::DIR_NAME).exists()); + let _ = fs::remove_dir_all(&game); +} + +#[test] +fn a_damaged_partial_fails_its_check_and_is_not_kept() { + let fx = fixture(); + let game = temp_game("damagedpartial"); + place_partial(&fx, &game, &[0u8; 3000], "0\n"); + let err = run(&request(&fx, &game), &AtomicBool::new(false), &Recorder::default()).unwrap_err(); + assert_eq!(err, Stop::Failed("SHA-1 mismatch for a.bin".into())); + assert!(staging::partials(&game.join(staging::DIR_NAME)).is_empty()); + let retry = Recorder::default(); + run(&request(&fx, &game), &AtomicBool::new(false), &retry).unwrap(); + assert_eq!(fs::read(game.join("a.bin")).unwrap(), fx.expected[0].1); + let _ = fs::remove_dir_all(&game); +} + #[test] fn guid_names_are_cache_names() { let c = chunk(5, 10); diff --git a/app/src/main/rust/stores/src/epic/install/writer.rs b/app/src/main/rust/stores/src/epic/install/writer.rs index 3a7e93a0e1..66cab176b3 100644 --- a/app/src/main/rust/stores/src/epic/install/writer.rs +++ b/app/src/main/rust/stores/src/epic/install/writer.rs @@ -1,6 +1,6 @@ use std::fs::{self, File, OpenOptions}; use std::os::unix::fs::FileExt; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering}; use std::sync::{Arc, Condvar, Mutex}; use std::time::{Duration, Instant}; @@ -25,6 +25,12 @@ pub struct EngineFile { pub sha1: Option, pub replacing: bool, pub parts: Vec, + pub resume: Option, +} + +pub struct Resume { + pub stage: PathBuf, + pub kept: Vec, } pub struct EngineInput<'a> { @@ -40,6 +46,8 @@ pub struct EngineInput<'a> { pub process_workers: usize, pub ca_bundle: String, pub user_agent: String, + pub progress_base: u64, + pub progress_total: u64, } #[derive(Debug, Default)] @@ -120,7 +128,7 @@ impl<'a> Engine<'a> { return; } self.events.progress( - self.written.load(Ordering::Relaxed), + self.input.progress_base + self.written.load(Ordering::Relaxed), self.total_bytes, self.files_done.load(Ordering::Relaxed) as u32, self.input.files.len() as u32, @@ -232,10 +240,14 @@ impl<'a> Engine<'a> { .sync_all() .map_err(|e| format!("Could not assemble or atomically replace {}: {e}", file.path))?; let len = handle.metadata().map(|m| m.len()).unwrap_or(u64::MAX); - drop(handle); if len != file.size { return Err(format!("Size mismatch for {}", file.path)); } + let hash = match (hash, &file.resume) { + (None, Some(_)) if file.sha1.is_some() => Some(hash_whole(&handle, file)?), + (hash, _) => hash, + }; + drop(handle); if let (Some(expected), Some(got)) = (file.sha1, hash) { if expected != got { return Err(format!("SHA-1 mismatch for {}", file.path)); @@ -260,6 +272,9 @@ impl<'a> Engine<'a> { fs::rename(&stage, &file.dest) .map_err(|e| format!("Could not assemble or atomically replace {}: {e}", file.path)) })(); + if file.resume.is_some() { + let _ = fs::remove_file(staging::list_path(&stage)); + } if let Err(e) = result { let _ = fs::remove_file(&stage); return Err(e); @@ -278,13 +293,16 @@ impl<'a> Engine<'a> { } fn open_stage(&self, f: usize) -> Result<(), String> { - let path = self.input.stage_dir.join(staging::unique_name()); - let handle = OpenOptions::new() - .read(true) - .write(true) - .create_new(true) - .open(&path) - .map_err(|e| format!("Could not stage {}: {e}", self.input.files[f].path))?; + let file = &self.input.files[f]; + let (path, opened) = match &file.resume { + Some(r) => (r.stage.clone(), OpenOptions::new().read(true).write(true).open(&r.stage)), + None => { + let path = self.input.stage_dir.join(staging::unique_name()); + let opened = OpenOptions::new().read(true).write(true).create_new(true).open(&path); + (path, opened) + } + }; + let handle = opened.map_err(|e| format!("Could not stage {}: {e}", file.path))?; let mut slot = self.slots[f].lock().expect("slot lock"); slot.file = Some(Arc::new(handle)); slot.stage = Some(path); @@ -439,7 +457,7 @@ pub fn run(input: &EngineInput<'_>, stop: &AtomicBool, events: &dyn Events) -> R stage: None, written: vec![false; f.parts.len()], next_hash: 0, - hasher: f.sha1.map(|_| Sha1::new()), + hasher: f.sha1.filter(|_| f.resume.is_none()).map(|_| Sha1::new()), left: f.parts.len(), done: false, }) @@ -466,7 +484,7 @@ pub fn run(input: &EngineInput<'_>, stop: &AtomicBool, events: &dyn Events) -> R started: Instant::now(), replace_ok: Mutex::new(None), events, - total_bytes: input.files.iter().map(|f| f.size).sum(), + total_bytes: input.progress_total, }; for (i, p) in schedule.producers.iter().enumerate() { if p.preloaded && remaining[i] == 0 { @@ -503,7 +521,7 @@ pub fn run(input: &EngineInput<'_>, stop: &AtomicBool, events: &dyn Events) -> R stream: false, }; - events.progress(0, engine.total_bytes, 0, input.files.len() as u32); + events.progress(input.progress_base, engine.total_bytes, 0, input.files.len() as u32); let log = |line: &str| events.log(line); let gate = |i: usize| -> bool { engine.hint.fetch_max(i, Ordering::Relaxed); @@ -546,12 +564,14 @@ pub fn run(input: &EngineInput<'_>, stop: &AtomicBool, events: &dyn Events) -> R let complete = failure.is_none() && engine.files_done.load(Ordering::Relaxed) == input.files.len(); if !complete { - for slot in &engine.slots { + for (file, slot) in input.files.iter().zip(&engine.slots) { let mut s = slot.lock().expect("slot lock"); if !s.done { s.file.take(); if let Some(stage) = s.stage.take() { - let _ = fs::remove_file(stage); + if failure.is_some() || !keep_partial(file, &s.written, &stage, &input.stage_dir) { + let _ = fs::remove_file(stage); + } } } } @@ -588,6 +608,100 @@ fetches={} refetches={} peak_cache_mib={} hosts={}", Err(Stop::Failed("The download ended before every file was written".into())) } +fn hash_whole(handle: &File, file: &EngineFile) -> Result { + let mut h = Sha1::new(); + let mut buf = vec![0u8; 1024 * 1024]; + let mut at = 0u64; + while at < file.size { + let n = buf.len().min((file.size - at) as usize); + handle + .read_exact_at(&mut buf[..n], at) + .map_err(|e| format!("Could not read back {}: {e}", file.path))?; + h.update(&buf[..n]); + at += n as u64; + } + Ok(h.finalize().into()) +} + +fn keep_partial(file: &EngineFile, written: &[bool], stage: &Path, dir: &Path) -> bool { + let mut kept: Vec = file.resume.as_ref().map(|r| r.kept.clone()).unwrap_or_default(); + kept.extend(file.parts.iter().zip(written).filter(|(_, w)| **w).map(|(p, _)| p.file_offset)); + if kept.is_empty() || file.sha1.is_none() { + return false; + } + kept.sort_unstable(); + let partial = dir.join(staging::partial_name(&file.path, file.size, file.sha1)); + let list: String = kept.iter().map(|o| format!("{o}\n")).collect(); + let synced = OpenOptions::new().write(true).open(stage).and_then(|h| h.sync_all()); + if synced.is_err() || fs::rename(stage, &partial).is_err() { + return false; + } + let resumed = file.resume.as_ref().is_some_and(|r| r.stage == partial); + let temp = dir.join(staging::unique_name()); + let listed = fs::write(&temp, list).and_then(|_| fs::rename(&temp, staging::list_path(&partial))).is_ok(); + if !listed { + let _ = fs::remove_file(&temp); + if !resumed { + let _ = fs::remove_file(&partial); + } + } + listed || resumed +} + fn tidy_fetch_error(message: &str) -> String { message.strip_prefix("epic: ").unwrap_or(message).to_string() } + +#[cfg(test)] +mod tests { + use super::*; + + fn part(file_offset: u64, size: u32) -> PlanPart { + PlanPart { chunk: 0, chunk_offset: 0, size, file_offset } + } + + #[test] + fn a_pause_keeps_every_written_part_and_lists_them() { + let dir = std::env::temp_dir().join(format!("dd-epic-keep-{}", std::process::id())); + let _ = fs::remove_dir_all(&dir); + fs::create_dir_all(&dir).unwrap(); + let file = EngineFile { + path: "Game/a.pak".into(), + dest: dir.join("a.pak"), + size: 30, + sha1: Some([1; 20]), + replacing: false, + parts: vec![part(0, 10), part(10, 10), part(20, 10)], + resume: None, + }; + let kept = dir.join(staging::partial_name("Game/a.pak", 30, Some([1; 20]))); + let stage = dir.join("x.stage"); + + fs::write(&stage, [7u8; 30]).unwrap(); + assert!(!keep_partial(&file, &[false, false, false], &stage, &dir)); + let unhashed = EngineFile { + path: file.path.clone(), + dest: file.dest.clone(), + size: 30, + sha1: None, + replacing: false, + parts: file.parts.clone(), + resume: None, + }; + assert!(!keep_partial(&unhashed, &[true, true, true], &stage, &dir)); + assert!(stage.exists()); + assert!(keep_partial(&file, &[false, true, true], &stage, &dir)); + assert_eq!(fs::read(&kept).unwrap(), [7u8; 30]); + assert_eq!(fs::read_to_string(staging::list_path(&kept)).unwrap(), "10\n20\n"); + assert!(!stage.exists()); + + let resumed = EngineFile { + parts: vec![part(0, 10)], + resume: Some(Resume { stage: kept.clone(), kept: vec![20, 10] }), + ..file + }; + assert!(keep_partial(&resumed, &[false], &kept, &dir)); + assert_eq!(fs::read_to_string(staging::list_path(&kept)).unwrap(), "10\n20\n"); + let _ = fs::remove_dir_all(&dir); + } +} diff --git a/docs/development/epic-cleanroom.md b/docs/development/epic-cleanroom.md index e121d4caf6..1dbaf7131f 100644 --- a/docs/development/epic-cleanroom.md +++ b/docs/development/epic-cleanroom.md @@ -116,6 +116,10 @@ Numbers in brackets refer to the spec's list of unknowns. several native threads. 19. **Network window** is the speed tier's value clamped to 1–128; the per-host cap is `max(6, ceil(window / hosts))`. +20. **Pause keeps half-written files**: a stopped run keeps each unfinished stage file as a `.part` + file named after the file's path, hash and size, with a `.part.list` of the parts already + written. The next run writes only the other parts and hashes the whole file when it is complete; + that SHA-1 check still decides whether the file is kept, so files without one start over. **Kept at parity (known weak spots)** @@ -131,7 +135,7 @@ Numbers in brackets refer to the spec's list of unknowns. - `AdditionalCommandLine` is one argument, frozen at install [11]. - Shop search, an unused "wants an exchange code" helper and per-game uninstall work are not ported; DLC stay hidden and are never installed separately; optional (non-language) install tags - are never selected; resume restarts a partially written file from zero [15–18]. + are never selected [15–18]. - Library details are fetched one game at a time, as before. ## What needs device testing diff --git a/docs/development/stores.md b/docs/development/stores.md index 4fb78f4da0..fbeec4f6b6 100644 --- a/docs/development/stores.md +++ b/docs/development/stores.md @@ -85,18 +85,22 @@ installed record (`StoreInstalls.complete`). Resume, update and repair are the s no cache (needs only the net peak); when even that does not fit the install is refused before any chunk request, naming the storage, the need, the free space and the shortfall. - **Progress**: the bar counts pending-file bytes written (not compressed chunk bytes), at most every - 50 ms plus once per finished file. The run logs `epic: plan …` and `epic: summary mode=adaptive|narrow + 50 ms plus once per finished file. A resumed run starts the bar at what earlier runs kept; on a + fresh install that includes the files already complete, so the bar carries on from the pause. The run logs `epic: plan …` and `epic: summary mode=adaptive|narrow files=… bytes_written=… avg_mbps=… fetches=… refetches=… peak_cache_mib=… hosts=…`. - **Cancel / pause / failure**: the cancel flag is forwarded within 250 ms; the run stops its - requests, joins its threads, removes every unfinished stage file and `.part` cache entry, and only - then returns. Swapped files stay; unswapped destinations keep their old content; the chunk cache + requests, joins its threads, removes every `.part` cache entry, and only then returns. On a cancel + or a download error each unfinished stage file is kept in the staging folder as + `--.part`, with the written parts' offsets in `.part.list`; the next run + fetches only the other parts and hashes the whole file once it is complete (a partial that no + longer matches the manifest, or whose file has no SHA-1 in it, is deleted). Any other failure removes the unfinished stage files. Swapped files stay; unswapped destinations keep their old content; the chunk cache stays for the next run. Success removes the cache and the staging folder (when only its marker is left). The staging folder is recognised by its `owner` marker (`DroidDeck Epic staging v1` + LF). Before the delta pass the run checks that the folder is a real directory at the expected canonical path, -that the marker matches and that every other entry is a plain `.stage` file directly inside it; only -then are those orphans deleted. Anything unexpected fails the run without deleting. A manifest path +that the marker matches and that every other entry is a plain `.stage`, `.part` or `.part.list` file +directly inside it; only then are the `.stage` orphans deleted. Anything unexpected fails the run without deleting. A manifest path naming the staging folder, an absolute path or a `..` segment is refused. `.stage` / `.part` files elsewhere in the game folder are never touched. From 8471682b1c3702762db1285c13707cf66b144744 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 24 Oct 2026 14:47:21 -0400 Subject: [PATCH 109/174] Collect only the Steam log lines a session wrote (#1505) --- .../launcher/session/SessionArtifacts.kt | 74 +++++++++++++++++-- .../launcher/session/SessionService.kt | 5 +- .../launcher/session/SessionSteamLogsTest.kt | 62 ++++++++++++++++ .../overlay/usr/local/bin/droiddeck-session | 7 -- 4 files changed, 135 insertions(+), 13 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/SessionSteamLogsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt index 9ec21c2090..c356bf0d04 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt @@ -200,22 +200,86 @@ object SessionArtifacts { internal fun recordedClient(dir: File): String? = runCatching { File(dir, CLIENT_FILE).readText().trim() }.getOrNull()?.takeIf { it == "arm64" || it == "x86_64" } + private const val LOG_MARKS = "steam-log-marks.txt" + private const val MAX_STEAM_LOG = 8L * 1024 * 1024 + private const val HEAD = 4096L + + private class Mark(val size: Long, val head: String) + + fun markSteamLogs(dir: File, logs: File) { + val lines = logs.listFiles { f -> f.isFile }?.mapNotNull { f -> + val size = f.length() + head(f, size)?.let { "$size\t$it\t${f.name}" } + } ?: return + runCatching { File(dir, LOG_MARKS).writeText(lines.joinToString("") { "$it\n" }) } + } + + private fun head(f: File, length: Long): String? = runCatching { + val buf = ByteArray(minOf(length, HEAD).toInt()) + f.inputStream().use { input -> + var off = 0 + while (off < buf.size) { + val n = input.read(buf, off, buf.size - off) + if (n < 0) return@runCatching null + off += n + } + } + java.security.MessageDigest.getInstance("SHA-1").digest(buf).joinToString("") { "%02x".format(it) } + }.getOrNull() + + private fun steamLogMarks(dir: File): List? = runCatching { + File(dir, LOG_MARKS).readLines().mapNotNull { line -> + val parts = line.split('\t', limit = 3) + parts.getOrNull(0)?.toLongOrNull()?.let { size -> parts.getOrNull(1)?.let { Mark(size, it) } } + } + }.getOrNull() + + private fun startOf(src: File, size: Long, marks: List): Long { + val heads = HashMap() + return marks.filter { it.size <= size }.sortedByDescending { it.size } + .firstOrNull { m -> heads.getOrPut(minOf(m.size, HEAD)) { head(src, m.size) } == m.head }?.size ?: 0L + } + private fun copySteamLogs(context: Context, dir: File, record: Record, steamArch: String? = null) { val logs = File(steamArch?.let { SessionPrefs.steamRoot(context, it) } ?: SessionPrefs.activeSteamRoot(context), "logs") if (!logs.isDirectory) return val out = File(dir, "steam").apply { mkdirs() } - logs.listFiles { f -> f.isFile && f.length() < 8L * 1024 * 1024 }?.forEach { src -> + copySessionLogs(logs, dir, out).forEach { dst -> record.files[dst] = Scrubbed(dst.length(), dst.lastModified()) } + Log.i(TAG, "collected ${out.listFiles()?.size ?: 0} Steam log(s), scrubbed, into $out") + } + + internal fun copySessionLogs(logs: File, dir: File, out: File): List { + val marks = steamLogMarks(dir) + val copied = ArrayList() + logs.listFiles { f -> f.isFile }?.forEach { src -> + val size = src.length() + val from = marks?.let { startOf(src, size, it) } ?: 0L + if (marks != null && from == size || size - from >= MAX_STEAM_LOG) return@forEach try { val dst = File(out, src.name) - dst.bufferedWriter().use { w -> - src.forEachLine { line -> w.write(LogRedactor.redact(line)); w.newLine() } + src.inputStream().buffered().use { input -> + var left = if (from > 0) from - 1 else 0L + while (left > 0) { + val skipped = input.skip(left) + if (skipped <= 0) break + left -= skipped + } + if (from > 0 && input.read() != '\n'.code) { + while (true) { + val c = input.read() + if (c < 0 || c == '\n'.code) break + } + } + dst.bufferedWriter().use { w -> + input.bufferedReader().forEachLine { line -> w.write(LogRedactor.redact(line)); w.newLine() } + } } - record.files[dst] = Scrubbed(dst.length(), dst.lastModified()) + copied.add(dst) } catch (e: Exception) { Log.w(TAG, "could not scrub ${src.name}", e) } } - Log.i(TAG, "collected ${out.listFiles()?.size ?: 0} Steam log(s), scrubbed, into $out") + return copied } @Synchronized 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 762de4f93b..ebc9212390 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -710,7 +710,10 @@ class SessionService : Service() { SessionState.steamClientArch = if (steamHere) SessionPrefs.steamClientArch(this) else null SessionState.steamClientArch?.let { arch -> guest.add("BL_STEAM_CLIENT_ARCH=$arch") - SessionPaths.current()?.let { SessionArtifacts.recordClient(it, arch) } + SessionPaths.current()?.let { + SessionArtifacts.recordClient(it, arch) + SessionArtifacts.markSteamLogs(it, File(SessionPrefs.steamRoot(this, arch), "logs")) + } if (arch == "x86_64") FexCatalog.cached(this)?.let { guest.addAll(FexCatalog.environment(it)) } } if (SessionState.mode == MODE_STEAM) { diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionSteamLogsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionSteamLogsTest.kt new file mode 100644 index 0000000000..60c57ecfd5 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSteamLogsTest.kt @@ -0,0 +1,62 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class SessionSteamLogsTest { + @get:Rule val tmp = TemporaryFolder() + + private fun names(files: List) = files.map { it.name }.sorted() + + @Test fun onlyWhatTheSessionWroteIsCollected() { + val logs = tmp.newFolder("logs") + val session = tmp.newFolder("session") + val out = tmp.newFolder("out") + File(logs, "console_log.txt").writeText("old line\n") + File(logs, "cef_log.txt").writeText("old cef\n") + File(logs, "cef_log.previous.txt").writeText("older cef\n") + File(logs, "shrunk.txt").writeText("a long old line\n") + File(logs, "untouched.txt").writeText("nothing new\n") + SessionArtifacts.markSteamLogs(session, logs) + + File(logs, "console_log.txt").appendText("new line\n") + File(logs, "cef_log.previous.txt").delete() + File(logs, "cef_log.txt").renameTo(File(logs, "cef_log.previous.txt")) + File(logs, "cef_log.txt").writeText("this session's cef\n") + File(logs, "shrunk.txt").writeText("short\n") + File(logs, "content_log.txt").writeText("created this session\n") + + val copied = SessionArtifacts.copySessionLogs(logs, session, out) + assertEquals(listOf("cef_log.txt", "console_log.txt", "content_log.txt", "shrunk.txt"), names(copied)) + assertEquals("new line\n", File(out, "console_log.txt").readText()) + assertEquals("this session's cef\n", File(out, "cef_log.txt").readText()) + assertEquals("short\n", File(out, "shrunk.txt").readText()) + assertFalse(File(out, "cef_log.previous.txt").exists()) + assertFalse(File(out, "untouched.txt").exists()) + } + + @Test fun aLineCutByTheMarkIsLeftOut() { + val logs = tmp.newFolder("logs") + val session = tmp.newFolder("session") + val out = tmp.newFolder("out") + File(logs, "web.txt").writeText("old\nGET /x?sessionid=") + SessionArtifacts.markSteamLogs(session, logs) + File(logs, "web.txt").appendText("abcdef123456 200\nnext line\n") + SessionArtifacts.copySessionLogs(logs, session, out) + assertEquals("next line\n", File(out, "web.txt").readText()) + } + + @Test fun withoutMarksEveryLogUnderTheCapIsCollectedAndRedacted() { + val logs = tmp.newFolder("logs") + val out = tmp.newFolder("out") + File(logs, "web.txt").writeText("GET /x?sessionid=abcdef123456 200\n") + File(logs, "big.txt").outputStream().use { it.write(ByteArray(8 * 1024 * 1024)) } + val copied = SessionArtifacts.copySessionLogs(logs, tmp.newFolder("session"), out) + assertEquals(listOf("web.txt"), names(copied)) + assertFalse(File(out, "web.txt").readText().contains("abcdef123456")) + } +} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index d8a44be52f..368740c147 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -86,12 +86,6 @@ run_gamescope() ( collect_steam_logs() { [ -n "${BL_DEBUG_DIR:-}" ] || return 0 - local steam_root=${XDG_DATA_HOME:-$HOME/.local/share}/Steam - [ "${steam_x64:-0}" = 1 ] && steam_root=${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam - mkdir -p "$BL_DEBUG_DIR/steam" 2>/dev/null || return 0 - [ -d "$steam_root/logs" ] && find "$steam_root/logs" -maxdepth 1 -type f -size -8192k \ - -exec cp {} "$BL_DEBUG_DIR/steam/" \; 2>/dev/null - [ "${steam_x64:-0}" = 0 ] && [ -f "$HOME/.steam/steam/logs/steamwebhelper.log" ] && cp "$HOME/.steam/steam/logs/steamwebhelper.log" "$BL_DEBUG_DIR/steam/" 2>/dev/null local sync_store=$HOME/.local/share/droiddeck-esync sync_file if [ -d "$sync_store" ] && mkdir -p "$BL_DEBUG_DIR/droiddeck-esync" 2>/dev/null; then for sync_file in launches.log tools.tsv wanted.tsv prefixes.json; do @@ -102,7 +96,6 @@ collect_steam_logs() { if [ -d "$fex_state" ] && mkdir -p "$BL_DEBUG_DIR/droiddeck-fex" 2>/dev/null; then cp "$fex_state/status.json" "$fex_state/config/Config.json" "$BL_DEBUG_DIR/droiddeck-fex/" 2>/dev/null fi - echo "== steam logs copied to $BL_DEBUG_DIR/steam" } trap 'collect_steam_logs 2>/dev/null || true' TERM INT HUP if [ -n "${BL_VK_DRIVER:-}" ]; then From 49b6a0739d97cd168b891833eeb2f9771b9b54f4 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 24 Oct 2026 17:56:40 -0400 Subject: [PATCH 110/174] Present games from the KDE Steam client through software WSI (#1518) --- docs/testing/steam-in-kde.md | 2 +- .../linuxfs/overlay/usr/local/bin/droiddeck-steam-launch | 4 ++++ tools/tests/test_steam_desktop_launch.py | 9 +++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/testing/steam-in-kde.md b/docs/testing/steam-in-kde.md index c199aca81e..306e9a20dc 100644 --- a/docs/testing/steam-in-kde.md +++ b/docs/testing/steam-in-kde.md @@ -8,6 +8,6 @@ Validation on AYN Thor uses the full wireless ADB serial `adb-d234a848-fv2FDl (2 Rapid repeated desktop-icon taps were also tested: one client started with software CEF and the library remained on KDE. -Host regression tests cover desktop display preservation, game URLs, duplicate launches before and after IPC is ready, explicit Big Picture handoff, non-desktop callers, invalid targets, and software CEF limited to the KDE desktop client. Gameplay through Steam's library on KDE has not been validated; the desktop's existing GPU presentation limitations remain. +Host regression tests cover desktop display preservation, game URLs, duplicate launches before and after IPC is ready, explicit Big Picture handoff, non-desktop callers, invalid targets, and software CEF limited to the KDE desktop client. Games started from this client present through Mesa's software WSI path (`MESA_VK_WSI_DEBUG=sw`), because KDE's nested Xwayland has no DRI3, so Vulkan swapchains on `:0` otherwise fail with `VK_ERROR_SURFACE_LOST_KHR` and the game exits with "X connection to :0 broken". Among Us (Proton, DXVK) now opens and renders in a KDE window on a REDMAGIC NP06J. The final release-signed APK was built with `tools/build_local.sh`, verified to contain the exact tested Steam scripts, and installed with `adb install -r`. APK SHA-256: `d104b1e6e20fb10e85fcdd95eaf2a8ca69061547164640b8590e41e4495663e4`. On that installation, two rapid desktop-icon taps started one software-rendered Steam client; the library displayed on KDE and restored to a desktop window. Final session: `2026-10-12-09-desktop`, READY, mode `lxqt`, with no gamescope process or handoff request. The Thor was left running this desktop Steam client. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch index ec5453f5ba..731f64dc20 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch @@ -12,6 +12,10 @@ case $target in esac if [ "$ui" = desktop ] && [ "${BL_DESKTOP:-}" = 1 ]; then + case ",${MESA_VK_WSI_DEBUG:-}," in + *,sw,*) ;; + *) export MESA_VK_WSI_DEBUG=${MESA_VK_WSI_DEBUG:+$MESA_VK_WSI_DEBUG,}sw ;; + esac if [ "${BL_STEAM_CLIENT_ARCH:-}" = x86_64 ]; then client_home=${BL_X64_HOME:-${HOME:-/root}/.droiddeck-x64} client=(/usr/local/bin/droiddeck-steam-x64 --exec) diff --git a/tools/tests/test_steam_desktop_launch.py b/tools/tests/test_steam_desktop_launch.py index 626631e7fe..1e40f8e98a 100644 --- a/tools/tests/test_steam_desktop_launch.py +++ b/tools/tests/test_steam_desktop_launch.py @@ -42,6 +42,15 @@ class DesktopSteamLaunchTest(unittest.TestCase): self.assertEqual(result.stdout.splitlines(), ['1', 'desktop', ':7', 'steam', 'steam://open/library']) self.assertFalse((self.session / 'steam-launch').exists()) + def test_desktop_games_present_without_dri3(self): + (self.root / 'supervisor').write_text('#!/bin/bash\nprintf "%s\\n" "$MESA_VK_WSI_DEBUG"\n') + self.env.pop('MESA_VK_WSI_DEBUG', None) + self.assertEqual(self.launch('desktop', '945360').stdout.splitlines(), ['sw']) + self.env['MESA_VK_WSI_DEBUG'] = 'noshm' + self.assertEqual(self.launch('desktop', '945360').stdout.splitlines(), ['noshm,sw']) + self.env['MESA_VK_WSI_DEBUG'] = 'sw,noshm' + self.assertEqual(self.launch('desktop', '945360').stdout.splitlines(), ['sw,noshm']) + def test_desktop_game_url_goes_to_client(self): result = self.launch('desktop', '501590') self.assertEqual(result.returncode, 0, result.stderr) From dc08385411228bb1378f1eeadef317acf7672b9d Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 24 Oct 2026 17:57:59 -0400 Subject: [PATCH 111/174] Stop the library helper when the KDE Steam client exits (#1519) --- .../overlay/usr/local/bin/droiddeck-session | 2 +- tools/tests/test_steam_compat_environment.py | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 368740c147..e1db4272df 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -807,7 +807,7 @@ BUSCONF echo "== steam: devtools port $BL_CDP_PORT, guest processes only" fi [ -n "${BL_LAUNCH_DIR:-}" ] && mkdir -p "$BL_LAUNCH_DIR/agent" && echo "$BL_CDP_PORT" > "$BL_LAUNCH_DIR/agent/cdp-port" - [ "$steam_x64" = 1 ] || "${_bl_compat_env[@]}" droiddeck-steam-compat "$steam_root" 2>&1 & + [ "$steam_x64" = 1 ] || { "${_bl_compat_env[@]}" droiddeck-steam-compat "$steam_root" 2>&1 & } _bl_ui=(-gamepadui) [ "${BL_STEAM_UI:-}" = desktop ] && _bl_ui=() _bl_cef=(-cef-force-gpu -cef-use-gl=angle -cef-use-angle=vulkan) diff --git a/tools/tests/test_steam_compat_environment.py b/tools/tests/test_steam_compat_environment.py index 22a15e0d45..273fbf6dde 100644 --- a/tools/tests/test_steam_compat_environment.py +++ b/tools/tests/test_steam_compat_environment.py @@ -45,6 +45,30 @@ class SteamCompatEnvironmentTest(unittest.TestCase): client_path += ':' + inherited['LD_LIBRARY_PATH'] self.assertEqual(result.stdout.splitlines(), ['1', client_path]) + def test_session_exit_stops_the_library_helper(self): + source = (BIN / 'droiddeck-session').read_text() + launch = next(line for line in source.splitlines() + if 'droiddeck-steam-compat "$steam_root"' in line) + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + pid = root / 'pid' + helper = root / 'droiddeck-steam-compat' + helper.write_text('#!/bin/sh\necho $$ > "$PID_FILE"\nexec sleep 30\n') + helper.chmod(0o755) + env = dict(os.environ, PATH=str(root) + os.pathsep + os.environ['PATH'], + PID_FILE=str(pid), steam_root='/steam', steam_x64='0') + subprocess.run(['bash', '-c', '_bl_compat_env=(env)\n' + launch + '\n' + 'until [ -s "$PID_FILE" ]; do sleep 0.05; done\n' + 'kill $(jobs -p)\nwait'], + env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=10) + helper_pid = int(pid.read_text()) + try: + os.kill(helper_pid, 0) + except ProcessLookupError: + return + os.kill(helper_pid, 9) + self.fail('droiddeck-steam-compat outlived the session') + if __name__ == '__main__': unittest.main() From c9493993af26da2f07dc37f667bb7bfaace98b39 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 10:58:02 -0400 Subject: [PATCH 112/174] fix(desktop): keep the Desktop page from overlapping on phones --- .../com/droiddeck/launcher/ui/DesktopPage.kt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt index f6ce824ea8..01d6dc5ac0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt @@ -70,6 +70,7 @@ import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.boundsInRoot import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.painterResource @@ -102,6 +103,7 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie val ctx = LocalContext.current val density = LocalDensity.current val narrow = LocalNarrowPane.current + val short = compactDesktop() val colors = MaterialTheme.colorScheme LaunchedEffect(Unit) { UserAppsState.refresh(ctx) } LaunchedEffect(s.ready) { com.droiddeck.launcher.store.StoreState.refresh(ctx) } @@ -133,7 +135,7 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie words = { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Text( - stringResource(R.string.rail_desktop), fontSize = if (narrow) 30.sp else 42.sp, lineHeight = if (narrow) 34.sp else 46.sp, + stringResource(R.string.rail_desktop), fontSize = if (short) 30.sp else 42.sp, lineHeight = if (short) 34.sp else 46.sp, fontWeight = FontWeight.Black, color = colors.onBackground, ) BusyChip(s) @@ -143,11 +145,9 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie PrimaryButton(open, enabled = !s.busy, main = true, large = true, icon = Icons.Outlined.DesktopWindows, onClick = click) }, beside = { - Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { - Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { - HeroIconButton(Icons.Outlined.Storefront, stringResource(R.string.flathub_name), FlathubTeal, "desktop:flathub") { at -> openFrom(at, null, "store") } - HeroIconButton(Icons.Filled.Add, stringResource(R.string.user_apps_add), null, "desktop:add") { if (!s.busy) adding = true } - } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp), verticalAlignment = Alignment.CenterVertically) { + HeroIconButton(Icons.Outlined.Storefront, stringResource(R.string.flathub_name), FlathubTeal, "desktop:flathub") { at -> openFrom(at, null, "store") } + HeroIconButton(Icons.Filled.Add, stringResource(R.string.user_apps_add), null, "desktop:add") { if (!s.busy) adding = true } if (s.desktopPresent) UninstallDesktop(enabled = !s.runtimeActionsBlocked, onUninstall = a.onRemoveDesktop) } }, @@ -159,6 +159,9 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie if (adding && !s.busy) AddAppDialog(s.ready, onDismiss = { adding = false }) { request, label -> UserAppsState.add(ctx, request, label) } } +@Composable +private fun compactDesktop() = LocalNarrowPane.current || LocalConfiguration.current.screenHeightDp < 600 + @Composable private fun DesktopDock( s: FrontEndState, a: FrontEndActions, installed: List, apps: List, @@ -177,7 +180,7 @@ private fun DesktopDock( LaunchedEffect(Unit) { mounted[0] = true } val scroll = rememberScrollState() if (keys.isEmpty() && available.isEmpty() && UserAppsState.working == null && UserAppsState.lastError == null) return - Column(Modifier.fillMaxWidth().padding(top = if (narrow) 14.dp else 22.dp)) { + Column(Modifier.fillMaxWidth().padding(top = if (compactDesktop()) 14.dp else 22.dp)) { Text( stringResource(R.string.user_apps_section).uppercase(), fontSize = 11.sp, fontWeight = FontWeight.Bold, letterSpacing = 1.6.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = if (narrow) 20.dp else 44.dp, bottom = 8.dp), From 74a6a88df8c3371dd4570e1ce9e258832b380e11 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 11:55:49 -0400 Subject: [PATCH 113/174] fix(desktop): keep the Desktop actions and Settings handle on small phones --- .../main/java/com/droiddeck/launcher/ui/DesktopPage.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt index 01d6dc5ac0..39862c0823 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt @@ -122,7 +122,7 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie key = "desktop", tabs = tabs, onOpen = a.onDesktopSettings, onPrimary = a.onDesktop, modifier = modifier.clipToBounds(), - start = if (narrow) 20.dp else 44.dp, bottom = if (narrow) 20.dp else 44.dp, + start = if (narrow) 20.dp else 44.dp, bottom = 44.dp, background = { DesktopWall(installed.map { it.iconRes } + apps.mapNotNull { it.icon }) }, @@ -134,7 +134,7 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie }, words = { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { - Text( + if (LocalConfiguration.current.screenHeightDp >= 400) Text( stringResource(R.string.rail_desktop), fontSize = if (short) 30.sp else 42.sp, lineHeight = if (short) 34.sp else 46.sp, fontWeight = FontWeight.Black, color = colors.onBackground, ) @@ -145,7 +145,10 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie PrimaryButton(open, enabled = !s.busy, main = true, large = true, icon = Icons.Outlined.DesktopWindows, onClick = click) }, beside = { - Row(horizontalArrangement = Arrangement.spacedBy(10.dp), verticalAlignment = Alignment.CenterVertically) { + Row( + horizontalArrangement = Arrangement.spacedBy(10.dp), verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.horizontalScroll(rememberScrollState()), + ) { HeroIconButton(Icons.Outlined.Storefront, stringResource(R.string.flathub_name), FlathubTeal, "desktop:flathub") { at -> openFrom(at, null, "store") } HeroIconButton(Icons.Filled.Add, stringResource(R.string.user_apps_add), null, "desktop:add") { if (!s.busy) adding = true } if (s.desktopPresent) UninstallDesktop(enabled = !s.runtimeActionsBlocked, onUninstall = a.onRemoveDesktop) From 8a948fbe4538d049db79a06be00b4e75ee5454fa Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 24 Oct 2026 16:37:39 -0400 Subject: [PATCH 114/174] feat: automatically update installed Proton builds on app open --- .../droiddeck/launcher/FrontEndActivity.kt | 2 +- .../java/com/droiddeck/launcher/ProtonMenu.kt | 50 +++++- .../droiddeck/launcher/ProtonMenuAutoTest.kt | 144 ++++++++++++++++++ 3 files changed, 187 insertions(+), 9 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 83e0468f06..7083dcc360 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -91,7 +91,7 @@ class FrontEndActivity : ComponentActivity() { private val components = ComponentsMenu(this, ui) private val decky = DeckyMenu(this, ui) private val updates = UpdatesMenu(this, ui) - private val protons = ProtonMenu(this, ui) + private val protons = ProtonMenu(this, ui) { !busy && pkgStage == null && components.compBusy == null } private var installed by mutableStateOf(null) private var flood by mutableStateOf(null) diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index 5bd651cf5f..6bb28bc6cd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher import android.os.Handler +import android.util.Log +import androidx.annotation.VisibleForTesting import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf @@ -8,31 +10,47 @@ import androidx.compose.runtime.setValue import com.droiddeck.launcher.session.ProtonExtras import com.droiddeck.launcher.ui.ProtonRow import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.frontend.AutoComponents +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.runtime.LinuxRuntimeInstaller -internal class ProtonMenu(private val activity: android.app.Activity, private val ui: android.os.Handler) { +internal class ProtonMenu( + private val activity: android.app.Activity, + private val ui: Handler, + private val idle: () -> Boolean = { true }, +) { var protonRows by mutableStateOf>(emptyList()) var protonBusyId by mutableStateOf(null) var protonStage by mutableStateOf(null) var protonPercent by mutableIntStateOf(-1) private val checking = java.util.concurrent.atomic.AtomicBoolean(false) + private val autoAttempts = HashMap>() + @VisibleForTesting internal var installer: (ProtonExtras.Tool, (String, Int) -> Unit) -> String? = + { tool, progress -> ProtonExtras.install(activity, tool, progress) } - fun installProton(id: String) { + fun installProton(id: String, automatic: Boolean = false) { val tool = ProtonExtras.tools.firstOrNull { it.id == id } ?: return - if (protonBusyId != null || SessionState.running) return + if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return ProtonExtras.unqueue(activity, tool) protonBusyId = id protonStage = activity.getString(R.string.store_starting) protonPercent = -1 Thread({ - val problem = ProtonExtras.install(activity, tool) { label, value -> - ui.post { protonStage = label; protonPercent = value } - } + val problem = runCatching { + installer(tool) { label, value -> + ui.post { protonStage = label; protonPercent = value } + } + }.getOrElse { it.message ?: it.javaClass.simpleName } ui.post { protonBusyId = null protonStage = null protonPercent = -1 refreshProtons() - if (problem != null) android.widget.Toast.makeText(activity, problem, android.widget.Toast.LENGTH_LONG).show() + if (problem != null) { + if (automatic) Log.w("ProtonMenu", "auto-update ${tool.id}: $problem") + else android.widget.Toast.makeText(activity, problem, android.widget.Toast.LENGTH_LONG).show() + } + if (automatic) ensureAutoUpdates() } }, "install-proton-$id").start() } @@ -64,7 +82,23 @@ internal class ProtonMenu(private val activity: android.app.Activity, private va if (!checking.compareAndSet(false, true)) return Thread({ val asked = try { ProtonExtras.checkLatest(activity, force) } catch (_: Throwable) { false } finally { checking.set(false) } - if (asked) ui.post { refreshProtons() } + ui.post { + if (asked) refreshProtons() + ensureAutoUpdates() + } }, "proton-updates").start() } + + internal fun ensureAutoUpdates(now: Long = System.currentTimeMillis()) { + if (activity.isFinishing || activity.isDestroyed || !idle() || protonBusyId != null || + ProtonExtras.installInProgress || SessionState.running || LinuxRuntimeInstaller.isBusy() || + !LinuxRuntime.isInstalled(activity) || !AutoComponents.online(activity) || AutoComponents.unfavourable(activity)) return + val (tool, update) = ProtonExtras.tools.firstNotNullOfOrNull { tool -> + val update = ProtonExtras.update(activity, tool) ?: return@firstNotNullOfOrNull null + val previous = autoAttempts[tool.id] + if (previous == null || previous.first != update || now - previous.second !in 0 until 15L * 60 * 1000) tool to update else null + } ?: return + autoAttempts[tool.id] = update to now + installProton(tool.id, automatic = true) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt new file mode 100644 index 0000000000..124fd4e665 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -0,0 +1,144 @@ +package com.droiddeck.launcher + +import android.app.Activity +import android.os.Handler +import android.os.Looper +import com.droiddeck.launcher.frontend.AutoComponents +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.ProtonExtras +import com.droiddeck.launcher.session.SessionState +import org.json.JSONObject +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ProtonMenuAutoTest { + private val online = AutoComponents.online + private val constrained = AutoComponents.unfavourable + private lateinit var activity: Activity + private lateinit var menu: ProtonMenu + private lateinit var root: File + private val attempts = mutableListOf() + private var idle = true + + @Before fun setup() { + activity = Robolectric.buildActivity(Activity::class.java).setup().get() + root = LinuxRuntime.rootDir(activity) + for (path in listOf("usr/bin/gamescope", "usr/local/bin/droiddeck-session", "opt/android-host/proot", "opt/android-host/loader")) { + File(root, path).apply { parentFile!!.mkdirs(); writeText("") } + } + AutoComponents.online = { true } + AutoComponents.unfavourable = { false } + SessionState.running = false + val latest = JSONObject() + for (tool in ProtonExtras.tools) latest.put(tool.id, JSONObject() + .put("tag", "${tool.prefix}-11-12").put("at", System.currentTimeMillis())) + File(activity.filesDir, "proton-latest.json").writeText(latest.toString()) + menu = ProtonMenu(activity, Handler(Looper.getMainLooper())) { idle } + menu.installer = { tool, progress -> + progress("Installing ${tool.name}", 50) + install("${tool.prefix}-11-12") + null + } + } + + @After fun reset() { + AutoComponents.online = online + AutoComponents.unfavourable = constrained + SessionState.running = false + } + + private fun install(name: String): File = File(root, "root/.local/share/Steam/compatibilitytools.d/$name").apply { + mkdirs() + File(this, "toolmanifest.vdf").writeText("manifest") + } + + private fun waitUntil(done: () -> Boolean) { + val deadline = System.nanoTime() + 5_000_000_000L + while (System.nanoTime() < deadline) { + shadowOf(Looper.getMainLooper()).idle() + if (done()) return + Thread.sleep(10) + } + fail("Proton work did not finish") + } + + @Test fun aCachedCheckUpdatesOnlyInstalledFamiliesAndKeepsOlderBuildsAndSelections() { + val older = install("DroidDeck-Proton-11-11.1") + val request = File(root, "root/.local/share/droiddeck-compat/request.json").apply { + parentFile!!.mkdirs() + writeText("{\"seq\":1,\"dir\":\"DroidDeck-Proton-11-11.1\",\"valve\":false}") + } + val before = request.readText() + assertFalse(ProtonExtras.checkLatest(activity)) + menu.checkUpdates() + waitUntil { menu.protonRows.singleOrNull { it.id == "droiddeck" }?.installed == "DroidDeck-Proton-11-12" && menu.protonBusyId == null } + assertTrue(older.isDirectory) + assertEquals(before, request.readText()) + assertTrue(ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == "ge" }).isEmpty()) + assertTrue(ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == "cachyos" }).isEmpty()) + } + + @Test fun downloadsWaitForTheSessionNetworkPowerAndOtherInstallWork() { + install("DroidDeck-Proton-11-11.1") + menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } + SessionState.running = true + menu.ensureAutoUpdates() + SessionState.running = false + AutoComponents.online = { false } + menu.ensureAutoUpdates() + AutoComponents.online = { true } + AutoComponents.unfavourable = { true } + menu.ensureAutoUpdates() + AutoComponents.unfavourable = { false } + idle = false + menu.ensureAutoUpdates() + assertNull(menu.protonBusyId) + assertTrue(attempts.isEmpty()) + idle = true + menu.ensureAutoUpdates() + waitUntil { menu.protonBusyId == null } + assertEquals(listOf("droiddeck"), attempts) + } + + @Test fun aFailedUpdateDoesNotLoopOrBlockOtherInstalledFamilies() { + val ge = install("GE-Proton11-11") + val dd = install("DroidDeck-Proton-11-11.1") + menu.installer = { tool, _ -> + attempts.add(tool.id) + if (tool.id == "ge") throw IllegalStateException("download failed") + install("${tool.prefix}-11-12") + null + } + menu.ensureAutoUpdates() + waitUntil { menu.protonBusyId == null } + menu.ensureAutoUpdates() + shadowOf(Looper.getMainLooper()).idle() + assertEquals(listOf("ge", "droiddeck"), attempts) + assertTrue(ge.isDirectory) + assertTrue(dd.isDirectory) + assertNull(menu.protonStage) + assertEquals(-1, menu.protonPercent) + } + + @Test fun anUninstalledRuntimeOrCurrentProtonDoesNotStartADownload() { + install("DroidDeck-Proton-11-12") + menu.installer = { tool, _ -> attempts.add(tool.id); null } + menu.ensureAutoUpdates() + assertTrue(attempts.isEmpty()) + install("GE-Proton11-11") + File(root, "usr/bin/gamescope").delete() + menu.ensureAutoUpdates() + assertTrue(attempts.isEmpty()) + assertNull(menu.protonBusyId) + } +} From b56ea6122a7d92225d2777f5ad16482e15a8884e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 24 Oct 2026 16:58:29 -0400 Subject: [PATCH 115/174] fix: exclude pending launches and retain Proton update cooldowns --- .../droiddeck/launcher/FrontEndActivity.kt | 10 +++- .../java/com/droiddeck/launcher/ProtonMenu.kt | 8 +-- .../droiddeck/launcher/ProtonMenuAutoTest.kt | 51 +++++++++++++++++++ 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 7083dcc360..e2ce59eff8 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -91,7 +91,7 @@ class FrontEndActivity : ComponentActivity() { private val components = ComponentsMenu(this, ui) private val decky = DeckyMenu(this, ui) private val updates = UpdatesMenu(this, ui) - private val protons = ProtonMenu(this, ui) { !busy && pkgStage == null && components.compBusy == null } + private val protons = ProtonMenu(this, ui) { !busy && flood == null && pkgStage == null && components.compBusy == null } private var installed by mutableStateOf(null) private var flood by mutableStateOf(null) @@ -460,7 +460,13 @@ class FrontEndActivity : ComponentActivity() { } private fun launchFlooded(f: PendingFlood) { - if (busy || LinuxRuntimeInstaller.isBusy()) { flood = null; floodProgress = 0f; return } + if (busy || LinuxRuntimeInstaller.isBusy() || protons.protonBusyId != null || + ProtonExtras.installInProgress || pkgStage != null) { + flood = null + floodProgress = 0f + com.droiddeck.launcher.ui.LaunchOrigin.flooding = null + return + } val signal = com.droiddeck.launcher.ui.Themes.byId(theme).signal super.startActivity(f.intent.putExtra(com.droiddeck.launcher.ui.EXTRA_FLOOD, signal.toArgb())) overridePendingTransition(0, 0) diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index 6bb28bc6cd..a226f53cde 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -24,7 +24,6 @@ internal class ProtonMenu( var protonStage by mutableStateOf(null) var protonPercent by mutableIntStateOf(-1) private val checking = java.util.concurrent.atomic.AtomicBoolean(false) - private val autoAttempts = HashMap>() @VisibleForTesting internal var installer: (ProtonExtras.Tool, (String, Int) -> Unit) -> String? = { tool, progress -> ProtonExtras.install(activity, tool, progress) } @@ -93,12 +92,13 @@ internal class ProtonMenu( if (activity.isFinishing || activity.isDestroyed || !idle() || protonBusyId != null || ProtonExtras.installInProgress || SessionState.running || LinuxRuntimeInstaller.isBusy() || !LinuxRuntime.isInstalled(activity) || !AutoComponents.online(activity) || AutoComponents.unfavourable(activity)) return + val attempts = activity.getSharedPreferences("proton-auto-updates", android.content.Context.MODE_PRIVATE) val (tool, update) = ProtonExtras.tools.firstNotNullOfOrNull { tool -> val update = ProtonExtras.update(activity, tool) ?: return@firstNotNullOfOrNull null - val previous = autoAttempts[tool.id] - if (previous == null || previous.first != update || now - previous.second !in 0 until 15L * 60 * 1000) tool to update else null + val previous = attempts.getLong("${tool.id}.at", 0L) + if (attempts.getString("${tool.id}.tag", null) != update || now - previous !in 0 until 15L * 60 * 1000) tool to update else null } ?: return - autoAttempts[tool.id] = update to now + attempts.edit().putString("${tool.id}.tag", update).putLong("${tool.id}.at", now).apply() installProton(tool.id, automatic = true) } } diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt index 124fd4e665..87fd554a64 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -1,12 +1,16 @@ package com.droiddeck.launcher import android.app.Activity +import android.content.Intent import android.os.Handler 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.ProtonExtras import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.ui.LaunchOrigin +import com.droiddeck.launcher.ui.Motion import org.json.JSONObject import org.junit.After import org.junit.Assert.* @@ -17,6 +21,7 @@ import org.robolectric.Robolectric import org.robolectric.RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers import java.io.File @RunWith(RobolectricTestRunner::class) @@ -39,6 +44,8 @@ class ProtonMenuAutoTest { AutoComponents.online = { true } AutoComponents.unfavourable = { false } SessionState.running = false + LaunchOrigin.take() + LaunchOrigin.flooding = null val latest = JSONObject() for (tool in ProtonExtras.tools) latest.put(tool.id, JSONObject() .put("tag", "${tool.prefix}-11-12").put("at", System.currentTimeMillis())) @@ -55,6 +62,8 @@ class ProtonMenuAutoTest { AutoComponents.online = online AutoComponents.unfavourable = constrained SessionState.running = false + LaunchOrigin.take() + LaunchOrigin.flooding = null } private fun install(name: String): File = File(root, "root/.local/share/Steam/compatibilitytools.d/$name").apply { @@ -141,4 +150,46 @@ class ProtonMenuAutoTest { assertTrue(attempts.isEmpty()) assertNull(menu.protonBusyId) } + + @Test fun aFailedReleaseIsNotRetriedAfterRecreatingTheLauncher() { + install("DroidDeck-Proton-11-11.1") + 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.ensureAutoUpdates() + assertNull(next.protonBusyId) + assertEquals(listOf("droiddeck"), attempts) + } + + @Test fun aPendingAnimatedLaunchPreventsAnAutomaticInstall() { + 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" } + Motion.refresh(launcher) + LaunchOrigin.mark(Rect(0f, 0f, 100f, 100f), "game") + launcher.startActivity(Intent(launcher, SessionActivity::class.java)) + assertNotNull(ReflectionHelpers.callInstanceMethod(launcher, "getFlood")) + assertNull(shadowOf(launcher).nextStartedActivity) + protons.ensureAutoUpdates() + assertNull(protons.protonBusyId) + assertTrue(attempts.isEmpty()) + } + + @Test fun anAnimatedLaunchRechecksTheProtonInstallGuardBeforeStarting() { + val launcher = Robolectric.buildActivity(FrontEndActivity::class.java).get() + Motion.refresh(launcher) + LaunchOrigin.mark(Rect(0f, 0f, 100f, 100f), "game") + launcher.startActivity(Intent(launcher, SessionActivity::class.java)) + val pending = requireNotNull(ReflectionHelpers.callInstanceMethod(launcher, "getFlood")) + ReflectionHelpers.getField(launcher, "protons").protonBusyId = "droiddeck" + FrontEndActivity::class.java.getDeclaredMethod("launchFlooded", pending.javaClass) + .apply { isAccessible = true }.invoke(launcher, pending) + assertNull(shadowOf(launcher).nextStartedActivity) + assertNull(ReflectionHelpers.callInstanceMethod(launcher, "getFlood")) + assertNull(LaunchOrigin.flooding) + } } From 71f84f05933641ace4b3d92c912c2d0ca6cfadd7 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 24 Oct 2026 17:03:54 -0400 Subject: [PATCH 116/174] fix: defer automatic Proton updates until session teardown ends --- .../java/com/droiddeck/launcher/ProtonMenu.kt | 2 ++ .../com/droiddeck/launcher/ProtonMenuAutoTest.kt | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index a226f53cde..5e49b5cf5d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -10,6 +10,7 @@ import androidx.compose.runtime.setValue import com.droiddeck.launcher.session.ProtonExtras import com.droiddeck.launcher.ui.ProtonRow import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SessionPhase import com.droiddeck.launcher.frontend.AutoComponents import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.runtime.LinuxRuntimeInstaller @@ -91,6 +92,7 @@ internal class ProtonMenu( internal fun ensureAutoUpdates(now: Long = System.currentTimeMillis()) { if (activity.isFinishing || activity.isDestroyed || !idle() || protonBusyId != null || ProtonExtras.installInProgress || SessionState.running || LinuxRuntimeInstaller.isBusy() || + SessionState.phase !in setOf(SessionPhase.IDLE, SessionPhase.FAILED) || !LinuxRuntime.isInstalled(activity) || !AutoComponents.online(activity) || AutoComponents.unfavourable(activity)) return val attempts = activity.getSharedPreferences("proton-auto-updates", android.content.Context.MODE_PRIVATE) val (tool, update) = ProtonExtras.tools.firstNotNullOfOrNull { tool -> diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt index 87fd554a64..66e2ceeb27 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -9,6 +9,7 @@ import com.droiddeck.launcher.frontend.AutoComponents import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.ProtonExtras import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SessionPhase import com.droiddeck.launcher.ui.LaunchOrigin import com.droiddeck.launcher.ui.Motion import org.json.JSONObject @@ -44,6 +45,7 @@ class ProtonMenuAutoTest { AutoComponents.online = { true } AutoComponents.unfavourable = { false } SessionState.running = false + SessionState.phase = SessionPhase.IDLE LaunchOrigin.take() LaunchOrigin.flooding = null val latest = JSONObject() @@ -62,6 +64,7 @@ class ProtonMenuAutoTest { AutoComponents.online = online AutoComponents.unfavourable = constrained SessionState.running = false + SessionState.phase = SessionPhase.IDLE LaunchOrigin.take() LaunchOrigin.flooding = null } @@ -164,6 +167,19 @@ class ProtonMenuAutoTest { assertEquals(listOf("droiddeck"), attempts) } + @Test fun automaticUpdatesWaitForEveryNonEndedSessionPhaseEvenWhenRunningIsFalse() { + install("DroidDeck-Proton-11-11.1") + for (phase in SessionPhase.entries.filter { it != SessionPhase.IDLE && it != SessionPhase.FAILED }) { + SessionState.phase = phase + menu.ensureAutoUpdates() + assertNull("Must wait during $phase", menu.protonBusyId) + } + SessionState.phase = SessionPhase.FAILED + menu.ensureAutoUpdates() + waitUntil { menu.protonBusyId == null } + assertEquals("DroidDeck-Proton-11-12", ProtonExtras.installed(activity, ProtonExtras.tools.first { it.id == "droiddeck" })) + } + @Test fun aPendingAnimatedLaunchPreventsAnAutomaticInstall() { install("DroidDeck-Proton-11-11.1") val launcher = Robolectric.buildActivity(FrontEndActivity::class.java).get() From 96ba91537840e4279bab968ab4908d9e67670a00 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 24 Oct 2026 17:16:10 -0400 Subject: [PATCH 117/174] fix: publish session stopping before clearing the running flag --- .../java/com/droiddeck/launcher/session/SessionService.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 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 ebc9212390..1293d1d608 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -1651,6 +1651,8 @@ class SessionService : Service() { completeNativeSleep() val (ended, endedArch) = synchronized(stopLock) { if (!SessionState.running) return + SessionEvents.record("guest.exited", mapOf("status" to status)) + SessionEvents.transition(SessionPhase.STOPPING, "session.stopping", mapOf("status" to status)) SessionState.running = false SessionPaths.take() to SessionState.steamClientArch } @@ -1660,10 +1662,8 @@ class SessionService : Service() { val stoppedSession = SessionState.sessionId val launcherEnded = SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || SessionState.program == NoSteamLaunch.EPIC SessionState.stopRequested = false - SessionEvents.record("guest.exited", mapOf("status" to status)) GpuClockPin.stop(this) GameThreadHints.stop() - SessionEvents.transition(SessionPhase.STOPPING, "session.stopping", mapOf("status" to status)) suspendOperationPending = false freezePending = false launchWatcher?.stopWatching() From aca7fca19fe087dffe89a86a1a92eebd190cdf20 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 24 Oct 2026 17:32:07 -0400 Subject: [PATCH 118/174] fix: keep cancellation polling from ending session teardown early --- .../com/droiddeck/launcher/SessionActivity.kt | 3 +- .../droiddeck/launcher/ProtonMenuAutoTest.kt | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 0d87bc1f10..478c6c706d 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1893,7 +1893,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun run() { if (!watching) return if (::pip.isInitialized) pip.refresh() - if (SessionState.stopRequested && !SessionState.running && !installingRuntime) { + if (SessionState.stopRequested && !SessionState.running && !installingRuntime && + SessionState.phase != SessionPhase.STOPPING) { SessionState.stopRequested = false SessionEvents.transition(SessionPhase.IDLE, "session.cancelled") collectStartArtifacts("session start cancelled") diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt index 66e2ceeb27..f0424bdaa0 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -10,6 +10,7 @@ import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.ProtonExtras import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.session.SessionPhase +import com.droiddeck.launcher.session.LoadingState import com.droiddeck.launcher.ui.LaunchOrigin import com.droiddeck.launcher.ui.Motion import org.json.JSONObject @@ -24,6 +25,7 @@ import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.util.ReflectionHelpers import java.io.File +import java.util.concurrent.TimeUnit @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) @@ -46,6 +48,7 @@ class ProtonMenuAutoTest { AutoComponents.unfavourable = { false } SessionState.running = false SessionState.phase = SessionPhase.IDLE + SessionState.stopRequested = false LaunchOrigin.take() LaunchOrigin.flooding = null val latest = JSONObject() @@ -65,6 +68,7 @@ class ProtonMenuAutoTest { AutoComponents.unfavourable = constrained SessionState.running = false SessionState.phase = SessionPhase.IDLE + SessionState.stopRequested = false LaunchOrigin.take() LaunchOrigin.flooding = null } @@ -208,4 +212,33 @@ class ProtonMenuAutoTest { assertNull(ReflectionHelpers.callInstanceMethod(launcher, "getFlood")) assertNull(LaunchOrigin.flooding) } + + @Test fun aCancellationDuringTeardownCannotPublishIdleEarly() { + val session = watchCancellation(SessionPhase.STOPPING) + assertEquals(SessionPhase.STOPPING, SessionState.phase) + assertTrue(SessionState.stopRequested) + assertFalse(session.isFinishing) + } + + @Test fun cancellationBeforeSessionStartupStillFinishesTheActivity() { + val session = watchCancellation(SessionPhase.PREPARING) + assertEquals(SessionPhase.IDLE, SessionState.phase) + assertFalse(SessionState.stopRequested) + assertTrue(session.isFinishing) + } + + private fun watchCancellation(phase: SessionPhase): SessionActivity { + val session = Robolectric.buildActivity(SessionActivity::class.java).get() + ReflectionHelpers.setField(session, "loading", LoadingState(session).apply { visible = false }) + SessionState.phase = phase + SessionState.stopRequested = true + try { + ReflectionHelpers.callInstanceMethod(session, "watchSession") + shadowOf(Looper.getMainLooper()).idle() + } finally { + ReflectionHelpers.setField(session, "watching", false) + shadowOf(Looper.getMainLooper()).idleFor(500, TimeUnit.MILLISECONDS) + } + return session + } } From 8d407aa1e80efc041ec86c181f603838389aea42 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 24 Oct 2026 20:04:54 -0400 Subject: [PATCH 119/174] Focus flatpak and other sandboxed shortcuts in gaming mode (#1524) --- .../overlay/usr/local/bin/droiddeck-agent | 81 +++++++++++++++++-- tools/tests/test_droiddeck_agent.py | 57 +++++++++++++ 2 files changed, 131 insertions(+), 7 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent index 8a0ba6a2cc..162d7ebc27 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent @@ -259,24 +259,91 @@ def focus_snapshot(): STEAM_APP_CLASS = re.compile(r"steam_app_(\d+)$") -def tag_game_windows(snap): - if os.environ.get("BL_STEAM_CLIENT_ARCH") != "x86_64": - return False +def process_env(pid, proc=Path("/proc")): + try: + return dict(entry.split(b"=", 1) for entry in (proc / str(pid) / "environ").read_bytes().split(b"\0") if b"=" in entry) + except OSError: + return {} + + +def steam_app_id(env): + try: + app = int(env.get(b"SteamAppId", b"0")) + except ValueError: + return None + return app if 0 < app < 2**32 else None + + +def under_reaper(pid, proc=Path("/proc")): + for _ in range(64): + try: + if (proc / str(pid) / "comm").read_text().strip() == "reaper": + return True + stat = (proc / str(pid) / "stat").read_text() + pid = int(stat[stat.rindex(")") + 2:].split()[1]) + except (OSError, ValueError, IndexError): + return False + if pid <= 1: + return False + return False + + +def sandboxed_apps(proc=Path("/proc")): + apps = {} + try: + pids = [entry for entry in os.listdir(proc) if entry.isdigit()] + except OSError: + return apps + for pid in pids: + env = process_env(pid, proc) + flatpak, app = env.get(b"FLATPAK_ID"), steam_app_id(env) + if flatpak and app: + name = flatpak.decode(errors="replace").lower() + for key in {name, name.rsplit(".", 1)[-1]}: + apps[key] = app if apps.get(key, app) == app else None + return apps + + +def window_steam_app(win, flatpaks, proc=Path("/proc")): + match = STEAM_APP_CLASS.match(win.get("class") or "") + if match: + return match.group(1) if os.environ.get("BL_STEAM_CLIENT_ARCH") == "x86_64" else None + pid = win.get("pid") + if pid: + if under_reaper(pid, proc): + return None + app = steam_app_id(process_env(pid, proc)) + if app: + return str(app) + app = flatpaks().get((win.get("class") or "").lower()) + return str(app) if app else None + + +def tag_game_windows(snap, proc=Path("/proc")): tagged = False + found = [] + + def flatpaks(): + if not found: + found.append(sandboxed_apps(proc)) + return found[0] + for display, wins in snap.get("displays", {}).items(): if display == os.environ.get("DISPLAY"): continue for win in wins: - match = STEAM_APP_CLASS.match(win.get("class") or "") - if not match or win.get("appId") or win.get("map") != "viewable" or win.get("overrideRedirect"): + if win.get("appId") or win.get("map") != "viewable" or win.get("overrideRedirect") or win.get("inputOnly"): + continue + app = window_steam_app(win, flatpaks, proc) + if not app: continue try: done = subprocess.run(["xprop", "-display", display, "-id", str(win["window"]), "-f", "STEAM_GAME", "32c", - "-set", "STEAM_GAME", match.group(1)], + "-set", "STEAM_GAME", app], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=5).returncode == 0 except (OSError, subprocess.TimeoutExpired): done = False - log("game window %s on %s tagged STEAM_GAME=%s: %s" % (win["window"], display, match.group(1), "ok" if done else "failed")) + log("game window %s on %s tagged STEAM_GAME=%s: %s" % (win["window"], display, app, "ok" if done else "failed")) tagged = tagged or done return tagged diff --git a/tools/tests/test_droiddeck_agent.py b/tools/tests/test_droiddeck_agent.py index 66744b6d55..e9fae88621 100644 --- a/tools/tests/test_droiddeck_agent.py +++ b/tools/tests/test_droiddeck_agent.py @@ -196,6 +196,63 @@ class AgentTest(unittest.TestCase): answer = self.ask({"kind": "vr", "action": "status"}) self.assertEqual("UNAVAILABLE", answer["error"]["code"]) + def fake_proc(self, pid, parent, comm, env): + root = self.dir / "proc" / str(pid) + root.mkdir(parents=True) + (root / "comm").write_text(comm + "\n") + (root / "stat").write_text("%d (%s) S %d 0 0" % (pid, comm, parent)) + (root / "environ").write_bytes(b"\0".join(b"%s=%s" % (k.encode(), v.encode()) for k, v in env.items()) + b"\0") + + def tag(self, wins, arch="arm64"): + snap = {"displays": {":0": [], ":1": wins}} + with patch.dict(os.environ, {"DISPLAY": ":0", "BL_STEAM_CLIENT_ARCH": arch}), \ + patch.object(agent.subprocess, "run") as run, patch.object(agent, "log"): + run.return_value.returncode = 0 + tagged = agent.tag_game_windows(snap, proc=self.dir / "proc") + return tagged, [call.args[0][-1] for call in run.call_args_list] + + def test_a_sandboxed_flatpak_window_is_tagged_with_its_shortcut(self): + self.fake_proc(40, 1, "gjs", {"FLATPAK_ID": "com.github.tchx84.Flatseal", "SteamAppId": "2166984148"}) + win = {"window": 7, "map": "viewable", "class": "com.github.tchx84.Flatseal", "pid": None} + self.assertEqual(self.tag([win]), (True, ["2166984148"])) + + def test_a_flatpak_window_named_after_the_app_is_matched(self): + self.fake_proc(40, 1, "vacuumtube", {"FLATPAK_ID": "rocks.shy.VacuumTube", "SteamAppId": "3000000001"}) + win = {"window": 7, "map": "viewable", "class": "VacuumTube", "pid": None} + self.assertEqual(self.tag([win]), (True, ["3000000001"])) + + def test_a_window_whose_process_has_no_app_id_falls_back_to_its_flatpak(self): + self.fake_proc(40, 1, "bwrap", {"FLATPAK_ID": "com.github.tchx84.Flatseal", "SteamAppId": "2166984148"}) + self.fake_proc(41, 1, "gjs", {}) + win = {"window": 7, "map": "viewable", "class": "com.github.tchx84.Flatseal", "pid": 41} + self.assertEqual(self.tag([win]), (True, ["2166984148"])) + + def test_a_flatpak_shared_by_two_shortcuts_is_not_guessed(self): + self.fake_proc(40, 1, "gjs", {"FLATPAK_ID": "com.github.tchx84.Flatseal", "SteamAppId": "2166984148"}) + self.fake_proc(42, 1, "gjs", {"FLATPAK_ID": "com.github.tchx84.Flatseal", "SteamAppId": "3000000003"}) + win = {"window": 7, "map": "viewable", "class": "com.github.tchx84.Flatseal", "pid": None} + self.assertEqual(self.tag([win]), (False, [])) + + def test_a_window_outside_the_reaper_takes_its_process_app_id(self): + self.fake_proc(30, 1, "proot", {}) + self.fake_proc(31, 30, "electron", {"SteamAppId": "3000000002"}) + win = {"window": 8, "map": "viewable", "class": "electron", "pid": 31} + self.assertEqual(self.tag([win]), (True, ["3000000002"])) + + def test_windows_gamescope_already_resolves_are_left_alone(self): + self.fake_proc(20, 1, "reaper", {}) + self.fake_proc(21, 20, "game", {"SteamAppId": "413150"}) + wins = [{"window": 9, "map": "viewable", "class": "game", "pid": 21}, + {"window": 10, "map": "viewable", "class": "tagged", "pid": None, "appId": 5}, + {"window": 11, "map": "viewable", "class": "other", "pid": None}, + {"window": 12, "map": "unmapped", "class": "game", "pid": 21}, + {"window": 13, "map": "viewable", "class": "steam_app_550", "pid": None}] + self.assertEqual(self.tag(wins), (False, [])) + + def test_the_x86_client_still_tags_its_game_classes(self): + win = {"window": 13, "map": "viewable", "class": "steam_app_550", "pid": None} + self.assertEqual(self.tag([win], arch="x86_64"), (True, ["550"])) + def test_exec_output_and_status(self): answer = self.ask({"kind": "exec", "argv": ["sh", "-c", "echo out; echo err >&2; exit 3"], "env": {"X": "1"}}) self.assertTrue(answer["ok"]) From c866bb90dbafe27dd27d9f4fd615856385bb8ac8 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 16:00:41 -0400 Subject: [PATCH 120/174] Share installed games between the arm64 and x86-64 Steam clients --- .../droiddeck/launcher/frontend/Library.kt | 16 +- .../launcher/session/SessionFiles.kt | 1 + .../launcher/frontend/LibraryArchTest.kt | 14 + docs/development/x86-64-steam-client.md | 37 ++- .../overlay/usr/local/bin/droiddeck-session | 1 + .../usr/local/bin/droiddeck-steam-share | 266 ++++++++++++++++++ .../overlay/usr/local/bin/droiddeck-steam-x64 | 16 +- tools/tests/test_steam_share.py | 149 ++++++++++ 8 files changed, 486 insertions(+), 14 deletions(-) create mode 100755 tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share create mode 100644 tools/tests/test_steam_share.py 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 3e1a0e85eb..59cf850617 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -106,7 +106,10 @@ object Library { .firstOrNull { it.isDirectory } } - fun steamGames(context: Context, strictRead: Boolean = false, arch: String = SessionPrefs.activeSteamClientArch(context)): List { + fun steamGames( + context: Context, strictRead: Boolean = false, arch: String = SessionPrefs.activeSteamClientArch(context), + withShared: Boolean = true, + ): List { val root = SessionPrefs.steamRoot(context, arch) val cache = File(root, "appcache/librarycache") val libraries = steamLibraries(context, arch) @@ -139,9 +142,20 @@ object Library { )) } } + if (withShared) { + val other = if (arch == "x86_64") "arm64" else "x86_64" + val shared = sharedApps(context, arch) - out.keys + if (shared.isNotEmpty()) runCatching { steamGames(context, arch = other, withShared = false) }.getOrDefault(emptyList()) + .filter { it.appId in shared }.forEach { out[it.appId] = it } + } return out.values.toList() } + internal fun sharedApps(context: Context, arch: String): Set { + val view = File(LinuxRuntime.rootDir(context), "root/.droiddeck-x64/shared/${if (arch == "x86_64") "arm64" else "x86-64"}/steamapps") + return view.list().orEmpty().mapNotNull { Regex("appmanifest_(\\d+)\\.acf").matchEntire(it)?.groupValues?.get(1)?.toIntOrNull() }.toSet() + } + fun steamLibraryArt(context: Context): List> { val root = SessionPrefs.activeSteamRoot(context) val cache = File(root, "appcache/librarycache") 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 8cd846513d..38d6c6fd08 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -61,6 +61,7 @@ object SessionFiles { "usr/local/bin/droiddeck-steam-shaders" to "usr/local/bin/droiddeck-steam-shaders", "usr/local/bin/droiddeck-steam-desktop-ui" to "usr/local/bin/droiddeck-steam-desktop-ui", "usr/local/bin/droiddeck-steam-library" to "usr/local/bin/droiddeck-steam-library", + "usr/local/bin/droiddeck-steam-share" to "usr/local/bin/droiddeck-steam-share", "usr/local/bin/droiddeck-seed-redists" to "usr/local/bin/droiddeck-seed-redists", "usr/local/bin/droiddeck-launcher-cores" to "usr/local/bin/droiddeck-launcher-cores", "usr/local/bin/droiddeck-proton-extra" to "usr/local/bin/droiddeck-proton-extra", diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/LibraryArchTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryArchTest.kt index 8ecd411b0c..0b05b0e842 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/LibraryArchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryArchTest.kt @@ -23,6 +23,20 @@ class LibraryArchTest { assertEquals(emptyList(), Library.launchableGames(app, added = emptyList(), arch = "arm64").map { it.name }) } + @Test fun aGameTheOtherClientSharesIsListedFromItsFiles() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + val apps = File(SessionPrefs.steamRoot(app, "x86_64"), "steamapps").apply { mkdirs() } + File(apps, "common/Team Fortress 2").mkdirs() + val manifest = "\"AppState\"\n{\n\t\"appid\"\t\t\"440\"\n\t\"name\"\t\t\"Team Fortress 2\"\n\t\"StateFlags\"\t\t\"4\"\n\t\"installdir\"\t\t\"Team Fortress 2\"\n}\n" + File(apps, "appmanifest_440.acf").writeText(manifest) + val view = File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(app), "root/.droiddeck-x64/shared/x86-64/steamapps").apply { mkdirs() } + File(view, "appmanifest_440.acf").writeText(manifest) + val shared = Library.steamGames(app, arch = "arm64").single() + assertEquals("Team Fortress 2", shared.name) + assertEquals(File(apps, "common/Team Fortress 2"), shared.gameFiles) + assertEquals(listOf("Team Fortress 2"), Library.steamGames(app, arch = "x86_64").map { it.name }) + } + @Test fun anAddedGameSteamAlreadyListsFromItsFolderIsShownOnce() { SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") val folder = File(app.filesDir, "games/Example").apply { mkdirs() } diff --git a/docs/development/x86-64-steam-client.md b/docs/development/x86-64-steam-client.md index 3e0d867a26..8d57b9ce23 100644 --- a/docs/development/x86-64-steam-client.md +++ b/docs/development/x86-64-steam-client.md @@ -291,13 +291,28 @@ alone would then read as an installed client. ## Libraries, SD card and sharing between clients -- **Separate libraries.** With folders shared, each client could update, verify or switch the - other's games. A title with a Linux build runs as that in the x86 client and as the Windows build in - the arm64 one, so opening it in the other client switched the files and the first client downloaded - its version again (Left 4 Dead 2, 8.6 GB). Hard links do not help: switching platform makes Steam - download depot 551 anyway. A game wanted in both clients is installed in both. Folders an earlier - version shared are taken out of the x86 client's lists (written only while no x86 client runs); the - games stay in the arm64 library. +- **Shared games.** Before either client starts, `droiddeck-steam-share` gives it a view of the games + the other client installed: `~/.droiddeck-x64/shared/arm64` for the x86 client ("ARM64 client + games") and `shared/x86-64` for the arm64 one ("x86-64 client games"). A view holds a copy of each + finished game's manifest and links to its `common` folder and `compatdata`, so the game shows as + installed in both clients, runs from the same files and keeps one prefix and one set of saves. + Runtimes, Proton and FEX are not shared. Device: the x86 client listed the 14 arm64 games as + installed (13 ready to launch, Valheim fetching its shader cache) and started Stardew Valley from the + arm64 files with no game data downloaded; the arm64 client listed Spacewar installed only in the x86 + client. +- **Same build in both.** A title with a Linux build ran as that in the x86 client and as the Windows + build in the arm64 one, so opening it in the other client switched the files and the first client + downloaded its version again (Left 4 Dead 2, 8.6 GB; hard links do not help, switching platform makes + Steam download depot 551 anyway). A shared game gets the tool its own client uses: `droiddeck-fex` + there becomes `droiddeck-direct` here and the other way round, a Proton build keeps its Proton. Only + automatic choices are replaced; a tool the user picked stays. +- **Updates and uninstall.** The newer manifest wins: an update made through a view is written back to + the client that owns the game. Uninstalling a shared game removes it from that client only; its files + stay with the client that installed it (Steam does not delete through the link) and it stays hidden + there until that client updates or reinstalls it. A game installed in both clients is each client's + own and is not shared. A view with nothing in it is not offered as an install location. Views are + written only while no client runs. Shader pre-caching stays each client's own: the x86 client may + fetch a shared game's shader cache into its own folder (Valheim, 1.8 GB). - **SD card.** The x86 client's card library is a folder inside the arm64 one (`/mnt/droiddeck-sd/x86-64`, `GameStorage.X64_CARD_DIR`, passed as `BL_X64_STEAM_LIBRARIES`), so the install dialog offers Internal Storage and SD card. compatdata, shadercache and runtime tools stay private, as in the arm64 card @@ -334,9 +349,11 @@ alone would then read as an installed client. redactor learns account names from both clients. The startup movie is staged into the x86 client's config only once its first start has created it; `--prepare` links the arm64 `config/uioverrides` and copies the `StartupMovie` choice. -- **Storage page.** It lists both clients' games, the x86 ones labelled; a game can be installed in - both and an id left over in several libraries. `steam://uninstall` reaches only the session's client, - so the other client's copy is uninstalled after switching clients. Tools in the x86 client's +- **Storage page.** It lists both clients' games, the x86 ones labelled, each where its files are, so a + shared game is counted once; a game can be installed in both and an id left over in several + libraries. The Games page of each client lists the games shared with it. `steam://uninstall` + reaches only the session's client, so the other client's own copy is uninstalled after switching + clients. Tools in the x86 client's libraries are shown as required (it runs its Linux games with Valve's runtimes). Proton tool files live only in the arm64 root; the x86 client has wrappers. An x86 client without `config.vdf` has never mapped a game. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index e1db4272df..e95a7a940a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -396,6 +396,7 @@ case $mode in steam_root=$XDG_DATA_HOME/Steam if [ -f "${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam/local.vdf" ]; then droiddeck-steam-x64 --sync-login || true + droiddeck-steam-x64 --share || true fi steam_client=("$steam_root/steamrtarm64/steam") _bl_srt_shim=$HOME/.droiddeck-steamrt-shim diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share new file mode 100755 index 0000000000..fd6380c653 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share @@ -0,0 +1,266 @@ +#!/usr/bin/python3 +import json +import os +import re +import runpy +import sys + +NOT_GAMES = frozenset(( + "228980", "1070560", "1391110", "1628350", "1493710", "3127680", + "4183110", "4185400", "4427310", "4628740", +)) +TOOL_DIR = re.compile(r"(steam ?linux ?runtime.*|proton.*|steamworks shared|fex|steamvr)", re.I) +AUTOMATIC = ("", "droiddeck-direct", "droiddeck-fex", "droiddeck-proton-arm64", "droiddeck-proton-11-arm64") +STATE = ".droiddeck-shared.json" +LABELS = {"arm64": "ARM64 client games", "x86-64": "x86-64 client games"} + + +def say(message): + print("droiddeck-steam-share: " + message) + + +def read(path): + try: + with open(path, encoding="utf-8", errors="surrogateescape") as f: + return f.read() + except OSError: + return None + + +def write(path, text): + staged = path + ".droiddeck-new" + with open(staged, "w", encoding="utf-8", errors="surrogateescape") as f: + f.write(text) + os.replace(staged, path) + + +def field(text, key): + m = re.search(r'"%s"\s+"([^"]*)"' % re.escape(key), text or "", re.I) + return m.group(1) if m else None + + +def number(text, key): + value = field(text, key) + return int(value) if value and value.isdigit() else 0 + + +def same(a, b): + return os.path.realpath(a) == os.path.realpath(b) + + +def libraries(root, skip): + found = [root] + [p.replace("\\\\", "\\") for p in + re.findall(r'"path"\s+"((?:[^"\\]|\\.)*)"', read(os.path.join(root, "steamapps", "libraryfolders.vdf")) or "")] + return [p for p in dict.fromkeys(found) if not any(same(p, s) for s in skip)] + + +def installs(libs): + games = {} + for library in libs: + steamapps = os.path.join(library, "steamapps") + try: + names = sorted(os.listdir(steamapps)) + except OSError: + continue + for name in names: + m = re.fullmatch(r"appmanifest_(\d+)\.acf", name) + if not m or m.group(1) in NOT_GAMES or m.group(1) in games: + continue + text = read(os.path.join(steamapps, name)) + folder = field(text, "installdir") + if (not folder or folder in (".", "..") or "/" in folder or TOOL_DIR.fullmatch(folder) + or not number(text, "StateFlags") & 4 + or not os.path.isdir(os.path.join(steamapps, "common", folder))): + continue + games[m.group(1)] = (steamapps, text, folder) + return games + + +def link(path, target): + if os.path.islink(path): + if os.readlink(path) == target: + return True + os.unlink(path) + elif os.path.lexists(path): + return False + os.symlink(target, path) + return True + + +def unlink(path): + if os.path.islink(path): + os.unlink(path) + + +def emptied(src, folder): + path = os.path.join(src, "common", folder) + return not os.path.isdir(path) or not os.listdir(path) + + +def sync(view, source, own): + steamapps = os.path.join(view, "steamapps") + for sub in ("common", "compatdata"): + os.makedirs(os.path.join(steamapps, sub), exist_ok=True) + state = {} + try: + state = json.loads(read(os.path.join(view, STATE)) or "{}") + except ValueError: + pass + managed = {app: tuple(v) for app, v in state.get("shared", {}).items() if isinstance(v, list) and len(v) == 2} + hidden = state.get("hidden", {}) + shared, back = {}, [] + for app, (src, folder) in managed.items(): + if app in source and app not in own: + continue + manifest = os.path.join(steamapps, "appmanifest_%s.acf" % app) + if app not in own and not os.path.isfile(manifest) and emptied(src, folder) and os.path.isfile(os.path.join(src, "appmanifest_%s.acf" % app)): + os.unlink(os.path.join(src, "appmanifest_%s.acf" % app)) + unlink(os.path.join(steamapps, "common", folder)) + unlink(os.path.join(steamapps, "compatdata", app)) + if os.path.isfile(manifest): + os.unlink(manifest) + for app, (src, text, folder) in sorted(source.items(), key=lambda item: int(item[0])): + if app in own: + continue + stamp = number(text, "LastUpdated") + if hidden.get(app) == stamp: + continue + hidden.pop(app, None) + manifest = os.path.join(steamapps, "appmanifest_%s.acf" % app) + mine = read(manifest) + if app in managed and mine is None: + unlink(os.path.join(steamapps, "common", folder)) + unlink(os.path.join(steamapps, "compatdata", app)) + if emptied(src, folder): + os.unlink(os.path.join(src, "appmanifest_%s.acf" % app)) + else: + hidden[app] = stamp + continue + if not link(os.path.join(steamapps, "common", folder), os.path.join(src, "common", folder)): + continue + if os.path.isdir(os.path.join(src, "compatdata", app)): + link(os.path.join(steamapps, "compatdata", app), os.path.join(src, "compatdata", app)) + if mine is not None and number(mine, "LastUpdated") > stamp: + write(os.path.join(src, "appmanifest_%s.acf" % app), mine) + back.append(app) + elif mine != text: + write(manifest, text) + shared[app] = [src, folder] + state = {"shared": shared, "hidden": hidden} + write(os.path.join(view, STATE), json.dumps(state, indent=1, sort_keys=True) + "\n") + return shared, back + + +def tools(root): + names = set() + folder = os.path.join(root, "compatibilitytools.d") + try: + entries = os.listdir(folder) + except OSError: + return names + for entry in entries: + text = read(os.path.join(folder, entry, "compatibilitytool.vdf")) or "" + m = re.search(r'"compat_tools"\s*\{\s*"([^"]+)"', text) + if m: + names.add(m.group(1)) + return names + + +def mapping_block(text): + m = re.search(r'"CompatToolMapping"\s*\{', text) + if not m: + return None + depth, k = 1, m.end() + while depth and k < len(text): + depth += {"{": 1, "}": -1}.get(text[k], 0) + k += 1 + return m.end(), k - 1 + + +def entries(text): + span = mapping_block(text) + found = {} + if not span: + return found + inner = text[span[0]:span[1]] + for m in re.finditer(r'"(\d+)"\s*\{([^{}]*)\}', inner): + name = re.search(r'"name"\s*"([^"]*)"', m.group(2)) + found.setdefault(m.group(1), name.group(1) if name else "") + return found + + +def set_tools(config, wanted): + text = read(config) + if text is None or not wanted: + return [] + span = mapping_block(text) + if not span: + return [] + inner = text[span[0]:span[1]] + changed = [] + for app, tool in sorted(wanted.items(), key=lambda item: int(item[0])): + m = re.search(r'"%s"\s*\{([^{}]*)\}' % app, inner) + if m: + name = re.search(r'"name"\s*"([^"]*)"', m.group(1)) + name = name.group(1) if name else "" + if name == tool or not (name in AUTOMATIC or name.startswith("proton_")): + continue + inner = inner[:m.start()] + inner[m.end():] + inner = ('\n\t\t\t\t\t"%s"\n\t\t\t\t\t{\n\t\t\t\t\t\t"name"\t\t"%s"\n\t\t\t\t\t\t"config"\t\t""\n' + '\t\t\t\t\t\t"priority"\t\t"250"\n\t\t\t\t\t}' % (app, tool)) + inner + changed.append(app) + if changed: + write(config, text[:span[0]] + inner + text[span[1]:]) + return changed + + +def translate(name, here, available): + if name == "droiddeck-fex" and here == "x86-64": + return "droiddeck-direct" + if name == "droiddeck-direct" and here == "arm64": + return "droiddeck-fex" + return name if name in available else None + + +def library_helper(): + sibling = os.path.join(os.path.dirname(os.path.realpath(__file__)), "droiddeck-steam-library") + return runpy.run_path(sibling if os.path.isfile(sibling) else "/usr/local/bin/droiddeck-steam-library") + + +def main(argv): + if len(argv) != 5 or argv[0] not in LABELS: + say("usage: droiddeck-steam-share arm64|x86-64 ARM_STEAM X64_STEAM X64_CARD SHARED_DIR") + return 2 + here, arm, x64, x64_card, shared_dir = argv + views = {name: os.path.join(shared_dir, name) for name in LABELS} + roots = {"arm64": arm, "x86-64": x64} + other = "x86-64" if here == "arm64" else "arm64" + skip = list(views.values()) + [x64, x64_card] + arm_libs = libraries(arm, skip) + x64_libs = [x64] + [p for p in libraries(x64, list(views.values()) + [arm]) if not same(p, x64)] + games = {"arm64": installs(arm_libs), "x86-64": installs(x64_libs)} + view = views[other] + shared, back = sync(view, games[other], games[here]) + helper = library_helper() + if not any(re.fullmatch(r"appmanifest_\d+\.acf", n) for n in os.listdir(os.path.join(view, "steamapps"))): + helper["forget"](roots[here], view) + return 0 + helper["register"](roots[here], view, LABELS[other]) + helper["relabel"](roots[here], view, LABELS[other]) + picks = entries(read(os.path.join(roots[other], "config", "config.vdf")) or "") + available = tools(roots[here]) | {"droiddeck-direct" if here == "x86-64" else "droiddeck-fex"} + wanted = {} + for app in shared: + tool = translate(picks.get(app) or picks.get("0", ""), here, available) + if tool: + wanted[app] = tool + changed = set_tools(os.path.join(roots[here], "config", "config.vdf"), wanted) + say("%d game(s) from the %s client%s%s" % ( + len(shared), other, + "; tools set for %s" % " ".join(changed) if changed else "", + "; manifests sent back for %s" % " ".join(back) if back else "")) + return 0 + + +if __name__ == "__main__": + sys.exit(main(sys.argv[1:])) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 index f6f11d1873..8461fdf8a6 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 @@ -87,7 +87,7 @@ x64_map_direct() { [ -f "$STEAM_X64/config/config.vdf" ] || return 0 if [ "$mode" = write ] && pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then return 0; fi python3 - "$mode" "$STEAM_X64/config/config.vdf" "$STEAM_X64/appcache/appinfo.vdf" "$X64_HOME/direct-auto.json" \ - "$X64_HOME/direct-sniper" "$STEAM_X64/steamapps:/mnt/droiddeck-sd/x86-64/steamapps" "$(x64_default_tool)" \ + "$X64_HOME/direct-sniper" "$STEAM_X64/steamapps:/mnt/droiddeck-sd/x86-64/steamapps:$X64_HOME/shared/arm64/steamapps" "$(x64_default_tool)" \ "$REAL_HOME/.bl-compat-pending" ${BL_X64_DIRECT_APPS:-550} \ <<'PY' || { [ "$mode" = live ] || step "could not map titles to DroidDeck direct"; } # Steam does not swap an installed build when the tool changes: a title installed for Windows stays on Proton. @@ -610,6 +610,7 @@ RUN printf '"InstallConfigStore"\n{\n\t"Software"\n\t{\n\t\t"Valve"\n\t\t{\n\t\t\t"Steam"\n\t\t\t{\n\t\t\t\t"CompatToolMapping"\n\t\t\t\t{\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n' \ > "$STEAM_X64/config/config.vdf" fi + x64_share x86-64 x64_map_direct # Each wrapper execs droiddeck-x64-arm-proton through an arm64 binary, which FEX hands straight to the CPU. arm_tools=$ARM_STEAM/compatibilitytools.d @@ -659,9 +660,9 @@ VDF # Each client keeps its own libraries; written only while no x86 client runs, as it rewrites these on exit. if ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then listing_ok=0 - if python3 - "$STEAM_X64" "${BL_X64_STEAM_LIBRARIES:-}" "$STEAM_X64/config/libraryfolders.vdf" "$STEAM_X64/steamapps/libraryfolders.vdf" <<'PY'; then + if BL_X64_SHARED=$X64_HOME/shared/arm64 python3 - "$STEAM_X64" "${BL_X64_STEAM_LIBRARIES:-}" "$STEAM_X64/config/libraryfolders.vdf" "$STEAM_X64/steamapps/libraryfolders.vdf" <<'PY'; then import json, os, re, sys -keep = {os.path.realpath(sys.argv[1])} +keep = {os.path.realpath(sys.argv[1]), os.path.realpath(os.environ["BL_X64_SHARED"])} # Without the session's list nothing is known about the card: leave the folders as they are. if not sys.argv[2]: sys.exit(3) @@ -911,6 +912,14 @@ x64_exec() { exec "${BL_FEX:-/usr/local/bin/FEX}" "$STEAM_X64/steamrt64/steam" "$@" } +x64_share() { + pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1 && return 0 + pgrep -f 'steamrtarm64/steam( |$)' >/dev/null 2>&1 && return 0 + [ -d "$STEAM_X64/steamapps" ] && [ -d "$ARM_STEAM/steamapps" ] || return 0 + droiddeck-steam-share "$1" "$ARM_STEAM" "$STEAM_X64" /mnt/droiddeck-sd/x86-64 "$X64_HOME/shared" || + step "could not share the games between the clients" +} + # Steam renews its token every few days and refuses old copies: copy the newest every start, never while a client runs. x64_sync_login() { pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1 && return 0 @@ -1027,6 +1036,7 @@ PY case "${1:-}" in --sync-login) x64_sync_login; exit 0 ;; + --share) x64_share arm64; exit 0 ;; --prepare) x64_prepare; exit 0 ;; --exec) shift; x64_exec "$@" ;; --gpu) x64_gpu; exit $? ;; diff --git a/tools/tests/test_steam_share.py b/tools/tests/test_steam_share.py new file mode 100644 index 0000000000..c1b269713f --- /dev/null +++ b/tools/tests/test_steam_share.py @@ -0,0 +1,149 @@ +from pathlib import Path +import contextlib +import io +import json +import os +import runpy +import tempfile +import unittest + + +SCRIPT = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-steam-share' +SHARE = runpy.run_path(str(SCRIPT)) + +CONFIG = ('"InstallConfigStore"\n{\n\t"Software"\n\t{\n\t\t"Valve"\n\t\t{\n\t\t\t"Steam"\n\t\t\t{\n' + '\t\t\t\t"CompatToolMapping"\n\t\t\t\t{\n%s\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n') + + +def mapping(**tools): + return ''.join('\t\t\t\t\t"%s"\n\t\t\t\t\t{\n\t\t\t\t\t\t"name"\t\t"%s"\n\t\t\t\t\t\t"config"\t\t""\n' + '\t\t\t\t\t\t"priority"\t\t"250"\n\t\t\t\t\t}\n' % (app.lstrip('_'), name) + for app, name in tools.items()) + + +def manifest(app, folder, updated=100, flags=4): + return ('"AppState"\n{\n\t"appid"\t\t"%s"\n\t"name"\t\t"%s"\n\t"StateFlags"\t\t"%d"\n' + '\t"installdir"\t\t"%s"\n\t"LastUpdated"\t\t"%d"\n}\n' % (app, folder, flags, folder, updated)) + + +class SteamShareTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + home = Path(self.temp.name) + self.arm = home / 'arm/Steam' + self.x64 = home / 'x64/Steam' + self.card = home / 'card' + self.shared = home / 'x64/shared' + for root in (self.arm, self.x64): + (root / 'steamapps/common').mkdir(parents=True) + (root / 'config').mkdir() + (root / 'compatibilitytools.d/proton').mkdir(parents=True) + (root / 'compatibilitytools.d/proton/compatibilitytool.vdf').write_text( + '"compatibilitytools"\n{\n\t"compat_tools"\n\t{\n\t\t"droiddeck-proton-arm64"\n\t\t{\n\t\t}\n\t}\n}\n') + (self.arm / 'config/config.vdf').write_text(CONFIG % mapping(_0='droiddeck-proton-arm64', _413150='droiddeck-fex')) + (self.x64 / 'config/config.vdf').write_text(CONFIG % '') + self.install(self.arm, '413150', 'Stardew Valley') + self.install(self.arm, '13210', 'Unreal Tournament 3') + self.install(self.arm, '1493710', 'Proton - Experimental') + + def install(self, root, app, folder, updated=100): + (root / 'steamapps/common' / folder).mkdir(parents=True, exist_ok=True) + (root / 'steamapps/common' / folder / 'game.bin').write_text('x') + (root / ('steamapps/appmanifest_%s.acf' % app)).write_text(manifest(app, folder, updated)) + + def run_share(self, here): + with contextlib.redirect_stdout(io.StringIO()): + return SHARE['main']([here, str(self.arm), str(self.x64), str(self.card), str(self.shared)]) + + def view(self, *parts): + return self.shared.joinpath('arm64', 'steamapps', *parts) + + def test_x64_client_sees_arm64_games_in_place(self): + self.assertEqual(self.run_share('x86-64'), 0) + self.assertEqual(os.readlink(self.view('common/Stardew Valley')), str(self.arm / 'steamapps/common/Stardew Valley')) + self.assertTrue(self.view('appmanifest_413150.acf').is_file()) + self.assertTrue(self.view('appmanifest_13210.acf').is_file()) + self.assertFalse(self.view('appmanifest_1493710.acf').exists()) + folders = (self.x64 / 'steamapps/libraryfolders.vdf').read_text() + self.assertIn(str(self.shared / 'arm64'), folders) + self.assertIn('ARM64 client games', folders) + + def test_tools_follow_the_other_client(self): + self.run_share('x86-64') + tools = SHARE['entries']((self.x64 / 'config/config.vdf').read_text()) + self.assertEqual(tools['413150'], 'droiddeck-direct') + self.assertEqual(tools['13210'], 'droiddeck-proton-arm64') + + def test_a_tool_the_user_chose_is_kept(self): + (self.x64 / 'config/config.vdf').write_text(CONFIG % mapping(_13210='my-proton')) + self.run_share('x86-64') + self.assertEqual(SHARE['entries']((self.x64 / 'config/config.vdf').read_text())['13210'], 'my-proton') + + def test_own_install_wins(self): + self.install(self.x64, '413150', 'Stardew Valley') + self.run_share('x86-64') + self.assertFalse(self.view('appmanifest_413150.acf').exists()) + self.assertFalse(os.path.lexists(self.view('common/Stardew Valley'))) + + def test_newer_update_goes_back_to_the_source(self): + self.run_share('x86-64') + self.view('appmanifest_413150.acf').write_text(manifest('413150', 'Stardew Valley', 200)) + self.run_share('x86-64') + self.assertIn('"LastUpdated"\t\t"200"', (self.arm / 'steamapps/appmanifest_413150.acf').read_text()) + + def test_uninstall_from_the_view_hides_until_reinstalled(self): + self.run_share('x86-64') + self.view('appmanifest_13210.acf').unlink() + self.run_share('x86-64') + self.assertFalse(os.path.lexists(self.view('common/Unreal Tournament 3'))) + self.assertTrue((self.arm / 'steamapps/common/Unreal Tournament 3/game.bin').is_file()) + self.run_share('x86-64') + self.assertFalse(self.view('appmanifest_13210.acf').exists()) + self.install(self.arm, '13210', 'Unreal Tournament 3', 300) + self.run_share('x86-64') + self.assertTrue(self.view('appmanifest_13210.acf').is_file()) + + def test_files_deleted_through_the_view_drop_the_source_manifest(self): + self.run_share('x86-64') + (self.arm / 'steamapps/common/Unreal Tournament 3/game.bin').unlink() + self.view('appmanifest_13210.acf').unlink() + self.run_share('x86-64') + self.assertFalse((self.arm / 'steamapps/appmanifest_13210.acf').exists()) + + def test_removed_source_leaves_the_view(self): + self.run_share('x86-64') + (self.arm / 'steamapps/appmanifest_413150.acf').unlink() + self.run_share('x86-64') + self.assertFalse(self.view('appmanifest_413150.acf').exists()) + self.assertFalse(os.path.lexists(self.view('common/Stardew Valley'))) + state = json.loads((self.shared / 'arm64/.droiddeck-shared.json').read_text()) + self.assertNotIn('413150', state['shared']) + + def test_arm64_client_sees_x64_games(self): + self.install(self.x64, '550', 'Left 4 Dead 2') + (self.x64 / 'config/config.vdf').write_text(CONFIG % mapping(_550='droiddeck-direct')) + self.run_share('arm64') + self.assertTrue(self.shared.joinpath('x86-64/steamapps/appmanifest_550.acf').is_file()) + self.assertEqual(SHARE['entries']((self.arm / 'config/config.vdf').read_text())['550'], 'droiddeck-fex') + self.assertIn('x86-64 client games', (self.arm / 'steamapps/libraryfolders.vdf').read_text()) + + def test_an_empty_view_is_not_offered(self): + self.run_share('x86-64') + for app in ('413150', '13210', '1493710'): + (self.arm / ('steamapps/appmanifest_%s.acf' % app)).unlink() + self.run_share('x86-64') + self.assertNotIn(str(self.shared / 'arm64'), (self.x64 / 'steamapps/libraryfolders.vdf').read_text()) + + def test_unfinished_installs_are_not_shared(self): + (self.arm / 'steamapps/appmanifest_413150.acf').write_text(manifest('413150', 'Stardew Valley', flags=1026)) + self.run_share('x86-64') + self.assertFalse(self.view('appmanifest_413150.acf').exists()) + + def test_bad_arguments(self): + with contextlib.redirect_stdout(io.StringIO()): + self.assertEqual(SHARE['main'](['mips']), 2) + + +if __name__ == '__main__': + unittest.main() From 5f0e6a8b7e4c7c0a15922ecad7b98fb322b16bea Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 16:15:16 -0400 Subject: [PATCH 121/174] Match Proton tools across clients by their arm64 and a64 names --- .../usr/local/bin/droiddeck-steam-share | 8 ++++++-- tools/tests/test_steam_share.py | 18 +++++++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share index fd6380c653..d3191b449f 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share @@ -203,7 +203,7 @@ def set_tools(config, wanted): if m: name = re.search(r'"name"\s*"([^"]*)"', m.group(1)) name = name.group(1) if name else "" - if name == tool or not (name in AUTOMATIC or name.startswith("proton_")): + if name == tool or not (canonical(name) in map(canonical, AUTOMATIC) or name.startswith("proton_")): continue inner = inner[:m.start()] + inner[m.end():] inner = ('\n\t\t\t\t\t"%s"\n\t\t\t\t\t{\n\t\t\t\t\t\t"name"\t\t"%s"\n\t\t\t\t\t\t"config"\t\t""\n' @@ -214,12 +214,16 @@ def set_tools(config, wanted): return changed +def canonical(name): + return re.sub(r"arm64|aarch64", "a64", name) + + def translate(name, here, available): if name == "droiddeck-fex" and here == "x86-64": return "droiddeck-direct" if name == "droiddeck-direct" and here == "arm64": return "droiddeck-fex" - return name if name in available else None + return {canonical(a): a for a in available}.get(canonical(name)) def library_helper(): diff --git a/tools/tests/test_steam_share.py b/tools/tests/test_steam_share.py index c1b269713f..cb50137670 100644 --- a/tools/tests/test_steam_share.py +++ b/tools/tests/test_steam_share.py @@ -35,12 +35,12 @@ class SteamShareTest(unittest.TestCase): self.x64 = home / 'x64/Steam' self.card = home / 'card' self.shared = home / 'x64/shared' - for root in (self.arm, self.x64): + for root, tool in ((self.arm, 'droiddeck-proton-arm64'), (self.x64, 'droiddeck-proton-a64')): (root / 'steamapps/common').mkdir(parents=True) (root / 'config').mkdir() (root / 'compatibilitytools.d/proton').mkdir(parents=True) (root / 'compatibilitytools.d/proton/compatibilitytool.vdf').write_text( - '"compatibilitytools"\n{\n\t"compat_tools"\n\t{\n\t\t"droiddeck-proton-arm64"\n\t\t{\n\t\t}\n\t}\n}\n') + '"compatibilitytools"\n{\n\t"compat_tools"\n\t{\n\t\t"%s"\n\t\t{\n\t\t}\n\t}\n}\n' % tool) (self.arm / 'config/config.vdf').write_text(CONFIG % mapping(_0='droiddeck-proton-arm64', _413150='droiddeck-fex')) (self.x64 / 'config/config.vdf').write_text(CONFIG % '') self.install(self.arm, '413150', 'Stardew Valley') @@ -73,7 +73,19 @@ class SteamShareTest(unittest.TestCase): self.run_share('x86-64') tools = SHARE['entries']((self.x64 / 'config/config.vdf').read_text()) self.assertEqual(tools['413150'], 'droiddeck-direct') - self.assertEqual(tools['13210'], 'droiddeck-proton-arm64') + self.assertEqual(tools['13210'], 'droiddeck-proton-a64') + + def test_an_automatic_x64_proton_is_replaced(self): + (self.x64 / 'config/config.vdf').write_text(CONFIG % mapping(_13210='droiddeck-proton-11-a64')) + (self.arm / 'config/config.vdf').write_text(CONFIG % mapping(_0='droiddeck-proton-arm64')) + self.run_share('x86-64') + self.assertEqual(SHARE['entries']((self.x64 / 'config/config.vdf').read_text())['13210'], 'droiddeck-proton-a64') + + def test_an_x64_proton_pick_reaches_the_arm64_client(self): + self.install(self.x64, '550', 'Left 4 Dead 2') + (self.x64 / 'config/config.vdf').write_text(CONFIG % mapping(_550='droiddeck-proton-a64')) + self.run_share('arm64') + self.assertEqual(SHARE['entries']((self.arm / 'config/config.vdf').read_text())['550'], 'droiddeck-proton-arm64') def test_a_tool_the_user_chose_is_kept(self): (self.x64 / 'config/config.vdf').write_text(CONFIG % mapping(_13210='my-proton')) From 82d8eb3b79df447c8df577584eb58bf8965d769a Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 16:35:10 -0400 Subject: [PATCH 122/174] Keep a Proton choice unless the shared build needs the other platform --- docs/development/x86-64-steam-client.md | 3 ++- .../overlay/usr/local/bin/droiddeck-steam-share | 3 +++ tools/tests/test_steam_share.py | 12 +++++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/development/x86-64-steam-client.md b/docs/development/x86-64-steam-client.md index 8d57b9ce23..af3c02f4a8 100644 --- a/docs/development/x86-64-steam-client.md +++ b/docs/development/x86-64-steam-client.md @@ -305,7 +305,8 @@ alone would then read as an installed client. downloaded its version again (Left 4 Dead 2, 8.6 GB; hard links do not help, switching platform makes Steam download depot 551 anyway). A shared game gets the tool its own client uses: `droiddeck-fex` there becomes `droiddeck-direct` here and the other way round, a Proton build keeps its Proton. Only - automatic choices are replaced; a tool the user picked stays. + an automatic choice that would switch the build is replaced; any other choice, including another + Proton, stays. - **Updates and uninstall.** The newer manifest wins: an update made through a view is written back to the client that owns the game. Uninstalling a shared game removes it from that client only; its files stay with the client that installed it (Steam does not delete through the link) and it stays hidden diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share index d3191b449f..9ab21e781b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share @@ -11,6 +11,7 @@ NOT_GAMES = frozenset(( )) TOOL_DIR = re.compile(r"(steam ?linux ?runtime.*|proton.*|steamworks shared|fex|steamvr)", re.I) AUTOMATIC = ("", "droiddeck-direct", "droiddeck-fex", "droiddeck-proton-arm64", "droiddeck-proton-11-arm64") +LINUX_TOOLS = ("droiddeck-direct", "droiddeck-fex") STATE = ".droiddeck-shared.json" LABELS = {"arm64": "ARM64 client games", "x86-64": "x86-64 client games"} @@ -205,6 +206,8 @@ def set_tools(config, wanted): name = name.group(1) if name else "" if name == tool or not (canonical(name) in map(canonical, AUTOMATIC) or name.startswith("proton_")): continue + if name and (name in LINUX_TOOLS) == (tool in LINUX_TOOLS): + continue inner = inner[:m.start()] + inner[m.end():] inner = ('\n\t\t\t\t\t"%s"\n\t\t\t\t\t{\n\t\t\t\t\t\t"name"\t\t"%s"\n\t\t\t\t\t\t"config"\t\t""\n' '\t\t\t\t\t\t"priority"\t\t"250"\n\t\t\t\t\t}' % (app, tool)) + inner diff --git a/tools/tests/test_steam_share.py b/tools/tests/test_steam_share.py index cb50137670..2145433579 100644 --- a/tools/tests/test_steam_share.py +++ b/tools/tests/test_steam_share.py @@ -75,11 +75,17 @@ class SteamShareTest(unittest.TestCase): self.assertEqual(tools['413150'], 'droiddeck-direct') self.assertEqual(tools['13210'], 'droiddeck-proton-a64') - def test_an_automatic_x64_proton_is_replaced(self): + def test_a_proton_pick_stays_when_the_other_client_uses_another_proton(self): (self.x64 / 'config/config.vdf').write_text(CONFIG % mapping(_13210='droiddeck-proton-11-a64')) - (self.arm / 'config/config.vdf').write_text(CONFIG % mapping(_0='droiddeck-proton-arm64')) self.run_share('x86-64') - self.assertEqual(SHARE['entries']((self.x64 / 'config/config.vdf').read_text())['13210'], 'droiddeck-proton-a64') + self.assertEqual(SHARE['entries']((self.x64 / 'config/config.vdf').read_text())['13210'], 'droiddeck-proton-11-a64') + + def test_an_automatic_proton_gives_way_to_the_installed_linux_build(self): + self.install(self.x64, '550', 'Left 4 Dead 2') + (self.x64 / 'config/config.vdf').write_text(CONFIG % mapping(_550='droiddeck-direct')) + (self.arm / 'config/config.vdf').write_text(CONFIG % mapping(_0='droiddeck-proton-arm64', _550='droiddeck-proton-arm64')) + self.run_share('arm64') + self.assertEqual(SHARE['entries']((self.arm / 'config/config.vdf').read_text())['550'], 'droiddeck-fex') def test_an_x64_proton_pick_reaches_the_arm64_client(self): self.install(self.x64, '550', 'Left 4 Dead 2') From 5ca1f610abfcc2327034ef5f5a04a98a3ac3730b Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Sat, 24 Oct 2026 21:39:09 -0400 Subject: [PATCH 123/174] Xbox: fix sign-in on phones with a slow StrongBox Keystore (#1521) On some phones (tester: Honor BKQ-N49, Android 17) Xbox sign-in stopped with "the Xbox helper stopped with exit code 1" before Microsoft's page opened. The backend asks the app to read and save credentials over a socket and waits 10 s for each reply. The app sealed credentials with a StrongBox-backed Keystore key, and each StrongBox operation took 7-15 s on that phone, so the backend gave up. The app still finished those saves afterwards, leaving a record without a username that every later attempt had to read back slowly. - Seal new store credentials with a TEE Keystore key (v2 envelopes); v1 envelopes still open with the old key and move to v2 on their next write. - A sign-in discards an Xbox record without a username (an unfinished sign-in) before starting the backend. - The backend waits 30 s for the app's credential reply. - The backend names the failing step instead of only credential-io (socket connect/exchange, session lock, missing socket name/port/key), and falls back to a keyed 127.0.0.1 port when the abstract socket is refused. - The app's credential listener logs and retries accept errors, serves each connection on its own thread, and logs slow requests with per-stage times. Refs #1337, #1300 Co-authored-by: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> --- .../launcher/stores/CredentialCipher.kt | 47 ++-- .../launcher/stores/xbox/XboxCredentials.kt | 119 ++++++++- .../launcher/stores/xbox/XboxLoginActivity.kt | 17 +- .../droiddeck/launcher/stores/xbox/Xodus.kt | 2 + .../stores/StoreAccountsCipherTest.kt | 16 ++ .../overlay/usr/local/bin/droiddeck-xbox | 6 +- tools/tests/test_xbox_launch.py | 12 +- tools/xbox/README.md | 10 + .../droiddeck-credential-diagnostics.patch | 237 ++++++++++++++++++ .../xbox/droiddeck-credential-fallback.patch | 113 +++++++++ tools/xbox/prepare.py | 3 +- 11 files changed, 541 insertions(+), 41 deletions(-) create mode 100644 tools/xbox/droiddeck-credential-diagnostics.patch create mode 100644 tools/xbox/droiddeck-credential-fallback.patch diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt b/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt index aa07484231..01c7eebcf4 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt @@ -1,6 +1,5 @@ package com.droiddeck.launcher.stores -import android.os.Build import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyProperties import android.util.Base64 @@ -13,6 +12,8 @@ import javax.crypto.spec.GCMParameterSpec object CredentialCipher { const val VERSION = 1 + /** Sealed with the hardware-keystore (TEE) key; [VERSION] envelopes keep opening with the older, possibly StrongBox, key. */ + const val VERSION_TEE = 2 const val ALG = "AES/GCM" private const val TRANSFORMATION = "AES/GCM/NoPadding" private const val TAG_BITS = 128 @@ -21,6 +22,11 @@ object CredentialCipher { fun key(): SecretKey fun existing(): SecretKey = key() + + /** Key for [VERSION] envelopes written before [VERSION_TEE]. */ + fun legacy(): SecretKey = existing() + + val version: Int get() = VERSION } class KeyMissing : java.security.GeneralSecurityException("no key") @@ -29,33 +35,33 @@ object CredentialCipher { e is android.security.keystore.KeyPermanentlyInvalidatedException || e is KeyMissing || e is org.json.JSONException || e is IllegalArgumentException + // StrongBox took over 10 s per Xbox credential write on a tester's phone, past the backend's + // 10 s reply timeout, so new writes use a TEE key. The old alias stays readable. object Keystore : KeyProvider { - private const val ALIAS = "droiddeck-store-credentials" + private const val LEGACY_ALIAS = "droiddeck-store-credentials" + private const val ALIAS = "droiddeck-store-credentials-tee" private const val PROVIDER = "AndroidKeyStore" - @Synchronized - override fun existing(): SecretKey { - val ks = KeyStore.getInstance(PROVIDER).apply { load(null) } - return ks.getKey(ALIAS, null) as? SecretKey ?: throw KeyMissing() - } + override val version: Int get() = VERSION_TEE @Synchronized - override fun key(): SecretKey { - val ks = KeyStore.getInstance(PROVIDER).apply { load(null) } - (ks.getKey(ALIAS, null) as? SecretKey)?.let { return it } - if (Build.VERSION.SDK_INT >= 28) { - try { return generate(strongBox = true) } catch (e: Exception) { } - } - return generate(strongBox = false) - } + override fun existing(): SecretKey = stored(ALIAS) ?: throw KeyMissing() - private fun generate(strongBox: Boolean): SecretKey { + @Synchronized + override fun legacy(): SecretKey = stored(LEGACY_ALIAS) ?: throw KeyMissing() + + @Synchronized + override fun key(): SecretKey = stored(ALIAS) ?: generate() + + private fun stored(alias: String): SecretKey? = + KeyStore.getInstance(PROVIDER).apply { load(null) }.getKey(alias, null) as? SecretKey + + private fun generate(): SecretKey { val spec = KeyGenParameterSpec.Builder(ALIAS, KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT) .setKeySize(256) .setBlockModes(KeyProperties.BLOCK_MODE_GCM) .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE) .setUserAuthenticationRequired(false) - .apply { if (strongBox && Build.VERSION.SDK_INT >= 28) setIsStrongBoxBacked(true) } .build() return KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, PROVIDER).run { init(spec); generateKey() } } @@ -64,15 +70,16 @@ object CredentialCipher { fun seal(plain: String, keys: KeyProvider): JSONObject { val cipher = Cipher.getInstance(TRANSFORMATION).apply { init(Cipher.ENCRYPT_MODE, keys.key()) } val ct = cipher.doFinal(plain.toByteArray(Charsets.UTF_8)) - return JSONObject().put("v", VERSION).put("alg", ALG) + return JSONObject().put("v", keys.version).put("alg", ALG) .put("iv", b64(cipher.iv)).put("ct", b64(ct)) } fun open(envelope: JSONObject, keys: KeyProvider): String { - require(envelope.optInt("v", -1) == VERSION && envelope.optString("alg") == ALG) { "unknown envelope" } + val version = envelope.optInt("v", -1) + require((version == VERSION || version == VERSION_TEE) && envelope.optString("alg") == ALG) { "unknown envelope" } val iv = Base64.decode(envelope.getString("iv"), Base64.NO_WRAP) val ct = Base64.decode(envelope.getString("ct"), Base64.NO_WRAP) - val cipher = Cipher.getInstance(TRANSFORMATION).apply { init(Cipher.DECRYPT_MODE, keys.existing(), GCMParameterSpec(TAG_BITS, iv)) } + val cipher = Cipher.getInstance(TRANSFORMATION).apply { init(Cipher.DECRYPT_MODE, if (version == VERSION) keys.legacy() else keys.existing(), GCMParameterSpec(TAG_BITS, iv)) } return String(cipher.doFinal(ct), Charsets.UTF_8) } 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 ffe4b9de6b..f969c20ebb 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 @@ -14,6 +14,11 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str val name = "droiddeck-xbox-${UUID.randomUUID()}" private val generation = lifecycle(app, expectedGeneration) { it } private val server = LocalServerSocket(name) + // Some devices refuse the abstract socket from inside PRoot; the backend then falls back to this keyed loopback port. + private val loopback = java.net.ServerSocket(0, 8, java.net.InetAddress.getByAddress(byteArrayOf(127, 0, 0, 1))) + val port: Int get() = loopback.localPort + val key: String = ByteArray(32).also { java.security.SecureRandom().nextBytes(it) }.joinToString("") { "%02x".format(it) } + @Volatile private var loopbackUsed = false @Volatile private var closed = false private val bound = java.util.concurrent.CountDownLatch(1) private var backend: Process? = null @@ -79,33 +84,122 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str } } } - init { + /** Each connection gets its own thread; an accept error is logged and retried instead of silently ending the loop. */ + private fun listen(route: String, accept: () -> S, serve: (S) -> Unit) = Thread({ + var failures = 0 + while (!closed) { + val socket = try { accept() } catch (e: Exception) { + if (closed) break + failures++ + note("Credential $route accept failed: ${e.javaClass.simpleName}") + if (failures >= 20) { note("Credential $route listener stopped after repeated accept failures"); break } + Thread.sleep(100) + continue + } + failures = 0 + Thread({ serve(socket) }, "xbox-credentials-$route-request").start() + } + }, "xbox-credentials-$route").start() + + /** Logs requests that take 2 s or more, and the stage a request is still in after 8 s (the backend waits 30 s). */ + private fun tracked(route: String, block: (step: (String) -> Unit) -> JSONObject): JSONObject { + val started = android.os.SystemClock.elapsedRealtime() + val stage = java.util.concurrent.atomic.AtomicReference("auth") + val done = java.util.concurrent.CountDownLatch(1) + val stages = java.util.Collections.synchronizedList(mutableListOf()) + var mark = started + val step = { next: String -> + val now = android.os.SystemClock.elapsedRealtime() + stages += "${stage.getAndSet(next)} ${now - mark} ms" + mark = now + } Thread({ - while (!closed) { - val socket = runCatching { server.accept() }.getOrNull() ?: break - socket.use { - it.soTimeout = 10_000 - val reply = runCatching { + if (!done.await(8, java.util.concurrent.TimeUnit.SECONDS)) note("Credential $route request still in ${stage.get()} after 8 s") + }, "xbox-credentials-watch").apply { isDaemon = true; start() } + try { + return block(step) + } finally { + done.countDown() + step("done") + val total = android.os.SystemClock.elapsedRealtime() - started + if (total >= 2000) note("Credential $route request took $total ms (${stages.joinToString(", ")})") + } + } + + init { + listen("socket", { server.accept() }) { socket -> + socket.use { + it.soTimeout = 10_000 + val reply = tracked("socket") { step -> + runCatching { val peer = it.peerCredentials check(peer.uid == android.os.Process.myUid() && authorized(peer.pid)) + step("read") val request = JSONObject(readLine(it.inputStream.buffered(), 2_097_152)) + step("lock") storage(app) { + step("answer") check(!closed && epoch(app) == generation && authorized(peer.pid)) - answer(request) + answer(request, step) } }.getOrElse { note("Credential request rejected: ${it.javaClass.simpleName}") JSONObject().put("ok", false) } - runCatching { it.outputStream.write((reply.toString() + "\n").toByteArray()) } } + runCatching { it.outputStream.write((reply.toString() + "\n").toByteArray()) } + .onFailure { failure -> note("Credential reply not delivered: ${failure.javaClass.simpleName}") } } - }, "xbox-credentials").start() + } + listen("loopback", { loopback.accept() }) { socket -> + socket.use { + it.soTimeout = 10_000 + val reply = tracked("loopback") { step -> + runCatching { + val input = it.getInputStream().buffered() + check(it.inetAddress.isLoopbackAddress) + if (!java.security.MessageDigest.isEqual(readLine(input, 128).toByteArray(), key.toByteArray())) { + rejected("loopback-key"); error("loopback key") + } + if (!loopbackOwner(it.port)) { rejected("loopback-owner"); error("loopback owner") } + check(bound.await(5, java.util.concurrent.TimeUnit.SECONDS) && backend?.isAlive == true) + if (!loopbackUsed) { loopbackUsed = true; note("Backend reached the app over the loopback fallback") } + step("read") + val request = JSONObject(readLine(input, 2_097_152)) + step("lock") + storage(app) { + step("answer") + check(!closed && epoch(app) == generation) + answer(request, step) + } + }.getOrElse { failure -> + note("Credential request rejected: ${failure.javaClass.simpleName}") + JSONObject().put("ok", false) + } + } + runCatching { it.getOutputStream().write((reply.toString() + "\n").toByteArray()) } + .onFailure { failure -> note("Credential reply not delivered: ${failure.javaClass.simpleName}") } + } + } } - private fun answer(request: JSONObject): JSONObject { + /** The connecting socket must belong to this app's user; an unreadable table (newer Android) leaves the key as the check. */ + private fun loopbackOwner(peerPort: Int): Boolean { + val uid = android.os.Process.myUid() + val rows = listOf("/proc/net/tcp", "/proc/net/tcp6").mapNotNull { runCatching { java.io.File(it).readLines().drop(1) }.getOrNull() }.flatten() + val owners = rows.mapNotNull { row -> + val fields = row.trim().split(Regex("\\s+")) + val local = fields.getOrNull(1)?.substringAfterLast(':')?.toIntOrNull(16) + val remote = fields.getOrNull(2)?.substringAfterLast(':')?.toIntOrNull(16) + if (local == peerPort && remote == loopback.localPort) fields.getOrNull(7)?.toIntOrNull() else null + } + return owners.isEmpty() || owners.all { it == uid } + } + + private fun answer(request: JSONObject, step: (String) -> Unit = {}): JSONObject { val key = request.getString("key") require(key.isNotEmpty() && key.length <= 512) + step("record-read") val record = StoreAccounts.read(app, Store.XBOX) check(!StoreAccounts.isUnavailable(Store.XBOX)) val json = record ?: JSONObject() @@ -118,15 +212,16 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str require(bytes.length() <= 262_144) for (i in 0 until bytes.length()) require(bytes.getInt(i) in 0..255) slots.put(key, bytes) + step("record-save") StoreAccounts.write(app, Store.XBOX, json) } - "remove" -> { slots.remove(key); StoreAccounts.write(app, Store.XBOX, json) } + "remove" -> { slots.remove(key); step("record-save"); StoreAccounts.write(app, Store.XBOX, json) } else -> error("Invalid credential operation") } return result } - override fun close() { closed = true; bound.countDown(); runCatching { server.close() } } + override fun close() { closed = true; bound.countDown(); runCatching { server.close() }; runCatching { loopback.close() } } companion object { val lock = Any() diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt index bdfb27d09a..10fc5ea71a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt @@ -31,6 +31,7 @@ class XboxLoginActivity : ComponentActivity() { @Volatile private var session = 0L @Volatile private var closed = false @Volatile private var step = "starting" + private val codes = java.util.concurrent.CopyOnWriteArrayList() @SuppressLint("SetJavaScriptEnabled") override fun onCreate(savedInstanceState: Bundle?) { @@ -53,6 +54,14 @@ class XboxLoginActivity : ComponentActivity() { Thread({ if (closed) return@Thread try { + // A record without a username is left from a sign-in that never finished; starting clean + // also avoids reading it back with an older, slow Keystore key. + progress("preparing the sign-in", "Preparing Microsoft sign-in…") + val leftover = StoreAccounts.read(applicationContext, Store.XBOX) + if (leftover != null && leftover.optString("username").isBlank()) { + XboxCredentials.invalidate(applicationContext) + logStep("discarded credentials from an unfinished sign-in") + } val accountGeneration = XboxCredentials.lifecycle(applicationContext) { it } progress("downloading the Xbox components", "Downloading Xbox components…") check(AddonPack.XBOX.await(applicationContext, { !closed }) { state -> @@ -64,7 +73,10 @@ class XboxLoginActivity : ComponentActivity() { child = process if (closed) return@use // StoresState.logLine writes no file in this process, so the reason would miss the shared log. - Xodus.diagnostics(process) { logStep(it) } + Xodus.diagnostics(process) { line -> + logStep(line) + line.removePrefix("NEXUS_CREDENTIAL_ERROR_V1 ").takeIf { it != line && it !in codes && codes.size < 6 }?.let(codes::add) + } progress("waiting for the Xbox helper", "Waiting for the Xbox helper…") val timer = Thread({ runCatching { if (!process.process.waitFor(10, TimeUnit.MINUTES)) process.process.destroy() } @@ -140,7 +152,8 @@ class XboxLoginActivity : ComponentActivity() { logStep("failed while $failed: $reason") runOnUiThread { disposeView() - status.text = "Microsoft sign-in did not complete.\nFailed while $failed: $reason\nClose this window and try again." + val details = if (codes.isEmpty()) "" else "\nDetails: ${codes.joinToString(", ")}" + status.text = "Microsoft sign-in did not complete.\nFailed while $failed: $reason$details\nClose this window and try again." } } }, "xbox-login").start() 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 22ce89ffb2..5d6160c44d 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 @@ -101,6 +101,8 @@ internal object Xodus { val command = LinuxRuntime.commandWithBinds(app, root, binds, guestCommand) val builder = ProcessBuilder(command).directory(LinuxRuntime.rootDir(app)) if (launchDirectory != null) builder.environment()["TMPDIR"] = launchDirectory.path + builder.environment()["DROIDDECK_XBOX_CREDENTIAL_PORT"] = credentials.port.toString() + builder.environment()["DROIDDECK_XBOX_CREDENTIAL_KEY"] = credentials.key builder.environment().apply { remove("LD_PRELOAD"); remove("LD_AUDIT"); remove("LD_LIBRARY_PATH") put("PROOT_LOADER", LinuxRuntime.prootLoader(app).path) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreAccountsCipherTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreAccountsCipherTest.kt index 2dde17cab1..0aeb49bb35 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreAccountsCipherTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreAccountsCipherTest.kt @@ -201,4 +201,20 @@ class StoreAccountsCipherTest { assertFalse(StoreAccounts.isUnavailable(Store.AMAZON)) assertFalse(file(Store.AMAZON).exists()) } + + @Test + fun teeEnvelopesUseTheCurrentKeyAndOlderOnesTheLegacyKey() { + val legacy = SecretKeySpec(ByteArray(32) { 7 }, "AES") + val keys = object : CredentialCipher.KeyProvider { + override fun key(): SecretKey = key + override fun legacy(): SecretKey = legacy + override val version: Int get() = CredentialCipher.VERSION_TEE + } + val old = CredentialCipher.seal("old", CredentialCipher.KeyProvider { legacy }) + assertEquals(CredentialCipher.VERSION, old.getInt("v")) + assertEquals("old", CredentialCipher.open(old, keys)) + val new = CredentialCipher.seal("new", keys) + assertEquals(CredentialCipher.VERSION_TEE, new.getInt("v")) + assertEquals("new", CredentialCipher.open(new, keys)) + } } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index e9fd668ce4..f8aaff7b1b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -144,7 +144,8 @@ def wine(argv, source_env=None): if len(command) < 3 or command[1] != 'waitforexitandrun' or len(argv) != 1: raise ValueError('Invalid Xbox Proton invocation') env = dict(source_env) - env.pop('DROIDDECK_XBOX_CREDENTIAL_SOCKET', None) + for name in ('DROIDDECK_XBOX_CREDENTIAL_SOCKET', 'DROIDDECK_XBOX_CREDENTIAL_PORT', 'DROIDDECK_XBOX_CREDENTIAL_KEY'): + env.pop(name, None) env.pop('DROIDDECK_XBOX_COMMAND_FILE', None) prefix = Path(source_env['STEAM_COMPAT_DATA_PATH']) / 'pfx' prefix.parent.mkdir(parents=True, exist_ok=True) @@ -207,7 +208,8 @@ def launch(command, env): 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') - owned_env.pop('DROIDDECK_XBOX_CREDENTIAL_SOCKET', 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'): owned_env['XODUS_XSTS_PLAYFAB'] = reply['playfab'] content = folder / '.xbox-content' diff --git a/tools/tests/test_xbox_launch.py b/tools/tests/test_xbox_launch.py index 2d7aaecd9a..3ed2cf6c10 100644 --- a/tools/tests/test_xbox_launch.py +++ b/tools/tests/test_xbox_launch.py @@ -56,11 +56,13 @@ class XboxLaunchTest(unittest.TestCase): patch.dict(xbox['launch'].__globals__, wine=unittest.mock.Mock(return_value=7)): launch = xbox['launch'] self.assertEqual(launch(['/proton', 'waitforexitandrun', '/encrypted/Game.exe'], - {'BL_LAUNCH_DIR': '/launch', 'DROIDDECK_XBOX_CREDENTIAL_SOCKET': 'stale'}), 7) + {'BL_LAUNCH_DIR': '/launch', 'DROIDDECK_XBOX_CREDENTIAL_SOCKET': 'stale', + 'DROIDDECK_XBOX_CREDENTIAL_PORT': '4100', 'DROIDDECK_XBOX_CREDENTIAL_KEY': 'stale-key'}), 7) wine = launch.__globals__['wine'] self.assertEqual(wine.call_args.args[0], ['/private/Game.exe']) env = wine.call_args.args[1] - self.assertNotIn('DROIDDECK_XBOX_CREDENTIAL_SOCKET', env) + for name in ('DROIDDECK_XBOX_CREDENTIAL_SOCKET', 'DROIDDECK_XBOX_CREDENTIAL_PORT', 'DROIDDECK_XBOX_CREDENTIAL_KEY'): + self.assertNotIn(name, env) self.assertEqual(env['XODUS_XSTS_PLAYFAB'], 'game-token') close.assert_called_once() self.assertEqual(store['ask'].call_args.args[1], {'op': 'xbox-released', 'lease': 'lease-1'}) @@ -117,7 +119,8 @@ class XboxLaunchTest(unittest.TestCase): command = root / 'command.json' command.write_text(json.dumps(['/selected/proton', 'waitforexitandrun', '/encrypted/Game.exe', '--custom', 'two words'])) env = {'STEAM_COMPAT_DATA_PATH': str(prefix.parent), 'DROIDDECK_XBOX_COMMAND_FILE': str(command), - 'DROIDDECK_XBOX_CREDENTIAL_SOCKET': 'private-account-channel', 'XODUS_BRIDGE_KEY': 'runtime-key'} + 'DROIDDECK_XBOX_CREDENTIAL_SOCKET': 'private-account-channel', 'DROIDDECK_XBOX_CREDENTIAL_PORT': '4100', + 'DROIDDECK_XBOX_CREDENTIAL_KEY': 'private-key', 'XODUS_BRIDGE_KEY': 'runtime-key'} with patch.dict(os.environ, env), patch.dict(xbox['wine'].__globals__, RUNTIME=runtime.parent), patch('subprocess.run') as initialize, patch('subprocess.call', return_value=7) as call: initialize.return_value.returncode = 0 self.assertEqual(xbox['wine'](['/private-view/Game.exe']), 7) @@ -128,7 +131,8 @@ class XboxLaunchTest(unittest.TestCase): initialize.assert_called_once() for child in (initialize, call): child_env = child.call_args.kwargs['env'] - self.assertNotIn('DROIDDECK_XBOX_CREDENTIAL_SOCKET', child_env) + for name in ('DROIDDECK_XBOX_CREDENTIAL_SOCKET', 'DROIDDECK_XBOX_CREDENTIAL_PORT', 'DROIDDECK_XBOX_CREDENTIAL_KEY'): + self.assertNotIn(name, child_env) self.assertNotIn('DROIDDECK_XBOX_COMMAND_FILE', child_env) self.assertEqual(child_env['XODUS_BRIDGE_KEY'], 'runtime-key') diff --git a/tools/xbox/README.md b/tools/xbox/README.md index abe39f8c9b..604e8e4fe8 100644 --- a/tools/xbox/README.md +++ b/tools/xbox/README.md @@ -30,6 +30,16 @@ patched backend source archive and the checksum-verified runtime source archive in the build cache and publishes both in CI's `xbox-corresponding-source` artifact; distribute corresponding sources with published binaries. +`droiddeck-credential-fallback.patch` names the reason when the backend cannot reach the +app's credential socket (`NEXUS_CREDENTIAL_ERROR_V1 socket-refused`, `-denied`, ...) and then +uses a keyed loopback port the app also listens on; some devices refuse the abstract socket +from inside PRoot. The key is passed in the backend's environment only. + +`droiddeck-credential-diagnostics.patch` names the step behind a `credential-io` failure: the +session lock (`lock-dir-owner`, `lock-file-mode`, `lock-flock-`, ...), a socket or loopback +exchange that broke after connecting (`socket-exchange-`), a malformed host reply, or a +missing socket name, port or key. Errno values without a name are spelled with letters, a = 0 ... j = 9. + `droiddeck-credentials.patch` replaces Linux Secret Service with a bounded, Android abstract socket restricted to the backend process started by the host. The Android host encrypts every persistent write using its existing Keystore cipher, verifies backend read-backs, and diff --git a/tools/xbox/droiddeck-credential-diagnostics.patch b/tools/xbox/droiddeck-credential-diagnostics.patch new file mode 100644 index 0000000000..67576e1f54 --- /dev/null +++ b/tools/xbox/droiddeck-credential-diagnostics.patch @@ -0,0 +1,237 @@ +diff --git a/crates/xodus/src/tokens/backend/keychain.rs b/crates/xodus/src/tokens/backend/keychain.rs +index 19480da..dc8f136 100644 +--- a/crates/xodus/src/tokens/backend/keychain.rs ++++ b/crates/xodus/src/tokens/backend/keychain.rs +@@ -13,29 +13,24 @@ pub struct KeychainBackend; + // keyed loopback port the app also listens on is used for the rest of the process. + static LOOPBACK: AtomicBool = AtomicBool::new(false); + static REPORTED: AtomicBool = AtomicBool::new(false); ++// The app seals credentials with the Android Keystore, which took over 10 s on some phones. ++const REPLY_TIMEOUT: Duration = Duration::from_secs(30); + +-/// Letters and dashes only: the app passes `NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}` lines to its log. +-fn reason(error: &std::io::Error) -> &'static str { +- match error.raw_os_error() { +- Some(111) => "refused", +- Some(13) => "denied", +- Some(1) => "not-permitted", +- Some(2) => "missing", +- Some(110) => "timed-out", +- Some(38) => "unsupported", +- Some(97) => "family-unsupported", +- Some(22) => "invalid", +- Some(104) => "reset", +- Some(32) => "broken-pipe", +- _ => match error.kind() { +- std::io::ErrorKind::TimedOut | std::io::ErrorKind::WouldBlock => "timed-out", +- std::io::ErrorKind::UnexpectedEof => "closed", +- _ => "other", +- }, +- } ++use crate::tokens::store::io_reason as reason; ++ ++fn exchange(stream: S, prefix: Option<&str>, value: &Value) -> Result { ++ let route = if prefix.is_some() { "loopback" } else { "socket" }; ++ transfer(stream, prefix, value).inspect_err(|error| { ++ // Kind Other is the host's own refusal, already reported. ++ if let TokenStoreError::Io(error) = error ++ && error.kind() != std::io::ErrorKind::Other ++ { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 {route}-exchange-{}", reason(error)); ++ } ++ }) + } + +-fn exchange(mut stream: S, prefix: Option<&str>, value: &Value) -> Result { ++fn transfer(mut stream: S, prefix: Option<&str>, value: &Value) -> Result { + if let Some(key) = prefix { + stream.write_all(key.as_bytes())?; + stream.write_all(b"\n")?; +@@ -45,6 +40,7 @@ fn exchange(mut stream: S, prefix: Option<&str>, value: &Value) + let mut bytes = Vec::new(); + std::io::BufReader::new(stream).take(2_097_153).read_until(b'\n', &mut bytes)?; + if bytes.len() > 2_097_152 || bytes.last() != Some(&b'\n') { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 host-response-invalid"); + return Err(std::io::Error::other("Invalid Android credential response").into()); + } + let response: Value = serde_json::from_slice(&bytes)?; +@@ -56,28 +52,36 @@ fn exchange(mut stream: S, prefix: Option<&str>, value: &Value) + } + + fn loopback(value: &Value) -> Result { +- let port: u16 = std::env::var("DROIDDECK_XBOX_CREDENTIAL_PORT").ok().and_then(|v| v.parse().ok()) +- .ok_or_else(|| std::io::Error::other("Android credential port is unavailable"))?; +- let key = std::env::var("DROIDDECK_XBOX_CREDENTIAL_KEY") +- .map_err(|_| std::io::Error::other("Android credential key is unavailable"))?; ++ let port: u16 = std::env::var("DROIDDECK_XBOX_CREDENTIAL_PORT").ok().and_then(|v| v.parse().ok()).ok_or_else(|| { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 loopback-port-missing"); ++ std::io::Error::other("Android credential port is unavailable") ++ })?; ++ let key = std::env::var("DROIDDECK_XBOX_CREDENTIAL_KEY").map_err(|_| { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 loopback-key-missing"); ++ std::io::Error::other("Android credential key is unavailable") ++ })?; + let address = SocketAddrV4::new(Ipv4Addr::LOCALHOST, port).into(); + let stream = TcpStream::connect_timeout(&address, Duration::from_secs(5)).inspect_err(|error| { + eprintln!("NEXUS_CREDENTIAL_ERROR_V1 loopback-{}", reason(error)); + })?; +- stream.set_read_timeout(Some(Duration::from_secs(10)))?; +- stream.set_write_timeout(Some(Duration::from_secs(10)))?; ++ stream.set_read_timeout(Some(REPLY_TIMEOUT))?; ++ stream.set_write_timeout(Some(REPLY_TIMEOUT))?; + exchange(stream, Some(&key), value) + } + + fn request(value: Value) -> Result { + if LOOPBACK.load(Ordering::Relaxed) { return loopback(&value); } +- let name = std::env::var("DROIDDECK_XBOX_CREDENTIAL_SOCKET") +- .map_err(|_| std::io::Error::other("Android credential host is unavailable"))?; +- let address = SocketAddr::from_abstract_name(name)?; ++ let name = std::env::var("DROIDDECK_XBOX_CREDENTIAL_SOCKET").map_err(|_| { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 socket-name-missing"); ++ std::io::Error::other("Android credential host is unavailable") ++ })?; ++ let address = SocketAddr::from_abstract_name(name).inspect_err(|_| { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 socket-name-invalid"); ++ })?; + match UnixStream::connect_addr(&address) { + Ok(stream) => { +- stream.set_read_timeout(Some(Duration::from_secs(10)))?; +- stream.set_write_timeout(Some(Duration::from_secs(10)))?; ++ stream.set_read_timeout(Some(REPLY_TIMEOUT))?; ++ stream.set_write_timeout(Some(REPLY_TIMEOUT))?; + exchange(stream, None, &value) + } + Err(error) => { +diff --git a/crates/xodus/src/tokens/session.rs b/crates/xodus/src/tokens/session.rs +index 38c4b2b..254c14f 100644 +--- a/crates/xodus/src/tokens/session.rs ++++ b/crates/xodus/src/tokens/session.rs +@@ -44,14 +44,30 @@ async fn renewal_lock_at( + wait: WaitDuration, + ) -> std::io::Result { + use std::os::unix::fs::{DirBuilderExt, MetadataExt, OpenOptionsExt}; ++ fn report(stage: &'static str) -> impl Fn(&std::io::Error) { ++ move |error| eprintln!("NEXUS_CREDENTIAL_ERROR_V1 lock-{stage}-{}", super::store::io_reason(error)) ++ } ++ fn unsafe_lock(stage: &str, check: &str) -> std::io::Error { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 lock-{stage}-{check}"); ++ std::io::Error::other(if stage == "dir" { "Unsafe session lock directory" } else { "Unsafe session lock" }) ++ } + match std::fs::DirBuilder::new().mode(0o700).create(&root) { + Ok(()) => {} + Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => {} +- Err(error) => return Err(error), ++ Err(error) => { ++ report("dir-create")(&error); ++ return Err(error); ++ } ++ } ++ let dir = std::fs::symlink_metadata(&root).inspect_err(report("dir-stat"))?; ++ if !dir.is_dir() { ++ return Err(unsafe_lock("dir", "type")); ++ } ++ if dir.uid() != uid { ++ return Err(unsafe_lock("dir", "owner")); + } +- let dir = std::fs::symlink_metadata(&root)?; +- if !dir.is_dir() || dir.uid() != uid || dir.mode() & 0o077 != 0 { +- return Err(std::io::Error::other("Unsafe session lock directory")); ++ if dir.mode() & 0o077 != 0 { ++ return Err(unsafe_lock("dir", "mode")); + } + let file = std::fs::OpenOptions::new() + .read(true) +@@ -60,10 +76,20 @@ async fn renewal_lock_at( + .truncate(false) + .mode(0o600) + .custom_flags(libc::O_NOFOLLOW | libc::O_CLOEXEC) +- .open(root.join("device.lock"))?; +- let meta = file.metadata()?; +- if !meta.is_file() || meta.uid() != uid || meta.nlink() != 1 || meta.mode() & 0o077 != 0 { +- return Err(std::io::Error::other("Unsafe session lock")); ++ .open(root.join("device.lock")) ++ .inspect_err(report("file-open"))?; ++ let meta = file.metadata().inspect_err(report("file-stat"))?; ++ if !meta.is_file() { ++ return Err(unsafe_lock("file", "type")); ++ } ++ if meta.uid() != uid { ++ return Err(unsafe_lock("file", "owner")); ++ } ++ if meta.nlink() != 1 { ++ return Err(unsafe_lock("file", "links")); ++ } ++ if meta.mode() & 0o077 != 0 { ++ return Err(unsafe_lock("file", "mode")); + } + let deadline = tokio::time::Instant::now() + wait; + loop { +@@ -75,7 +101,10 @@ async fn renewal_lock_at( + { + tokio::time::sleep(WaitDuration::from_millis(100)).await + } +- Err(error) => return Err(error), ++ Err(error) => { ++ report("flock")(&error); ++ return Err(error); ++ } + } + } + } +diff --git a/crates/xodus/src/tokens/store.rs b/crates/xodus/src/tokens/store.rs +index 78b73d0..15cbff0 100644 +--- a/crates/xodus/src/tokens/store.rs ++++ b/crates/xodus/src/tokens/store.rs +@@ -50,3 +50,51 @@ impl TokenStoreError { + eprintln!("{self}"); + } + } ++ ++/// Letters and dashes only: DroidDeck passes `NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}` lines to its ++/// log. Unlisted errno values are spelled with letters, a = 0 ... j = 9 (`os-dh` = errno 37). ++pub(crate) fn io_reason(error: &std::io::Error) -> String { ++ let known = match error.raw_os_error() { ++ Some(111) => "refused", ++ Some(13) => "denied", ++ Some(1) => "not-permitted", ++ Some(2) => "missing", ++ Some(110) => "timed-out", ++ Some(38) => "unsupported", ++ Some(97) => "family-unsupported", ++ Some(22) => "invalid", ++ Some(104) => "reset", ++ Some(32) => "broken-pipe", ++ Some(4) => "interrupted", ++ Some(11) => "would-block", ++ Some(17) => "exists", ++ Some(20) => "not-directory", ++ Some(21) => "is-directory", ++ Some(28) => "no-space", ++ Some(30) => "read-only", ++ Some(37) => "no-locks", ++ Some(40) => "symlink-loop", ++ Some(95) => "not-supported", ++ Some(code) => { ++ let letters: String = code.unsigned_abs().to_string().bytes().map(|b| (b - b'0' + b'a') as char).collect(); ++ return format!("os-{letters}"); ++ } ++ None => match error.kind() { ++ std::io::ErrorKind::TimedOut | std::io::ErrorKind::WouldBlock => "timed-out", ++ std::io::ErrorKind::UnexpectedEof => "closed", ++ _ => "other", ++ }, ++ }; ++ known.to_string() ++} ++ ++#[cfg(test)] ++mod io_reason_tests { ++ #[test] ++ fn io_reason_is_letters_and_dashes() { ++ for (code, expected) in [(37, "no-locks"), (13, "denied"), (99, "os-jj"), (125, "os-bcf")] { ++ assert_eq!(super::io_reason(&std::io::Error::from_raw_os_error(code)), expected); ++ } ++ assert_eq!(super::io_reason(&std::io::Error::other("x")), "other"); ++ } ++} diff --git a/tools/xbox/droiddeck-credential-fallback.patch b/tools/xbox/droiddeck-credential-fallback.patch new file mode 100644 index 0000000000..859afd4f65 --- /dev/null +++ b/tools/xbox/droiddeck-credential-fallback.patch @@ -0,0 +1,113 @@ +diff --git a/crates/xodus/src/tokens/backend/keychain.rs b/crates/xodus/src/tokens/backend/keychain.rs +index 1903638..19480da 100644 +--- a/crates/xodus/src/tokens/backend/keychain.rs ++++ b/crates/xodus/src/tokens/backend/keychain.rs +@@ -1,20 +1,46 @@ + use crate::tokens::store::{TokenBackend, TokenStoreError}; + use serde_json::{Value, json}; + use std::io::{BufRead, Read, Write}; ++use std::net::{Ipv4Addr, SocketAddrV4, TcpStream}; + use std::os::linux::net::SocketAddrExt; + use std::os::unix::net::{SocketAddr, UnixStream}; ++use std::sync::atomic::{AtomicBool, Ordering}; + use std::time::Duration; + + pub struct KeychainBackend; + +-fn request(value: Value) -> Result { +- let name = std::env::var("DROIDDECK_XBOX_CREDENTIAL_SOCKET") +- .map_err(|_| std::io::Error::other("Android credential host is unavailable"))?; +- let address = SocketAddr::from_abstract_name(name)?; +- let mut stream = UnixStream::connect_addr(&address)?; +- stream.set_read_timeout(Some(Duration::from_secs(10)))?; +- stream.set_write_timeout(Some(Duration::from_secs(10)))?; +- serde_json::to_writer(&mut stream, &value)?; ++// Some Android devices refuse the abstract socket from inside PRoot; after one failure the ++// keyed loopback port the app also listens on is used for the rest of the process. ++static LOOPBACK: AtomicBool = AtomicBool::new(false); ++static REPORTED: AtomicBool = AtomicBool::new(false); ++ ++/// Letters and dashes only: the app passes `NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}` lines to its log. ++fn reason(error: &std::io::Error) -> &'static str { ++ match error.raw_os_error() { ++ Some(111) => "refused", ++ Some(13) => "denied", ++ Some(1) => "not-permitted", ++ Some(2) => "missing", ++ Some(110) => "timed-out", ++ Some(38) => "unsupported", ++ Some(97) => "family-unsupported", ++ Some(22) => "invalid", ++ Some(104) => "reset", ++ Some(32) => "broken-pipe", ++ _ => match error.kind() { ++ std::io::ErrorKind::TimedOut | std::io::ErrorKind::WouldBlock => "timed-out", ++ std::io::ErrorKind::UnexpectedEof => "closed", ++ _ => "other", ++ }, ++ } ++} ++ ++fn exchange(mut stream: S, prefix: Option<&str>, value: &Value) -> Result { ++ if let Some(key) = prefix { ++ stream.write_all(key.as_bytes())?; ++ stream.write_all(b"\n")?; ++ } ++ serde_json::to_writer(&mut stream, value)?; + stream.write_all(b"\n")?; + let mut bytes = Vec::new(); + std::io::BufReader::new(stream).take(2_097_153).read_until(b'\n', &mut bytes)?; +@@ -22,10 +48,52 @@ fn request(value: Value) -> Result { + return Err(std::io::Error::other("Invalid Android credential response").into()); + } + let response: Value = serde_json::from_slice(&bytes)?; +- if response["ok"] != true { return Err(std::io::Error::other("Android credential storage unavailable").into()); } ++ if response["ok"] != true { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 host-refused"); ++ return Err(std::io::Error::other("Android credential storage unavailable").into()); ++ } + Ok(response) + } + ++fn loopback(value: &Value) -> Result { ++ let port: u16 = std::env::var("DROIDDECK_XBOX_CREDENTIAL_PORT").ok().and_then(|v| v.parse().ok()) ++ .ok_or_else(|| std::io::Error::other("Android credential port is unavailable"))?; ++ let key = std::env::var("DROIDDECK_XBOX_CREDENTIAL_KEY") ++ .map_err(|_| std::io::Error::other("Android credential key is unavailable"))?; ++ let address = SocketAddrV4::new(Ipv4Addr::LOCALHOST, port).into(); ++ let stream = TcpStream::connect_timeout(&address, Duration::from_secs(5)).inspect_err(|error| { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 loopback-{}", reason(error)); ++ })?; ++ stream.set_read_timeout(Some(Duration::from_secs(10)))?; ++ stream.set_write_timeout(Some(Duration::from_secs(10)))?; ++ exchange(stream, Some(&key), value) ++} ++ ++fn request(value: Value) -> Result { ++ if LOOPBACK.load(Ordering::Relaxed) { return loopback(&value); } ++ let name = std::env::var("DROIDDECK_XBOX_CREDENTIAL_SOCKET") ++ .map_err(|_| std::io::Error::other("Android credential host is unavailable"))?; ++ let address = SocketAddr::from_abstract_name(name)?; ++ match UnixStream::connect_addr(&address) { ++ Ok(stream) => { ++ stream.set_read_timeout(Some(Duration::from_secs(10)))?; ++ stream.set_write_timeout(Some(Duration::from_secs(10)))?; ++ exchange(stream, None, &value) ++ } ++ Err(error) => { ++ if !REPORTED.swap(true, Ordering::Relaxed) { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 socket-{}", reason(&error)); ++ } ++ let result = loopback(&value); ++ if result.is_ok() { ++ LOOPBACK.store(true, Ordering::Relaxed); ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 loopback-in-use"); ++ } ++ result ++ } ++ } ++} ++ + impl TokenBackend for KeychainBackend { + fn get(&self, key: &str) -> Result>, TokenStoreError> { + let response = request(json!({"op":"get", "key":key}))?; diff --git a/tools/xbox/prepare.py b/tools/xbox/prepare.py index 30afc1b019..7a07c6335c 100755 --- a/tools/xbox/prepare.py +++ b/tools/xbox/prepare.py @@ -9,7 +9,8 @@ import sys recipe = Path(__file__).resolve().parent 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'] +local_patches = ['droiddeck-credentials.patch', 'droiddeck-launch-view.patch', 'droiddeck-library-subscriptions.patch', + 'droiddeck-credential-fallback.patch', 'droiddeck-credential-diagnostics.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 c5d7cdc058981094a1b48603d5f25b48ff0bcda6 Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Sat, 24 Oct 2026 23:17:57 -0400 Subject: [PATCH 124/174] Xbox Cloud Gaming: stream from the store and Games tab, native player with DroidDeck frame generation (#1531) Xbox Cloud Gaming: stream from the store and Games tab, native player with DroidDeck frame generation Stream Xbox games with Xbox Cloud Gaming (Game Pass) from DroidDeck, outside the Linux session. - Backend: `xodus-cli cloud-token` (tools/xbox/droiddeck-cloud-token.patch) gets the streaming tokens; they stay in memory. - Web player (default): the Greenlight player page (tools/xcloud-player, MIT) in a WebView, plus Microsoft's own xbox.com/play player. In-stream menu with screen effects (sharpen, colour, deband, FXAA, CRT, NTSC, Toon, fps cap), stream quality, performance overlay (level, layout, top right / top left) and rumble. - Native player (opt-in, Android 10+, Player engine: Native): Google's WebRTC (io.github.webrtc-sdk 125.6422.07, BSD) with the Greenlight protocol ported to Kotlin, in its own process (:xcloudnative) with its own instance of DroidDeck's compositor. Decoded frames reach the compositor as AHardwareBuffers (new stream mode, VK_ANDROID_external_memory_android_ hardware_buffer import), so DDFG 2x and LSFG 2x/3x/4x run on them. Live frame generation, frame-rate target (presets and a 10-165 fps slider, even pacing), zero-copy picture, small network buffer, fast decoder, instant controller input, overlay with engine and on-screen fps, background end, restart and web fallback. It takes the main process's tokens through XboxCloudTokenService; they are fetched ahead while a cloud game is shown. - The compositor requests the dma-buf import extensions only where the driver has them (the system driver has none). - Catalog: cloud availability, Game Pass plan CFQ7TTC0K6L8 counted, library filter All / Owned / Game Pass / Cloud, Stream and Add to Games on the store page, stream-only Games-tab entries (Stream + Download / Play + Stream). - Xbox games get VC++ 2015-2022 and the ARM64 runtime registry entries (vcredist2022_arm64, built in until the catalog has it) before each launch. - Controller focus reaches pickers opened from a game page (install location, uninstall); Add / Remove from Games keep the focus. Credits: Greenlight by UnknownSKL (Jim Kroon), MIT, player and protocol; Better xCloud for the resolution / OS mapping; MGamer404's Bannerlator #627 for the ARM64 runtime approach. Ported from the412banner's Bannerlator. --- app/build.gradle | 2 + app/src/main/AndroidManifest.xml | 21 + app/src/main/assets/xcloud/player.html | 18 + app/src/main/assets/xcloud/player.js | 187 ++++ app/src/main/cpp/waylandcomp/CMakeLists.txt | 1 + app/src/main/cpp/waylandcomp/src/compositor.c | 117 +++ app/src/main/cpp/waylandcomp/src/vk_loader.h | 2 +- app/src/main/cpp/waylandcomp/src/vk_present.c | 79 +- app/src/main/cpp/waylandcomp/src/vk_present.h | 3 + .../cpp/waylandcomp/src/waylandcomp_jni.c | 22 + .../main/java/com/droiddeck/launcher/App.kt | 9 + .../droiddeck/launcher/frontend/Library.kt | 1 + .../launcher/frontend/WinCompSources.kt | 15 +- .../com/droiddeck/launcher/gpu/FrameGen.kt | 6 +- .../launcher/session/WinComponents.kt | 21 +- .../droiddeck/launcher/stores/StoresState.kt | 2 + .../launcher/stores/xbox/XboxBackend.kt | 10 +- .../launcher/stores/xbox/XboxCatalog.kt | 58 +- .../launcher/stores/xbox/XboxCloudActivity.kt | 189 ++++ .../launcher/stores/xbox/XboxCloudGames.kt | 135 +++ .../stores/xbox/XboxCloudPlayerActivity.kt | 399 ++++++++ .../launcher/stores/xbox/XboxCloudSession.kt | 120 +++ .../launcher/stores/xbox/XboxCloudSettings.kt | 108 +++ .../stores/xbox/XboxCloudSettingsActivity.kt | 60 ++ .../stores/xbox/XboxCloudSettingsPanel.kt | 313 +++++++ .../stores/xbox/XboxCloudSignalling.kt | 74 ++ .../stores/xbox/XboxCloudTokenService.kt | 74 ++ .../launcher/stores/xbox/XboxLibraryCache.kt | 11 +- .../launcher/stores/xbox/XboxLibraryFilter.kt | 41 + .../launcher/stores/xbox/XboxNativePad.kt | 80 ++ .../stores/xbox/XboxNativePlayerActivity.kt | 852 ++++++++++++++++++ .../stores/xbox/XboxNativeProtocol.kt | 186 ++++ .../launcher/stores/xbox/XboxNativeVideo.kt | 183 ++++ .../droiddeck/launcher/ui/FrontEndGames.kt | 48 +- .../droiddeck/launcher/ui/FrontEndScreen.kt | 3 + .../com/droiddeck/launcher/ui/StoresDetail.kt | 37 + .../com/droiddeck/launcher/ui/StoresPage.kt | 58 +- .../launcher/ui/WinComponentsEditor.kt | 3 +- .../launcher/wayland/WaylandCompositor.java | 7 + .../DroidDeckLowLatencyDecoderFactory.java | 257 ++++++ .../launcher/frontend/WinCompSourcesTest.kt | 11 + .../session/WinComponentsSupportTest.kt | 8 + .../launcher/stores/xbox/XboxCatalogTest.kt | 36 +- .../launcher/stores/xbox/XboxCloudTest.kt | 49 + .../stores/xbox/XboxLibraryCacheTest.kt | 13 +- tools/tests/test_output_refresh.py | 2 + tools/xbox/README.md | 6 + tools/xbox/droiddeck-cloud-token.patch | 171 ++++ tools/xbox/prepare.py | 2 +- tools/xcloud-player/NOTICE.md | 20 + tools/xcloud-player/build.sh | 9 + tools/xcloud-player/entry.ts | 212 +++++ tools/xcloud-player/greenlight/LICENSE | 21 + .../greenlight/lib/channel/channel.ts | 69 ++ .../greenlight/lib/channel/chat.ts | 84 ++ .../greenlight/lib/channel/control.ts | 108 +++ .../greenlight/lib/channel/debug.ts | 15 + .../greenlight/lib/channel/input.ts | 142 +++ .../greenlight/lib/channel/input/packet.ts | 404 +++++++++ .../greenlight/lib/channel/input/queue.ts | 171 ++++ .../greenlight/lib/channel/message.ts | 120 +++ .../greenlight/lib/channel/message/handler.ts | 73 ++ tools/xcloud-player/greenlight/lib/ice.ts | 56 ++ .../greenlight/lib/input/gamepad.ts | 441 +++++++++ .../greenlight/lib/input/mousekeyboard.ts | 143 +++ .../greenlight/lib/input/touch.ts | 70 ++ tools/xcloud-player/greenlight/lib/player.ts | 143 +++ .../greenlight/lib/render/audio.ts | 38 + .../greenlight/lib/render/overlay.ts | 118 +++ .../greenlight/lib/render/video.ts | 76 ++ .../greenlight/lib/render/webgpu.ts | 483 ++++++++++ tools/xcloud-player/greenlight/lib/sdp.ts | 127 +++ tools/xcloud-player/greenlight/lib/stats.ts | 107 +++ tools/xcloud-player/greenlight/lib/teredo.ts | 31 + tools/xcloud-player/renderer.ts | 385 ++++++++ tools/xcloud-player/sdp-tweaks.ts | 34 + tools/xcloud-player/streamstats.ts | 68 ++ tools/xcloud-player/uuid.ts | 2 + 78 files changed, 7835 insertions(+), 45 deletions(-) create mode 100644 app/src/main/assets/xcloud/player.html create mode 100644 app/src/main/assets/xcloud/player.js create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryFilter.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt create mode 100644 app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCloudTest.kt create mode 100644 tools/xbox/droiddeck-cloud-token.patch create mode 100644 tools/xcloud-player/NOTICE.md create mode 100644 tools/xcloud-player/build.sh create mode 100644 tools/xcloud-player/entry.ts create mode 100644 tools/xcloud-player/greenlight/LICENSE create mode 100644 tools/xcloud-player/greenlight/lib/channel/channel.ts create mode 100644 tools/xcloud-player/greenlight/lib/channel/chat.ts create mode 100644 tools/xcloud-player/greenlight/lib/channel/control.ts create mode 100644 tools/xcloud-player/greenlight/lib/channel/debug.ts create mode 100644 tools/xcloud-player/greenlight/lib/channel/input.ts create mode 100644 tools/xcloud-player/greenlight/lib/channel/input/packet.ts create mode 100644 tools/xcloud-player/greenlight/lib/channel/input/queue.ts create mode 100644 tools/xcloud-player/greenlight/lib/channel/message.ts create mode 100644 tools/xcloud-player/greenlight/lib/channel/message/handler.ts create mode 100644 tools/xcloud-player/greenlight/lib/ice.ts create mode 100644 tools/xcloud-player/greenlight/lib/input/gamepad.ts create mode 100644 tools/xcloud-player/greenlight/lib/input/mousekeyboard.ts create mode 100644 tools/xcloud-player/greenlight/lib/input/touch.ts create mode 100644 tools/xcloud-player/greenlight/lib/player.ts create mode 100644 tools/xcloud-player/greenlight/lib/render/audio.ts create mode 100644 tools/xcloud-player/greenlight/lib/render/overlay.ts create mode 100644 tools/xcloud-player/greenlight/lib/render/video.ts create mode 100644 tools/xcloud-player/greenlight/lib/render/webgpu.ts create mode 100644 tools/xcloud-player/greenlight/lib/sdp.ts create mode 100644 tools/xcloud-player/greenlight/lib/stats.ts create mode 100644 tools/xcloud-player/greenlight/lib/teredo.ts create mode 100644 tools/xcloud-player/renderer.ts create mode 100644 tools/xcloud-player/sdp-tweaks.ts create mode 100644 tools/xcloud-player/streamstats.ts create mode 100644 tools/xcloud-player/uuid.ts diff --git a/app/build.gradle b/app/build.gradle index 1b1eb5ae7c..8ba8c8ea09 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -337,6 +337,8 @@ dependencies { implementation 'androidx.camera:camera-camera2:1.4.2' implementation 'androidx.camera:camera-lifecycle:1.4.2' implementation 'androidx.webkit:webkit:1.12.1' + // Google's WebRTC (BSD) for the native Xbox Cloud Gaming player (XboxNativePlayerActivity). + implementation 'io.github.webrtc-sdk:android:125.6422.07' implementation("com.google.mediapipe:tasks-vision:${trackingPack.MEDIAPIPE_VERSION}") { exclude group: 'com.google.auto.value', module: 'auto-value' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 286a9ee8ad..29718e0879 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -152,6 +152,27 @@ android:process=":xboxlogin" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|density" android:theme="@style/AppTheme" /> + + + + + + + + + + + + + + + + + +
    +
    + + + diff --git a/app/src/main/assets/xcloud/player.js b/app/src/main/assets/xcloud/player.js new file mode 100644 index 0000000000..3d3762149d --- /dev/null +++ b/app/src/main/assets/xcloud/player.js @@ -0,0 +1,187 @@ +/* DroidDeck Xbox Cloud Gaming player. Includes Greenlight's player (c) UnknownSKL (Jim Kroon), MIT. */ +(()=>{var _=class{_player;_dataChannel;constructor(e){this._player=e,this._dataChannel=this._player._peerConnection.createDataChannel(this.getChannelName(),this.getChannelConfig()),this._dataChannel.onopen=this.onOpen.bind(this),this._dataChannel.onmessage=this.onMessage.bind(this),this._dataChannel.onclosing=this.onClosing.bind(this),this._dataChannel.onclose=this.onClose.bind(this),this._dataChannel.onerror=this.onError.bind(this)}getChannelName(){return"channel"}getChannelConfig(){return{}}onOpen(e){console.log(this.getChannelName(),"Opening channel:",e)}onMessage(e){console.log(this.getChannelName(),"Message channel:",e)}onClosing(e){console.log(this.getChannelName(),"Closing channel:",e)}onClose(e){console.log(this.getChannelName(),"Closed channel:",e)}onError(e){console.log(this.getChannelName(),"Error channel:",e)}send(e){if(this._dataChannel.readyState!=="open"){console.log("["+this.getChannelName()+"] Tried to send data while channel is not open. readyState is:",this._dataChannel.readyState);return}return typeof e=="string"&&(e=new TextEncoder().encode(e)),this._dataChannel.send(e)}getPlayer(){return this._player}destroy(){}};var S=class extends _{_micPermissions="prompt";_micStream;constructor(e){super(e),navigator.permissions.query({name:"microphone"}).then(t=>{this._micPermissions=t.state,t.onchange=()=>{this._micPermissions=t.state}})}getChannelName(){return"chat"}getChannelConfig(){return{ordered:!0,protocol:"chatV1"}}destroy(){}};var v=class r{_player;_index;_physicalGamepadId=-1;_rumbleInterval;_isFocused=!0;_gamepadOverride={buttons:{}};_options={enable_keyboard:!1,enable_gamepad:!0,enable_vibration:!0,keyboard_mapping:{A:"Enter",B:"Backspace",X:"x",Y:"y",DPadUp:"ArrowUp",DPadDown:"ArrowDown",DPadLeft:"ArrowLeft",DPadRight:"ArrowRight",LeftShoulder:"[",RightShoulder:"]",LeftThumb:"l",RightThumb:"r",LeftTrigger:"-",RightTrigger:"=",Menu:"m",View:"v",Nexus:"n"},gamepad_mapping:{A:"0",B:"1",X:"2",Y:"3",DPadUp:"12",DPadDown:"13",DPadLeft:"14",DPadRight:"15",LeftShoulder:"4",RightShoulder:"5",LeftThumb:"10",RightThumb:"11",LeftTrigger:"6",RightTrigger:"7",Menu:"9",View:"8",Nexus:"16"},gamepad_axes_mapping:{LeftThumbXAxis:"0",LeftThumbYAxis:"1",RightThumbXAxis:"2",RightThumbYAxis:"3"},gamepad_deadzone:.08,gamepad_force_capture:!1};_listener={keyDown:this.onKeyDown.bind(this),keyUp:this.onKeyUp.bind(this),gamepadConnected:this.onGamepadConnected.bind(this),gamepadDisconnected:this.onGamepadDisconnected.bind(this),windowFocus:this.onWindowFocus.bind(this),windowBlur:this.onWindowBlur.bind(this)};constructor(e,t={}){this._index=e,this._options={...this._options,...t}}attach(e){this._player=e,this._player._channels.control.sendGamepadState(this._index,!0,this),this._options.enable_keyboard===!0&&(window.addEventListener("keydown",this._listener.keyDown),window.addEventListener("keyup",this._listener.keyUp)),this._options.enable_gamepad===!0&&(window.addEventListener("gamepadconnected",this._listener.gamepadConnected),window.addEventListener("gamepaddisconnected",this._listener.gamepadDisconnected)),this._options.enable_gamepad===!0&&this._options.gamepad_force_capture===!1&&(window.addEventListener("blur",this._listener.windowBlur),window.addEventListener("focus",this._listener.windowFocus)),this.detectActiveGamepad()}detach(){if(this._player===void 0){console.log("[Gamepad] Player is not attached. this._player is:",this._player);return}this._player._channels.control.sendGamepadState(this._index,!1),this._physicalGamepadId=-1,this._rumbleInterval!==void 0&&clearInterval(this._rumbleInterval),this._options.enable_keyboard===!0&&(window.removeEventListener("keydown",this._listener.keyDown),window.removeEventListener("keyup",this._listener.keyUp)),this._options.enable_gamepad===!0&&(window.removeEventListener("gamepadconnected",this._listener.gamepadConnected),window.removeEventListener("gamepaddisconnected",this._listener.gamepadDisconnected)),this._options.enable_gamepad===!0&&this._options.gamepad_force_capture===!1&&(window.removeEventListener("blur",this._listener.windowBlur),window.removeEventListener("focus",this._listener.windowFocus))}sendButtonState(e,t){if(this._player===void 0){console.log("[Gamepad] Player is not attached. this._player is:",this._player);return}if(!(e in this.getDefaultFamepadFrame())){console.log("[Gamepad] Invalid button:",e);return}let n=this.getDefaultFamepadFrame();n.GamepadIndex=this._index,this._gamepadOverride.buttons[e]=t}onKeyDown(e){if(this._isFocused!==!1)for(let t in this._options.keyboard_mapping)this._options.keyboard_mapping[t]===e.key&&(this._gamepadOverride.buttons[t]=1,e.preventDefault())}onKeyUp(e){if(this._isFocused!==!1)for(let t in this._options.keyboard_mapping)this._options.keyboard_mapping[t]===e.key&&(this._gamepadOverride.buttons[t]=0,e.preventDefault())}onWindowFocus(){this._isFocused=!0}onWindowBlur(){}getDefaultFamepadFrame(){return{GamepadIndex:0,Nexus:0,Menu:0,View:0,A:0,B:0,X:0,Y:0,DPadUp:0,DPadDown:0,DPadLeft:0,DPadRight:0,LeftShoulder:0,RightShoulder:0,LeftThumb:0,RightThumb:0,LeftThumbXAxis:0,LeftThumbYAxis:0,RightThumbXAxis:0,RightThumbYAxis:0,LeftTrigger:0,RightTrigger:0}}detectActiveGamepad(){if(this._physicalGamepadId<0)for(let e in navigator.getGamepads()){let t=navigator.getGamepads()[e]?.index;if(t===void 0)continue;let n=!1;for(let i in this._player?._channels.control.getGamepadHandlers())if(this._player?._channels.control.getGamepadHandlers()[i]instanceof r&&(this._player?._channels.control.getGamepadHandlers()[i])._physicalGamepadId===navigator.getGamepads()[e]?.index){console.log("[Gamepad] Active gamepad already detected:",t,(this._player?._channels.control.getGamepadHandlers()[i])._physicalGamepadId),n=!0;continue}n===!1&&(this._physicalGamepadId=t,console.log("[Gamepad] Active gamepad detected:",this._physicalGamepadId))}else console.log("[Gamepad] Physical gamepad already detected:",this._physicalGamepadId)}onGamepadConnected(e){if(this._physicalGamepadId<0){for(let t in this._player?._channels.control.getGamepadHandlers())if(this._player?._channels.control.getGamepadHandlers()[t]instanceof r&&(this._player?._channels.control.getGamepadHandlers()[t])._physicalGamepadId===e.gamepad.index)return;this._physicalGamepadId=e.gamepad.index}}onGamepadDisconnected(e){e.gamepad.index===this._physicalGamepadId&&(this._physicalGamepadId=-1)}hasOverrideButtons(){return Object.keys(this._gamepadOverride.buttons).length>0}getGamepadState(){let e=this.getGamepad(this._physicalGamepadId);if((this._physicalGamepadId<0||e===void 0||this._isFocused===!1)&&this.hasOverrideButtons()===!1)return;let t=this.getDefaultFamepadFrame();if(t.GamepadIndex=this._index,e!==void 0){for(let i in this._options.gamepad_mapping)t[i]=e.buttons[this._options.gamepad_mapping[i]]?.value??0;for(let i in this._options.gamepad_axes_mapping)t[i]=this.normaliseAxis(e.axes[this._options.gamepad_axes_mapping[i]]??0)}for(let i in this._gamepadOverride.buttons)t[i]=this._gamepadOverride.buttons[i];let n=[];for(let i in this._gamepadOverride.buttons)this._gamepadOverride.buttons[i]===0&&n.push(i);for(let i of n)delete this._gamepadOverride.buttons[i];return t.View>0&&t.Menu>0&&(t.View=0,t.Menu=0,t.Nexus=1),t}getGamepad(e=-1){let t=navigator.getGamepads()[e];if(t!==null)return t}getPhysicalGamepadId(){return this._physicalGamepadId}handleVibration(e){if(this._physicalGamepadId<0){console.log("[Gamepad] Received a vibration report but no physical gamepad is connected");return}let t=this.getGamepad(this._physicalGamepadId);if(t===void 0){console.log("[Gamepad] Received a vibration report but no physical gamepad is connected");return}if(this._options.enable_vibration===!1)return;let n={startDelay:0,duration:e.durationMs,weakMagnitude:e.rightMotorPercent*(window.__ddRumble??1),strongMagnitude:e.leftMotorPercent*(window.__ddRumble??1),leftTrigger:e.leftTriggerMotorPercent,rightTrigger:e.rightTriggerMotorPercent};if(t.vibrationActuator?.type==="dual-rumble"){let i=e.rightMotorPercent<.6?(.6-e.rightMotorPercent)/2:0,a=(e.leftTriggerMotorPercent+e.rightTriggerMotorPercent)/4,s=Math.min(i,a);if(n.weakMagnitude=Math.min(1,(e.rightMotorPercent+s)*(window.__ddRumble??1)),n.leftTrigger=0,n.rightTrigger=0,t.vibrationActuator?.playEffect("dual-rumble",n),clearInterval(this._rumbleInterval),e.repeat>0){let o=e.repeat;this._rumbleInterval=setInterval(()=>{o<=0&&clearInterval(this._rumbleInterval),t.vibrationActuator!==void 0&&t.vibrationActuator?.playEffect("dual-rumble",n),o--},e.delayMs+e.durationMs)}}else console.log("[Gamepad] Unknown vibration type:",t.vibrationActuator.type)}normaliseAxis(e){return Math.abs(e)0&&(this._reportType|=1,s=s+this._calculateMetadataSize(e),this._metadataFrames=e),t.length>0&&(this._reportType|=2,s=s+this._calculateGamepadSize(t),this._gamepadFrames=t),n.length>0&&(this._reportType|=4,s=s+this._calculatePointerSize(n),this._pointerFrames=n),i.length>0&&(this._reportType|=32,s=s+this._calculateMouseSize(i),this._mouseFrames=i),a.length>0&&(this._reportType|=64,s=s+this._calculateKeyboardSize(a),this._keyboardFrames=a),this._totalSize=s}_calculateMetadataSize(e){return 1+7*4*e.length}_calculateGamepadSize(e){return 1+23*e.length}_calculatePointerSize(e){let t=1;for(let n in e)t=t+1+e[n].events.length*20;return t}_calculateMouseSize(e){return 1+18*e.length}_calculateKeyboardSize(e){return 1+3*e.length}_writeMetadataData(e,t,n){e.setUint8(t,n.length),t++,n.length>=30&&console.warn("metadataQueue is bigger then 30. This might impact reliability!");for(let i=0;i=30&&console.warn("gamepadQueue is bigger then 30. This might impact reliability!");for(let i=0;i0&&(s|=2),a.Menu>0&&(s|=4),a.View>0&&(s|=8),a.A>0&&(s|=16),a.B>0&&(s|=32),a.X>0&&(s|=64),a.Y>0&&(s|=128),a.DPadUp>0&&(s|=256),a.DPadDown>0&&(s|=512),a.DPadLeft>0&&(s|=1024),a.DPadRight>0&&(s|=2048),a.LeftShoulder>0&&(s|=4096),a.RightShoulder>0&&(s|=8192),a.LeftThumb>0&&(s|=16384),a.RightThumb>0&&(s|=32768),e.setUint16(t,s,!0),e.setInt16(t+2,this._normalizeAxisValue(a.LeftThumbXAxis),!0),e.setInt16(t+4,this._normalizeAxisValue(-a.LeftThumbYAxis),!0),e.setInt16(t+6,this._normalizeAxisValue(a.RightThumbXAxis),!0),e.setInt16(t+8,this._normalizeAxisValue(-a.RightThumbYAxis),!0),e.setUint16(t+10,this._normalizeTriggerValue(a.LeftTrigger),!0),e.setUint16(t+12,this._normalizeTriggerValue(a.RightTrigger),!0),e.setUint32(t+14,1,!0),e.setUint32(t+18,1,!1),t+=22}return t}_writePointerData(e,t,n){e.setUint8(t,1),t++,n.length>=2&&console.warn("pointerQueue is bigger then 1. Only one event will be sent.");let i=n[0];if(i!==void 0){e.setUint8(t,i.events.length),t++;let a=this._serverVideoWidth,s=this._serverVideoHeight;for(let o=0;o=30&&console.warn("mouseQueue is bigger then 30. This might impact reliability!");for(let i=0;i=30&&console.warn("keyboardQueue is bigger then 30. This might impact reliability!");for(let i=0;i0&&(n=this._writeMetadataData(t,n,this._metadataFrames)),this._gamepadFrames.length>0&&(n=this._writeGamepadData(t,n,this._gamepadFrames)),this._pointerFrames.length>0&&(n=this._writePointerData(t,n,this._pointerFrames)),this._mouseFrames.length>0&&(n=this._writeMouseData(t,n,this._mouseFrames)),this._keyboardFrames.length>0&&(n=this._writeKeyboardData(t,n,this._keyboardFrames)),this._reportType===8&&(t.setUint8(n,this._maxTouchpoints),n++),n!==n)throw new Error("Packet length mismatch. Something is wrong!");return t}_normalizeTriggerValue(e){return e<=0||Number.isNaN(e)?0:e>=1?65535:e*65535|0}_normalizeAxisValue(e){let i=Math.round(e*32767);return i>32767?32767:i<-32767?-32767:i}};var F=class{_player;_inputSequenceNum=0;_metadataQueue=[];_gamepadQueue=[];_pointerQueue=[];_mouseQueue=[];_keyboardQueue=[];_gamepadHeartbeatTimers=new Map;_lastGamepadState=new Map;_axisChangeThreshold=.08;constructor(e){this._player=e}_hasQueuedData(){return this._metadataQueue.length>0||this._gamepadQueue.length>0||this._pointerQueue.length>0||this._mouseQueue.length>0||this._keyboardQueue.length>0}_upsertGamepadFrame(e){for(let t=0;tthis._axisChangeThreshold||o>.15)return!0}for(let a of i)if(Math.abs(e[a]-t[a])>.01)return!0;return!1}_isHeartbeatDue(e){let t=this._gamepadHeartbeatTimers.get(e)??0;return performance.now()-t>33}queueMetadataFrame(e){this._metadataQueue.push(e),this.checkQueueAndSend()}queueGamepadFrame(e){let t=this._lastGamepadState.get(e.GamepadIndex),n=this._hasSignificantAxisChange(e,t),i=this._isHeartbeatDue(e.GamepadIndex);(n||i)&&(this._upsertGamepadFrame(e),this._lastGamepadState.set(e.GamepadIndex,e),this._gamepadHeartbeatTimers.set(e.GamepadIndex,performance.now()),this.checkQueueAndSend())}queueGamepadFrames(e,t=!1){for(let n of e)this._upsertGamepadFrame(n);this.checkQueueAndSend(t)}queueMouseFrame(e){this._mouseQueue.push(e),this.checkQueueAndSend()}queueKeyboardFrame(e){this._keyboardQueue.push(e),this.checkQueueAndSend()}queuePointerFrame(e){this._pointerQueue.length>0?this._pointerQueue[0].events=this._pointerQueue[0].events.concat(e.events):this._pointerQueue.push(e),this.checkQueueAndSend()}checkQueueAndSend(e=!1){if(e===!0){this._hasQueuedData()&&this.sendQueue();return}if(this._gamepadQueue.length>0){this.sendQueue();return}if(this._mouseQueue.length>0||this._keyboardQueue.length>0||this._pointerQueue.length>0){this.sendQueue();return}this._metadataQueue.length>5&&this.sendQueue()}sendQueue(){let e=new y(this.getSequenceNum());this._pointerQueue.length>0&&e.setStreamConfig({width:this._player._channels.input.getServerVideoWidth(),height:this._player._channels.input.getServerVideoHeight()}),e.setData(this._metadataQueue,this._gamepadQueue,this._pointerQueue,this._mouseQueue,this._keyboardQueue),this._player._channels.input.send(e.toBuffer()),this.clearQueues()}clearQueues(){this._metadataQueue=[],this._gamepadQueue=[],this._pointerQueue=[],this._mouseQueue=[],this._keyboardQueue=[]}getSequenceNum(){return this._inputSequenceNum++,this._inputSequenceNum}};var A=class extends _{_serverVideoWidth=0;_serverVideoHeight=0;_inputQueue=new F(this.getPlayer());getChannelName(){return"input"}getChannelConfig(){return{ordered:!0,protocol:"1.0"}}getServerVideoWidth(){return this._serverVideoWidth}getServerVideoHeight(){return this._serverVideoHeight}start(){let e=new y(0);e.setMetadata(navigator.maxTouchPoints>1?navigator.maxTouchPoints:1),this.send(e.toBuffer()),console.log("[InputChannel] Sent metadata:",e,e.toBuffer()),setTimeout(this.gamepadStateLoop.bind(this),16)}onMessage(e){let t=new DataView(e.data),n=t.getUint8(0);if(console.log("[InputChannel] received:",t),n===128){console.log("Received a vibration report"),t.getUint8(2);let i=t.getUint8(3),a=this.getPlayer()._channels.control.getGamepadHandler(i);if(a!==void 0){let s=t.getUint8(4)/100,o=t.getUint8(5)/100,d=t.getUint8(6)/100,u=t.getUint8(7)/100,h=t.getUint16(8,!0),g=t.getUint16(10,!0),p=t.getUint8(12),c={gamepadIndex:i,leftMotorPercent:s,rightMotorPercent:o,leftTriggerMotorPercent:d,rightTriggerMotorPercent:u,durationMs:h,delayMs:g,repeat:p};a.handleVibration(c)}else console.log("[InputChannel] Received a vibration report but no gamepad handler is available")}else n===16&&(console.log("[InputChannel] Received server video dimensions:",t.getUint32(2,!0),t.getUint32(6,!0)),this._serverVideoHeight=t.getUint32(2,!0),this._serverVideoWidth=t.getUint32(6,!0))}gamepadStateLoop(){let e=this.getPlayer()._channels.control.getGamepadHandlers(),t=[];for(let n in e)if(e[n]instanceof v){let i=e[n].getGamepadState();i!==void 0&&t.push(i)}t.length>0&&this.queueGamepadFrames(t),setTimeout(this.gamepadStateLoop.bind(this),16)}queueMetadataFrame(e){return this._inputQueue.queueMetadataFrame(e)}queueGamepadFrames(e,t=!1){this._inputQueue.queueGamepadFrames(e,t)}queueMouseFrame(e){this._inputQueue.queueMouseFrame(e)}queueKeyboardFrame(e){this._inputQueue.queueKeyboardFrame(e)}queuePointerFrame(e){this._inputQueue.queuePointerFrame(e)}destroy(){}};function Q(){return crypto.randomUUID()}var D=class{_channel;_data;constructor(e,t){this._channel=e,this._data=t,this.handle(this._data)}handle(e){switch(console.log("[MessageHandler] Handling:",e),e.target){case"/streaming/sessionLifetimeManagement/serverInitiatedDisconnect":this.completeTransaction(e.id,""),this._channel.getPlayer().destroy();break;case"/streaming/properties/titleinfo":console.log("Title update:",e);break;case"/streaming/touchcontrols/showlayoutv2":break;case"/streaming/systemUi/messages/ShowMessageDialog":this.handleMessage(e);break;default:console.log("[MessageChannel] Unhandled transaction:",e)}}completeTransaction(e,t){let n=JSON.stringify({type:"TransactionComplete",content:JSON.stringify(t),id:e,cv:""});this._channel.send(n)}cancelTransaction(e,t){let n=JSON.stringify({type:"ReceiverCancel",content:JSON.stringify(t),id:e,cv:""});this._channel.send(n)}handleMessage(e){let t=JSON.parse(e.content);console.log(t),confirm(t.TitleText+` + +`+t.ContentText)?this.completeTransaction(e.id,{Result:0}):this.completeTransaction(e.id,{Result:1})}};var M=class extends _{_handshakeCompleted=!1;getChannelName(){return"message"}getChannelConfig(){return{protocol:"messageV1",ordered:!0}}onOpen(){console.log("[MessageChannel] Sending handshake...");let e=JSON.stringify({type:"Handshake",version:"messageV1",id:"be0bfc6d-1e83-4c8a-90ed-fa8601c5a179",cv:"0"});this.send(e)}onMessage(e){let t=JSON.parse(e.data);switch(t.type){case"HandshakeAck":console.log("[MessageChannel] Handshake completed"),this._handshakeCompleted=!0,this.getPlayer()._channels.control.sendAuthorization(),this.getPlayer()._channels.input.start(),this.sendConfig();break;case"TransactionStart":case"Message":new D(this,t);break;default:console.log("[MessageChannel] Unhandled message type:",t.type,t)}}sendConfig(){let e=[],t=[0,2,0],n=JSON.stringify(this.generateMessage("/streaming/systemUi/configuration",{version:t,systemUis:e}));this.send(n);let i=JSON.stringify(this.generateMessage("/streaming/properties/clientappinstallidchanged",{clientAppInstallId:"c97d7ee0-73b2-4239-bf1d-9d805a338429"}));this.send(i);let a=JSON.stringify(this.generateMessage("/streaming/characteristics/orientationchanged",{orientation:0}));this.send(a);let s=JSON.stringify(this.generateMessage("/streaming/characteristics/touchinputenabledchanged",{touchInputEnabled:!1}));this.send(s);let o=JSON.stringify(this.generateMessage("/streaming/characteristics/clientdevicecapabilities",{}));this.send(o);let d=JSON.stringify(this.generateMessage("/streaming/characteristics/dimensionschanged",{horizontal:1920,vertical:1080,preferredWidth:1920,preferredHeight:1080,safeAreaLeft:0,safeAreaTop:0,safeAreaRight:1920,safeAreaBottom:1080,supportsCustomResolution:!0}));this.send(d)}generateMessage(e,t){return{type:"Message",content:JSON.stringify(t),id:Q(),target:e,cv:""}}destroy(){}};var E=class{_address;_ipv4Address;_ipv4Port;constructor(e){this._address=e;let t=this._address.split(":"),n=t[6]+t[7],i=t[5],a=~parseInt(n.substring(0,2),16)&255,s=~parseInt(n.substring(2,4),16)&255,o=~parseInt(n.substring(4,6),16)&255,d=~parseInt(n.substring(6,8),16)&255,u=~parseInt(i.substring(0,4),16)&65535;this._ipv4Address=a+"."+s+"."+o+"."+d,this._ipv4Port=u}getIpv4Address(){return this._ipv4Address}getIpv4Port(){return this._ipv4Port}};var R=class{_peerConnection;_iceCandidates=[];constructor(e){this._peerConnection=e._peerConnection,this._peerConnection.addEventListener("icecandidate",t=>{t.candidate&&this._iceCandidates.push(t.candidate)})}getCandidates(){return this._iceCandidates}setRemoteCandidates(e){e.length===0&&console.warn("Error: No candidates received!");for(let t in e){if(e[t].candidate==="a=end-of-candidates")continue;let n=e[t].candidate.split(" ");if(n.length>4&&n[4].substr(0,4)==="2001"){let i=new E(n[4]);this._peerConnection.addIceCandidate({candidate:"a=candidate:10 1 UDP 1 "+i.getIpv4Address()+" 9002 typ host ",sdpMLineIndex:e[t].sdpMLineIndex,sdpMid:e[t].sdpMid}),this._peerConnection.addIceCandidate({candidate:"a=candidate:11 1 UDP 1 "+i.getIpv4Address()+" "+i.getIpv4Port()+" typ host ",sdpMLineIndex:e[t].sdpMLineIndex,sdpMid:e[t].sdpMid})}this._peerConnection.addIceCandidate({candidate:e[t].candidate,sdpMid:e[t].sdpMid,sdpMLineIndex:e[t].sdpMLineIndex})}}};var I=class{_player;_peerConnection;constructor(e){this._player=e,this._peerConnection=e._peerConnection}getAvailableCodecs(){let e=RTCRtpReceiver.getCapabilities("video")?.codecs;if(e===void 0)return[];let t=[];for(let n in e)t.includes(e[n].mimeType)||t.push(e[n].mimeType);return t}setLocalSDP(e){return console.log("[SDP] setLocalSDP() Setting local SDP:",e),e.sdp=e.sdp?.replace("useinbandfec=1","useinbandfec=1; stereo=1"),e}setRemoteSDP(e){return console.log("[SDP] setRemoteSDP() Setting remote SDP:",e),e}getDefaultCodecPreferences(){let e=RTCRtpReceiver.getCapabilities("video")?.codecs;if(e===void 0)return[];let t=[],n=[],i=[],a=[];for(let o in e)e[o].mimeType.includes("H264")?e[o].sdpFmtpLine?.includes("profile-level-id=4d")?t.push(e[o]):e[o].sdpFmtpLine?.includes("profile-level-id=42e")?n.push(e[o]):e[o].sdpFmtpLine?.includes("profile-level-id=420")&&i.push(e[o]):(e[o].mimeType.includes("ulpfec")||e[o].mimeType.includes("flexfec")||e[o].mimeType.includes("VP9")||e[o].mimeType.includes("VP8"))&&a.push(e[o]);return[...t,...n,...i,...a]}_setBitrate(e,t,n){let i=e.split(` +`),a=-1;for(let o=0;o{e.forEach(t=>{t.type==="inbound-rtp"?this.readInboundRtp(t):t.type==="candidate-pair"&&t.packetsReceived!==void 0&&t.packetsReceived>0?this.readCandidatePair(t):t.type==="remote-candidate"&&this.readRemoteCandidate(t)})})}readInboundRtp(e){e.kind==="video"&&e.codecId&&e.packetsReceived!==void 0&&e.packetsReceived>0?(e.codecId.includes("profile-level-id=4d")?this._videoCodec="H264 (High)":e.codecId.includes("profile-level-id=42e")?this._videoCodec="H264 (Normal)":e.codecId.includes("profile-level-id=420")?this._videoCodec="H264 (Low)":this._videoCodec="Other ("+e.codecId+")",e.frameWidth&&(this._videoWidth=e.frameWidth),e.frameHeight&&(this._videoHeight=e.frameHeight),e.framesPerSecond&&(this._videoFps=e.framesPerSecond)):e.kind==="audio"&&e.codecId&&e.packetsReceived!==void 0&&e.packetsReceived>0&&(this._audioCodec=e.codecId)}readCandidatePair(e){this._activeRemoteCandidate=e.remoteCandidateId,this._rtt=e.currentRoundTripTime}readRemoteCandidate(e){e.id===this._activeRemoteCandidate&&(this.isPrivateIP(e.address)?this._remoteIsLocal=!0:this._remoteIsLocal=!1,this.isIpv6(e.address)?this._remoteIsIpv6=!0:this._remoteIsIpv6=!1,this._remoteHost=e.address,this._remotePort=e.port)}isPrivateIP(e){let t=e.split(".");return t[0]==="10"||t[0]==="172"&&parseInt(t[1],10)>=16&&parseInt(t[1],10)<=31||t[0]==="192"&&t[1]==="168"}isIpv6(e){return e.split(":").length>3}};var G=class{_player;_videoComponent;_overlays={debug:void 0};constructor(e,t){this._videoComponent=e,this._player=t}toggleDebug(){this._overlays.debug===void 0?this.createDebugOverlay():this.destroy()}createDebugOverlay(){this._overlays.debug=document.createElement("div"),this._overlays.debug.id="playerDebugOverlay",this._overlays.debug.style.position="absolute",this._overlays.debug.style.top="0",this._overlays.debug.style.left="0",this._overlays.debug.style.width=this._videoComponent.getElement()?.style.width||"100%",this._overlays.debug.style.height=this._videoComponent.getElement()?.style.height||"auto",this._overlays.debug.style.background="linear-gradient(0deg, rgba(0,0,0, 0) 0%, rgba(0,0,0, 0) 75%, rgba(0,0,0, 0.5) 100%)",this._overlays.debug.style.padding="10px",this._overlays.debug.style.pointerEvents="none",document.getElementById(this._player.getElementId())?.appendChild(this._overlays.debug),setTimeout(()=>{this.refreshDebugOverlay()},500),this.refreshDebugOverlay()}destroy(){this._overlays.debug?.remove(),this._overlays.debug=void 0}refreshDebugOverlay(){if(this._overlays.debug!==void 0){this._overlays.debug.innerHTML="",this._overlays.debug.appendChild(this.createLabel("Local Play",this._player.getStats()._remoteIsLocal?"Local":"Remote","ok")),this._overlays.debug.appendChild(this.createLabel("Resolution",this._player.getStats()._videoWidth+"x"+this._player.getStats()._videoHeight,"ok")),this._overlays.debug.appendChild(this.createLabel("Stream FPS",this._player.getStats()._videoFps.toString(),this._player.getStats()._videoFps>=58?"ok":"warning"));let e=this._videoComponent.getFrameStats?.();e&&(this._overlays.debug.appendChild(this.createLabel("Render FPS",e.renderingFps.toString(),e.renderingFps>=58?"ok":"warning")),this._overlays.debug.appendChild(this.createLabel("Render Delay",e.renderDelayMs.toString()+" ms",e.renderDelayMs<16?"ok":e.renderDelayMs<33?"warning":"error")),this._overlays.debug.appendChild(this.createLabel("Dropped Frames",e.droppedFrames.toString(),e.droppedFrames===0?"ok":e.droppedFrames<30?"warning":"error"))),this._overlays.debug.appendChild(this.createLabel("Connection",this._player.getStats()._remoteIsIpv6?"IPv6":"IPv4","ok")),this._overlays.debug.appendChild(this.createLabel("Video",this._player.getStats()._videoCodec,"ok"));let t=this._player.getStats()._rtt*1e3>75?"error":this._player.getStats()._rtt*1e3>40?"warning":"ok";this._overlays.debug.appendChild(this.createLabel("RTT",(this._player.getStats()._rtt*1e3).toString()+" ms",t)),setTimeout(()=>{this.refreshDebugOverlay()},500)}}createLabel(e,t="",n=""){let i={borderRadius:"5px",background:"linear-gradient(0deg, rgba(28,26,26,1) 0%, rgba(47,45,45,1) 100%)",padding:"10px",fontSize:"12px",marginTop:"3px",marginRight:"10px",marginBottom:"2px",textTransform:"uppercase",color:"white",display:"inline-block"},a=document.createElement("span"),s={error:"rgb(220, 53, 69)",warning:"rgb(255, 193, 7)",ok:"rgb(25, 135, 84)"};t!==""?a.innerHTML=`${e}: ${t}`:a.innerText=e;for(let o in i)a.style[o]=i[o];return a}};var L=class{_player;_element;_overlay;constructor(e){this._player=e,this._overlay=new G(this,this._player)}create(e){let t=document.createElement("video");t.srcObject=e,t.autoplay=!0,t.muted=!0,t.playsInline=!0,t.style.width="100%",t.style.height="100%",t.style.objectFit="contain",t.style.backgroundColor="black",t.style.touchAction="none",t.poster="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7";let n=document.getElementById(this._player.getElementId());if(n===null)return;this._element=t,n.appendChild(this._element),getComputedStyle(n).position==="static"===!0&&(n.style.position="relative"),this._element.requestVideoFrameCallback(this.processVideoMetadata.bind(this))}processVideoMetadata(e,t){this._element!==void 0&&(this._element.requestVideoFrameCallback(this.processVideoMetadata.bind(this)),this._player._channels.input.queueMetadataFrame({serverDataKey:t.rtpTimestamp,firstFramePacketArrivalTimeMs:t.receiveTime,frameSubmittedTimeMs:t.receiveTime,frameDecodedTimeMs:t.expectedDisplayTime,frameRenderedTimeMs:t.expectedDisplayTime}))}getElement(){return this._element}toggleDebugOverlay(){this._overlay.toggleDebug()}destroy(){let t=document.getElementById(this._player.getElementId())?.querySelector("video");this._overlay!==void 0&&this._overlay.destroy(),t&&t.remove()}};var N=class{_player;_element;constructor(e){this._player=e}create(e){let t=document.createElement("audio");t.srcObject=e,t.autoplay=!0,t.muted=!1,this._element=t;let n=document.getElementById(this._player.getElementId());n!==null&&n.appendChild(this._element)}getElement(){return this._element}destroy(){let t=document.getElementById(this._player.getElementId())?.querySelector("audio");t&&t.remove()}};var U=class{_peerConnection=new RTCPeerConnection({});_channels={chat:new S(this),control:new w(this),input:new A(this),message:new M(this)};_elementId;_isDestoyed=!1;_iceHelper=new R(this);_sdpHelper=new I(this);_statsHelper=new P(this);_videoComponent;_audioComponent;constructor(e){console.log("xCloudPlayer constructing..."),this._elementId=e,this._peerConnection.addTransceiver("audio",{direction:"sendrecv"}),this._peerConnection.addTransceiver("video",{direction:"recvonly"}).setCodecPreferences(this._sdpHelper.getDefaultCodecPreferences()),this._peerConnection.ontrack=n=>{n.track.kind==="video"?(this._videoComponent=new L(this),this._videoComponent.create(n.streams[0])):n.track.kind==="audio"?(this._audioComponent=new N(this),this._audioComponent.create(n.streams[0])):console.log("[xPlayer] Detected an unknown stream type: ",n.track.kind)},console.log("xCloudPlayer constructed.")}init(){console.log("xCloudPlayer init called.")}getElementId(){return this._elementId}async createOffer(){let e=await this._peerConnection.createOffer({offerToReceiveAudio:!0,offerToReceiveVideo:!0}),t=this._sdpHelper.setLocalSDP(e);return this._peerConnection.setLocalDescription(t),t}async setRemoteSDP(e){let t=this._sdpHelper.setRemoteSDP(e);return await this._peerConnection.setRemoteDescription({type:"answer",sdp:t})}async getICECandidates(){return this._iceHelper.getCandidates()}async setRemoteIceCandidates(e){this._iceHelper.setRemoteCandidates(e)}getVideoElement(){if(this._videoComponent)return this._videoComponent.getElement()}getAudioElement(){if(this._audioComponent)return this._audioComponent.getElement()}toggleDebugOverlay(){this._videoComponent&&this._videoComponent.toggleDebugOverlay()}getStats(){return this._statsHelper}destroy(){if(this._isDestoyed===!1){this._peerConnection.close(),this._peerConnection.onconnectionstatechange&&this._peerConnection.onconnectionstatechange(new Event("connectionstatechanged"));for(let e in this._channels)this._channels[e].destroy();this._videoComponent&&this._videoComponent.destroy(),this._audioComponent&&this._audioComponent.destroy(),this._isDestoyed=!0}else console.log("Cannot destroy because the player is already destroyed.")}};function X(r){return r.brightness!==0||r.contrast!==0||Math.abs(r.gamma-1)>.001||r.saturation!==100||r.sharpen>0||r.deband>0||r.fxaa||r.toon||r.crt||r.ntsc||r.maxFps>0}var J=`#version 300 es +in vec2 position; +out vec2 vUV; +void main() { vUV = position * 0.5 + 0.5; gl_Position = vec4(position, 0.0, 1.0); }`,j=`attribute vec2 position; +varying vec2 vUV; +void main() { vUV = position * 0.5 + 0.5; gl_Position = vec4(position, 0.0, 1.0); }`,Z=`#version 300 es +precision mediump float; +uniform sampler2D screenTexture; +uniform vec2 resolution; +uniform int filterId; +uniform float sharpenFactor; +uniform float brightness; +uniform float contrast; +uniform float gamma; +uniform float saturation; +uniform float deband; +out vec4 fragColor; +const float CAS_CONTRAST_PEAK = 0.8 * -3.0 + 8.0; + +vec3 sharpen(vec2 coord, vec3 e) { + vec2 px = 1.0 / resolution; + vec3 b = texture(screenTexture, coord + px * vec2(0, 1)).rgb; + vec3 d = texture(screenTexture, coord + px * vec2(-1, 0)).rgb; + vec3 f = texture(screenTexture, coord + px * vec2(1, 0)).rgb; + vec3 h = texture(screenTexture, coord + px * vec2(0, -1)).rgb; + vec3 a = texture(screenTexture, coord + px * vec2(-1, 1)).rgb; + vec3 c = texture(screenTexture, coord + px * vec2(1, 1)).rgb; + vec3 g = texture(screenTexture, coord + px * vec2(-1, -1)).rgb; + vec3 i = texture(screenTexture, coord + px * vec2(1, -1)).rgb; + if (filterId == 1) { + vec3 blur = ((a + c + g + i) + (b + d + f + h) * 2.0 + e * 4.0) / 16.0; + return e + (e - blur) * sharpenFactor / 3.0; + } + vec3 minRgb = min(min(min(d, e), min(f, b)), h) + min(min(a, c), min(g, i)); + vec3 maxRgb = max(max(max(d, e), max(f, b)), h) + max(max(a, c), max(g, i)); + vec3 amplify = inversesqrt(clamp(min(minRgb, 2.0 - maxRgb) / maxRgb, 0.0, 1.0)); + vec3 weight = -(1.0 / (amplify * CAS_CONTRAST_PEAK)); + vec3 outColor = clamp(((b + d + f + h) * weight + e) / (4.0 * weight + 1.0), 0.0, 1.0); + return mix(e, outColor, sharpenFactor / 2.0); +} + +float ign(vec2 p) { return fract(52.9829189 * fract(dot(p, vec2(0.06711056, 0.00583715)))); } + +void main() { + vec2 uv = gl_FragCoord.xy / resolution; + vec3 color = texture(screenTexture, uv).rgb; + if (sharpenFactor > 0.0) color = sharpen(uv, color); + color = clamp(color + brightness, 0.0, 1.0); + color = (color - 0.5) * clamp(contrast + 1.0, 0.5, 2.0) + 0.5; + color = mix(vec3(dot(color, vec3(0.2126, 0.7152, 0.0722))), color, saturation); + color = pow(max(color, 0.0), vec3(1.0 / gamma)); + if (deband > 0.0) color += vec3(((ign(gl_FragCoord.xy) + ign(gl_FragCoord.xy + vec2(11.0, 17.0))) - 1.0) * (deband / 255.0)); + fragColor = vec4(color, 1.0); +}`,ee=`precision highp float; +#define FXAA_MIN_REDUCE (1.0 / 128.0) +#define FXAA_MUL_REDUCE (1.0 / 8.0) +#define MAX_SPAN 8.0 +uniform sampler2D screenTexture; +uniform vec2 resolution; +const vec3 luma = vec3(0.299, 0.587, 0.114); +void main() { + vec2 invResolution = 1.0 / resolution; + vec3 rgbNW = texture2D(screenTexture, (gl_FragCoord.xy + vec2(-1.0, -1.0)) * invResolution).rgb; + vec3 rgbNE = texture2D(screenTexture, (gl_FragCoord.xy + vec2( 1.0, -1.0)) * invResolution).rgb; + vec3 rgbSW = texture2D(screenTexture, (gl_FragCoord.xy + vec2(-1.0, 1.0)) * invResolution).rgb; + vec3 rgbSE = texture2D(screenTexture, (gl_FragCoord.xy + vec2( 1.0, 1.0)) * invResolution).rgb; + vec3 rgbM = texture2D(screenTexture, gl_FragCoord.xy * invResolution).rgb; + float lumaNW = dot(rgbNW, luma); + float lumaNE = dot(rgbNE, luma); + float lumaSW = dot(rgbSW, luma); + float lumaSE = dot(rgbSE, luma); + float lumaM = dot(rgbM, luma); + float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE))); + float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE))); + vec2 dir; + dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE)); + dir.y = ((lumaNW + lumaSW) - (lumaNE + lumaSE)); + float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) * 0.25 * FXAA_MUL_REDUCE, FXAA_MIN_REDUCE); + float minDirFactor = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce); + dir = clamp(dir * minDirFactor, vec2(-MAX_SPAN), vec2(MAX_SPAN)) * invResolution; + vec4 rgbA = 0.5 * ( + texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * (1.0 / 3.0 - 0.5)) + + texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * (2.0 / 3.0 - 0.5))); + vec4 rgbB = rgbA * 0.5 + 0.25 * ( + texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * -0.5) + + texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * 0.5)); + float lumaB = dot(rgbB, vec4(luma, 0.0)); + gl_FragColor = lumaB < lumaMin || lumaB > lumaMax ? rgbA : rgbB; +}`,te=`precision highp float; +uniform sampler2D screenTexture; +uniform vec2 resolution; +void main() { + vec2 uv = gl_FragCoord.xy / resolution; + float edgeThreshold = 0.2; + vec2 offset = vec2(1.0) / resolution; + vec3 colorCenter = texture2D(screenTexture, uv).rgb; + vec3 colorLeft = texture2D(screenTexture, uv - vec2(offset.x, 0.0)).rgb; + vec3 colorRight = texture2D(screenTexture, uv + vec2(offset.x, 0.0)).rgb; + vec3 colorUp = texture2D(screenTexture, uv - vec2(0.0, offset.y)).rgb; + vec3 colorDown = texture2D(screenTexture, uv + vec2(0.0, offset.y)).rgb; + float diffHorizontal = length(colorRight - colorLeft); + float diffVertical = length(colorUp - colorDown); + float edgeFactor = step(edgeThreshold, diffHorizontal + diffVertical); + vec3 outlineColor = mix(colorCenter, vec3(0.0), edgeFactor); + gl_FragColor = vec4(outlineColor, 1.0); +}`,ne=`precision highp float; +#define CA_AMOUNT 1.0025 +#define SCANLINE_INTENSITY_X 0.125 +#define SCANLINE_INTENSITY_Y 0.375 +#define SCANLINE_SIZE 1024.0 +uniform sampler2D screenTexture; +varying vec2 vUV; +void main() { + vec4 finalColor = texture2D(screenTexture, vUV); + finalColor.rgb = vec3( + texture2D(screenTexture, (vUV - 0.5) * CA_AMOUNT + 0.5).r, + finalColor.g, + texture2D(screenTexture, (vUV - 0.5) / CA_AMOUNT + 0.5).b + ); + float scanlineX = abs(sin(vUV.x * SCANLINE_SIZE) * 0.5 * SCANLINE_INTENSITY_X); + float scanlineY = abs(sin(vUV.y * SCANLINE_SIZE) * 0.5 * SCANLINE_INTENSITY_Y); + gl_FragColor = vec4(mix(finalColor.rgb, vec3(0.0), scanlineX + scanlineY), finalColor.a); +}`,ie=`precision highp float; +#define PI 3.14159265 +#define SCANLINE_INTENSITY 0.35 +#define CHROMA_OFFSET 0.005 +#define BLUR_RADIUS 0.002 +#define WARP_AMOUNT 0.01 +#define SCANLINE_DARKEN 0.5 +uniform sampler2D screenTexture; +uniform int FrameCount; +uniform vec2 TextureSize; +uniform vec2 resolution; +varying vec2 vUV; +const mat3 yiq_mat = mat3( + 0.299, 0.587, 0.114, + 0.596, -0.275, -0.321, + 0.212, -0.523, 0.311 +); +const mat3 yiq2rgb_mat = mat3( + 1.0, 0.956, 0.621, + 1.0, -0.272, -0.647, + 1.0, -1.106, 1.705 +); +vec3 applyNTSC(vec2 uv) { + vec3 col = texture2D(screenTexture, uv).rgb; + vec3 yiq = col * yiq_mat; + float chromaPhase = PI * (mod(uv.y * TextureSize.y, 2.0) + float(FrameCount)); + yiq.y *= cos(chromaPhase * 0.5); + yiq.z *= sin(chromaPhase * 0.5); + vec3 rgb = yiq * yiq2rgb_mat; + vec3 finalColor; + finalColor.r = texture2D(screenTexture, uv + vec2(CHROMA_OFFSET, 0.0)).r; + finalColor.g = texture2D(screenTexture, uv + vec2(0.0, BLUR_RADIUS)).g; + finalColor.b = texture2D(screenTexture, uv - vec2(CHROMA_OFFSET, 0.0)).b; + return finalColor; +} +vec3 applyScanlines(vec2 uv) { + vec3 col = texture2D(screenTexture, uv).rgb; + float scanline = abs(sin(uv.y * resolution.y * 2.0)) * SCANLINE_INTENSITY; + col *= 1.0 - (scanline * SCANLINE_DARKEN); + return col; +} +vec2 applyWarp(vec2 uv) { + uv = uv * 2.0 - 1.0; + float r = sqrt(uv.x * uv.x + uv.y * uv.y); + uv += uv * (r * r) * WARP_AMOUNT; + return uv * 0.5 + 0.5; +} +void main() { + vec2 warpedUV = applyWarp(vUV); + vec3 ntscColor = applyNTSC(warpedUV); + vec3 scanlineColor = applyScanlines(warpedUV); + vec3 finalColor = mix(ntscColor, scanlineColor, 0.7); + gl_FragColor = vec4(finalColor, 1.0); +}`,H=class{constructor(e,t){this.video=e;this.effects=t;this.canvas=document.createElement("canvas"),Object.assign(this.canvas.style,{position:"absolute",inset:"0",width:"100%",height:"100%",objectFit:"contain",zIndex:"1"}),e.parentElement?.appendChild(this.canvas);let n=this.canvas.getContext("webgl2",{alpha:!1,antialias:!1,depth:!1,desynchronized:!0,powerPreference:"high-performance"});if(n===null)throw new Error("WebGL2 unavailable");this.gl=n;let i=n.createBuffer();n.bindBuffer(n.ARRAY_BUFFER,i),n.bufferData(n.ARRAY_BUFFER,new Float32Array([-1,-1,3,-1,-1,3]),n.STATIC_DRAW),this.passes.set("base",this.compile(J,Z,["screenTexture","resolution","filterId","sharpenFactor","brightness","contrast","gamma","saturation","deband"])),this.videoTexture=this.texture(),this.schedule()}canvas;gl;passes=new Map;videoTexture;targets=[];width=0;height=0;frame=0;lastDraw=0;stopped=!1;idle=!1;pending=!1;update(e){this.effects=e}pause(){this.idle||this.stopped||(this.idle=!0,this.canvas.style.display="none")}resume(e){this.effects=e,!(!this.idle||this.stopped)&&(this.idle=!1,this.canvas.style.display="",this.schedule())}schedule(){this.pending||(this.pending=!0,this.video.requestVideoFrameCallback(this.onFrame))}compile(e,t,n){let i=this.gl,a=(o,d)=>{let u=i.createShader(o);if(i.shaderSource(u,d),i.compileShader(u),!i.getShaderParameter(u,i.COMPILE_STATUS))throw new Error(`shader: ${i.getShaderInfoLog(u)}`);return u},s=i.createProgram();if(i.attachShader(s,a(i.VERTEX_SHADER,e)),i.attachShader(s,a(i.FRAGMENT_SHADER,t)),i.bindAttribLocation(s,0,"position"),i.linkProgram(s),!i.getProgramParameter(s,i.LINK_STATUS))throw new Error(`program: ${i.getProgramInfoLog(s)}`);return{program:s,uniforms:new Map(n.map(o=>[o,i.getUniformLocation(s,o)]))}}extra(e){let t=this.passes.get(e);if(t===void 0){let n={fxaa:ee,toon:te,crt:ne,ntsc:ie}[e];t=this.compile(j,n,["screenTexture","resolution","TextureSize","FrameCount"]),this.passes.set(e,t)}return t}texture(){let e=this.gl,t=e.createTexture();return e.bindTexture(e.TEXTURE_2D,t),e.texParameteri(e.TEXTURE_2D,e.TEXTURE_MIN_FILTER,e.LINEAR),e.texParameteri(e.TEXTURE_2D,e.TEXTURE_MAG_FILTER,e.LINEAR),e.texParameteri(e.TEXTURE_2D,e.TEXTURE_WRAP_S,e.CLAMP_TO_EDGE),e.texParameteri(e.TEXTURE_2D,e.TEXTURE_WRAP_T,e.CLAMP_TO_EDGE),t}resize(e,t){let n=this.gl;this.width=e,this.height=t,this.canvas.width=e,this.canvas.height=t;for(let i of this.targets)n.deleteFramebuffer(i.framebuffer),n.deleteTexture(i.texture);this.targets=[0,1].map(()=>{let i=this.texture();n.texImage2D(n.TEXTURE_2D,0,n.RGBA,e,t,0,n.RGBA,n.UNSIGNED_BYTE,null);let a=n.createFramebuffer();return n.bindFramebuffer(n.FRAMEBUFFER,a),n.framebufferTexture2D(n.FRAMEBUFFER,n.COLOR_ATTACHMENT0,n.TEXTURE_2D,i,0),{framebuffer:a,texture:i}}),n.bindFramebuffer(n.FRAMEBUFFER,null)}onFrame=e=>{if(this.pending=!1,this.stopped||this.idle)return;this.schedule();let t=this.effects.maxFps;if(!(t>0&&e-this.lastDraw<1e3/t-2)){this.lastDraw=e;try{this.draw()}catch(n){window.DDCloud?.log(`effects: ${String(n).slice(0,200)}`),this.destroy()}}};draw(){let e=this.gl,t=this.effects,n=this.video.videoWidth,i=this.video.videoHeight;if(n===0||i===0)return;(n!==this.width||i!==this.height)&&this.resize(n,i),this.frame++,e.activeTexture(e.TEXTURE0),e.bindTexture(e.TEXTURE_2D,this.videoTexture),e.pixelStorei(e.UNPACK_FLIP_Y_WEBGL,!0),e.texImage2D(e.TEXTURE_2D,0,e.RGBA,e.RGBA,e.UNSIGNED_BYTE,this.video);let a=["fxaa","toon","crt","ntsc"].filter(d=>t[d]);e.viewport(0,0,n,i),e.enableVertexAttribArray(0),e.vertexAttribPointer(0,2,e.FLOAT,!1,0,0);let s=this.passes.get("base");e.bindFramebuffer(e.FRAMEBUFFER,a.length>0?this.targets[0].framebuffer:null),e.useProgram(s.program);let o=s.uniforms;e.uniform1i(o.get("screenTexture"),0),e.uniform2f(o.get("resolution"),n,i),e.uniform1i(o.get("filterId"),t.sharpenMode==="usm"?1:2),e.uniform1f(o.get("sharpenFactor"),t.sharpen),e.uniform1f(o.get("brightness"),t.brightness/100),e.uniform1f(o.get("contrast"),t.contrast/100),e.uniform1f(o.get("gamma"),Math.min(5,Math.max(.1,t.gamma))),e.uniform1f(o.get("saturation"),t.saturation/100),e.uniform1f(o.get("deband"),t.deband),e.drawArrays(e.TRIANGLES,0,3),a.forEach((d,u)=>{let h=this.extra(d),g=this.targets[u%2],p=u===a.length-1;e.bindFramebuffer(e.FRAMEBUFFER,p?null:this.targets[(u+1)%2].framebuffer),e.useProgram(h.program),e.bindTexture(e.TEXTURE_2D,g.texture);let c=h.uniforms;e.uniform1i(c.get("screenTexture")??null,0),e.uniform2f(c.get("resolution")??null,n,i),e.uniform2f(c.get("TextureSize")??null,n,i),e.uniform1i(c.get("FrameCount")??null,this.frame),e.drawArrays(e.TRIANGLES,0,3)})}destroy(){this.stopped=!0,this.canvas.remove(),this.gl.getExtension("WEBGL_lose_context")?.loseContext()}};var V=class{constructor(e){this.pc=e;this.element=document.createElement("div"),Object.assign(this.element.style,{position:"absolute",top:"8px",right:"8px",zIndex:"3",padding:"4px 8px",borderRadius:"6px",background:"rgba(0,0,0,0.55)",color:"#e8e8e8",font:"12px monospace",lineHeight:"16px",pointerEvents:"none",display:"none",whiteSpace:"pre",textAlign:"right"}),document.body.appendChild(this.element)}element;timer;level=0;vertical=!1;left=!1;server="";last={bytes:0,time:0,decode:0,frames:0,lost:0,received:0};show(e,t,n,i=!1){this.level=e,this.vertical=t,this.server=n,this.left=i,Object.assign(this.element.style,i?{left:"8px",right:"",textAlign:"left"}:{left:"",right:"8px",textAlign:"right"}),this.element.style.display=e>0?"block":"none",e>0&&this.timer===void 0&&(this.timer=setInterval(()=>this.update(),1e3),this.update()),e===0&&this.timer!==void 0&&(clearInterval(this.timer),this.timer=void 0)}async update(){let e=await this.pc.getStats(),t,n,i=new Map;if(e.forEach(c=>{c.type==="inbound-rtp"&&c.kind==="video"?t=c:c.type==="candidate-pair"&&c.state==="succeeded"&&c.nominated?n=c:c.type==="codec"&&i.set(c.id,c)}),t===void 0)return;let a=this.last.time>0?(t.timestamp-this.last.time)/1e3:0,s=a>0?(t.bytesReceived-this.last.bytes)*8/a/1e6:0,o=(t.framesDecoded??0)-this.last.frames,d=o>0?((t.totalDecodeTime??0)-this.last.decode)*1e3/o:0,u=(t.packetsLost??0)-this.last.lost,h=(t.packetsReceived??0)-this.last.received,g=u+h>0?u*100/(u+h):0;this.last={bytes:t.bytesReceived,time:t.timestamp,decode:t.totalDecodeTime??0,frames:t.framesDecoded??0,lost:t.packetsLost??0,received:t.packetsReceived??0};let p=["web",`${Math.round(t.framesPerSecond??0)} fps`];if(this.level>=2&&(n?.currentRoundTripTime!==void 0&&p.push(`ping ${Math.round(n.currentRoundTripTime*1e3)} ms`),p.push(`${t.frameWidth??"?"}x${t.frameHeight??"?"}`)),this.level>=3&&p.push(`${s.toFixed(1)} Mb/s`,`decode ${d.toFixed(1)} ms`,`loss ${g.toFixed(1)}%`),this.level>=4){let c=i.get(t.codecId);c&&p.push(String(c.mimeType??"").replace("video/","")),p.push(`jitter ${Math.round((t.jitter??0)*1e3)} ms`,`dropped ${t.framesDropped??0}`),this.server&&p.push(this.server)}this.element.textContent=p.join(this.vertical?` +`:" \xB7 ")}destroy(){this.show(0,this.vertical,this.server,this.left),this.element.remove()}};function z(r,e){let t=e==="high"?"4d":e==="low"?"420":"42e",n=[];for(let d of r.matchAll(/a=fmtp:(\d+).*profile-level-id=([0-9a-f]{6})/g))d[2].startsWith(t)&&n.push(d[1]);if(n.length===0)return r;let i=r.split(`\r +`),a=i.findIndex(d=>d.startsWith("m=video"));if(a<0)return r;let s=i[a].trim().split(" "),o=s.slice(3).filter(d=>!n.includes(d));return i[a]=s.slice(0,3).concat(n,o).join(" "),i.join(`\r +`)}function K(r,e){let t=r.split(`\r +`),n=t.findIndex(a=>a.startsWith("m=video"));if(n<0)return r;let i=`b=AS:${e}`;for(let a=n+1;a<=t.length;a++){let s=t[a];if(s===void 0||s.startsWith("m=")){t.splice(a,0,i);break}if(!(s.startsWith("i=")||s.startsWith("c="))){if(s.startsWith("b=AS:")){t[a]=i;break}t.splice(a,0,i);break}}return t.join(`\r +`)}var m=JSON.parse(DDCloud.settings()),ae=RTCPeerConnection.prototype.setLocalDescription;RTCPeerConnection.prototype.setLocalDescription=function(r){return r?.sdp&&((m.codec==="high"||m.codec==="normal"||m.codec==="low")&&(r.sdp=z(r.sdp,m.codec)),m.bitrateMbps>0&&(r.sdp=K(r.sdp,m.bitrateMbps*1e3))),ae.call(this,r)};window.__ddRumble=m.rumble/100;window.addEventListener("error",r=>DDCloud.log(`error: ${r.message} @${r.lineno}`));window.addEventListener("unhandledrejection",r=>DDCloud.log(`rejection: ${String(r.reason).slice(0,200)}`));window.addEventListener("gamepadconnected",r=>DDCloud.log(`controller: ${r.gamepad.id.slice(0,60)} mapping=${r.gamepad.mapping||"none"} buttons=${r.gamepad.buttons.length} axes=${r.gamepad.axes.length}`));var W=new Map,re=1;window.__ddResolve=(r,e,t)=>{let n=W.get(r);W.delete(r),n&&n({status:e,body:t})};function C(r,e=""){return new Promise(t=>{let n=re++;W.set(n,t),DDCloud.call(n,r,typeof e=="string"?e:JSON.stringify(e))})}var B=r=>new Promise(e=>setTimeout(e,r)),se=r=>r.status>=200&&r.status<300;function x(r){let e=document.getElementById("status");e&&(e.textContent=r),DDCloud.status(r)}var T=class extends Error{constructor(t,n){super(t);this.stage=t;this.detail=n}};function k(r,e){if(!se(e))throw new T(r,`${e.status} ${e.body.slice(0,300)}`);return e}function oe(r,e){return new Promise(t=>{if(r.iceGatheringState==="complete")return t();let n=setTimeout(t,e);r.addEventListener("icegatheringstatechange",()=>{r.iceGatheringState==="complete"&&(clearTimeout(n),t())})})}async function de(){x("Starting the game on Xbox Cloud Gaming\u2026"),k("start",await C("start"));let r=!1,e=0;for(;;){let l=k("state",await C("state")),f=JSON.parse(l.body||"{}");if(f.state==="Provisioned")break;if(f.state==="Failed")throw new T("provision",JSON.stringify(f.errorDetails??{}).slice(0,300));f.state==="ReadyToConnect"&&!r?(r=!0,x("Signing in to the cloud console\u2026"),k("connect",await C("connect"))):f.state==="WaitingForResources"?x(`In the queue for a cloud console\u2026 ${Math.round(e/1e3)} s`):x(`Getting a cloud console ready\u2026 ${Math.round(e/1e3)} s`),await B(1e3),e+=1e3}x("Connecting\u2026");let t=new U("player");t.init();let n=t._peerConnection,i=t._channels.input,a=i.queueMetadataFrame.bind(i);i.queueMetadataFrame=l=>{if(m.preventDrops){let f=l.frameRenderedTimeMs-l.frameDecodedTimeMs;l.frameDecodedTimeMs=l.frameSubmittedTimeMs+10,l.frameRenderedTimeMs=l.frameDecodedTimeMs+f}a(l)};let s,o,d=()=>{if(!(o===void 0||s===void 0&&m.volume===100)){if(s===void 0){let l=new AudioContext;s=l.createGain(),l.createMediaStreamSource(o).connect(s).connect(l.destination);let f=document.querySelector("#player audio");f&&(f.muted=!0)}s.gain.value=m.volume/100}};n.addEventListener("track",l=>{l.track.kind==="audio"&&(o=l.streams[0],d())});let u=new V(n),h,g=()=>{let l=t.getVideoElement();if(l!==void 0){if(!X(m)){h?.pause();return}if(h===void 0)try{h=new H(l,m)}catch(f){DDCloud.log(`effects unavailable: ${String(f).slice(0,200)}`)}else h.resume(m)}};window.__ddApply=l=>{m=JSON.parse(l),window.__ddRumble=m.rumble/100,u.show(m.statsLevel,m.statsLayout==="vertical",m.server,m.statsCorner==="left"),d(),g()},n.addEventListener("connectionstatechange",()=>{n.connectionState==="connected"?(x(""),DDCloud.playing(),u.show(m.statsLevel,m.statsLayout==="vertical",m.server,m.statsCorner==="left"),setTimeout(g,500)):n.connectionState==="failed"?DDCloud.failed("webrtc","connection failed"):n.connectionState==="disconnected"&&x("Connection lost\u2026")});let p=await t.createOffer(),c=k("sdp",await C("sdp",p.sdp??"")),O=JSON.parse(JSON.parse(c.body).exchangeResponse);if(O.status&&O.status!=="success")throw new T("sdp-answer",JSON.stringify(O).slice(0,300));await t.setRemoteSDP(O.sdp),await oe(n,3e3);let Y=(await t.getICECandidates()).map(l=>JSON.stringify({candidate:l.candidate,sdpMid:l.sdpMid,sdpMLineIndex:l.sdpMLineIndex,usernameFragment:l.usernameFragment})),$=k("ice",await C("ice",Y));t.setRemoteIceCandidates(JSON.parse(JSON.parse($.body).exchangeResponse));let q=Date.now();for(;!t._channels.message._handshakeCompleted&&Date.now()-q<2e4;)await B(100);DDCloud.log(`handshake ${t._channels.message._handshakeCompleted?"done":"missing"} after ${Date.now()-q} ms`),await B(300);let b=new v(0,{enable_keyboard:!1});b.attach(t),DDCloud.log(`controllers at attach: ${Array.from(navigator.getGamepads()).filter(Boolean).length}`),window.__ddNexus=()=>{b.sendButtonState("Nexus",1),setTimeout(()=>b.sendButtonState("Nexus",0),200)},window.__ddButton=(l,f)=>b.sendButtonState(l,f),window.__ddInput=l=>{l?b.onWindowFocus():b.onWindowBlur()},setInterval(()=>{C("keepalive")},3e4),window.__ddStop=()=>{try{h?.destroy(),u.destroy(),b.detach(),t.destroy()}catch{}}}de().catch(r=>{r instanceof T?DDCloud.failed(r.stage,r.detail):DDCloud.failed("page",String(r).slice(0,300))});})(); diff --git a/app/src/main/cpp/waylandcomp/CMakeLists.txt b/app/src/main/cpp/waylandcomp/CMakeLists.txt index f8eb312910..c2bfc86434 100644 --- a/app/src/main/cpp/waylandcomp/CMakeLists.txt +++ b/app/src/main/cpp/waylandcomp/CMakeLists.txt @@ -95,4 +95,5 @@ target_link_libraries(droiddeckwayland dl log android + nativewindow ) diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 1be637a7bb..562a83a750 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include "xdg-shell-server-protocol.h" @@ -1845,7 +1846,121 @@ static void hdr_count_copied(const struct draw_list *dl, const char *reason) { } } +/* + * Stream mode (the Xbox Cloud Gaming native player, in its own process): no Wayland clients, the scene is one + * picture handed over as AHardwareBuffers (ImageReader images of the decoded video). Each buffer is imported once + * and kept while the reader cycles through its few buffers; the newest frame is the scene, so the screen effects + * and frame generation apply to it as to a game. + */ +#define STREAM_SLOTS 6 +static pthread_mutex_t g_stream_lock = PTHREAD_MUTEX_INITIALIZER; +static atomic_int g_stream_on; +static AHardwareBuffer *g_stream_pending; +static struct { AHardwareBuffer *ahb; struct vkp_image *img; uint64_t used; } g_stream_slots[STREAM_SLOTS]; +static struct vkp_image *g_stream_img; +static uint64_t g_stream_seq; +static atomic_uint g_stream_frames; + +static void stream_forget_all(void) { + vkp_wait_idle(); + for (int i = 0; i < STREAM_SLOTS; i++) { + if (g_stream_slots[i].img) vkp_image_destroy(g_stream_slots[i].img); + if (g_stream_slots[i].ahb) AHardwareBuffer_release(g_stream_slots[i].ahb); + g_stream_slots[i].img = NULL; g_stream_slots[i].ahb = NULL; g_stream_slots[i].used = 0; + } + g_stream_img = NULL; +} + +/* Compositor thread: the newest handed-over buffer becomes the scene picture. */ +static void stream_take(void) { + pthread_mutex_lock(&g_stream_lock); + AHardwareBuffer *ahb = g_stream_pending; + g_stream_pending = NULL; + pthread_mutex_unlock(&g_stream_lock); + if (!ahb) return; + if (!atomic_load(&g_stream_on)) { AHardwareBuffer_release(ahb); return; } + int slot = -1, oldest = 0; + for (int i = 0; i < STREAM_SLOTS; i++) { + if (g_stream_slots[i].ahb == ahb) { slot = i; break; } + if (g_stream_slots[i].used < g_stream_slots[oldest].used) oldest = i; + } + if (slot >= 0) { + AHardwareBuffer_release(ahb); /* the slot keeps its own reference */ + } else { + struct vkp_image *img = vkp_image_from_ahb(ahb); + if (!img) { + static int said; + if (!said) { said = 1; droiddeck_log("stream", "a decoded frame could not be imported: nothing to show"); } + AHardwareBuffer_release(ahb); + return; + } + droiddeck_log("stream", "decoded frame buffer imported (%dx%d)", vkp_image_width(img), vkp_image_height(img)); + slot = oldest; + if (g_stream_slots[slot].img) { + vkp_wait_idle(); /* the GPU may still read the picture being replaced */ + if (g_stream_img == g_stream_slots[slot].img) g_stream_img = NULL; + vkp_image_destroy(g_stream_slots[slot].img); + } + if (g_stream_slots[slot].ahb) AHardwareBuffer_release(g_stream_slots[slot].ahb); + g_stream_slots[slot].ahb = ahb; + g_stream_slots[slot].img = img; + } + g_stream_slots[slot].used = ++g_stream_seq; + g_stream_img = g_stream_slots[slot].img; + atomic_fetch_add(&g_stream_frames, 1); + schedule_render(); +} + +static void render_stream(void) { + g_dirty = 0; + struct vkp_image *img = g_stream_img; + if (!img) return; + int w = vkp_image_width(img), h = vkp_image_height(img); + if (w != g_scene_w || h != g_scene_h) { + droiddeck_log("stream", "picture %dx%d", w, h); + g_scene_w = w; + g_scene_h = h; + } + struct vkp_draw d = {.img = img, .sx = 0, .sy = 0, .sw = (float)w, .sh = (float)h, .dx = 0, .dy = 0, .dw = w, .dh = h, .blend = 0}; + vkp_apply_window_request(); + sc_layer_hide(); + int r = vkp_render(w, h, &d, 1); + if (r == 0) { + g_stat_frames++; + static int first; + if (!first) { first = 1; droiddeck_log("stream", "first stream frame presented"); } + } else { + static int failed; + if (failed++ % 600 == 0) droiddeck_log("stream", "presenting a stream frame failed (%d, %d times)", r, failed); + } +} + +void droiddeck_stream_set(int on) { + atomic_store(&g_stream_on, on ? 1 : 0); + if (g_input_pipe[1] < 0) return; + struct input_msg m = { 21, on ? 1 : 0, 0, 0, 0 }; + ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); + (void)n; +} + +/* Any thread: hands over one decoded frame (acquires its own reference). */ +void droiddeck_stream_frame(AHardwareBuffer *ahb) { + if (!ahb || !atomic_load(&g_stream_on) || g_input_pipe[1] < 0) return; + AHardwareBuffer_acquire(ahb); + pthread_mutex_lock(&g_stream_lock); + AHardwareBuffer *dropped = g_stream_pending; + g_stream_pending = ahb; + pthread_mutex_unlock(&g_stream_lock); + if (dropped) { AHardwareBuffer_release(dropped); return; } /* a wake-up is already queued */ + struct input_msg m = { 20, 0, 0, 0, 0 }; + ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); + (void)n; +} + +unsigned droiddeck_stream_frames(void) { return atomic_load(&g_stream_frames); } + static void render_scene(void) { + if (atomic_load(&g_stream_on)) { render_stream(); return; } struct draw_list dl = {0}; struct surface *s; int w, h; @@ -3005,6 +3120,8 @@ static int on_input_readable(int fd, uint32_t mask, void *data) { break; case 10: break; case 11: axis_event(m.p1, m.p2); break; + case 20: stream_take(); break; + case 21: if (!m.p1) stream_forget_all(); schedule_render(); break; default: deliver_pointer(&m); break; } } diff --git a/app/src/main/cpp/waylandcomp/src/vk_loader.h b/app/src/main/cpp/waylandcomp/src/vk_loader.h index e10950d0d1..54cb888816 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_loader.h +++ b/app/src/main/cpp/waylandcomp/src/vk_loader.h @@ -21,7 +21,7 @@ X(BindImageMemory) X(DestroyImage) X(FreeMemory) X(AcquireNextImageKHR) \ X(ResetCommandBuffer) X(BeginCommandBuffer) X(CmdPipelineBarrier) X(CmdBlitImage) \ X(EndCommandBuffer) X(ResetFences) X(QueueSubmit) X(QueuePresentKHR) X(WaitForFences) \ - X(QueueWaitIdle) X(GetMemoryFdPropertiesKHR) \ + X(QueueWaitIdle) X(GetMemoryFdPropertiesKHR) X(GetAndroidHardwareBufferPropertiesANDROID) \ X(GetImageSubresourceLayout) X(MapMemory) X(UnmapMemory) X(CmdClearColorImage) \ \ X(CreateShaderModule) X(DestroyShaderModule) X(CreatePipelineLayout) X(DestroyPipelineLayout) \ diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.c b/app/src/main/cpp/waylandcomp/src/vk_present.c index d7f1c99030..c917afbbab 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.c +++ b/app/src/main/cpp/waylandcomp/src/vk_present.c @@ -19,6 +19,7 @@ #include #include #include +#include #define TAG "DroidDeckWayland" #define LOGI(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__) @@ -39,6 +40,7 @@ struct vkp_image { }; static ANativeWindow *g_window; +static int g_ahb_import; static char *g_driver_path, *g_library_name, *g_native_lib_dir; static int g_dev_state; static VkInstance g_inst; @@ -459,17 +461,19 @@ static int dev_init(void) { } g_vk.GetPhysicalDeviceMemoryProperties(g_pd, &g_memprops); - const char *dev_exts[7] = {VK_KHR_SWAPCHAIN_EXTENSION_NAME, "VK_KHR_external_memory_fd", - "VK_EXT_external_memory_dma_buf", "VK_EXT_image_drm_format_modifier", - "VK_KHR_image_format_list", NULL, NULL}; - uint32_t n_dev_exts = 5; + static const char *const import_exts[4] = {"VK_KHR_external_memory_fd", "VK_EXT_external_memory_dma_buf", + "VK_EXT_image_drm_format_modifier", "VK_KHR_image_format_list"}; + const char *dev_exts[9] = {VK_KHR_SWAPCHAIN_EXTENSION_NAME}; + uint32_t n_dev_exts = 1; uint32_t ne = 0; g_vk.EnumerateDeviceExtensionProperties(g_pd, NULL, &ne, NULL); VkExtensionProperties *exts = calloc(ne ? ne : 1, sizeof(*exts)); g_vk.EnumerateDeviceExtensionProperties(g_pd, NULL, &ne, exts); - for (unsigned i = 0; i < 5; i++) - if (!has_ext(exts, ne, dev_exts[i])) - LOGE("present: driver MISSING %s (dmabuf import will fail)", dev_exts[i]); + /* Only what the driver has: the system driver lacks the dma-buf ones, which the cloud player never needs. */ + for (unsigned i = 0; i < 4; i++) { + if (has_ext(exts, ne, import_exts[i])) dev_exts[n_dev_exts++] = import_exts[i]; + else LOGE("present: driver MISSING %s (dmabuf import will fail)", import_exts[i]); + } int want_hdr_md = 0; if (droiddeck_color_requested()) { want_hdr_md = has_ext(exts, ne, VK_EXT_HDR_METADATA_EXTENSION_NAME); @@ -477,6 +481,13 @@ static int dev_init(void) { } const int want_sem_fd = has_ext(exts, ne, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME); if (want_sem_fd) dev_exts[n_dev_exts++] = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME; + /* The cloud player's decoded frames arrive as AHardwareBuffers (vkp_image_from_ahb). */ + g_ahb_import = has_ext(exts, ne, VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME) && + has_ext(exts, ne, VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME); + if (g_ahb_import) { + dev_exts[n_dev_exts++] = VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME; + dev_exts[n_dev_exts++] = VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME; + } free(exts); float prio = 1.0f; @@ -987,6 +998,60 @@ struct vkp_image *vkp_image_import_dmabuf(int fd, uint32_t drm_format, uint64_t return img; } +void vkp_wait_idle(void) { + if (g_dev && g_vk.DeviceWaitIdle) g_vk.DeviceWaitIdle(g_dev); +} + +struct vkp_image *vkp_image_from_ahb(AHardwareBuffer *ahb) { + if (!ahb || dev_init() != 0) return NULL; + if (!g_ahb_import || !g_vk.GetAndroidHardwareBufferPropertiesANDROID) { + static int said; + if (!said) { said = 1; LOGE("ahb: the driver cannot import AHardwareBuffers (VK_ANDROID_external_memory_android_hardware_buffer)"); } + return NULL; + } + AHardwareBuffer_Desc desc; + AHardwareBuffer_describe(ahb, &desc); + VkAndroidHardwareBufferFormatPropertiesANDROID fp = { + .sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID}; + VkAndroidHardwareBufferPropertiesANDROID props = { + .sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID, .pNext = &fp}; + VkResult pr = g_vk.GetAndroidHardwareBufferPropertiesANDROID(g_dev, ahb, &props); + if (pr != VK_SUCCESS || fp.format == VK_FORMAT_UNDEFINED) { + LOGE("ahb: %ux%u format %u: properties %s, Vulkan format %d", desc.width, desc.height, desc.format, + vk_result_name(pr), (int)fp.format); + return NULL; + } + struct vkp_image *img = calloc(1, sizeof(*img)); + if (!img) return NULL; + img->w = (int)desc.width; img->h = (int)desc.height; img->dmabuf = 1; img->fmt = fp.format; img->sampled = 1; + VkExternalMemoryImageCreateInfo ext = { + .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO, + .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID}; + VkImageCreateInfo ici = { + .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, .pNext = &ext, + .imageType = VK_IMAGE_TYPE_2D, .format = fp.format, .extent = {desc.width, desc.height, 1}, + .mipLevels = 1, .arrayLayers = 1, .samples = VK_SAMPLE_COUNT_1_BIT, .tiling = VK_IMAGE_TILING_OPTIMAL, + .usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, + .sharingMode = VK_SHARING_MODE_EXCLUSIVE, .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED}; + VkResult cr = g_vk.CreateImage(g_dev, &ici, NULL, &img->image); + if (cr != VK_SUCCESS) { LOGE("ahb: vkCreateImage %ux%u -> %s", desc.width, desc.height, vk_result_name(cr)); free(img); return NULL; } + int idx = -1; + for (int i = 0; i < 32; i++) if (props.memoryTypeBits & (1u << i)) { idx = i; break; } + VkImportAndroidHardwareBufferInfoANDROID imp = { + .sType = VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID, .buffer = ahb}; + VkMemoryDedicatedAllocateInfo ded = {.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO, + .pNext = &imp, .image = img->image}; + VkMemoryAllocateInfo mai = {.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, .pNext = &ded, + .allocationSize = props.allocationSize, .memoryTypeIndex = (uint32_t)(idx < 0 ? 0 : idx)}; + VkResult mr = idx < 0 ? VK_ERROR_FEATURE_NOT_PRESENT : g_vk.AllocateMemory(g_dev, &mai, NULL, &img->mem); + if (mr != VK_SUCCESS || g_vk.BindImageMemory(g_dev, img->image, img->mem, 0) != VK_SUCCESS) { + LOGE("ahb: importing %ux%u -> %s", desc.width, desc.height, vk_result_name(mr)); + if (img->mem) g_vk.FreeMemory(g_dev, img->mem, NULL); + g_vk.DestroyImage(g_dev, img->image, NULL); free(img); return NULL; + } + return img; +} + static int shm_sampled(void) { static int known; if (!known) { diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.h b/app/src/main/cpp/waylandcomp/src/vk_present.h index 48d32ab4dc..7271f468b6 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.h +++ b/app/src/main/cpp/waylandcomp/src/vk_present.h @@ -34,6 +34,9 @@ struct vkp_image *vkp_image_import_dmabuf(int fd, uint32_t drm_format, uint64_t int vkp_image_is_dmabuf(const struct vkp_image *img); struct vkp_image *vkp_image_create_shm(int w, int h); +struct AHardwareBuffer; +struct vkp_image *vkp_image_from_ahb(struct AHardwareBuffer *ahb); +void vkp_wait_idle(void); void vkp_image_upload_shm(struct vkp_image *img, const void *data, int stride); int vkp_image_width(const struct vkp_image *img); diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index bc349cdf6c..16e42d1b5d 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "vk_present.h" #include "droiddeck_ext.h" #include "ahb_swapchain.h" @@ -27,6 +28,9 @@ extern int droiddeck_cursor_serial(void); extern void droiddeck_wayland_send_key(int evdev, int state); extern void droiddeck_wayland_send_scene_input(int type, int a, int b); extern void droiddeck_wayland_vsync(int64_t frame_time_ns); +extern void droiddeck_stream_set(int on); +extern void droiddeck_stream_frame(AHardwareBuffer *ahb); +extern unsigned droiddeck_stream_frames(void); extern void droiddeck_wayland_output_resized(void); extern void droiddeck_wayland_set_output_refresh_rate(int mhz); extern volatile int g_fps_limit; @@ -667,3 +671,21 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetCardboardSpatialP (*env)->GetFloatArrayRegion(env, pos, 0, 3, p); vkp_cardboard_set_spatial_pose(m, p, live ? 1 : 0); } + +/* The Xbox Cloud Gaming native player: its decoded frames are the whole scene (no Wayland clients). */ +JNIEXPORT void JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeStreamMode(JNIEnv *env, jclass clazz, jboolean on) { + droiddeck_stream_set(on ? 1 : 0); +} + +JNIEXPORT void JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeStreamFrame(JNIEnv *env, jclass clazz, jobject hardwareBuffer) { + if (!hardwareBuffer) return; + AHardwareBuffer *ahb = AHardwareBuffer_fromHardwareBuffer(env, hardwareBuffer); + if (ahb) droiddeck_stream_frame(ahb); +} + +JNIEXPORT jint JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeStreamFrames(JNIEnv *env, jclass clazz) { + return (jint)droiddeck_stream_frames(); +} diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index aa26d5fca9..928d7caa8c 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -25,6 +25,15 @@ class App : Application() { if (android.os.Build.VERSION.SDK_INT >= 28) android.webkit.WebView.setDataDirectorySuffix("xbox") return } + if (process == "$packageName:xboxcloud") { + if (android.os.Build.VERSION.SDK_INT >= 28) android.webkit.WebView.setDataDirectorySuffix("xboxcloud") + return + } + if (process == "$packageName:xcloudnative") { + // The native cloud player: the stores log and nothing that touches the Linux session. + com.droiddeck.launcher.stores.StoresState.init(this) + return + } if (process == "$packageName:vr_recovery" || process == "$packageName:rgb_diagnostic") return CrashHandler.install(this) com.droiddeck.launcher.session.QuestExperimental.initialize(this) 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 59cf850617..05f3f98691 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -27,6 +27,7 @@ object Library { const val ADDED = "added" const val EPIC_LAUNCHER = "epic-launcher" const val EPIC_LAUNCHER_NAME = "Epic Games Launcher" + const val XBOX_CLOUD = "xbox-cloud" const val SOURCE_STEAM = "steam" class Rom(val name: String, val hostPath: File, val guestPath: String, val emulatorId: String, val art: File? = null) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt index 7562cc1ee0..63e8627790 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt @@ -3,12 +3,13 @@ package com.droiddeck.launcher.frontend import android.content.Context import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.session.WinComponents import org.json.JSONObject import java.io.File import java.util.Locale object WinCompSources { - enum class Origin { STEAM, GOG, EPIC, AMAZON, STEAM_NAME, FOLDER } + enum class Origin { STEAM, GOG, EPIC, AMAZON, STEAM_NAME, FOLDER, XBOX } data class Finding(val component: String?, val original: String, val origin: Origin, val auto: Boolean, val args: List = emptyList()) @@ -49,6 +50,17 @@ object WinCompSources { fun installer(path: String): List = if (UE_PREREQ.containsMatchIn(path)) listOf("vcredist2022", "d3dx9") else DependencyDetector.componentsFor(path) + private val XBOX_KNOWN = Regex("""> { + val config = folder?.listFiles().orEmpty().firstOrNull { it.isFile && it.name.equals("MicrosoftGame.config", ignoreCase = true) && it.length() < 1L shl 20 } + val declared = config?.let { file -> runCatching { XBOX_KNOWN.findAll(file.readText()).map { it.groupValues[1] }.toList() }.getOrNull() }.orEmpty() + return (listOf("VC14") + declared).flatMap { name -> XBOX_COMPONENTS[name].orEmpty().map { it to name } }.distinctBy { it.first } + } + fun steamDepots(ids: List): List> = ids.mapNotNull { SteamRedists.DEPOTS[it] }.distinctBy { it.first } @@ -94,6 +106,7 @@ object WinCompSources { parts.forEach { out += Finding(it, original, Origin.EPIC, true) } } } + store == Store.XBOX -> xbox(folder).forEach { (component, original) -> out += Finding(component, original, Origin.XBOX, true) } store == Store.AMAZON -> folder?.let { amazonPostInstall(it) }?.forEach { command -> val parts = installer(command) val original = command.replace('\\', '/').substringAfterLast('/') diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt b/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt index 4282ecf6f3..3d493c6063 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt @@ -50,8 +50,10 @@ object FrameGen { else -> context.getString(R.string.frame_gen_off) } - fun apply(context: Context, refreshHz: Float): String? { - val mode = mode(context) + fun apply(context: Context, refreshHz: Float): String? = apply(context, mode(context), refreshHz) + + /** Arms [mode] in this process's compositor; the cloud player passes its own mode and frame-rate cap. */ + fun apply(context: Context, mode: Mode, refreshHz: Float): String? { when (mode.engine) { ENGINE_LSFG -> { val status = Lossless.sync(context) diff --git a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt index 2c5a1aa0d1..4b355caa40 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt @@ -101,10 +101,28 @@ object WinComponents { fun cached(context: Context): List? = runCatching { parse(File(context.filesDir, CATALOG_CACHE).readText()) }.getOrNull() + const val VCREDIST_ARM64 = "vcredist2022_arm64" + + /** + * The ARM64 Visual C++ 2015-2022 runtime as registry values only (the version a 14.44.35211 installer writes, in both + * registry views). Xbox games' launchers running as ARM64EC check for it; Wine's own CRT does the work. Same approach as + * MGamer404's Bannerlator #627. Used until the catalog carries a component of this name. + */ + internal fun builtInArm64Runtime(): Component { + fun value(view: String, name: String, type: String, data: String) = Step("set_register_key", JSONObject() + .put("action", "set_register_key").put("key", "HKLM\\Software\\${view}Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\arm64") + .put("value", name).put("type", type).put("data", data)) + val steps = listOf("", "Wow6432Node\\").flatMap { view -> + listOf(value(view, "Installed", "REG_DWORD", "1"), value(view, "Major", "REG_DWORD", "14"), value(view, "Minor", "REG_DWORD", "44"), + value(view, "Bld", "REG_DWORD", "35211"), value(view, "Rbld", "REG_DWORD", "0"), value(view, "Version", "REG_SZ", "v14.44.35211.00")) + } + return Component(VCREDIST_ARM64, "Microsoft Visual C++ 2015-2022 ARM64 runtime 14.44.35211 (registry entries only)", "Microsoft", "ready", emptyList(), steps) + } + private fun parse(body: String): List? { return try { val arr = JSONObject(body).getJSONArray("components") - (0 until arr.length()).mapNotNull { i -> + val listed = (0 until arr.length()).mapNotNull { i -> val o = arr.getJSONObject(i) val name = o.optString("name") if (!validId(name)) return@mapNotNull null @@ -117,6 +135,7 @@ object WinComponents { o.optString("snapshot"), ) } + if (listed.any { it.name == VCREDIST_ARM64 }) listed else listed + builtInArm64Runtime() } catch (e: Exception) { Log.w(TAG, "catalog: $e"); null } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index 482619e6f1..cf7fc2dfa6 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -184,6 +184,8 @@ object StoresState { } var openDownloads by mutableStateOf(false) + /** A "store:id" key another page asks the Stores page to open. */ + var openGameRequest by mutableStateOf(null) private fun askForNotifications(context: Context) { val activity = context as? android.app.Activity ?: return 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 9121a35c9b..a50b56612e 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 @@ -26,6 +26,8 @@ object XboxBackend : StoreBackend { access = emptyMap() } XboxLibraryCache.clear(context) + XboxCloudSession.clear() + XboxCloudActivity.clearWebSignIn(context) XboxRuntime.stop() } StoresState.post { packageChoice = null; StoresState.shelves.remove(store); StoresState.found.remove(store) } @@ -57,9 +59,13 @@ object XboxBackend : StoreBackend { val response = Xodus.run(app, listOf("library", "--json", "--market", market)) val licenses = XboxCatalog.access(response, account, market, report = { StoresState.logLine("Xbox: $it") }) val products = XboxCatalog.rawProducts(licenses.keys.toList(), market) - val games = products.mapNotNull { XboxCatalog.product(it, licenses) }.sortedBy { it.title.lowercase() } + val cloud = runCatching { XboxCatalog.cloudCatalog(market) } + .onFailure { StoresState.logLine("Xbox: cloud lists unavailable (${it.javaClass.simpleName})") }.getOrNull() + val games = mergeEditions(products.mapNotNull { XboxCatalog.product(it, licenses, cloud) }).sortedBy { it.title.lowercase() } StoresState.logLine("Xbox: library catalog requested=${licenses.size} returned=${products.size} supported=${games.size} " + - "filtered=${products.size - games.size} backend-skipped=${response.optInt("skippedEntitlements")}") + "filtered=${products.size - games.size} backend-skipped=${response.optInt("skippedEntitlements")} " + + "pc=${games.count { it.xboxPc }} cloud=${games.count { it.xboxCloud }} cloud-only=${games.count { !it.xboxPc }} " + + "cloud-lists=${cloud?.gamePass?.size ?: -1}/${cloud?.all?.size ?: -1}") synchronized(this) { if (current != generation || StoreAccounts.signedInAs(app, store) != account) return@Thread access = licenses 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 100371b06e..d4a16c4098 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 @@ -10,7 +10,7 @@ import java.time.Instant internal object XboxCatalog { private val productId = Regex("[A-Z0-9]{12}") private val plans = setOf("CFQ7TTC0KGQ8", "CFQ7TTC0KHS0", "CFQ7TTC0P85B", "CFQ7TTC0K5DJ", "CFQ7TTC0K6L8", "CFQ7TTC10QFD") - /** Plans that include PC games; the retired console-only plan must not offer a Windows install. */ + /** Plans whose store offers advertise PC games. Library entitlements under any active plan count, as the backend resolves a PC package for them. */ private val pcPlans = mapOf( "CFQ7TTC0KGQ8" to "PC Game Pass", "CFQ7TTC0KHS0" to "Game Pass Ultimate", @@ -61,7 +61,7 @@ internal object XboxCatalog { val parent = row.optString("satisfiedByProductId").takeUnless { it.isBlank() || it == "null" } if (parent == null) return if (id in plans) null else "owned" if (parent in blocked) return null - if (parent in plans) return if (parent in pcPlans && activePlan(parent)) "gamepass" else null + if (parent in plans) return if (activePlan(parent)) "gamepass" else null return kind(parent, visited + id) } val result = rows.keys.mapNotNull { id -> kind(id)?.let { id to it } }.toMap() @@ -98,7 +98,7 @@ internal object XboxCatalog { return products(objects(body.optJSONArray("productsList")).map { it.optString("productId") }.take(24), access) } - internal fun product(json: JSONObject, access: Map): CatalogItem? { + internal fun product(json: JSONObject, access: Map, cloud: XboxCloudCatalog? = null): CatalogItem? { val id = json.optString("ProductId").uppercase() if (!productId.matches(id) || json.optString("ProductType") != "Game") return null val localized = objects(json.optJSONArray("LocalizedProperties")).firstOrNull() ?: return null @@ -107,7 +107,9 @@ internal object XboxCatalog { objects(it.optJSONObject("Sku")?.optJSONObject("Properties")?.optJSONArray("Packages")) } val pc = packages.filter { pkg -> objects(pkg.optJSONArray("PlatformDependencies")).any { it.optString("PlatformName") == "Windows.Desktop" } } - if (pc.none { it.optString("PackageFormat").equals("MSIXVC", true) }) return null + val installable = pc.any { it.optString("PackageFormat").equals("MSIXVC", true) } + val streams = cloud?.streams(id, access[id].orEmpty()) == true + if (!installable && !streams) return null val images = objects(localized.optJSONArray("Images")) fun image(vararg kinds: String): String? = kinds.firstNotNullOfOrNull { purpose -> images.firstOrNull { it.optString("ImagePurpose") == purpose }?.optString("Uri")?.let { raw -> @@ -127,13 +129,57 @@ internal object XboxCatalog { storeUrl = "https://www.xbox.com/games/store/$id", publisher = localized.optString("PublisherName"), developer = localized.optString("DeveloperName"), description = localized.optString("ProductDescription"), - sizeBytes = pc.maxOfOrNull { it.optLong("MaxDownloadSizeInBytes") } ?: 0L, - extra = mapOf("market" to Xodus.market(), "access" to kind.orEmpty()), + 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)), ) } + private const val CLOUD_GAME_PASS = "29a81209-df6f-41fd-a528-2ae6b91f719c" + private const val CLOUD_ALL = "ce573635-7c18-4d0c-9d68-90b932393470" + + /** Microsoft's public cloud lists (catalog.gamepass.com "sigls"; ids as Better xCloud by redphx, MIT, uses them). */ + fun cloudCatalog(market: String = Xodus.market()): XboxCloudCatalog = + XboxCloudCatalog(cloudList(CLOUD_GAME_PASS, market), cloudList(CLOUD_ALL, market)) + + private fun cloudList(id: String, market: String): Set { + val body = JSONArray(StoreNet.get("https://catalog.gamepass.com/sigls/v2?id=$id&language=en-us&market=$market") ?: error("Xbox cloud list unavailable")) + return (0 until body.length()).mapNotNull { body.optJSONObject(it)?.optString("id")?.uppercase()?.takeIf(productId::matches) }.toSet() + } + + fun cloudUrl(id: String, title: String, cloudId: String = id): String = + "https://www.xbox.com/play/launch/${title.lowercase().replace(Regex("[^a-z0-9]+"), "-").trim('-').ifEmpty { "game" }}/$cloudId" + + internal fun flag(value: Boolean) = if (value) "1" else "0" + fun objects(array: JSONArray?): List = if (array == null) emptyList() else (0 until array.length()).mapNotNull { array.optJSONObject(it) } private fun get(url: String): JSONObject = JSONObject(StoreNet.get(url) ?: error("Microsoft Store could not be reached. Try again.")) } + +internal data class XboxCloudCatalog(val gamePass: Set, val all: Set) { + fun streams(id: String, access: String): Boolean = when (access) { + "gamepass" -> id in gamePass + "owned" -> id in all || id in gamePass + else -> false + } +} + +val CatalogItem.xboxPc: Boolean get() = extra["pc"] != "0" +val CatalogItem.xboxCloud: Boolean get() = extra["cloud"] == "1" +val CatalogItem.xboxCloudId: String get() = extra["cloudId"]?.takeIf { it.isNotEmpty() } ?: id + +/** Microsoft lists console and PC editions as separate products; a cloud-only one with a PC game's title folds into that card. */ +internal fun mergeEditions(games: List): List { + fun key(title: String) = title.lowercase().replace(Regex("[^a-z0-9]+"), "") + val cloudOnly = games.filter { !it.xboxPc && it.xboxCloud }.groupBy { key(it.title) } + val folded = HashSet() + val merged = games.map { game -> + if (!game.xboxPc || game.xboxCloud) game + else cloudOnly[key(game.title)]?.firstOrNull()?.let { console -> + folded.add(console.id) + game.copy(extra = game.extra + mapOf("cloud" to "1", "cloudId" to console.id)) + } ?: game + } + return merged.filter { it.id !in folded } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt new file mode 100644 index 0000000000..1fa7bdfe56 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt @@ -0,0 +1,189 @@ +package com.droiddeck.launcher.stores.xbox + +import android.annotation.SuppressLint +import android.content.Context +import android.content.Intent +import android.graphics.Color +import android.os.Bundle +import android.util.Log +import android.view.InputDevice +import android.view.KeyEvent +import android.view.View +import android.view.WindowManager +import android.webkit.ConsoleMessage +import android.webkit.CookieManager +import android.webkit.PermissionRequest +import android.webkit.WebChromeClient +import android.webkit.WebResourceRequest +import android.webkit.WebSettings +import android.webkit.WebView +import android.webkit.WebViewClient +import android.widget.FrameLayout +import androidx.activity.ComponentActivity +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsControllerCompat +import androidx.webkit.WebSettingsCompat +import androidx.webkit.WebViewCompat +import androidx.webkit.WebViewFeature + +/** + * Microsoft's web player (xbox.com/play) in its own process and WebView data directory: the store sign-in + * clears its own web data after each attempt, so the player keeps a separate Microsoft session. Signing out of + * the store clears it ([clearWebSignIn]). + */ +class XboxCloudActivity : ComponentActivity() { + private var web: WebView? = null + private var custom: View? = null + private var customCallback: WebChromeClient.CustomViewCallback? = null + private lateinit var root: FrameLayout + + @SuppressLint("SetJavaScriptEnabled") + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + hideBars() + root = FrameLayout(this).apply { setBackgroundColor(Color.BLACK) } + setContentView(root) + Log.i(TAG, "WebView ${WebViewCompat.getCurrentWebViewPackage(this)?.versionName}") + + val view = WebView(this) + web = view + view.settings.apply { + javaScriptEnabled = true + domStorageEnabled = true + databaseEnabled = true + mediaPlaybackRequiresUserGesture = false + allowFileAccess = false + allowContentAccess = false + mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW + useWideViewPort = true + loadWithOverviewMode = true + userAgentString = chromeUserAgent(userAgentString) + } + // No "X-Requested-With: " header: it marks the page as embedded in an app. + if (WebViewFeature.isFeatureSupported(WebViewFeature.REQUESTED_WITH_HEADER_ALLOW_LIST)) + WebSettingsCompat.setRequestedWithHeaderOriginAllowList(view.settings, emptySet()) + Log.i(TAG, "UA ${view.settings.userAgentString}") + CookieManager.getInstance().setAcceptCookie(true) + CookieManager.getInstance().setAcceptThirdPartyCookies(view, true) + view.webViewClient = object : WebViewClient() { + override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = + request.url.scheme != "https" + override fun onPageFinished(view: WebView, url: String) { Log.i(TAG, "page ${url.substringBefore('?')}") } + } + view.webChromeClient = object : WebChromeClient() { + override fun onConsoleMessage(message: ConsoleMessage): Boolean { + Log.d(TAG, "console ${message.messageLevel()}: ${message.message().take(300)}") + return true + } + override fun onPermissionRequest(request: PermissionRequest) { + Log.i(TAG, "permission request ${request.resources.joinToString()} denied") + request.deny() + } + override fun onShowCustomView(view: View, callback: CustomViewCallback) { + custom?.let { root.removeView(it) } + custom = view; customCallback = callback + root.addView(view, FrameLayout.LayoutParams(-1, -1)) + hideBars() + } + override fun onHideCustomView() { + custom?.let { root.removeView(it) } + custom = null; customCallback = null + } + } + root.addView(view, FrameLayout.LayoutParams(-1, -1)) + if (savedInstanceState != null) view.restoreState(savedInstanceState) + else view.loadUrl(startUrl(intent)) + } + + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) + web?.loadUrl(startUrl(intent)) + } + + private fun startUrl(intent: Intent): String = + intent.getStringExtra("url")?.takeIf { url -> runCatching { java.net.URI(url) }.getOrNull()?.let { + it.scheme == "https" && it.host == "www.xbox.com" && it.userInfo == null && it.port == -1 } == true } ?: START_URL + + // Without the WebView markers the page treats this as Chrome for Android. + private fun chromeUserAgent(default: String): String = + default.replace("; wv)", ")").replace(Regex(" Version/\\d+(\\.\\d+)*"), "") + + private fun hideBars() { + WindowCompat.setDecorFitsSystemWindows(window, false) + WindowInsetsControllerCompat(window, window.decorView).apply { + hide(WindowInsetsCompat.Type.systemBars()) + systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + } + } + + override fun onWindowFocusChanged(hasFocus: Boolean) { + super.onWindowFocusChanged(hasFocus) + if (hasFocus) hideBars() + } + + // A controller's unused B arrives as BACK; ask before leaving so a stray press never ends a stream. + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (event.keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) { + val fromController = event.source and InputDevice.SOURCE_GAMEPAD == InputDevice.SOURCE_GAMEPAD || + event.source and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK + when { + custom != null -> customCallback?.onCustomViewHidden() + fromController -> confirmLeave() + web?.canGoBack() == true -> web?.goBack() + else -> finish() + } + return true + } + if (event.keyCode == KeyEvent.KEYCODE_BACK) return true + return super.dispatchKeyEvent(event) + } + + private var leaving: android.app.AlertDialog? = null + + private fun confirmLeave() { + if (leaving?.isShowing == true) return + leaving = android.app.AlertDialog.Builder(this, android.R.style.Theme_DeviceDefault_Dialog_Alert) + .setTitle("Leave Xbox Cloud Gaming?") + .setMessage("The stream ends when you leave.") + .setPositiveButton("Leave") { _, _ -> finish() } + .setNegativeButton("Stay", null) + .show() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + web?.saveState(outState) + } + + override fun onPause() { super.onPause(); CookieManager.getInstance().flush() } + + override fun onDestroy() { + web?.let { root.removeView(it); it.stopLoading(); it.destroy() } + web = null + super.onDestroy() + } + + companion object { + private const val TAG = "XboxCloud" + const val START_URL = "https://www.xbox.com/play" + + fun intent(context: Context, url: String? = null): Intent = Intent(context, XboxCloudActivity::class.java) + .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + .apply { if (url != null) putExtra("url", url) } + + const val PROCESS_SUFFIX = ":xboxcloud" + const val WEBVIEW_SUFFIX = "xboxcloud" + + fun clearWebSignIn(context: Context) { + val am = context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager + am.runningAppProcesses.orEmpty().filter { it.processName.endsWith(PROCESS_SUFFIX) } + .forEach { android.os.Process.killProcess(it.pid) } + val suffix = WEBVIEW_SUFFIX + listOf(java.io.File(context.applicationInfo.dataDir, "app_webview_$suffix"), java.io.File(context.cacheDir.parentFile, "cache/webview_$suffix")) + .forEach { runCatching { it.deleteRecursively() } } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt new file mode 100644 index 0000000000..10b034eaae --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt @@ -0,0 +1,135 @@ +package com.droiddeck.launcher.stores.xbox + +import android.content.Context +import android.content.Intent +import androidx.compose.runtime.mutableStateListOf +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.net.HttpURLConnection +import java.net.URL + +/** Xbox games added to the Games tab to stream before (or without) installing them. */ +object XboxCloudGames { + class Entry(val id: String, val title: String, val poster: String?, val hero: String?) + + private const val PREFS = "xbox_cloud_games" + private val idPattern = Regex("[A-Z0-9]{12}") + val entries = mutableStateListOf() + @Volatile private var loaded = false + + fun load(context: Context) { + if (loaded) return + loaded = true + val list = decode(context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString("games", null)) + StoresState.post { entries.clear(); entries.addAll(list) } + } + + fun isAdded(id: String) = entries.any { it.id == id } + + fun add(context: Context, item: CatalogItem) { + val app = context.applicationContext + if (isAdded(item.id)) return + entries.add(Entry(item.id, item.title, item.tallImageUrl, item.imageUrl)) + save(app) + Thread({ + fetch(item.tallImageUrl, File(artDir(app, item.id), "poster")) + fetch(item.imageUrl, File(artDir(app, item.id), "hero")) + StoresState.post { StoresState.notifyLibraryChanged(app) } + }, "xbox-cloud-art").start() + } + + fun remove(context: Context, id: String) { + val app = context.applicationContext + entries.removeAll { it.id == id } + save(app) + artDir(app, id).deleteRecursively() + } + + private fun save(app: Context) { + app.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString("games", encode(entries.toList())).apply() + } + + internal fun encode(list: List): String = JSONArray().apply { + list.forEach { put(JSONObject().put("id", it.id).put("title", it.title).put("poster", it.poster.orEmpty()).put("hero", it.hero.orEmpty())) } + }.toString() + + internal fun decode(text: String?): List = runCatching { + val array = JSONArray(text ?: return emptyList()) + (0 until minOf(array.length(), 2000)).mapNotNull { array.optJSONObject(it) }.mapNotNull { o -> + val id = o.optString("id") + val title = o.optString("title") + if (!idPattern.matches(id) || title.isBlank()) null + else Entry(id, title.take(200), o.optString("poster").takeIf { it.isNotEmpty() }, o.optString("hero").takeIf { it.isNotEmpty() }) + }.distinctBy { it.id } + }.getOrDefault(emptyList()) + + /** Games-tab rows for the added games that are not installed (an installed copy has its own row). */ + fun rows(context: Context, installedIds: Set): List = entries.filter { it.id !in installedIds }.map { e -> + val dir = artDir(context, e.id) + val appId = rowId(e.id) + Library.SteamGame(appId = appId, name = e.title, art = File(dir, "poster").takeIf { it.isFile }, library = Library.XBOX_CLOUD, + hero = File(dir, "hero").takeIf { it.isFile }, source = Store.XBOX.id, storeId = e.id) + } + + internal fun rowId(id: String): Int = ("xbox-cloud:$id").hashCode() or Int.MIN_VALUE + + private fun artDir(context: Context, id: String) = File(context.filesDir, "xbox-cloud-art/$id") + + private fun fetch(url: String?, target: File) { + if (url == null) return + runCatching { + val parsed = URL(url) + require(parsed.protocol == "https" && parsed.host in setOf("store-images.s-microsoft.com", "store-images.microsoft.com")) + val connection = parsed.openConnection() as HttpURLConnection + try { + connection.connectTimeout = 15_000; connection.readTimeout = 30_000 + check(connection.responseCode == 200) + val bytes = connection.inputStream.use { it.readBytes() } + require(bytes.size in 1..12_000_000) + target.parentFile?.mkdirs() + File(target.path + ".tmp").apply { writeBytes(bytes); check(renameTo(target)) } + } finally { connection.disconnect() } + } + } + + private val prefetching = java.util.concurrent.atomic.AtomicBoolean(false) + + /** + * Fetches the streaming tokens in the background while a cloud game is on screen (about 20 s), so Stream starts at + * once; both players take them from this process (the native one through XboxCloudTokenService). + */ + fun prefetch(context: Context) { + val app = context.applicationContext + if (!prefetching.compareAndSet(false, true)) return + Thread({ + try { + val account = com.droiddeck.launcher.stores.StoreAccounts.signedInAs(app, Store.XBOX) ?: return@Thread + runCatching { XboxCloudSession.get(app, account) } + .onFailure { StoresState.logLine("Xbox: cloud tokens not fetched ahead: ${it.message?.take(160)}") } + } finally { prefetching.set(false) } + }, "xcloud-prefetch").start() + } + + /** Streaming runs outside the Linux session; the session owns the screen, audio and controllers while it runs. */ + fun stream(context: Context, id: String, title: String) { + if (SessionState.running) { + android.widget.Toast.makeText(context, "Close the Steam session to stream Xbox games.", android.widget.Toast.LENGTH_LONG).show() + return + } + context.startActivity(XboxCloudPlayerActivity.playerIntent(context, id, title).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + } + + /** Whether the signed-in library says this game streams (cached library; reads disk). */ + fun streams(context: Context, id: String): Boolean = runCatching { + StoresState.library[Store.XBOX]?.firstOrNull { it.id == id }?.let { return it.xboxCloud } + val app = context.applicationContext + val account = com.droiddeck.launcher.stores.StoreAccounts.signedInAs(app, Store.XBOX) ?: return false + XboxLibraryCache.read(app, account, Xodus.market())?.games?.firstOrNull { it.id == id }?.xboxCloud == true + }.getOrDefault(false) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt new file mode 100644 index 0000000000..9b8d11c0d0 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt @@ -0,0 +1,399 @@ +package com.droiddeck.launcher.stores.xbox + +import android.annotation.SuppressLint +import android.content.Context +import android.content.Intent +import android.graphics.Color +import android.os.Bundle +import android.view.Gravity +import android.view.KeyEvent +import android.view.WindowManager +import android.webkit.JavascriptInterface +import android.webkit.WebResourceRequest +import android.webkit.WebResourceResponse +import android.webkit.WebView +import android.webkit.WebViewClient +import android.widget.Button +import android.widget.FrameLayout +import android.widget.LinearLayout +import android.widget.TextView +import androidx.activity.ComponentActivity +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsControllerCompat +import androidx.webkit.WebViewAssetLoader +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.verticalScroll +import androidx.compose.runtime.getValue +import androidx.compose.runtime.setValue +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.input.key.key +import androidx.compose.ui.input.key.onKeyEvent +import androidx.compose.ui.input.key.type +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONObject +import java.util.concurrent.Executors + +/** Runs the WebRTC client page (tools/xcloud-player); signalling and tokens stay on this side of the bridge. */ +class XboxCloudPlayerActivity : ComponentActivity() { + private lateinit var root: FrameLayout + private var web: WebView? = null + private var notice: LinearLayout? = null + private val worker = Executors.newSingleThreadExecutor() + private val signalling = Executors.newCachedThreadPool() + @Volatile private var session: XboxCloudSession.Session? = null + @Volatile private var sessionPath: String? = null + @Volatile private var titleId: String? = null + @Volatile private var closed = false + @Volatile private var webUrl: String? = null + @Volatile private var settings = XboxCloudSettings() + @Volatile private var sessionSignals: XboxCloudSignalling? = null + /** The settings this stream started with (stream-start settings changed since then need a restart). */ + @Volatile private var startedWith: XboxCloudSettings? = null + private var menu: androidx.compose.ui.platform.ComposeView? = null + + @SuppressLint("SetJavaScriptEnabled") + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + hideBars() + watchBars() + root = FrameLayout(this).apply { setBackgroundColor(Color.BLACK) } + setContentView(root) + val requested = intent.getStringExtra("product").orEmpty() + showNotice("Signing in to Xbox Cloud Gaming…", withButtons = false) + worker.execute { + val result = runCatching { + val account = StoreAccounts.signedInAs(applicationContext, Store.XBOX) ?: error("Sign in to the Xbox store first.") + val cached = XboxLibraryCache.read(applicationContext, account, Xodus.market())?.games?.firstOrNull { it.id == requested } + val product = cached?.extra?.get("cloudId")?.takeIf { it.isNotEmpty() } ?: requested + webUrl = XboxCatalog.cloudUrl(requested, cached?.title ?: intent.getStringExtra("title").orEmpty(), product) + val active = XboxCloudSession.get(applicationContext, account) + val title = XboxCloudSession.titles(active)[product] ?: error("This game can't be streamed with this account here.") + settings = XboxCloudSettings.load(applicationContext) + startedWith = settings + session = active.forStream(settings.region, settings.osName); titleId = title + diag("cloud player: $product -> title $title, region ${java.net.URI(session!!.baseUri).host}, transfer=${active.userToken != null}") + } + runOnUiThread { + if (closed) return@runOnUiThread + result.onSuccess { openPlayer() }.onFailure { + diag("cloud player not started: ${it.javaClass.simpleName}: ${it.message?.take(160)}") + showNotice(it.message ?: "Xbox Cloud Gaming could not start.", withButtons = true) + } + } + } + } + + @SuppressLint("SetJavaScriptEnabled") + private fun openPlayer() { + val loader = WebViewAssetLoader.Builder().addPathHandler("/assets/", WebViewAssetLoader.AssetsPathHandler(this)).build() + val view = WebView(this) + web = view + view.settings.apply { + javaScriptEnabled = true + mediaPlaybackRequiresUserGesture = false + allowFileAccess = false + allowContentAccess = false + } + view.setBackgroundColor(Color.BLACK) + // The Gamepad API only sees controllers while the WebView has input focus. + view.isFocusable = true + view.isFocusableInTouchMode = true + view.addJavascriptInterface(Bridge(), "DDCloud") + view.webViewClient = object : WebViewClient() { + override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? = + loader.shouldInterceptRequest(request.url) + override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = true + } + view.webChromeClient = object : android.webkit.WebChromeClient() { + override fun onConsoleMessage(message: android.webkit.ConsoleMessage): Boolean { + android.util.Log.d("XboxCloudPlayer", "console ${message.messageLevel()}: ${message.message().take(300)}") + return true + } + } + root.addView(view, 0, FrameLayout.LayoutParams(-1, -1)) + notice?.let { root.removeView(it) } + notice = null + view.requestFocus() + view.loadUrl("https://appassets.androidplatform.net/assets/xcloud/player.html") + } + + private inner class Bridge { + @JavascriptInterface + fun call(id: Int, op: String, arg: String) { + signalling.execute { + val reply = runCatching { handle(op, arg) }.getOrElse { XboxCloudSession.Reply(0, it.javaClass.simpleName) } + if (reply.status !in 200..299) diag("cloud player $op: ${reply.status} ${reply.body.take(300)}") + else if (op != "state" && op != "keepalive") diag("cloud player $op: ${reply.status}") + runOnUiThread { web?.evaluateJavascript("window.__ddResolve($id, ${reply.status}, ${JSONObject.quote(reply.body)})", null) } + } + } + + @JavascriptInterface + fun status(text: String) { android.util.Log.i("XboxCloudPlayer", "status: ${text.take(120)}") } + + @JavascriptInterface + fun playing() { + diag("cloud player streaming") + runOnUiThread { web?.requestFocus() } + } + + @JavascriptInterface + fun settings(): String = pageSettings(this@XboxCloudPlayerActivity.settings) + + @JavascriptInterface + fun log(text: String) { diag("cloud player page: ${text.take(240)}") } + + @JavascriptInterface + fun failed(stage: String, detail: String) { + diag("cloud player failed at ${stage.take(40)}: ${detail.take(300)}") + runOnUiThread { if (!closed) showNotice("The stream could not start ($stage).", withButtons = true) } + } + } + + private fun handle(op: String, arg: String): XboxCloudSession.Reply { + val active = session ?: error("no session") + val signals = sessionSignals ?: XboxCloudSignalling(active, titleId ?: error("no title"), settings).also { sessionSignals = it } + return signals.op(op, arg).also { sessionPath = signals.path } + } + + private fun showNotice(text: String, withButtons: Boolean) { + notice?.let { root.removeView(it) } + val box = LinearLayout(this).apply { + orientation = LinearLayout.VERTICAL + gravity = Gravity.CENTER + setBackgroundColor(if (withButtons) Color.argb(230, 0, 0, 0) else Color.TRANSPARENT) + } + box.addView(TextView(this).apply { setTextColor(Color.WHITE); textSize = 18f; gravity = Gravity.CENTER; this.text = text; setPadding(32, 16, 32, 16) }) + if (withButtons) { + val row = LinearLayout(this).apply { orientation = LinearLayout.HORIZONTAL; gravity = Gravity.CENTER } + (webUrl ?: intent.getStringExtra("webUrl"))?.let { url -> + row.addView(Button(this).apply { this.text = "Open in Microsoft's player"; setOnClickListener { startActivity(XboxCloudActivity.intent(this@XboxCloudPlayerActivity, url)); finish() } }) + } + row.addView(Button(this).apply { this.text = "Close"; setOnClickListener { finish() } }) + box.addView(row) + } + notice = box + root.addView(box, FrameLayout.LayoutParams(-1, -1)) + } + + private val rehideBars = Runnable { if (window.decorView.hasWindowFocus()) hideBars() } + + private fun watchBars() { + androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { v, insets -> + if (insets.isVisible(WindowInsetsCompat.Type.navigationBars()) || insets.isVisible(WindowInsetsCompat.Type.statusBars())) { + v.removeCallbacks(rehideBars) + v.postDelayed(rehideBars, 1500) + } + androidx.core.view.ViewCompat.onApplyWindowInsets(v, insets) + } + } + + override fun onResume() { + super.onResume() + hideBars() + } + + private fun hideBars() { + WindowCompat.setDecorFitsSystemWindows(window, false) + WindowInsetsControllerCompat(window, window.decorView).apply { + hide(WindowInsetsCompat.Type.systemBars()) + systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + } + } + + override fun onWindowFocusChanged(hasFocus: Boolean) { + super.onWindowFocusChanged(hasFocus) + if (hasFocus) hideBars() + } + + private var guideDown = false + private var guideDownAt = 0L + private var lastGuideUp = 0L + private var pendingNexus: Runnable? = null + private var swallowGuideUp = false + + private fun isGuideKey(event: KeyEvent): Boolean = event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE + + /** One press is the stream's Xbox button; two quick presses or a hold open the player menu. */ + private fun guideKey(event: KeyEvent): Boolean { + if (!isGuideKey(event)) return false + if (event.action == KeyEvent.ACTION_DOWN) { + if (event.repeatCount == 0) { + guideDown = true; guideDownAt = event.eventTime + val pending = pendingNexus + if (pending != null && event.eventTime - lastGuideUp <= DOUBLE_PRESS_MS) { + root.removeCallbacks(pending); pendingNexus = null; guideDown = false + swallowGuideUp = true + openMenu() + } + } else if (guideDown && event.eventTime - guideDownAt >= 600) { + guideDown = false + swallowGuideUp = true + openMenu() + } + } else if (event.action == KeyEvent.ACTION_UP && guideDown) { + guideDown = false + lastGuideUp = event.eventTime + val tap = Runnable { pendingNexus = null; pressNexus(1); root.postDelayed({ pressNexus(0) }, 150) } + pendingNexus = tap + root.postDelayed(tap, DOUBLE_PRESS_MS) + } + return true + } + + private fun pressNexus(value: Int) { + web?.evaluateJavascript("window.__ddButton && window.__ddButton('Nexus', $value)", null) + } + + // Back opens the player menu so a stray press never ends a stream. + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (menu != null) { + if (isGuideKey(event)) { + if (event.action == KeyEvent.ACTION_UP) { if (swallowGuideUp) swallowGuideUp = false else closeMenu() } + return true + } + if (event.keyCode == KeyEvent.KEYCODE_BACK) { + if (event.action == KeyEvent.ACTION_UP) { if (menuPage.isNotEmpty()) menuPage = "" else closeMenu() } + return true + } + return super.dispatchKeyEvent(event) + } + if (notice == null && guideKey(event)) return true + if (event.keyCode == KeyEvent.KEYCODE_BACK) { + if (event.action == KeyEvent.ACTION_UP) { if (notice == null) openMenu() else finish() } + return true + } + // Reporting controller buttons handled stops Android turning an unused one into a fallback key. + val handled = super.dispatchKeyEvent(event) + val fromController = event.source and android.view.InputDevice.SOURCE_GAMEPAD == android.view.InputDevice.SOURCE_GAMEPAD || + event.source and android.view.InputDevice.SOURCE_JOYSTICK == android.view.InputDevice.SOURCE_JOYSTICK + return handled || (notice == null && web != null && fromController) + } + + private var menuPage by androidx.compose.runtime.mutableStateOf("") + + private fun openMenu() { + if (menu != null || web == null) return + web?.evaluateJavascript("window.__ddInput && window.__ddInput(false)", null) + menuPage = "" + val regions = session?.regionList?.map { it.name }.orEmpty() + val view = androidx.compose.ui.platform.ComposeView(this) + view.setContent { + com.droiddeck.launcher.ui.DroidDeckTheme { + var current by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(settings) } + val entries = androidx.compose.runtime.remember { List(6) { androidx.compose.ui.focus.FocusRequester() } } + androidx.compose.runtime.LaunchedEffect(menuPage) { + if (menuPage.isEmpty()) runCatching { entries[lastMainEntry.coerceIn(0, 5)].requestFocus() } + } + val cs = androidx.compose.material3.MaterialTheme.colorScheme + androidx.compose.foundation.layout.Box(androidx.compose.ui.Modifier.fillMaxSize()) { + androidx.compose.foundation.layout.Column( + androidx.compose.ui.Modifier.fillMaxHeight().width(400.dp).background(cs.surface.copy(alpha = 0.95f)) + .verticalScroll(androidx.compose.foundation.rememberScrollState()).padding(vertical = 12.dp), + ) { + androidx.compose.material3.Text(intent.getStringExtra("title").orEmpty().ifEmpty { "Xbox Cloud Gaming" }, + style = androidx.compose.material3.MaterialTheme.typography.titleMedium, color = cs.onSurface, + modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 4.dp)) + if (menuPage.isEmpty()) { + MenuEntry("Resume", "Back to the game", entries[0], 0) { closeMenu() } + MenuEntry("Xbox menu", "The game's Xbox menu (also: Guide once, or View + Menu)", entries[1], 1) { + closeMenu(); web?.evaluateJavascript("window.__ddNexus && window.__ddNexus()", null) + } + MenuEntry("Screen effects", "Sharpen, colour, deband, FXAA, CRT, NTSC, Toon, fps cap", entries[2], 2) { menuPage = "picture" } + MenuEntry("Stream quality", "Resolution, region, language, codec, bitrate (next stream)", entries[3], 3) { menuPage = "stream" } + MenuEntry("Performance overlay and sound", "Overlay level and layout, volume, controller rumble", entries[4], 4) { menuPage = "overlay" } + MenuEntry("Leave", "End the stream", entries[5], 5) { finish() } + androidx.compose.material3.Text("Guide twice opens this menu; Back or Guide closes it.", + style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant, + modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) + } else { + MenuEntry("‹ Back", null) { menuPage = "" } + if (menuPage == "stream") MenuEntry("Restart the stream with these settings", + "Ends this cloud session and starts a new one; the game restarts, unsaved progress is lost.") { restartStream() } + val page = menuPage + XboxCloudSettingsPanel(current, regions, live = true, section = page, restoreRow = lastRow[page] ?: 0, + onRowFocused = { lastRow[page] = it }, startedWith = startedWith) { changed -> + current = changed + settings = changed + XboxCloudSettings.save(this@XboxCloudPlayerActivity, changed) + web?.evaluateJavascript("window.__ddApply && window.__ddApply(${JSONObject.quote(pageSettings(changed))})", null) + } + } + } + } + } + } + menu = view + root.addView(view, FrameLayout.LayoutParams(-1, -1)) + view.requestFocus() + } + + private fun pageSettings(s: XboxCloudSettings): String = JSONObject(s.toJson()) + .put("server", session?.let { active -> active.regionList.firstOrNull { it.baseUri == active.baseUri }?.name } ?: "").toString() + + private var lastMainEntry = 0 + private val lastRow = mutableMapOf() + + @androidx.compose.runtime.Composable + private fun MenuEntry(title: String, note: String?, focus: androidx.compose.ui.focus.FocusRequester? = null, index: Int = -1, onClick: () -> Unit) = + XboxMenuEntry(title, note, focus, { if (index >= 0) lastMainEntry = index }, onClick) + + private fun restartStream() { + val active = session; val path = sessionPath + sessionPath = null + closeMenu() + showNotice("Restarting the stream…", withButtons = false) + Thread({ + if (active != null && path != null) runCatching { XboxCloudSession.request(active, "DELETE", "/$path") } + .onSuccess { diag("cloud player restart: session closed ${it.status}") } + runOnUiThread { if (!isFinishing) { startActivity(playerIntent(this, intent.getStringExtra("product").orEmpty(), intent.getStringExtra("title").orEmpty())); finish() } } + }, "xcloud-restart").start() + } + + private fun closeMenu() { + menu?.let { root.removeView(it) } + menu = null + web?.evaluateJavascript("window.__ddInput && window.__ddInput(true)", null) + web?.requestFocus() + } + + override fun onDestroy() { + closed = true + web?.let { it.evaluateJavascript("window.__ddStop && window.__ddStop()", null); root.removeView(it); it.destroy() } + web = null + val active = session; val path = sessionPath + if (active != null && path != null) Thread({ + runCatching { XboxCloudSession.request(active, "DELETE", "/$path") } + .onSuccess { diag("cloud player session closed: ${it.status}") } + }, "xcloud-stop").start() + worker.shutdownNow(); signalling.shutdownNow() + super.onDestroy() + } + + private fun diag(text: String) = StoresState.logLine("Xbox: $text") + + companion object { + private const val DOUBLE_PRESS_MS = 350L + + fun intent(context: Context, productId: String, title: String): Intent = Intent(context, XboxCloudPlayerActivity::class.java) + .putExtra("product", productId.uppercase()).putExtra("title", title) + + /** The player the settings pick: the native engine (frame generation) where it can run, else the web player. */ + fun playerIntent(context: Context, productId: String, title: String): Intent { + val native = XboxNativePlayerActivity.supported() && XboxCloudSettings.load(context).playerEngine == "native" + return if (!native) intent(context, productId, title) else Intent(context, XboxNativePlayerActivity::class.java) + .putExtra("product", productId.uppercase()).putExtra("title", title) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt new file mode 100644 index 0000000000..ca21202781 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt @@ -0,0 +1,120 @@ +package com.droiddeck.launcher.stores.xbox + +import android.content.Context +import org.json.JSONArray +import org.json.JSONObject +import java.net.HttpURLConnection +import java.net.URL + +/** Streaming-service tokens stay in memory only. Request shapes follow Greenlight / xal-node by unknownskl (MIT). */ +internal object XboxCloudSession { + class Region(val name: String, val baseUri: String, val isDefault: Boolean) + + class Session(val account: String, val token: String, val offering: String, val baseUri: String, val regionList: List, + val userToken: String?, internal val expiresAt: Long, + val osName: String = "windows") { + val fresh get() = System.currentTimeMillis() < expiresAt - 5 * 60_000L + val regions get() = regionList.size + + fun forStream(regionName: String, os: String): Session = Session(account, token, offering, + regionList.firstOrNull { it.name == regionName }?.baseUri ?: baseUri, regionList, userToken, expiresAt, os) + } + + @Volatile private var cached: Session? = null + + /** One fetch at a time (about 20 s: two ticket exchanges); a second caller waits and gets the same tokens. */ + @Synchronized + fun get(app: Context, account: String): Session { + cached?.takeIf { it.account == account && it.fresh }?.let { return it } + val json = Xodus.run(app, listOf("cloud-token"), timeout = 60) + require(json.getInt("schema") == 1 && json.getString("account") == account) + val array = json.getJSONArray("regions") + val regions = (0 until array.length()).map { array.getJSONObject(it) } + .map { Region(it.getString("name"), it.getString("baseUri"), it.optBoolean("isDefault")) } + val default = regions.firstOrNull { it.isDefault } ?: regions.firstOrNull() ?: error("No Xbox Cloud Gaming region") + val seconds = json.optLong("durationInSeconds").coerceIn(0, 24 * 3600) + return Session(account, json.getString("gsToken"), json.getString("offering"), default.baseUri, regions, + json.optString("userToken").takeIf { !json.isNull("userToken") && it.isNotEmpty() }, System.currentTimeMillis() + seconds * 1000).also { cached = it } + } + + fun clear() { cached = null; titleIds = null } + + /** + * For the native player's own process: the main process's tokens (it keeps them, and fetches them ahead while a + * cloud game's page is open), handed over in memory through XboxCloudTokenService; null if that is not reachable. + */ + fun fromMainProcess(app: Context, account: String, timeoutSeconds: Long = 90): Session? { + cached?.takeIf { it.account == account && it.fresh }?.let { return it } + val reply = XboxCloudTokenService.request(app, account, timeoutSeconds) ?: return null + reply.getString("error")?.let { error(it) } + return fromBundle(reply).takeIf { it.account == account && it.fresh }?.also { cached = it } + } + + internal fun toBundle(s: Session) = android.os.Bundle().apply { + putString("account", s.account); putString("token", s.token); putString("offering", s.offering) + putString("baseUri", s.baseUri); putString("userToken", s.userToken); putLong("expiresAt", s.expiresAt) + putStringArrayList("regionNames", ArrayList(s.regionList.map { it.name })) + putStringArrayList("regionUris", ArrayList(s.regionList.map { it.baseUri })) + putBooleanArray("regionDefaults", s.regionList.map { it.isDefault }.toBooleanArray()) + } + + internal fun fromBundle(b: android.os.Bundle): Session { + val names = b.getStringArrayList("regionNames").orEmpty() + val uris = b.getStringArrayList("regionUris").orEmpty() + val defaults = b.getBooleanArray("regionDefaults") ?: BooleanArray(0) + val regions = names.indices.map { Region(names[it], uris.getOrElse(it) { "" }, defaults.getOrElse(it) { false }) } + return Session(b.getString("account").orEmpty(), b.getString("token").orEmpty(), b.getString("offering").orEmpty(), + b.getString("baseUri").orEmpty(), regions, b.getString("userToken"), b.getLong("expiresAt")) + } + + @Volatile private var titleIds: Pair>? = null + + fun titles(session: Session): Map { + titleIds?.takeIf { it.first == session.account }?.let { return it.second } + val reply = request(session, "GET", "/v2/titles") + check(reply.status == 200) { "Xbox Cloud Gaming answered ${reply.status}" } + val results = JSONObject(reply.body).optJSONArray("results") ?: JSONArray() + val map = (0 until results.length()).mapNotNull { index -> + val row = results.optJSONObject(index) ?: return@mapNotNull null + val product = row.optJSONObject("details")?.optString("productId")?.uppercase().orEmpty() + val title = row.optString("titleId") + if (product.matches(Regex("[A-Z0-9]{12}")) && title.isNotBlank() && title.length <= 64) product to title else null + }.toMap() + titleIds = session.account to map + return map + } + + class Reply(val status: Int, val body: String) + + fun request(session: Session, method: String, path: String, body: String? = null): Reply { + val connection = URL(session.baseUri + path).openConnection() as HttpURLConnection + try { + connection.connectTimeout = 15_000; connection.readTimeout = 30_000 + connection.requestMethod = method + connection.setRequestProperty("Authorization", "Bearer ${session.token}") + connection.setRequestProperty("Accept", "application/json") + connection.setRequestProperty("Content-Type", "application/json") + connection.setRequestProperty("X-Gssv-Client", "XboxComBrowser") + connection.setRequestProperty("X-MS-Device-Info", deviceInfo(session.osName)) + if (body != null) { + connection.doOutput = true + connection.outputStream.use { it.write(body.toByteArray(Charsets.UTF_8)) } + } + val status = connection.responseCode + val stream = if (status in 200..299) connection.inputStream else connection.errorStream + val text = stream?.use { it.readBytes() }?.also { require(it.size <= 16_000_000) } ?: ByteArray(0) + return Reply(status, String(text, Charsets.UTF_8)) + } finally { connection.disconnect() } + } + + private fun deviceInfo(os: String) = JSONObject() + .put("appInfo", JSONObject().put("env", JSONObject().put("clientAppId", "www.xbox.com").put("clientAppType", "browser") + .put("clientAppVersion", "21.1.98").put("clientSdkVersion", "8.5.3").put("httpEnvironment", "prod").put("sdkInstallId", ""))) + .put("dev", JSONObject() + .put("hw", JSONObject().put("make", "Microsoft").put("model", "unknown").put("sdktype", "web")) + .put("os", JSONObject().put("name", os).put("ver", "22631.2715").put("platform", "desktop")) + .put("displayInfo", JSONObject().put("dimensions", JSONObject().put("widthInPixels", 1920).put("heightInPixels", 1080)) + .put("pixelDensity", JSONObject().put("dpiX", 2).put("dpiY", 2))) + .put("browser", JSONObject().put("browserName", "chrome").put("browserVersion", "119.0"))) + .toString() +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt new file mode 100644 index 0000000000..7b8806a36e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt @@ -0,0 +1,108 @@ +package com.droiddeck.launcher.stores.xbox + +import android.content.Context +import org.json.JSONObject + +data class XboxCloudSettings( + val resolution: String = "1080p", // 720p | 1080p | 1080p_hq + val region: String = "", // "" = Microsoft's choice + val language: String = "", // "" = the device's language + val codec: String = "default", // default | high | normal | low + val bitrateMbps: Int = 0, // 0 = no cap + val preventDrops: Boolean = false, + val statsLevel: Int = 0, // 0 off, 1 fps, 2 basic, 3 detailed, 4 full + val statsLayout: String = "horizontal", + val statsCorner: String = "right", // right | left + val volume: Int = 100, // 100..300 % + val rumble: Int = 100, // 0..100 % + val maxFps: Int = 0, + val brightness: Int = 0, + val contrast: Int = 0, + val gamma: Float = 1f, + val saturation: Int = 100, + val sharpen: Int = 0, + val sharpenMode: String = "cas", // cas | usm + val deband: Int = 0, + val fxaa: Boolean = false, + val toon: Boolean = false, + val crt: Boolean = false, + val ntsc: Boolean = false, + val playerEngine: String = "web", // web | native (WebRTC library + DroidDeck's compositor, frame generation) + val frameGen: String = "ddfg", // native engine: off | ddfg (2x) | lsfg | lsfg3 | lsfg4 (needs Lossless.dll) + val fpsLimit: Int = 0, // native engine target: 0 = the screen's rate, else 30/45/60/120/144/165 + val fpsCustomOn: Boolean = false, // use fpsCustom instead of the presets + val fpsCustom: Int = 60, // 10..165 + val instantInput: Boolean = true, // native: send controller changes at once (else every 16 ms) + val smallBuffer: Boolean = false, // native: WebRTC shows frames as soon as decoded (no playout delay) + val fastDecoder: Boolean = true, // native: the hardware decoder's low-latency mode + val zeroCopy: Boolean = false, // native, frame generation off: decode straight onto the screen +) { + /** The native engine's frame-rate target (0 = the screen's own rate). */ + val fpsTarget get() = if (fpsCustomOn) fpsCustom else fpsLimit + + /** The service picks the stream resolution from the reported OS (Better xCloud's mapping). */ + val osName get() = when (resolution) { "720p" -> "android"; "1080p_hq" -> "tizen"; else -> "windows" } + + fun toJson(): String = JSONObject() + .put("resolution", resolution).put("region", region).put("language", language).put("codec", codec) + .put("bitrateMbps", bitrateMbps).put("preventDrops", preventDrops).put("statsLevel", statsLevel).put("statsLayout", statsLayout).put("statsCorner", statsCorner) + .put("volume", volume).put("rumble", rumble).put("maxFps", maxFps).put("brightness", brightness).put("contrast", contrast) + .put("gamma", gamma.toDouble()).put("saturation", saturation).put("sharpen", sharpen).put("sharpenMode", sharpenMode) + .put("deband", deband).put("fxaa", fxaa).put("toon", toon).put("crt", crt).put("ntsc", ntsc) + .put("playerEngine", playerEngine).put("frameGen", frameGen) + .put("fpsLimit", fpsLimit).put("fpsCustomOn", fpsCustomOn).put("fpsCustom", fpsCustom) + .put("instantInput", instantInput).put("smallBuffer", smallBuffer).put("fastDecoder", fastDecoder).put("zeroCopy", zeroCopy) + .toString() + + fun withoutEffects() = copy(brightness = 0, contrast = 0, gamma = 1f, saturation = 100, sharpen = 0, sharpenMode = "cas", + deband = 0, fxaa = false, toon = false, crt = false, ntsc = false) + + companion object { + private const val PREFS = "xbox_cloud" + private const val KEY = "settings" + + fun load(context: Context): XboxCloudSettings = + decode(context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY, null)) + + internal fun decode(text: String?): XboxCloudSettings = runCatching { + val json = JSONObject(text ?: return XboxCloudSettings()) + val d = XboxCloudSettings() + XboxCloudSettings( + resolution = json.optString("resolution", d.resolution).takeIf { it in setOf("720p", "1080p", "1080p_hq") } ?: d.resolution, + region = json.optString("region", d.region).take(64), language = json.optString("language", d.language).take(16), + codec = json.optString("codec", d.codec).takeIf { it in setOf("default", "high", "normal", "low") } ?: d.codec, + bitrateMbps = json.optInt("bitrateMbps", d.bitrateMbps).coerceIn(0, 100), + preventDrops = json.optBoolean("preventDrops", d.preventDrops), + statsLevel = json.optInt("statsLevel", d.statsLevel).coerceIn(0, 4), + statsLayout = json.optString("statsLayout", d.statsLayout).takeIf { it == "vertical" } ?: "horizontal", + statsCorner = json.optString("statsCorner", d.statsCorner).takeIf { it == "left" } ?: "right", + volume = json.optInt("volume", d.volume).coerceIn(100, 300), rumble = json.optInt("rumble", d.rumble).coerceIn(0, 100), + maxFps = json.optInt("maxFps", d.maxFps).coerceIn(0, 120), + brightness = json.optInt("brightness", d.brightness).coerceIn(-50, 50), contrast = json.optInt("contrast", d.contrast).coerceIn(-100, 100), + gamma = json.optDouble("gamma", 1.0).toFloat().coerceIn(0.5f, 3f), saturation = json.optInt("saturation", d.saturation).coerceIn(0, 200), + sharpen = json.optInt("sharpen", d.sharpen).coerceIn(0, 10), + sharpenMode = json.optString("sharpenMode", d.sharpenMode).takeIf { it == "usm" } ?: "cas", + deband = json.optInt("deband", d.deband).coerceIn(0, 8), + fxaa = json.optBoolean("fxaa"), toon = json.optBoolean("toon"), crt = json.optBoolean("crt"), ntsc = json.optBoolean("ntsc"), + playerEngine = json.optString("playerEngine", d.playerEngine).takeIf { it == "native" } ?: "web", + frameGen = json.optString("frameGen", d.frameGen).let { if (it == "winfg") "ddfg" else it } + .takeIf { it in setOf("off", "ddfg", "lsfg", "lsfg3", "lsfg4") } ?: d.frameGen, + fpsLimit = json.optInt("fpsLimit", d.fpsLimit).takeIf { it in setOf(0, 30, 45, 60, 120, 144, 165) } ?: 0, + fpsCustomOn = json.optBoolean("fpsCustomOn", d.fpsCustomOn), + fpsCustom = json.optInt("fpsCustom", d.fpsCustom).coerceIn(10, 165), + instantInput = json.optBoolean("instantInput", d.instantInput), smallBuffer = json.optBoolean("smallBuffer", d.smallBuffer), + fastDecoder = json.optBoolean("fastDecoder", d.fastDecoder), zeroCopy = json.optBoolean("zeroCopy", d.zeroCopy), + ) + }.getOrDefault(XboxCloudSettings()) + + fun save(context: Context, settings: XboxCloudSettings) { + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString(KEY, settings.toJson()).apply() + } + + val LANGUAGES = listOf("" to "Device language", "en-US" to "English (US)", "en-GB" to "English (UK)", "de-DE" to "Deutsch", + "es-ES" to "Español (España)", "es-MX" to "Español (México)", "fr-FR" to "Français", "it-IT" to "Italiano", + "ja-JP" to "日本語", "ko-KR" to "한국어", "nl-NL" to "Nederlands", "pl-PL" to "Polski", "pt-BR" to "Português (Brasil)", + "pt-PT" to "Português (Portugal)", "ru-RU" to "Русский", "sv-SE" to "Svenska", "tr-TR" to "Türkçe", "zh-CN" to "中文 (简体)", + "zh-TW" to "中文 (繁體)") + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt new file mode 100644 index 0000000000..bfe1e3908e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt @@ -0,0 +1,60 @@ +package com.droiddeck.launcher.stores.xbox + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Text +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +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.text.font.FontWeight +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import com.droiddeck.launcher.ui.DroidDeckTheme +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +class XboxCloudSettingsActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + DroidDeckTheme { + var settings by remember { mutableStateOf(XboxCloudSettings.load(this)) } + var regions by remember { mutableStateOf(emptyList()) } + LaunchedEffect(Unit) { + regions = withContext(Dispatchers.IO) { + runCatching { + val account = StoreAccounts.signedInAs(applicationContext, Store.XBOX) ?: return@runCatching emptyList() + XboxCloudSession.get(applicationContext, account).regionList.map { it.name } + }.getOrDefault(emptyList()) + } + } + Column(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background).verticalScroll(rememberScrollState())) { + Row(Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically) { + OutlinedButton(onClick = { finish() }) { Text("Back") } + Text("Xbox Cloud Gaming", style = MaterialTheme.typography.headlineSmall, fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.padding(horizontal = 16.dp)) + } + XboxCloudSettingsPanel(settings, regions, live = false) { changed -> + settings = changed + XboxCloudSettings.save(this@XboxCloudSettingsActivity, changed) + } + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt new file mode 100644 index 0000000000..0a09fd7890 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt @@ -0,0 +1,313 @@ +package com.droiddeck.launcher.stores.xbox + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.foundation.border +import androidx.compose.foundation.background +import androidx.compose.foundation.focusable +import androidx.compose.foundation.gestures.detectTapGestures +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.compositionLocalOf +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusProperties +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.input.key.KeyEventType +import androidx.compose.ui.input.key.key +import androidx.compose.ui.input.key.onKeyEvent +import androidx.compose.ui.input.key.type +import androidx.compose.runtime.getValue +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.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp + +/** Shared by the Xbox cloud settings page and the in-player menu; [live] changes reach the running stream. */ +@Composable +fun XboxCloudSettingsPanel( + settings: XboxCloudSettings, + regions: List, + live: Boolean, + /** "stream", "picture" or "overlay" shows that section only; null shows all. */ + section: String? = null, + /** The row to select when the panel opens (the last one used), or null for no initial selection. */ + restoreRow: Int? = null, + onRowFocused: (Int) -> Unit = {}, + /** The settings the running stream started with; rows that differ say they need a restart (null: no stream). */ + startedWith: XboxCloudSettings? = null, + onChange: (XboxCloudSettings) -> Unit, +) { + val focus = remember(section) { PanelFocus() } + focus.next = 0 + focus.onFocused = onRowFocused + CompositionLocalProvider(LocalPanelFocus provides focus) { + PanelContent(settings, regions, live, section, startedWith, onChange) + } + LaunchedEffect(section) { + if (restoreRow != null) runCatching { focus.requester(restoreRow.coerceIn(0, (focus.count - 1).coerceAtLeast(0))).requestFocus() } + } +} + +/** Gives each settings row its place in the page, so the last-used row can be selected again. */ +private class PanelFocus { + var next = 0 + var count = 0 + var onFocused: (Int) -> Unit = {} + private val requesters = mutableMapOf() + fun requester(index: Int) = requesters.getOrPut(index) { FocusRequester() } + fun take(): Int = next++.also { count = maxOf(count, next) } +} + +private val LocalPanelFocus = compositionLocalOf { null } + +@Composable +private fun PanelContent( + settings: XboxCloudSettings, + regions: List, + live: Boolean, + section: String?, + startedWith: XboxCloudSettings?, + onChange: (XboxCloudSettings) -> Unit, +) { + // Stream-start settings changed during a stream wait for a restart; back at the starting value, no note. + fun pending(differs: (XboxCloudSettings) -> Boolean) = startedWith != null && differs(startedWith) + + if (section == null || section == "stream") Section("Stream", if (live) "Applies to the next stream." else "Applies when a stream starts.") { + if (XboxNativePlayerActivity.supported()) { + Choice("Player engine", listOf("web" to "Web", "native" to "Native (frame gen)"), settings.playerEngine, + pending { it.playerEngine != settings.playerEngine }) { onChange(settings.copy(playerEngine = it)) } + val ctx = androidx.compose.ui.platform.LocalContext.current + val lsfg = androidx.compose.runtime.remember { XboxNativeVideo.lsfgReady(ctx) } + Choice("Frame generation", XboxNativeVideo.modes(lsfg).map { it to XboxNativeVideo.modeName(it) }, settings.frameGen) { + onChange(settings.copy(frameGen = it)) + } + Text("Native engine (experimental): Google's WebRTC and DroidDeck's own compositor, so DroidDeck frame generation " + + "(DDFG) or LSFG can add frames. LSFG uses the Lossless.dll DroidDeck already uses for games. Screen effects " + + "apply to the web engine.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(start = 8.dp, bottom = 6.dp)) + } + // The service picks the size from the reported device profile (the PC profile can send 1440p). + Choice("Resolution", listOf("720p" to "720p (phone)", "1080p" to "Best (PC)", "1080p_hq" to "1080p HQ (TV)"), + settings.resolution, pending { it.resolution != settings.resolution }) { onChange(settings.copy(resolution = it)) } + Choice("Server region", listOf("" to "Automatic") + regions.map { it to it }, settings.region, + pending { it.region != settings.region }) { onChange(settings.copy(region = it)) } + Choice("Game language", XboxCloudSettings.LANGUAGES, settings.language, + pending { it.language != settings.language }) { onChange(settings.copy(language = it)) } + Choice("Video codec quality", listOf("default" to "Automatic", "high" to "High", "normal" to "Normal", "low" to "Low"), settings.codec, + pending { it.codec != settings.codec }) { onChange(settings.copy(codec = it)) } + Choice("Bitrate limit", listOf(0 to "No limit") + listOf(5, 8, 10, 12, 15, 20, 25, 30, 40, 50).map { it to "$it Mb/s" }, settings.bitrateMbps, + pending { it.bitrateMbps != settings.bitrateMbps }) { onChange(settings.copy(bitrateMbps = it)) } + Toggle("Stop quality drops", "Keeps the resolution up when this device decodes slowly.", settings.preventDrops) { onChange(settings.copy(preventDrops = it)) } + } + + if (section == null || section == "picture") Section("Picture", "Shader effects on the stream.") { + Step("Brightness", "${settings.brightness}", { onChange(settings.copy(brightness = (settings.brightness - 5).coerceAtLeast(-50))) }, + { onChange(settings.copy(brightness = (settings.brightness + 5).coerceAtMost(50))) }) + Step("Contrast", "${settings.contrast}", { onChange(settings.copy(contrast = (settings.contrast - 10).coerceAtLeast(-100))) }, + { onChange(settings.copy(contrast = (settings.contrast + 10).coerceAtMost(100))) }) + Step("Gamma", String.format("%.1f", settings.gamma), { onChange(settings.copy(gamma = ((settings.gamma * 10).toInt() - 1).coerceAtLeast(5) / 10f)) }, + { onChange(settings.copy(gamma = ((settings.gamma * 10).toInt() + 1).coerceAtMost(30) / 10f)) }) + Step("Saturation", "${settings.saturation}%", { onChange(settings.copy(saturation = (settings.saturation - 10).coerceAtLeast(0))) }, + { onChange(settings.copy(saturation = (settings.saturation + 10).coerceAtMost(200))) }) + Step("Sharpen", if (settings.sharpen == 0) "Off" else "${settings.sharpen}", { onChange(settings.copy(sharpen = (settings.sharpen - 1).coerceAtLeast(0))) }, + { onChange(settings.copy(sharpen = (settings.sharpen + 1).coerceAtMost(10))) }) + Choice("Sharpen type", listOf("cas" to "Contrast-adaptive", "usm" to "Unsharp mask"), settings.sharpenMode) { onChange(settings.copy(sharpenMode = it)) } + Step("Deband", if (settings.deband == 0) "Off" else "${settings.deband}", { onChange(settings.copy(deband = (settings.deband - 1).coerceAtLeast(0))) }, + { onChange(settings.copy(deband = (settings.deband + 1).coerceAtMost(8))) }) + Toggle("FXAA", "Smooths jagged edges.", settings.fxaa) { onChange(settings.copy(fxaa = it)) } + Toggle("CRT", "Scanlines and colour fringes.", settings.crt) { onChange(settings.copy(crt = it)) } + Toggle("NTSC", "Old TV signal look.", settings.ntsc) { onChange(settings.copy(ntsc = it)) } + Toggle("Toon", "Cartoon outlines.", settings.toon) { onChange(settings.copy(toon = it)) } + Choice("Frame-rate cap", listOf(0 to "Off", 30 to "30 fps", 45 to "45 fps", 60 to "60 fps"), settings.maxFps) { onChange(settings.copy(maxFps = it)) } + Row(Modifier.fillMaxWidth().padding(top = 6.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + OutlinedButton(onClick = { onChange(settings.withoutEffects()) }) { Text("Reset picture") } + } + Text("Effects cost a little GPU time; with none set the stream is shown directly.", style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(top = 4.dp)) + } + + if ((section == null && XboxNativePlayerActivity.supported()) || section == "framerate") Section("Frame rate (native engine)", + "With frame generation this is the rate shown; without it, only targets below the stream's 60 fps change anything.") { + Choice("Target", listOf(0 to "Screen's rate", 30 to "30 fps", 45 to "45 fps", 60 to "60 fps", 120 to "120 fps", 144 to "144 fps", 165 to "165 fps"), + settings.fpsLimit) { onChange(settings.copy(fpsLimit = it, fpsCustomOn = false)) } + Toggle("Custom frame rate", "Set any rate from 10 to 165 fps with the slider.", settings.fpsCustomOn) { onChange(settings.copy(fpsCustomOn = it)) } + if (settings.fpsCustomOn) SliderRow("Custom", settings.fpsCustom, 10, 165) { onChange(settings.copy(fpsCustom = it)) } + } + + if ((section == null && XboxNativePlayerActivity.supported()) || section == "latency") Section("Low latency (native engine)", null) { + Toggle("Instant controller input", "Sends each press the moment it happens instead of every 16 ms.", settings.instantInput) { + onChange(settings.copy(instantInput = it)) + } + Toggle("Small network buffer", "Shows frames as soon as they are decoded. Less delay; may stutter on weak Wi-Fi.", + settings.smallBuffer, pending { it.smallBuffer != settings.smallBuffer }) { onChange(settings.copy(smallBuffer = it)) } + Toggle("Fast decoder", "The video chip's low-latency mode.", settings.fastDecoder, + pending { it.fastDecoder != settings.fastDecoder }) { onChange(settings.copy(fastDecoder = it)) } + Toggle("Zero-copy picture", "Frames go straight from the video chip to the screen: the lowest delay. Used while frame generation is off and no target below 60 fps is set; switches live.", + settings.zeroCopy) { onChange(settings.copy(zeroCopy = it)) } + } + + // "overlay-native": the native player's page (its sound has no volume boost). + if (section == null || section == "overlay" || section == "overlay-native") Section("Overlay and sound", null) { + Choice("Performance overlay", listOf(0 to "Off", 1 to "FPS only", 2 to "Basic", 3 to "Detailed", 4 to "Full"), settings.statsLevel) { + onChange(settings.copy(statsLevel = it)) + } + Choice("Overlay layout", listOf("horizontal" to "Horizontal", "vertical" to "Vertical"), settings.statsLayout) { onChange(settings.copy(statsLayout = it)) } + Choice("Overlay position", listOf("right" to "Top right", "left" to "Top left"), settings.statsCorner) { onChange(settings.copy(statsCorner = it)) } + Text("Basic: fps, ping, resolution. Detailed: + bitrate, decode time, packet loss. Full: + codec, jitter, " + + "dropped frames, server.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + if (section != "overlay-native") Step("Volume", "${settings.volume}%", { onChange(settings.copy(volume = (settings.volume - 25).coerceAtLeast(100))) }, + { onChange(settings.copy(volume = (settings.volume + 25).coerceAtMost(300))) }) + Step("Controller rumble", if (settings.rumble == 0) "Off" else "${settings.rumble}%", { onChange(settings.copy(rumble = (settings.rumble - 25).coerceAtLeast(0))) }, + { onChange(settings.copy(rumble = (settings.rumble + 25).coerceAtMost(100))) }) + } +} + +@Composable +private fun Section(title: String, note: String?, content: @Composable ColumnScope.() -> Unit) { + Column(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) { + Text(title, style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.primary) + if (note != null) Text(note, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Spacer(Modifier.height(4.dp)) + content() + } +} + +/** + * One settings row, driven by a controller: it takes focus as a whole (highlighted), Left / Right change its + * value, A / Enter selects; the − / + buttons and switches inside stay for touch only. + */ +@Composable +private fun SettingRow( + onLeft: (() -> Unit)?, + onRight: (() -> Unit)?, + onSelect: (() -> Unit)?, + content: @Composable RowScope.() -> Unit, +) { + val panel = LocalPanelFocus.current + val index = panel?.take() ?: -1 + var focused by remember { mutableStateOf(false) } + val currentSelect by rememberUpdatedState(onSelect) + val cs = MaterialTheme.colorScheme + val shape = RoundedCornerShape(10.dp) + Row( + Modifier.fillMaxWidth().padding(vertical = 1.dp).clip(shape) + .background(if (focused) cs.primary.copy(alpha = 0.16f) else Color.Transparent) + .border(2.dp, if (focused) cs.primary else Color.Transparent, shape) + .let { if (panel != null && index >= 0) it.focusRequester(panel.requester(index)) else it } + .onFocusChanged { state -> focused = state.isFocused; if (state.isFocused && index >= 0) panel?.onFocused?.invoke(index) } + .onKeyEvent { event -> + if (event.type != KeyEventType.KeyDown) return@onKeyEvent false + val action = when (event.key) { + Key.DirectionLeft -> onLeft + Key.DirectionRight -> onRight + Key.Enter, Key.NumPadEnter, Key.DirectionCenter, Key.ButtonA -> onSelect + else -> null + } + if (action != null) { action(); true } else false + } + .focusable() + // A tap selects too, without a second focus stop (a clickable would be one). + .pointerInput(Unit) { detectTapGestures { currentSelect?.invoke() } } + .padding(horizontal = 8.dp, vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically, + content = content, + ) +} + +private val noFocus = Modifier.focusProperties { canFocus = false } + +@Composable +private fun Step(label: String, value: String, onMinus: () -> Unit, onPlus: () -> Unit) { + SettingRow(onLeft = onMinus, onRight = onPlus, onSelect = onPlus) { + Text(label, Modifier.weight(1f), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurface) + OutlinedButton(onClick = onMinus, modifier = noFocus.size(40.dp), contentPadding = PaddingValues(0.dp)) { Text("−") } + Text(value, Modifier.widthIn(min = 112.dp, max = 168.dp).padding(horizontal = 4.dp), textAlign = TextAlign.Center, + style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis) + OutlinedButton(onClick = onPlus, modifier = noFocus.size(40.dp), contentPadding = PaddingValues(0.dp)) { Text("+") } + } +} + +/** A value slider (touch) that a controller moves with Left / Right in steps of 1 (hold to repeat). */ +@Composable +private fun SliderRow(label: String, value: Int, min: Int, max: Int, onValue: (Int) -> Unit) { + SettingRow(onLeft = { onValue((value - 1).coerceAtLeast(min)) }, onRight = { onValue((value + 1).coerceAtMost(max)) }, onSelect = null) { + Text(label, Modifier.width(72.dp), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurface) + androidx.compose.material3.Slider(value = value.toFloat(), onValueChange = { onValue(it.toInt().coerceIn(min, max)) }, + valueRange = min.toFloat()..max.toFloat(), modifier = noFocus.weight(1f)) + Text("$value fps", Modifier.width(72.dp), textAlign = TextAlign.End, style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface) + } +} + +@Composable +private fun Choice(label: String, options: List>, selected: T, needsRestart: Boolean = false, onSelect: (T) -> Unit) { + val index = options.indexOfFirst { it.first == selected }.coerceAtLeast(0) + Step(label, options.getOrNull(index)?.second ?: "", + { if (options.isNotEmpty()) onSelect(options[(index - 1 + options.size) % options.size].first) }, + { if (options.isNotEmpty()) onSelect(options[(index + 1) % options.size].first) }) + if (needsRestart) Text("Takes effect when you restart the stream.", style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.tertiary, modifier = Modifier.padding(start = 8.dp, bottom = 4.dp)) +} + +@Composable +private fun Toggle(label: String, note: String, checked: Boolean, needsRestart: Boolean = false, onToggle: (Boolean) -> Unit) { + SettingRow(onLeft = { onToggle(false) }, onRight = { onToggle(true) }, onSelect = { onToggle(!checked) }) { + Column(Modifier.weight(1f)) { + Text(label, style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurface) + Text(note, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + } + Spacer(Modifier.width(8.dp)) + Switch(checked = checked, onCheckedChange = onToggle, modifier = noFocus) + } + if (needsRestart) Text("Takes effect when you restart the stream.", style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.tertiary, modifier = Modifier.padding(start = 8.dp, bottom = 4.dp)) +} + +/** One entry of the cloud players' menu list (highlighted when selected; A or a tap opens it). */ +@Composable +internal fun XboxMenuEntry(title: String, note: String?, focus: FocusRequester? = null, onFocused: () -> Unit = {}, onClick: () -> Unit) { + val cs = MaterialTheme.colorScheme + var focused by remember { mutableStateOf(false) } + val shape = RoundedCornerShape(10.dp) + androidx.compose.material3.Surface( + onClick = onClick, color = if (focused) cs.primary.copy(alpha = 0.2f) else cs.surfaceContainerHigh, shape = shape, + border = if (focused) androidx.compose.foundation.BorderStroke(2.dp, cs.primary) else null, + modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 3.dp) + .let { if (focus != null) it.focusRequester(focus) else it } + .onFocusChanged { state -> focused = state.isFocused; if (state.isFocused) onFocused() } + .onKeyEvent { event -> if (event.type == KeyEventType.KeyDown && event.key == Key.ButtonA) { onClick(); true } else false }, + ) { + Column(Modifier.padding(horizontal = 14.dp, vertical = 10.dp)) { + Text(title, style = MaterialTheme.typography.titleSmall, color = cs.onSurface) + if (note != null) Text(note, style = MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt new file mode 100644 index 0000000000..a5e7587af9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt @@ -0,0 +1,74 @@ +package com.droiddeck.launcher.stores.xbox + +import org.json.JSONArray +import org.json.JSONObject + +/** Request shapes follow Microsoft's web player as Greenlight (MIT) implements them. */ +internal class XboxCloudSignalling( + private val session: XboxCloudSession.Session, + private val titleId: String, + private val settings: XboxCloudSettings, +) { + @Volatile var path: String? = null + private set + + fun op(op: String, arg: String = ""): XboxCloudSession.Reply = when (op) { + "start" -> start() + "state" -> XboxCloudSession.request(session, "GET", "/$path/state") + "connect" -> connect() + "sdp" -> sdp(arg) + "ice" -> ice(arg) + "keepalive" -> XboxCloudSession.request(session, "POST", "/$path/keepalive", "{}") + else -> XboxCloudSession.Reply(0, "unknown request") + } + + fun start(): XboxCloudSession.Reply { + val body = JSONObject().put("clientSessionId", "").put("titleId", titleId).put("systemUpdateGroup", "") + .put("settings", JSONObject().put("nanoVersion", "V3;WebrtcTransport.dll").put("enableOptionalDataCollection", false) + .put("enableTextToSpeech", false).put("highContrast", 0).put("locale", settings.language.ifEmpty { java.util.Locale.getDefault().toLanguageTag() }) + .put("useIceConnection", false).put("timezoneOffsetMinutes", java.util.TimeZone.getDefault().getOffset(System.currentTimeMillis()) / 60_000) + .put("sdkType", "web").put("osName", settings.osName)) + .put("serverId", "").put("fallbackRegionNames", JSONArray()) + return XboxCloudSession.request(session, "POST", "/v5/sessions/cloud/play", body.toString()).also { reply -> + if (reply.status in 200..299) path = JSONObject(reply.body).getString("sessionPath").trim('/') + } + } + + fun connect(): XboxCloudSession.Reply { + val token = session.userToken ?: return XboxCloudSession.Reply(0, "no cloud transfer token for this account") + return XboxCloudSession.request(session, "POST", "/$path/connect", JSONObject().put("userToken", token).toString()) + } + + fun sdp(offer: String): XboxCloudSession.Reply { + val body = JSONObject().put("messageType", "offer").put("sdp", offer).put("requestId", "1").put("configuration", JSONObject() + .put("chatConfiguration", JSONObject().put("bytesPerSample", 2).put("expectedClipDurationMs", 20) + .put("format", JSONObject().put("codec", "opus").put("container", "webm")).put("numChannels", 1).put("sampleFrequencyHz", 24000)) + .put("chat", version(1, 1)).put("control", version(1, 3)).put("input", version(1, 9)).put("message", version(1, 1)) + .put("reliableinput", version(9, 9)).put("unreliableinput", version(9, 9))) + val posted = XboxCloudSession.request(session, "POST", "/$path/sdp", body.toString()) + return if (posted.status !in 200..299) posted else poll("/$path/sdp") + } + + fun ice(candidates: String): XboxCloudSession.Reply { + val posted = XboxCloudSession.request(session, "POST", "/$path/ice", JSONObject().put("candidates", JSONArray(candidates)).toString()) + return if (posted.status !in 200..299) posted else poll("/$path/ice") + } + + fun stop(): XboxCloudSession.Reply? { + val current = path ?: return null + path = null + return runCatching { XboxCloudSession.request(session, "DELETE", "/$current") }.getOrNull() + } + + private fun version(min: Int, max: Int) = JSONObject().put("minVersion", min).put("maxVersion", max) + + /** The exchange answers 204 until the console has replied. */ + private fun poll(path: String): XboxCloudSession.Reply { + repeat(60) { + val reply = XboxCloudSession.request(session, "GET", path) + if (reply.status != 204) return reply + Thread.sleep(500) + } + return XboxCloudSession.Reply(0, "no answer from the cloud console") + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt new file mode 100644 index 0000000000..03df4c19d4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt @@ -0,0 +1,74 @@ +package com.droiddeck.launcher.stores.xbox + +import android.app.Service +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.ServiceConnection +import android.os.Bundle +import android.os.Handler +import android.os.HandlerThread +import android.os.IBinder +import android.os.Looper +import android.os.Message +import android.os.Messenger +import java.util.concurrent.CountDownLatch +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit + +/** + * Hands the main process's Xbox Cloud Gaming tokens to the native player's process (:xcloudnative) over Binder, so + * they stay in memory (not exported, same app only) and a stream does not wait for a second ~20 s token fetch. + */ +class XboxCloudTokenService : Service() { + private val worker = Executors.newSingleThreadExecutor() + private val messenger = Messenger(Handler(Looper.getMainLooper()) { message -> + val replyTo = message.replyTo ?: return@Handler true + val account = message.data?.getString("account").orEmpty() + worker.execute { + val reply = Message.obtain(null, REPLY) + reply.data = runCatching { XboxCloudSession.toBundle(XboxCloudSession.get(applicationContext, account)) } + .getOrElse { Bundle().apply { putString("error", it.message ?: it.javaClass.simpleName) } } + runCatching { replyTo.send(reply) } + } + true + }) + + override fun onBind(intent: Intent?): IBinder = messenger.binder + + override fun onDestroy() { worker.shutdown(); super.onDestroy() } + + companion object { + private const val REQUEST = 1 + private const val REPLY = 2 + + /** Blocks until the main process answers (its tokens, or "error"), or returns null when it cannot be reached. */ + fun request(context: Context, account: String, timeoutSeconds: Long): Bundle? { + val app = context.applicationContext + val done = CountDownLatch(1) + var answer: Bundle? = null + val thread = HandlerThread("xcloud-token").apply { start() } + val replies = Messenger(Handler(thread.looper) { message -> + if (message.what == REPLY) { answer = message.data; done.countDown() } + true + }) + val connection = object : ServiceConnection { + override fun onServiceConnected(name: ComponentName?, binder: IBinder?) { + val ask = Message.obtain(null, REQUEST).apply { data = Bundle().apply { putString("account", account) }; replyTo = replies } + if (binder == null || runCatching { Messenger(binder).send(ask) }.isFailure) done.countDown() + } + override fun onServiceDisconnected(name: ComponentName?) { done.countDown() } + } + val bound = runCatching { app.bindService(Intent(app, XboxCloudTokenService::class.java), connection, Context.BIND_AUTO_CREATE) } + .getOrDefault(false) + try { + if (!bound) return null + done.await(timeoutSeconds, TimeUnit.SECONDS) + return answer + } finally { + if (bound) runCatching { app.unbindService(connection) } + thread.quitSafely() + } + } + } +} 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 bf9e7ee703..5de1abcac8 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 @@ -23,18 +23,19 @@ internal object XboxLibraryCache { fun clear(app: Context) { prefs(app).edit().remove("library").commit() } internal fun encode(account: String, market: String, games: List, now: Long = System.currentTimeMillis()): String = - JSONObject().put("schema", 1).put("account", account).put("market", market).put("savedAt", now) + JSONObject().put("schema", 2).put("account", account).put("market", market).put("savedAt", now) .put("games", JSONArray().apply { for (game in games) put(JSONObject().put("id", game.id).put("title", game.title) .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("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())) }).toString() internal fun decode(text: String?, account: String, market: String, now: Long = System.currentTimeMillis()): Snapshot? = runCatching { require(text != null && text.length <= 8_000_000) val json = JSONObject(text) - require(json.getInt("schema") == 1 && json.getString("account") == account && json.getString("market") == market) + require(json.getInt("schema") == 2 && json.getString("account") == account && json.getString("market") == market) val savedAt = json.getLong("savedAt") require(savedAt > 0 && savedAt <= now + 60_000) val rows = json.getJSONArray("games") @@ -44,12 +45,14 @@ internal object XboxLibraryCache { val id = row.getString("id") val title = row.getString("title") val access = row.getString("access") + val cloudId = row.optString("cloudId").takeIf { it.matches(Regex("[A-Z0-9]{12}")) }.orEmpty() require(id.matches(Regex("[A-Z0-9]{12}")) && title.isNotBlank() && access in setOf("owned", "gamepass")) 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)) + 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)) } require(games.map { it.id }.distinct().size == games.size) Snapshot(games, savedAt) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryFilter.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryFilter.kt new file mode 100644 index 0000000000..3e3e001d7b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryFilter.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.stores.xbox + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.stores.CatalogItem + +object XboxLibraryFilter { + const val ALL = "all" + const val OWNED = "owned" + const val GAME_PASS = "gamepass" + const val CLOUD = "cloud" + val ALL_FILTERS = listOf(ALL, OWNED, GAME_PASS, CLOUD) + + var current by mutableStateOf(ALL) + private set + + fun load(context: Context) { + current = context.getSharedPreferences("xbox", Context.MODE_PRIVATE).getString("libraryFilter", ALL)?.takeIf { it in ALL_FILTERS } ?: ALL + } + + fun set(context: Context, filter: String) { + current = filter + context.getSharedPreferences("xbox", Context.MODE_PRIVATE).edit().putString("libraryFilter", filter).apply() + } + + fun keeps(filter: String, item: CatalogItem): Boolean = when (filter) { + OWNED -> item.owned + GAME_PASS -> item.subscription + CLOUD -> item.xboxCloud + else -> true + } + + fun label(filter: String): String = when (filter) { + OWNED -> "Owned" + GAME_PASS -> "Game Pass" + CLOUD -> "Cloud" + else -> "All" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt new file mode 100644 index 0000000000..661023d542 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt @@ -0,0 +1,80 @@ +package com.droiddeck.launcher.stores.xbox + +import android.view.InputDevice +import android.view.KeyEvent +import android.view.MotionEvent + +/** + * Controller state for the native cloud player, from Android key and motion events (no Gamepad API). Button + * bits follow the xCloud input report (Greenlight's packet.ts): Nexus 2, Menu 4, View 8, A 16, B 32, X 64, + * Y 128, D-pad 256..2048, shoulders 4096 / 8192, stick clicks 16384 / 32768. + */ +internal class XboxNativePad { + data class State(val buttons: Int, val lx: Float, val ly: Float, val rx: Float, val ry: Float, val lt: Float, val rt: Float) { + /** Greenlight's rule: any button change, a stick moved past 0.08 or held past 0.15, a trigger past 0.01. */ + fun differsFrom(o: State): Boolean = buttons != o.buttons || + listOf(lx to o.lx, ly to o.ly, rx to o.rx, ry to o.ry).any { (a, b) -> Math.abs(a - b) > 0.08f || Math.abs(a) > 0.15f } || + Math.abs(lt - o.lt) > 0.01f || Math.abs(rt - o.rt) > 0.01f + } + + @Volatile private var buttons = 0 + @Volatile private var hatButtons = 0 + @Volatile private var lx = 0f; @Volatile private var ly = 0f + @Volatile private var rx = 0f; @Volatile private var ry = 0f + @Volatile private var lt = 0f; @Volatile private var rt = 0f + /** Called after any change (instant controller input). */ + @Volatile var onChanged: (() -> Unit)? = null + + /** Buttons pressed on behalf of the app (the menu's Xbox button), OR-ed in. */ + @Volatile var overrideButtons = 0 + + fun snapshot() = State(buttons or hatButtons or overrideButtons, lx, ly, rx, ry, lt, rt) + + /** True when the event was a controller button this pad tracks. */ + fun onKey(event: KeyEvent): Boolean { + val bit = when (event.keyCode) { + KeyEvent.KEYCODE_BUTTON_A -> 16 + KeyEvent.KEYCODE_BUTTON_B -> 32 + KeyEvent.KEYCODE_BUTTON_X -> 64 + KeyEvent.KEYCODE_BUTTON_Y -> 128 + KeyEvent.KEYCODE_DPAD_UP -> 256 + KeyEvent.KEYCODE_DPAD_DOWN -> 512 + KeyEvent.KEYCODE_DPAD_LEFT -> 1024 + KeyEvent.KEYCODE_DPAD_RIGHT -> 2048 + KeyEvent.KEYCODE_BUTTON_L1 -> 4096 + KeyEvent.KEYCODE_BUTTON_R1 -> 8192 + KeyEvent.KEYCODE_BUTTON_THUMBL -> 16384 + KeyEvent.KEYCODE_BUTTON_THUMBR -> 32768 + KeyEvent.KEYCODE_BUTTON_START -> 4 + KeyEvent.KEYCODE_BUTTON_SELECT -> 8 + // Digital triggers on pads without analog axes. + KeyEvent.KEYCODE_BUTTON_L2 -> { lt = if (event.action == KeyEvent.ACTION_DOWN) 1f else 0f; onChanged?.invoke(); return true } + KeyEvent.KEYCODE_BUTTON_R2 -> { rt = if (event.action == KeyEvent.ACTION_DOWN) 1f else 0f; onChanged?.invoke(); return true } + else -> return false + } + buttons = if (event.action == KeyEvent.ACTION_DOWN) buttons or bit else buttons and bit.inv() + onChanged?.invoke() + return true + } + + /** True when the event came from a joystick (sticks, triggers, hat). */ + fun onMotion(event: MotionEvent): Boolean { + if (event.source and InputDevice.SOURCE_JOYSTICK != InputDevice.SOURCE_JOYSTICK || event.action != MotionEvent.ACTION_MOVE) return false + val device = event.device + fun axis(code: Int): Float { + val value = event.getAxisValue(code) + val flat = device?.getMotionRange(code, event.source)?.flat ?: 0f + return if (Math.abs(value) > maxOf(flat, 0.08f)) value else 0f + } + lx = axis(MotionEvent.AXIS_X); ly = axis(MotionEvent.AXIS_Y) + rx = axis(MotionEvent.AXIS_Z); ry = axis(MotionEvent.AXIS_RZ) + lt = maxOf(axis(MotionEvent.AXIS_LTRIGGER), axis(MotionEvent.AXIS_BRAKE)) + rt = maxOf(axis(MotionEvent.AXIS_RTRIGGER), axis(MotionEvent.AXIS_GAS)) + val hx = event.getAxisValue(MotionEvent.AXIS_HAT_X); val hy = event.getAxisValue(MotionEvent.AXIS_HAT_Y) + hatButtons = (if (hy < -0.5f) 256 else 0) or (if (hy > 0.5f) 512 else 0) or (if (hx < -0.5f) 1024 else 0) or (if (hx > 0.5f) 2048 else 0) + onChanged?.invoke() + return true + } + + fun reset() { buttons = 0; hatButtons = 0; overrideButtons = 0; lx = 0f; ly = 0f; rx = 0f; ry = 0f; lt = 0f; rt = 0f } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt new file mode 100644 index 0000000000..97fd03a3da --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt @@ -0,0 +1,852 @@ +package com.droiddeck.launcher.stores.xbox + +import android.content.Context +import android.content.Intent +import android.graphics.Color +import android.os.Build +import android.os.Bundle +import android.os.VibrationEffect +import android.view.Gravity +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.SurfaceHolder +import android.view.SurfaceView +import android.view.WindowManager +import android.widget.FrameLayout +import android.widget.TextView +import androidx.activity.ComponentActivity +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.verticalScroll +import androidx.compose.runtime.getValue +import androidx.compose.runtime.setValue +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.input.key.KeyEventType +import androidx.compose.ui.input.key.key +import androidx.compose.ui.input.key.onKeyEvent +import androidx.compose.ui.input.key.type +import androidx.compose.ui.unit.dp +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsControllerCompat +import org.json.JSONArray +import org.json.JSONObject +import org.webrtc.DataChannel +import org.webrtc.DefaultVideoEncoderFactory +import org.webrtc.EglBase +import org.webrtc.IceCandidate +import org.webrtc.MediaConstraints +import org.webrtc.MediaStream +import org.webrtc.MediaStreamTrack +import org.webrtc.PeerConnection +import org.webrtc.PeerConnectionFactory +import org.webrtc.RtpReceiver +import org.webrtc.RtpTransceiver +import org.webrtc.SdpObserver +import org.webrtc.SessionDescription +import org.webrtc.VideoTrack +import org.webrtc.audio.JavaAudioDeviceModule +import java.util.concurrent.CountDownLatch +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit + +/** + * Native Xbox Cloud Gaming player (opt-in, Android 10+): Google's WebRTC library instead of the web page, the + * xCloud channels ported from Greenlight (XboxNativeProtocol), controller from Android input events, and the + * picture through DroidDeck's own compositor (XboxNativeVideo) so DDFG or LSFG can generate frames. Runs in + * its own process (:xcloudnative): that compositor instance is never the Linux session's. + * Sign-in and session requests are the web player's (XboxCloudSession, XboxCloudSignalling). + */ +class XboxNativePlayerActivity : ComponentActivity() { + private lateinit var root: FrameLayout + private lateinit var surfaceView: SurfaceView + private lateinit var status: TextView + private lateinit var overlay: TextView + private val worker = Executors.newSingleThreadExecutor() + private val ticker = Executors.newSingleThreadScheduledExecutor() + private val pad = XboxNativePad() + private var eglBase: EglBase? = null + private var factory: PeerConnectionFactory? = null + private var pc: PeerConnection? = null + private var protocol: XboxNativeProtocol? = null + private var video: XboxNativeVideo? = null + @Volatile private var signalling: XboxCloudSignalling? = null + @Volatile private var settings = XboxCloudSettings() + @Volatile private var closed = false + /** The stream reached the screen at least once (a later failure is a lost connection, not a failed start). */ + @Volatile private var connectedOnce = false + /** The session was ended because the player stayed in the background (Android freezes the app soon after). */ + @Volatile private var endedInBackground = false + private var backgroundEnd: Runnable? = null + private var notice: androidx.compose.ui.platform.ComposeView? = null + @Volatile private var regionNames = emptyList() + @Volatile private var serverName: String? = null + private val candidates = mutableListOf() + private val gathered = CountDownLatch(1) + private var menu: androidx.compose.ui.platform.ComposeView? = null + private var menuPage by androidx.compose.runtime.mutableStateOf("") + private var lastMainEntry = 0 + private val lastRow = mutableMapOf() + /** The settings this stream started with (stream-start settings changed since then need a restart). */ + private var startedWith: XboxCloudSettings? = null + /** + * The picture's route right now: true = zero-copy (decoder straight onto the screen), false = WebRTC's texture + * through the Vulkan compositor. Zero-copy whenever it is chosen and frame generation is off; switched live. + */ + @Volatile private var zeroCopy = false + /** The SurfaceView's surface while it exists (UI thread). */ + private var screen: android.view.Surface? = null + private var screenW = 0 + private var screenH = 0 + @Volatile private var zeroCopyFrames = 0L + @Volatile private var decoders: org.webrtc.DroidDeckLowLatencyDecoderFactory? = null + private var lastZeroCopyFrames = 0L + private var lastSubmitted = 0L + /** The release of the Guide press that opened the menu must not close it again. */ + private var swallowGuideUp = false + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + hideBars() + watchBars() + root = FrameLayout(this).apply { setBackgroundColor(Color.BLACK) } + surfaceView = SurfaceView(this) + root.addView(surfaceView, FrameLayout.LayoutParams(-1, -1)) + status = TextView(this).apply { setTextColor(Color.WHITE); textSize = 16f; gravity = Gravity.CENTER } + root.addView(status, FrameLayout.LayoutParams(-1, -2, Gravity.BOTTOM).apply { bottomMargin = 120 }) + overlay = TextView(this).apply { + setTextColor(Color.WHITE); textSize = 12f; typeface = android.graphics.Typeface.MONOSPACE + setBackgroundColor(Color.argb(140, 0, 0, 0)); setPadding(12, 6, 12, 6); visibility = android.view.View.GONE + } + root.addView(overlay, FrameLayout.LayoutParams(-2, -2, Gravity.TOP or Gravity.END).apply { topMargin = 16; rightMargin = 16 }) + setContentView(root) + settings = XboxCloudSettings.load(this) + startedWith = settings + applyDisplayRate(settings.fpsTarget) + applyOverlay() + + val egl = EglBase.create().also { eglBase = it } + val nativeVideo = XboxNativeVideo(this, egl) { log(it) }.also { video = it } + surfaceView.holder.addCallback(object : SurfaceHolder.Callback { + override fun surfaceCreated(holder: SurfaceHolder) {} + override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) { + screen = holder.surface; screenW = width; screenH = height + // Zero-copy: the decoder owns this surface (back on it after a stand-in); the Vulkan compositor must not connect to it. + if (zeroCopy) { decoders?.setZeroCopySurface(holder.surface); return } + @Suppress("DEPRECATION") + nativeVideo.setSurface(holder.surface, width, height, windowManager.defaultDisplay.refreshRate) + } + override fun surfaceDestroyed(holder: SurfaceHolder) { + screen = null + if (zeroCopy) decoders?.setZeroCopySurface(null) else nativeVideo.setSurface(null, 0, 0, 60f) + } + }) + show("Signing in to Xbox Cloud Gaming…") + worker.execute { runCatching { run() }.onFailure { fail("start", it.message ?: it.javaClass.simpleName) } } + } + + private fun log(text: String) = com.droiddeck.launcher.stores.StoresState.logLine("Xbox: native player: ${text.take(240)}") + private fun show(text: String) = runOnUiThread { status.text = text; status.visibility = if (text.isEmpty()) android.view.View.GONE else android.view.View.VISIBLE } + + private fun fail(stage: String, detail: String) { + log("failed at $stage: $detail") + if (closed) return + if (connectedOnce) showNotice("The connection to the cloud console was lost", + "The stream stopped reaching this device ($detail). Restart the stream to play again: the game starts over, " + + "unsaved progress is lost.", webPlayer = false) + else showNotice("The native stream could not start ($stage)", + "$detail\n\nYou can try again, or use the web player instead (Stores › Xbox › Cloud settings › Player engine).", + webPlayer = true) + } + + /** One popup at a time, in the app's dialog style; A or Enter picks the selected button, Back closes the player. */ + private fun showNotice(title: String, text: String, webPlayer: Boolean) = runOnUiThread { + if (notice != null || isFinishing || isDestroyed) return@runOnUiThread + closeMenu() + show("") + // The stream is over: stale numbers must not stay on screen. + overlayOn = false + overlay.visibility = android.view.View.GONE + val view = androidx.compose.ui.platform.ComposeView(this) + view.setContent { + com.droiddeck.launcher.ui.DroidDeckTheme { + val first = androidx.compose.runtime.remember { androidx.compose.ui.focus.FocusRequester() } + androidx.compose.runtime.LaunchedEffect(Unit) { androidx.compose.runtime.withFrameNanos { }; runCatching { first.requestFocus() } } + @androidx.compose.runtime.Composable + fun NoticeButton(label: String, focus: androidx.compose.ui.focus.FocusRequester?, onClick: () -> Unit) = + androidx.compose.material3.TextButton(onClick = onClick, + modifier = androidx.compose.ui.Modifier.let { if (focus != null) it.focusRequester(focus) else it } + .onKeyEvent { e -> if (e.type == KeyEventType.KeyDown && e.key == Key.ButtonA) { onClick(); true } else false }) { + androidx.compose.material3.Text(label) + } + androidx.compose.material3.AlertDialog( + onDismissRequest = { finish() }, + properties = androidx.compose.ui.window.DialogProperties(dismissOnClickOutside = false), + title = { androidx.compose.material3.Text(title) }, + text = { androidx.compose.material3.Text(text) }, + confirmButton = { + androidx.compose.foundation.layout.Row { + NoticeButton(if (connectedOnce) "Restart the stream" else "Try again", first) { restartStream() } + if (webPlayer) NoticeButton("Open the web player", null) { + startActivity(Intent(this@XboxNativePlayerActivity, XboxCloudPlayerActivity::class.java).putExtras(intent)); finish() + } + } + }, + dismissButton = { NoticeButton("Close", null) { finish() } }, + ) + } + } + notice = view + root.addView(view, FrameLayout.LayoutParams(-1, -1)) + } + + // ---- background ---- + + override fun onStop() { + super.onStop() + if (closed || isChangingConfigurations || signalling == null || endedInBackground) return + // Android freezes a background app about a minute after it leaves the screen; the connection then dies + // without a goodbye. End the session cleanly before that and offer a restart on return. + log("in the background") + val end = Runnable { backgroundEnd = null; endInBackground() } + backgroundEnd = end + root.postDelayed(end, BACKGROUND_GRACE_MS) + } + + override fun onStart() { + super.onStart() + backgroundEnd?.let { root.removeCallbacks(it); log("back before the stream was ended") } + backgroundEnd = null + if (endedInBackground && notice == null) showNotice("The stream ended while DroidDeck was in the background", + "Cloud sessions are closed after ${BACKGROUND_GRACE_MS / 1000} s away, before Android pauses the app. Restart the " + + "stream to play again: the game starts over, unsaved progress is lost.", webPlayer = false) + } + + private fun endInBackground() { + if (closed || endedInBackground) return + endedInBackground = true + closed = true + log("ending the session: ${BACKGROUND_GRACE_MS / 1000} s in the background") + val signals = signalling + signalling = null + ticker.shutdownNow() + runOnUiThread { overlayOn = false; overlay.visibility = android.view.View.GONE } + Thread({ signals?.stop()?.let { log("session closed: ${it.status}") } }, "xcloud-native-stop").start() + runCatching { protocol?.close() } + runCatching { pc?.close() } + } + + // ---- session ---- + + private fun run() { + val account = com.droiddeck.launcher.stores.StoreAccounts.signedInAs(applicationContext, com.droiddeck.launcher.stores.Store.XBOX) + ?: error("Sign in to the Xbox store first.") + val requested = intent.getStringExtra("product").orEmpty() + val cached = XboxLibraryCache.read(applicationContext, account, Xodus.market())?.games?.firstOrNull { it.id == requested } + val product = cached?.extra?.get("cloudId")?.takeIf { it.isNotEmpty() } ?: requested + // The main process's tokens when it has them (no second ~20 s fetch); else this process fetches its own. + val shared = runCatching { XboxCloudSession.fromMainProcess(applicationContext, account) } + .onFailure { log("tokens from the main process: ${it.message?.take(160)}") }.getOrNull() + log(if (shared != null) "tokens from the main process" else "tokens fetched here") + val active = (shared ?: XboxCloudSession.get(applicationContext, account)).forStream(settings.region, settings.osName) + regionNames = active.regionList.map { it.name } + serverName = active.regionList.firstOrNull { it.baseUri == active.baseUri }?.name + val title = XboxCloudSession.titles(active)[product] ?: error("This game can't be streamed with this account here.") + val signals = XboxCloudSignalling(active, title, settings).also { signalling = it } + log("$product -> $title, region ${java.net.URI(active.baseUri).host}, frame gen ${settings.frameGen}") + + show("Starting the game on Xbox Cloud Gaming…") + expect("start", signals.start()) + var connected = false + var waited = 0 + while (!closed) { + val state = JSONObject(expect("state", signals.op("state")).body.ifEmpty { "{}" }) + when (state.optString("state")) { + "Provisioned" -> break + "Failed" -> error("provision: ${state.optJSONObject("errorDetails")}") + "ReadyToConnect" -> if (!connected) { connected = true; show("Signing in to the cloud console…"); expect("connect", signals.connect()) } + "WaitingForResources" -> show("In the queue for a cloud console… ${waited / 1000} s") + else -> show("Getting a cloud console ready… ${waited / 1000} s") + } + Thread.sleep(1000); waited += 1000 + } + if (closed) return + + show("Connecting…") + // Small network buffer: no playout delay, frames go to the decoder and screen as soon as they are complete. + val trials = if (settings.smallBuffer) "WebRTC-ForcePlayoutDelay/min_ms:0,max_ms:0/WebRTC-ZeroPlayoutDelay/min_pacing:0ms,max_decode_queue_size:8/" else "" + PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions.builder(applicationContext) + .setFieldTrials(trials).createInitializationOptions()) + val egl = eglBase!! + val zeroSurface = if (zeroCopyWanted(settings)) { + repeat(40) { if (!surfaceView.holder.surface.isValid) Thread.sleep(50) } + surfaceView.holder.surface.takeIf { it.isValid } + } else null + if (zeroSurface != null) { + // The compositor may already hold the screen; it must let go before the decoder takes it. + val ready = CountDownLatch(1) + runOnUiThread { zeroCopy = true; video?.setSurface(null, 0, 0, 60f); ready.countDown() } + ready.await(2, TimeUnit.SECONDS) + } + log("latency: instant input ${settings.instantInput}, small buffer ${settings.smallBuffer}, fast decoder ${settings.fastDecoder}, " + + "zero-copy ${zeroSurface != null}") + val f = PeerConnectionFactory.builder() + .setAudioDeviceModule(JavaAudioDeviceModule.builder(applicationContext).createAudioDeviceModule()) + .setVideoDecoderFactory(org.webrtc.DroidDeckLowLatencyDecoderFactory(egl.eglBaseContext, settings.fastDecoder, zeroSurface) { zeroCopyFrames++ } + .also { decoders = it }) + .setVideoEncoderFactory(DefaultVideoEncoderFactory(egl.eglBaseContext, true, true)) + .createPeerConnectionFactory().also { factory = it } + val config = PeerConnection.RTCConfiguration(emptyList()).apply { sdpSemantics = PeerConnection.SdpSemantics.UNIFIED_PLAN } + val peer = f.createPeerConnection(config, observer) ?: error("WebRTC unavailable") + pc = peer + peer.addTransceiver(MediaStreamTrack.MediaType.MEDIA_TYPE_AUDIO, RtpTransceiver.RtpTransceiverInit(RtpTransceiver.RtpTransceiverDirection.SEND_RECV)) + peer.addTransceiver(MediaStreamTrack.MediaType.MEDIA_TYPE_VIDEO, RtpTransceiver.RtpTransceiverInit(RtpTransceiver.RtpTransceiverDirection.RECV_ONLY)) + protocol = XboxNativeProtocol(peer, pad, { log(it) }, ::rumble) { runOnUiThread { finish() } } + pad.onChanged = { if (settings.instantInput) protocol?.inputChanged() } + + val offer = await { done -> peer.createOffer(sdpObserver(done), MediaConstraints()) } + val local = SessionDescription(offer.type, tweakOffer(offer.description)) + await { done -> peer.setLocalDescription(sdpObserver(done), local) } + val sdpReply = expect("sdp", signals.sdp(local.description)) + val answer = JSONObject(JSONObject(sdpReply.body).getString("exchangeResponse")) + if (answer.has("status") && answer.optString("status") != "success") error("sdp answer: $answer") + await { done -> peer.setRemoteDescription(sdpObserver(done), SessionDescription(SessionDescription.Type.ANSWER, answer.getString("sdp"))) } + + gathered.await(3, TimeUnit.SECONDS) + val local2 = synchronized(candidates) { candidates.toList() }.map { c -> + JSONObject().put("candidate", c.sdp).put("sdpMid", c.sdpMid).put("sdpMLineIndex", c.sdpMLineIndex).put("usernameFragment", JSONObject.NULL).toString() + } + val iceReply = expect("ice", signals.ice(JSONArray(local2).toString())) + val remote = JSONArray(JSONObject(iceReply.body).getString("exchangeResponse")) + for (i in 0 until remote.length()) addRemoteCandidate(peer, remote.getJSONObject(i)) + log("signalling done: ${local2.size} local / ${remote.length()} remote candidates") + ticker.scheduleWithFixedDelay({ runCatching { signals.op("keepalive") } }, 30, 30, TimeUnit.SECONDS) + ticker.scheduleWithFixedDelay({ runCatching { updateOverlay() } }, 1, 1, TimeUnit.SECONDS) + } + + private fun expect(stage: String, reply: XboxCloudSession.Reply): XboxCloudSession.Reply { + if (reply.status !in 200..299) error("$stage: ${reply.status} ${reply.body.take(200)}") + return reply + } + + /** Opus stereo (Greenlight), H.264 profile order (Main first unless the user picked one) and the bitrate cap. */ + private fun tweakOffer(sdp: String): String { + var out = sdp.replace("useinbandfec=1", "useinbandfec=1; stereo=1") + val prefix = when (settings.codec) { "low" -> "420"; "normal" -> "42e"; else -> "4d" } + val ids = Regex("a=fmtp:(\\d+).*profile-level-id=([0-9a-f]{6})").findAll(out).filter { it.groupValues[2].startsWith(prefix) }.map { it.groupValues[1] }.toList() + if (ids.isNotEmpty()) out = out.split("\r\n").joinToString("\r\n") { line -> + if (!line.startsWith("m=video")) line else { + val parts = line.trim().split(" ") + (parts.take(3) + ids + parts.drop(3).filter { it !in ids }).joinToString(" ") + } + } + if (settings.bitrateMbps > 0) { + val lines = out.split("\r\n").toMutableList() + val start = lines.indexOfFirst { it.startsWith("m=video") } + if (start >= 0) { + var i = start + 1 + while (i < lines.size && (lines[i].startsWith("i=") || lines[i].startsWith("c="))) i++ + if (i < lines.size && lines[i].startsWith("b=AS:")) lines[i] = "b=AS:${settings.bitrateMbps * 1000}" else lines.add(i, "b=AS:${settings.bitrateMbps * 1000}") + out = lines.joinToString("\r\n") + } + } + return out + } + + /** The server's candidates, plus the IPv4 behind a Teredo address (Greenlight's ice.ts / teredo.ts). */ + private fun addRemoteCandidate(peer: PeerConnection, c: JSONObject) { + val line = c.optString("candidate").removePrefix("a=") + if (line.isEmpty() || line == "end-of-candidates") return + val mid = c.optString("sdpMid", "0"); val index = c.optString("sdpMLineIndex", "0").toIntOrNull() ?: 0 + val address = line.split(" ").getOrNull(4).orEmpty() + if (address.startsWith("2001")) runCatching { + val p = address.split(":") + val hex = p[6].padStart(4, '0') + p[7].padStart(4, '0') + val ip = (0 until 4).joinToString(".") { k -> ((hex.substring(k * 2, k * 2 + 2).toInt(16)).inv() and 0xFF).toString() } + val port = p[5].toInt(16).inv() and 0xFFFF + peer.addIceCandidate(IceCandidate(mid, index, "candidate:10 1 UDP 1 $ip 9002 typ host ")) + peer.addIceCandidate(IceCandidate(mid, index, "candidate:11 1 UDP 1 $ip $port typ host ")) + } + peer.addIceCandidate(IceCandidate(mid, index, line)) + } + + private val observer = object : PeerConnection.Observer { + override fun onSignalingChange(state: PeerConnection.SignalingState) {} + override fun onIceConnectionChange(state: PeerConnection.IceConnectionState) { log("ice $state") } + override fun onIceConnectionReceivingChange(receiving: Boolean) {} + override fun onIceGatheringChange(state: PeerConnection.IceGatheringState) { if (state == PeerConnection.IceGatheringState.COMPLETE) gathered.countDown() } + override fun onIceCandidate(candidate: IceCandidate) { synchronized(candidates) { candidates.add(candidate) } } + override fun onIceCandidatesRemoved(removed: Array) {} + override fun onAddStream(stream: MediaStream) {} + override fun onRemoveStream(stream: MediaStream) {} + override fun onDataChannel(channel: DataChannel) {} + override fun onRenegotiationNeeded() {} + override fun onAddTrack(receiver: RtpReceiver, streams: Array) { attach(receiver) } + override fun onTrack(transceiver: RtpTransceiver) { attach(transceiver.receiver) } + override fun onConnectionChange(state: PeerConnection.PeerConnectionState) { + log("connection $state") + when (state) { + PeerConnection.PeerConnectionState.CONNECTED -> { + connectedOnce = true + show("") + video?.setFpsTarget(settings.fpsTarget) + video?.setFrameGeneration(effectiveFrameGen()) + } + PeerConnection.PeerConnectionState.FAILED -> fail("webrtc", "connection failed") + PeerConnection.PeerConnectionState.DISCONNECTED -> show("Connection lost…") + else -> {} + } + } + } + + private var videoAttached = false + + private fun attach(receiver: RtpReceiver) = synchronized(this) { + val track = receiver.track() + // Always attached: in zero-copy WebRTC delivers no frames, and after a live switch back they flow again. + if (track is VideoTrack && !videoAttached) { videoAttached = true; video?.let { track.addSink(it) }; log("video track") } + } + + /** LSFG needs the Lossless.dll and its shader cache built; otherwise DDFG. */ + private fun effectiveFrameGen(): String { + if (!XboxNativeVideo.isLsfg(settings.frameGen)) return settings.frameGen + val status = com.droiddeck.launcher.gpu.Lossless.sync(applicationContext) + if (status == 0) return settings.frameGen + log("LSFG unavailable (status $status), using DDFG") + return XboxNativeVideo.FG_DDFG + } + + private fun await(start: (done: (Result) -> Unit) -> Unit): T { + val latch = CountDownLatch(1) + var result: Result? = null + start { r -> result = r; latch.countDown() } + check(latch.await(15, TimeUnit.SECONDS)) { "WebRTC timed out" } + return result!!.getOrThrow() + } + + @Suppress("UNCHECKED_CAST") + private fun sdpObserver(done: (Result) -> Unit) = object : SdpObserver { + override fun onCreateSuccess(description: SessionDescription) = done(Result.success(description as T)) + override fun onSetSuccess() = done(Result.success(Unit as T)) + override fun onCreateFailure(error: String) = done(Result.failure(IllegalStateException(error))) + override fun onSetFailure(error: String) = done(Result.failure(IllegalStateException(error))) + } + + // ---- input, rumble, overlay ---- + + private var guideDown = false + private var guideDownAt = 0L + private var lastGuideUp = 0L + private var pendingNexus: Runnable? = null + private fun isGuide(event: KeyEvent) = event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE + + private fun pressNexus() { + pad.overrideButtons = pad.overrideButtons or 2 + root.postDelayed({ pad.overrideButtons = pad.overrideButtons and 2.inv() }, 200) + } + + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (menu != null) { + // Guide closes the menu; Back goes up one page, then closes it. + if (isGuide(event)) { if (event.action == KeyEvent.ACTION_UP) { if (swallowGuideUp) swallowGuideUp = false else closeMenu() }; return true } + if (event.keyCode == KeyEvent.KEYCODE_BACK) { + if (event.action == KeyEvent.ACTION_UP) { if (menuPage.isNotEmpty()) menuPage = "" else closeMenu() } + return true + } + return super.dispatchKeyEvent(event) + } + // Guide / the Input Controls menu button: once = the Xbox button, twice or held = the player menu. + if (isGuide(event)) { + if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { + val pending = pendingNexus + if (pending != null && event.eventTime - lastGuideUp <= 350) { root.removeCallbacks(pending); pendingNexus = null; swallowGuideUp = true; openMenu() } + else { guideDown = true; guideDownAt = event.eventTime } + } else if (event.action == KeyEvent.ACTION_DOWN && guideDown && event.eventTime - guideDownAt >= 600) { + guideDown = false; swallowGuideUp = true; openMenu() + } else if (event.action == KeyEvent.ACTION_UP && guideDown) { + guideDown = false; lastGuideUp = event.eventTime + val tap = Runnable { pendingNexus = null; pressNexus() } + pendingNexus = tap; root.postDelayed(tap, 350) + } + return true + } + if (event.keyCode == KeyEvent.KEYCODE_BACK) { if (event.action == KeyEvent.ACTION_UP) openMenu(); return true } + if (pad.onKey(event)) return true + return super.dispatchKeyEvent(event) + } + + // With the menu open, sticks and the hat go to Android unhandled, which turns them into D-pad keys for the menu. + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean = + (menu == null && pad.onMotion(event)) || super.dispatchGenericMotionEvent(event) + + private fun rumble(strong: Float, weak: Float, durationMs: Int) { + val scale = settings.rumble / 100f + val amplitude = (maxOf(strong, weak) * scale * 255).toInt().coerceIn(0, 255) + if (amplitude == 0 || durationMs <= 0) return + val vibrator = (if (Build.VERSION.SDK_INT >= 31) getSystemService(android.os.VibratorManager::class.java)?.defaultVibrator + else @Suppress("DEPRECATION") getSystemService(android.os.Vibrator::class.java)) ?: return + runCatching { vibrator.vibrate(VibrationEffect.createOneShot(durationMs.coerceAtMost(1000).toLong(), amplitude)) } + } + + /** The overlay is remembered with the other cloud settings (on = overlay level above 0). */ + @Volatile private var overlayOn = false + + private var lastJitterDelay = 0.0 + private var lastJitterCount = 0.0 + private var lastDecodeTime = 0.0 + private var lastDecoded = 0.0 + private var lastBytes = 0.0 + private var lastStatsMs = 0.0 + private var lastLost = 0.0 + private var lastReceived = 0.0 + + /** + * The overlay, at the web player's levels and layout (settings statsLevel / statsLayout): 1 fps and frame + * generation base -> shown; 2 + resolution, ping; 3 + bitrate, jitter buffer, decode time, packet loss; 4 + frame + * generation's added delay, the estimated picture delay (one-way network + buffer + decode + frame generation + + * one screen refresh), codec and server. + */ + private fun updateOverlay() { + val level = settings.statsLevel + if (!overlayOn || level <= 0) return + val peer = pc ?: return + peer.getStats { report -> + var size = ""; var fps = 0; var codec = "" + var rttMs = -1.0; var bufferMs = 0.0; var decodeMs = 0.0; var mbps = 0.0; var loss = 0.0 + val codecs = HashMap() + report.statsMap.values.forEach { s -> if (s.type == "codec") codecs[s.id] = (s.members["mimeType"] as? String).orEmpty().removePrefix("video/") } + report.statsMap.values.forEach { s -> + val m = s.members + if (s.type == "inbound-rtp" && m["kind"] == "video") { + size = "${m["frameWidth"]}x${m["frameHeight"]}" + fps = (m["framesPerSecond"] as? Number)?.toInt() ?: 0 + codec = codecs[m["codecId"] as? String].orEmpty() + val jd = (m["jitterBufferDelay"] as? Number)?.toDouble() ?: 0.0 + val jc = (m["jitterBufferEmittedCount"] as? Number)?.toDouble() ?: 0.0 + if (jc > lastJitterCount) bufferMs = (jd - lastJitterDelay) * 1000 / (jc - lastJitterCount) + lastJitterDelay = jd; lastJitterCount = jc + val dt = (m["totalDecodeTime"] as? Number)?.toDouble() ?: 0.0 + val df = (m["framesDecoded"] as? Number)?.toDouble() ?: 0.0 + if (df > lastDecoded) decodeMs = (dt - lastDecodeTime) * 1000 / (df - lastDecoded) + lastDecodeTime = dt; lastDecoded = df + val bytes = (m["bytesReceived"] as? Number)?.toDouble() ?: 0.0 + val now = s.timestampUs / 1000.0 + if (lastStatsMs > 0 && now > lastStatsMs) mbps = (bytes - lastBytes) * 8 / ((now - lastStatsMs) * 1000) + lastBytes = bytes; lastStatsMs = now + val lost = (m["packetsLost"] as? Number)?.toDouble() ?: 0.0 + val received = (m["packetsReceived"] as? Number)?.toDouble() ?: 0.0 + val dl = lost - lastLost; val dr = received - lastReceived + if (dl + dr > 0) loss = dl * 100 / (dl + dr) + lastLost = lost; lastReceived = received + } else if (s.type == "candidate-pair" && m["state"] == "succeeded" && m["nominated"] == true) { + (m["currentRoundTripTime"] as? Number)?.toDouble()?.let { rttMs = it * 1000 } + } + } + // Zero-copy: WebRTC never sees a decoded frame, so size and decode time come from the decoder itself. + if (zeroCopy) decoders?.let { d -> + d.videoSize()?.let { size = it } + val ms = d.takeDecodeMs() + if (ms >= 0) decodeMs = ms + } + val fg = video?.stats() + val fgOn = fg != null && settings.frameGen != XboxNativeVideo.FG_OFF && fg[2] > 1f + val fgWaitMs = if (fgOn) 1000.0 / fg!![2] else 0.0 + val fgGpuMs = if (fgOn && fg!![5] > 0f) fg[5].toDouble() else 0.0 + @Suppress("DEPRECATION") val refreshMs = 1000.0 / windowManager.defaultDisplay.refreshRate + val total = (if (rttMs >= 0) rttMs / 2 else 0.0) + bufferMs + decodeMs + fgWaitMs + fgGpuMs + refreshMs + // What reaches the screen: the decoder's own count in zero-copy, the presented rate with frame generation, + // else the frames handed to the compositor (a frame-rate target drops some of WebRTC's decoded frames). + val submitted = video?.frames ?: 0L + val handed = (submitted - lastSubmitted).toInt().also { lastSubmitted = submitted } + val shownFps = when { + zeroCopy -> (zeroCopyFrames - lastZeroCopyFrames).toInt().also { lastZeroCopyFrames = zeroCopyFrames } + fgOn -> fg!![3].toInt() + else -> handed + } + val items = buildList { + add("native · " + if (settings.frameGen == XboxNativeVideo.FG_OFF) "no frame gen" else XboxNativeVideo.modeName(settings.frameGen)) + add("$shownFps fps" + if (zeroCopy) " zero-copy" else "") + if (fgOn) add("${settings.frameGen} ${fg!![2].toInt()} → ${fg[3].toInt()}") + if (level >= 2) { add(size); add(if (rttMs >= 0) "ping ${rttMs.toInt()} ms" else "ping –") } + if (level >= 3) { + add("${"%.1f".format(mbps)} Mb/s"); add("buffer ${"%.1f".format(bufferMs)} ms") + add("decode ${"%.1f".format(decodeMs)} ms"); add("loss ${"%.1f".format(loss)}%") + } + if (level >= 4) { + if (fgOn) add("frame gen +${"%.1f".format(fgWaitMs + fgGpuMs)} ms (gpu ${"%.1f".format(fgGpuMs)})") + add("picture delay ≈ ${total.toInt()} ms (est.)") + if (codec.isNotEmpty()) add(codec) + serverName?.let { add(it) } + } + } + val text = items.joinToString(if (settings.statsLayout == "vertical") "\n" else " · ") + runOnUiThread { overlay.text = text } + } + } + + // ---- menu ---- + + /** The player menu (as the web player's): Resume, Xbox menu, Frame generation, Stream quality, overlay, Leave. */ + private fun openMenu() { + if (menu != null) return + pad.reset() + menuPage = "" + val regions = regionNames + val lsfg = XboxNativeVideo.lsfgReady(this) + val view = androidx.compose.ui.platform.ComposeView(this) + view.setContent { + com.droiddeck.launcher.ui.DroidDeckTheme { + var current by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(settings) } + val entries = androidx.compose.runtime.remember { List(7) { androidx.compose.ui.focus.FocusRequester() } } + val choices = androidx.compose.runtime.remember { List(5) { androidx.compose.ui.focus.FocusRequester() } } + androidx.compose.runtime.LaunchedEffect(menuPage) { + // Wait a frame so the entries are attached before one of them takes the selection. + androidx.compose.runtime.withFrameNanos { } + runCatching { + if (menuPage.isEmpty()) entries[lastMainEntry.coerceIn(0, 6)].requestFocus() + else if (menuPage == "framegen") choices[FG_MODES.indexOf(current.frameGen).coerceIn(0, if (lsfg) 4 else 1)].requestFocus() + } + } + val cs = androidx.compose.material3.MaterialTheme.colorScheme + // A full-size box first: the root of a ComposeView gets fixed full-screen constraints, so the panel's + // width only holds inside it (as the web player's menu does). + androidx.compose.foundation.layout.Box(androidx.compose.ui.Modifier.fillMaxSize()) { + androidx.compose.foundation.layout.Column( + androidx.compose.ui.Modifier.fillMaxHeight().width(400.dp).background(cs.surface.copy(alpha = 0.95f)) + .verticalScroll(androidx.compose.foundation.rememberScrollState()).padding(vertical = 12.dp), + ) { + androidx.compose.material3.Text("${intent.getStringExtra("title").orEmpty()} · native", + style = androidx.compose.material3.MaterialTheme.typography.titleMedium, color = cs.onSurface, + modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 4.dp)) + fun fgName(mode: String) = when (mode) { + XboxNativeVideo.FG_DDFG -> "DDFG 2×"; XboxNativeVideo.FG_LSFG -> "LSFG 2×" + XboxNativeVideo.FG_LSFG3 -> "LSFG 3×"; XboxNativeVideo.FG_LSFG4 -> "LSFG 4×"; else -> "Off" + } + fun fpsName(s: XboxCloudSettings) = if (s.fpsTarget == 0) "the screen's rate" else "${s.fpsTarget} fps" + when (menuPage) { + "" -> { + XboxMenuEntry("Resume", "Back to the game", entries[0], { lastMainEntry = 0 }) { closeMenu() } + XboxMenuEntry("Xbox menu", "The game's Xbox menu (also: Guide once)", entries[1], { lastMainEntry = 1 }) { closeMenu(); pressNexus() } + XboxMenuEntry("Frame generation & low latency", "Now: ${fgName(current.frameGen)}" + if (zeroCopy) " · zero-copy" else "", + entries[2], { lastMainEntry = 2 }) { menuPage = "framegen" } + XboxMenuEntry("Frame rate", "Target: ${fpsName(current)}", entries[3], { lastMainEntry = 3 }) { menuPage = "framerate" } + XboxMenuEntry("Stream quality", "Engine, resolution, region, codec, bitrate (next stream)", entries[4], { lastMainEntry = 4 }) { menuPage = "stream" } + XboxMenuEntry("Performance overlay and rumble", if (current.statsLevel == 0) "Overlay off" + else "Overlay: " + listOf("", "FPS only", "Basic", "Detailed", "Full")[current.statsLevel] + ", " + current.statsLayout, + entries[5], { lastMainEntry = 5 }) { menuPage = "overlay-native" } + XboxMenuEntry("Leave", "End the stream", entries[6], { lastMainEntry = 6 }) { finish() } + androidx.compose.material3.Text("Guide twice opens this menu; Back or Guide closes it.", + style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant, + modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) + } + "framegen" -> { + XboxMenuEntry("‹ Back", null) { menuPage = "" } + val modes = if (lsfg) FG_MODES else FG_MODES.take(2) + modes.forEachIndexed { i, mode -> + XboxMenuEntry((if (current.frameGen == mode) "✓ " else "") + fgName(mode), when (mode) { + XboxNativeVideo.FG_DDFG -> "DroidDeck's own frame generation (DDFG); doubles the shown frame rate" + XboxNativeVideo.FG_LSFG, XboxNativeVideo.FG_LSFG3, XboxNativeVideo.FG_LSFG4 -> + "Lossless Scaling frame generation (the Lossless.dll DroidDeck uses for games); the frame-rate target caps the output" + else -> "Show the stream's own frames only" + }, choices[i]) { current = current.copy(frameGen = mode); setFrameGen(mode) } + } + if (!lsfg) androidx.compose.material3.Text("LSFG appears here once DroidDeck has the Lossless.dll (frame generation settings).", + style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant, + modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) + if (current.zeroCopy) androidx.compose.material3.Text( + "Zero-copy is used while frame generation is Off; picking a frame generation mode switches to the compositor live.", + style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant, + modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) + XboxCloudSettingsPanel(current, regionNames, live = true, section = "latency", restoreRow = null, + startedWith = startedWith) { changed -> + val before = current + current = changed + applyLive(before, changed) + } + XboxMenuEntry("Restart the stream with these settings", + "Ends this cloud session and starts a new one; the game restarts, unsaved progress is lost.") { restartStream() } + } + else -> { + XboxMenuEntry("‹ Back", null) { menuPage = "" } + if (menuPage == "stream") XboxMenuEntry("Restart the stream with these settings", + "Ends this cloud session and starts a new one; the game restarts, unsaved progress is lost.") { restartStream() } + val page = menuPage + XboxCloudSettingsPanel(current, regions, live = true, section = page, restoreRow = lastRow[page] ?: 0, + onRowFocused = { lastRow[page] = it }, startedWith = startedWith) { changed -> + val before = current + current = changed + applyLive(before, changed) + } + } + } + } + } + } + } + menu = view + root.addView(view, FrameLayout.LayoutParams(-1, -1)) + view.requestFocus() + } + + /** + * Applies a settings change from any menu page at once: frame generation, the frame-rate target, zero-copy, instant + * input and the overlay. Resolution, region, language, codec, bitrate, the network buffer, the decoder mode and the + * engine belong to the cloud session and need a restart (the page says so). + */ + private fun applyLive(before: XboxCloudSettings, changed: XboxCloudSettings) { + settings = changed + XboxCloudSettings.save(this, changed) + if (changed.frameGen != before.frameGen) setFrameGen(changed.frameGen) + else if (changed.zeroCopy != before.zeroCopy) applyRoute() + if (changed.fpsTarget != before.fpsTarget) { applyDisplayRate(changed.fpsTarget); video?.setFpsTarget(changed.fpsTarget); applyRoute() } + applyOverlay() + } + + /** + * Zero-copy draws every decoded frame straight onto the screen, so it is used only when nothing has to touch the + * frames: frame generation off and no frame-rate target below the stream's 60 fps (the compositor drops frames for that). + */ + private fun zeroCopyWanted(s: XboxCloudSettings) = + s.zeroCopy && s.frameGen == XboxNativeVideo.FG_OFF && (s.fpsTarget == 0 || s.fpsTarget >= 60) + + private fun applyOverlay() { + overlayOn = settings.statsLevel > 0 + overlay.visibility = if (overlayOn) android.view.View.VISIBLE else android.view.View.GONE + overlay.textSize = 12f + // Top left keeps clear of the clock Xbox draws top right while its guide is open. + val left = settings.statsCorner == "left" + overlay.layoutParams = (overlay.layoutParams as FrameLayout.LayoutParams).apply { + gravity = Gravity.TOP or (if (left) Gravity.START else Gravity.END) + leftMargin = if (left) 16 else 0; rightMargin = if (left) 0 else 16 + } + overlay.gravity = if (left) Gravity.START else Gravity.END + } + + /** Stream-start settings need a new cloud session: end this one, then open the player again. */ + private fun restartStream() { + val signals = signalling + closed = true + closeMenu() + notice?.let { root.removeView(it) } + notice = null + show("Restarting the stream…") + Thread({ + signals?.stop()?.let { log("restart: session closed ${it.status}") } + runOnUiThread { if (!isFinishing) { startActivity(XboxCloudPlayerActivity.playerIntent(this, intent.getStringExtra("product").orEmpty(), intent.getStringExtra("title").orEmpty())); finish() } } + }, "xcloud-native-restart").start() + } + + private fun closeMenu() { + menu?.let { root.removeView(it) } + menu = null + pad.reset() + } + + private fun setFrameGen(mode: String) { + settings = settings.copy(frameGen = mode) + XboxCloudSettings.save(this, settings) + applyRoute() + worker.execute { video?.setFrameGeneration(effectiveFrameGen()) } + } + + /** + * Live route switch (UI thread): zero-copy when chosen and frame generation is off, else the compositor. + * The screen surface takes one producer at a time, so the old one lets go before the new one connects. + */ + private fun applyRoute() { + val d = decoders ?: return + val want = zeroCopyWanted(settings) + if (want == zeroCopy) return + val target = screen + if (want) { + if (target == null) return + video?.setSurface(null, 0, 0, 60f) + if (d.useScreen(target)) { lastZeroCopyFrames = zeroCopyFrames; zeroCopy = true; log("route: zero-copy") } + else { attachCompositor(target); log("route: zero-copy refused by the decoder, compositor kept") } + } else { + if (!d.useScreen(null)) { log("route: decoder could not leave the screen, zero-copy kept"); return } + zeroCopy = false + target?.let { attachCompositor(it) } + log("route: compositor") + } + } + + private fun attachCompositor(target: android.view.Surface) { + @Suppress("DEPRECATION") + video?.setSurface(target, screenW, screenH, windowManager.defaultDisplay.refreshRate) + } + + /** + * Ask Android for the display mode whose refresh rate fits the target (at least the target when possible, + * else the fastest; the fastest for "the screen's rate"), so generated frames are not held back at 60 Hz. + */ + private fun applyDisplayRate(target: Int) { + @Suppress("DEPRECATION") val display = windowManager.defaultDisplay + val current = display.mode + val modes = display.supportedModes.filter { it.physicalWidth == current.physicalWidth && it.physicalHeight == current.physicalHeight } + val pick = (if (target > 0) modes.filter { it.refreshRate >= target - 0.5f }.minByOrNull { it.refreshRate } else null) + ?: modes.maxByOrNull { it.refreshRate } ?: return + window.attributes = window.attributes.apply { preferredDisplayModeId = pick.modeId } + log("display mode ${pick.refreshRate.toInt()} Hz for target ${if (target > 0) target else "screen"}") + } + + private val rehideBars = Runnable { if (window.decorView.hasWindowFocus()) hideBars() } + + /** + * Bars that come back while the player has focus (return from recents or another app, a swipe) are hidden + * again after a moment; focus alone missed the return from the background (10-24). + */ + private fun watchBars() { + androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { v, insets -> + if (insets.isVisible(WindowInsetsCompat.Type.navigationBars()) || insets.isVisible(WindowInsetsCompat.Type.statusBars())) { + v.removeCallbacks(rehideBars) + v.postDelayed(rehideBars, 1500) + } + androidx.core.view.ViewCompat.onApplyWindowInsets(v, insets) + } + } + + override fun onResume() { + super.onResume() + hideBars() + } + + private fun hideBars() { + WindowCompat.setDecorFitsSystemWindows(window, false) + WindowInsetsControllerCompat(window, window.decorView).apply { + hide(WindowInsetsCompat.Type.systemBars()) + systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + } + } + + override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus); if (hasFocus) hideBars() } + + override fun onDestroy() { + closed = true + ticker.shutdownNow() + val signals = signalling + Thread({ signals?.stop()?.let { log("session closed: ${it.status}") } }, "xcloud-native-stop").start() + runCatching { protocol?.close() } + runCatching { pc?.close(); pc?.dispose() } + runCatching { video?.release() } + runCatching { factory?.dispose() } + runCatching { decoders?.release() } + runCatching { eglBase?.release() } + worker.shutdownNow() + super.onDestroy() + } + + companion object { + /** How long a stream may stay in the background (Android froze the app ~70 s after it left the screen, 10-24). */ + private const val BACKGROUND_GRACE_MS = 45_000L + private val FG_MODES = listOf(XboxNativeVideo.FG_OFF, XboxNativeVideo.FG_DDFG, XboxNativeVideo.FG_LSFG, XboxNativeVideo.FG_LSFG3, XboxNativeVideo.FG_LSFG4) + + /** True when the native engine can run here (ImageReader GPU buffers need Android 10). */ + fun supported(): Boolean = Build.VERSION.SDK_INT >= 29 + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt new file mode 100644 index 0000000000..348079f527 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt @@ -0,0 +1,186 @@ +package com.droiddeck.launcher.stores.xbox + +import org.json.JSONObject +import org.webrtc.DataChannel +import org.webrtc.PeerConnection +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.nio.charset.StandardCharsets +import java.util.UUID +import java.util.concurrent.Executors +import java.util.concurrent.ScheduledFuture +import java.util.concurrent.TimeUnit + +/** + * The xCloud data-channel protocol for the native player, ported from Greenlight's player (UnknownSKL, MIT; + * tools/xcloud-player/greenlight/lib/channel): chat / control / input / message channels, the message + * handshake, authorization and gamepad announcements, and the binary input reports. The controller state + * comes from Android input events ([pad]); rumble reports come back through [onRumble]. + */ +internal class XboxNativeProtocol( + pc: PeerConnection, + private val pad: XboxNativePad, + private val log: (String) -> Unit, + private val onRumble: (strong: Float, weak: Float, durationMs: Int) -> Unit, + private val onServerDisconnect: () -> Unit, +) { + private val chat = pc.createDataChannel("chat", init("chatV1")) + private val control = pc.createDataChannel("control", init("controlV1")) + private val input = pc.createDataChannel("input", init("1.0")) + private val message = pc.createDataChannel("message", init("messageV1")) + private val timer = Executors.newSingleThreadScheduledExecutor { r -> Thread(r, "xcloud-input") } + private var loop: ScheduledFuture<*>? = null + private var sequence = 0 + private var lastSent: XboxNativePad.State? = null + private var lastSentAt = 0L + @Volatile var handshakeDone = false + private set + + init { + message.registerObserver(ChannelObserver(message, ::onMessageOpen, ::onMessageData)) + control.registerObserver(ChannelObserver(control, {}, {})) + input.registerObserver(ChannelObserver(input, {}, ::onInputData)) + chat.registerObserver(ChannelObserver(chat, {}, {})) + } + + private fun init(protocol: String) = DataChannel.Init().apply { ordered = true; this.protocol = protocol } + + private inner class ChannelObserver( + private val channel: DataChannel, + private val onOpen: () -> Unit, + private val onData: (DataChannel.Buffer) -> Unit, + ) : DataChannel.Observer { + private var opened = false + override fun onBufferedAmountChange(previous: Long) {} + override fun onStateChange() { + if (!opened && channel.state() == DataChannel.State.OPEN) { opened = true; runCatching(onOpen).onFailure { log("channel open failed: ${it.message}") } } + } + override fun onMessage(buffer: DataChannel.Buffer) { runCatching { onData(buffer) }.onFailure { log("channel message failed: ${it.message}") } } + } + + private fun send(channel: DataChannel, text: String) { + if (channel.state() != DataChannel.State.OPEN) return + channel.send(DataChannel.Buffer(ByteBuffer.wrap(text.toByteArray(StandardCharsets.UTF_8)), false)) + } + + private fun send(channel: DataChannel, bytes: ByteBuffer) { + if (channel.state() != DataChannel.State.OPEN) return + channel.send(DataChannel.Buffer(bytes, true)) + } + + private fun onMessageOpen() { + log("message channel open, handshake") + send(message, JSONObject().put("type", "Handshake").put("version", "messageV1") + .put("id", "be0bfc6d-1e83-4c8a-90ed-fa8601c5a179").put("cv", "0").toString()) + } + + private fun onMessageData(buffer: DataChannel.Buffer) { + val bytes = ByteArray(buffer.data.remaining()).also { buffer.data.get(it) } + val data = JSONObject(String(bytes, StandardCharsets.UTF_8)) + when (data.optString("type")) { + "HandshakeAck" -> { + handshakeDone = true + log("handshake done") + // Greenlight's order: authorization (announces controller 0 and removes it), input start, config. + send(control, JSONObject().put("message", "authorizationRequest").put("accessKey", "4BDB3609-C1F1-4195-9B37-FEFF45DA8B8E").toString()) + gamepadChanged(0, true); gamepadChanged(0, false) + startInput() + sendConfig() + // Our controller, after the authorization's add/remove. + gamepadChanged(0, true) + send(control, JSONObject().put("message", "videoKeyframeRequested").put("ifrRequested", true).toString()) + } + "TransactionStart", "Message" -> handleTransaction(data) + else -> {} + } + } + + private fun handleTransaction(data: JSONObject) { + when (data.optString("target")) { + "/streaming/sessionLifetimeManagement/serverInitiatedDisconnect" -> { + complete(data.optString("id"), "") + onServerDisconnect() + } + // The game's own dialogs: accept (Greenlight shows a confirm; the native player has no page). + "/streaming/systemUi/messages/ShowMessageDialog" -> complete(data.optString("id"), JSONObject().put("Result", 0)) + else -> {} + } + } + + private fun complete(id: String, content: Any) { + send(message, JSONObject().put("type", "TransactionComplete").put("content", content.toString().let { if (content is String) JSONObject.quote(it) else it }) + .put("id", id).put("cv", "").toString()) + } + + private fun gamepadChanged(index: Int, added: Boolean) { + send(control, JSONObject().put("message", "gamepadChanged").put("gamepadIndex", index).put("wasAdded", added).toString()) + } + + private fun sendConfig() { + fun msg(path: String, content: JSONObject) = JSONObject().put("type", "Message").put("content", content.toString()) + .put("id", UUID.randomUUID().toString()).put("target", path).put("cv", "").toString() + send(message, msg("/streaming/systemUi/configuration", JSONObject().put("version", org.json.JSONArray(listOf(0, 2, 0))).put("systemUis", org.json.JSONArray()))) + send(message, msg("/streaming/properties/clientappinstallidchanged", JSONObject().put("clientAppInstallId", "c97d7ee0-73b2-4239-bf1d-9d805a338429"))) + send(message, msg("/streaming/characteristics/orientationchanged", JSONObject().put("orientation", 0))) + send(message, msg("/streaming/characteristics/touchinputenabledchanged", JSONObject().put("touchInputEnabled", false))) + send(message, msg("/streaming/characteristics/clientdevicecapabilities", JSONObject())) + send(message, msg("/streaming/characteristics/dimensionschanged", JSONObject().put("horizontal", 1920).put("vertical", 1080) + .put("preferredWidth", 1920).put("preferredHeight", 1080).put("safeAreaLeft", 0).put("safeAreaTop", 0) + .put("safeAreaRight", 1920).put("safeAreaBottom", 1080).put("supportsCustomResolution", true))) + } + + private fun header(type: Int, size: Int): ByteBuffer = ByteBuffer.allocateDirect(size).order(ByteOrder.LITTLE_ENDIAN).apply { + putShort(type.toShort()); putInt(sequence++); putDouble(System.nanoTime() / 1e6) + } + + private fun startInput() { + // Client metadata: max touch points. + send(input, header(8, 15).apply { put(1.toByte()); flip() }) + loop = timer.scheduleWithFixedDelay({ runCatching { tick() } }, 16, 16, TimeUnit.MILLISECONDS) + } + + /** Instant controller input: send a report now if the state changed (the 16 ms loop stays as the heartbeat). */ + fun inputChanged() { + // At most one extra report every 4 ms (stick motion arrives far faster than that). + if (handshakeDone && loop != null && System.nanoTime() - lastSentAt > 4_000_000L) timer.execute { runCatching { tick() } } + } + + /** Greenlight's queue: a gamepad frame when the state changed (sticks past a small threshold) or every 33 ms. */ + @Synchronized + private fun tick() { + val state = pad.snapshot() + val now = System.nanoTime() + val changed = lastSent?.let { state.differsFrom(it) } ?: true + if (!changed && now - lastSentAt < 33_000_000L) return + lastSent = state; lastSentAt = now + val packet = header(2, 14 + 1 + 23).apply { + put(1.toByte()) // one frame + put(0.toByte()) // gamepad index + putShort(state.buttons.toShort()) + putShort(axis(state.lx)); putShort(axis(-state.ly)); putShort(axis(state.rx)); putShort(axis(-state.ry)) + putShort(trigger(state.lt)); putShort(trigger(state.rt)) + putInt(1) // physical physicality + order(ByteOrder.BIG_ENDIAN); putInt(1); order(ByteOrder.LITTLE_ENDIAN) // virtual physicality (Greenlight writes it big-endian) + flip() + } + send(input, packet) + } + + private fun axis(value: Float): Short = (value * 32767).toInt().coerceIn(-32767, 32767).toShort() + private fun trigger(value: Float): Short = if (value <= 0f) 0 else if (value >= 1f) 65535.toShort() else (value * 65535).toInt().toShort() + + private fun onInputData(buffer: DataChannel.Buffer) { + val data = buffer.data.order(ByteOrder.LITTLE_ENDIAN) + if (data.remaining() < 13 || (data.get(0).toInt() and 0xFF) != 128) return // vibration report + val strong = (data.get(4).toInt() and 0xFF) / 100f + val weak = (data.get(5).toInt() and 0xFF) / 100f + val duration = data.getShort(8).toInt() and 0xFFFF + onRumble(strong, weak, duration) + } + + fun close() { + loop?.cancel(false) + timer.shutdownNow() + listOf(chat, control, input, message).forEach { runCatching { it.unregisterObserver(); it.close(); it.dispose() } } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt new file mode 100644 index 0000000000..dc3657dbef --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt @@ -0,0 +1,183 @@ +package com.droiddeck.launcher.stores.xbox + +import android.content.Context +import android.graphics.PixelFormat +import android.hardware.HardwareBuffer +import android.media.Image +import android.media.ImageReader +import android.os.Handler +import android.os.HandlerThread +import android.view.Surface +import com.droiddeck.launcher.gpu.FrameGen +import com.droiddeck.launcher.gpu.Lossless +import com.droiddeck.launcher.wayland.CompositorHost +import com.droiddeck.launcher.wayland.WaylandCompositor +import org.webrtc.EglBase +import org.webrtc.EglRenderer +import org.webrtc.GlRectDrawer +import org.webrtc.VideoFrame +import org.webrtc.VideoSink +import java.io.File +import java.util.ArrayDeque + +/** + * The native player's picture: WebRTC's hardware-decoded frames are drawn (GL, WebRTC's EglRenderer) into an + * ImageReader whose images are GPU-shareable HardwareBuffers, and each one goes to DroidDeck's own compositor in + * stream mode (WaylandCompositor.nativeStreamFrame) as the whole scene, where DroidDeck's frame generation (DDFG, + * or LSFG with the Lossless.dll) multiplies it. The player runs in its own process (:xcloudnative), so this + * compositor is never the one a Linux session uses. Android 10+ (ImageReader usage flags). + */ +internal class XboxNativeVideo(private val context: Context, eglBase: EglBase, private val log: (String) -> Unit) : VideoSink { + companion object { + const val FG_OFF = "off" + const val FG_DDFG = "ddfg" + const val FG_LSFG = "lsfg" + const val FG_LSFG3 = "lsfg3" + const val FG_LSFG4 = "lsfg4" + fun isLsfg(mode: String) = mode == FG_LSFG || mode == FG_LSFG3 || mode == FG_LSFG4 + fun multiplier(mode: String) = when (mode) { FG_LSFG3 -> 3; FG_LSFG4 -> 4; FG_OFF -> 0; else -> 2 } + fun modes(lsfg: Boolean) = if (lsfg) listOf(FG_OFF, FG_DDFG, FG_LSFG, FG_LSFG3, FG_LSFG4) else listOf(FG_OFF, FG_DDFG) + fun modeName(mode: String) = when (mode) { + FG_DDFG -> "DDFG 2×"; FG_LSFG -> "LSFG 2×"; FG_LSFG3 -> "LSFG 3×"; FG_LSFG4 -> "LSFG 4×"; else -> "Off" + } + /** LSFG can run: the Lossless.dll was imported (or found in Steam) and its shader cache built. */ + fun lsfgReady(context: Context) = Lossless.state(context).ready + private const val SCALE_FIT = 1 + private const val ALIGN_CENTER = 0 + } + + private val lock = Any() + private val egl = EglRenderer("xcloud-native").apply { init(eglBase.eglBaseContext, EglBase.CONFIG_RGBA, GlRectDrawer()) } + private val readerThread = HandlerThread("xcloud-frames").apply { start() } + private val readerHandler = Handler(readerThread.looper) + private var reader: ImageReader? = null + private var readerW = 0 + private var readerH = 0 + /** Images the compositor may still read: the oldest goes back to the reader once two newer ones arrived. */ + private val held = ArrayDeque() + private var surface: Surface? = null + private var attached = false + @Volatile private var frameGen = FG_OFF + @Volatile private var refreshHz = 60f + /** The frame-rate target (0 = the screen's rate): the frame-gen pacer's cap, or a limit on stream frames without it. */ + @Volatile private var fpsTarget = 0 + private var nextDueNs = 0L + @Volatile var frames = 0L + private set + + /** The screen: the compositor presents to it (null detaches, e.g. for zero-copy or when the surface goes). */ + fun setSurface(target: Surface?, width: Int, height: Int, displayRefreshHz: Float) = synchronized(lock) { + refreshHz = displayRefreshHz + if (target == null) { + if (attached) letGo() + attached = false; surface = null + return@synchronized + } + surface = target + val runtime = File(context.cacheDir, "xcloud-wayland").apply { mkdirs() } + // System Vulkan driver; this process's compositor shows only the stream. + val started = CompositorHost.startOrAttach(context, target, runtime.path, null, null, context.applicationInfo.nativeLibraryDir, + width, height, displayRefreshHz, 0) + if (started) { + WaylandCompositor.nativeSetScaleMode(SCALE_FIT, ALIGN_CENTER) + log("compositor started on ${width}x$height at ${displayRefreshHz.toInt()} Hz") + } else { + WaylandCompositor.nativeResizeOutput(width, height) + } + WaylandCompositor.nativeStreamMode(true) + attached = true + applyFrameGen() + } + + /** + * Gives the screen surface up and waits until the compositor has really disconnected from it: the window request + * is applied on the compositor thread at its next tick, and the decoder (zero-copy) can only connect after that. + */ + private fun letGo() { + WaylandCompositor.nativeSetFrameGenArmed(false, 0, 0) + CompositorHost.detach(surface) + WaylandCompositor.nativeVsync(System.nanoTime()) + if (!WaylandCompositor.nativeWaitSurface(1000)) log("compositor did not let go of the screen within 1 s") + } + + /** Frame-rate target, 0 = the screen's rate. Live. */ + fun setFpsTarget(fps: Int) { + fpsTarget = fps + synchronized(lock) { if (attached) applyFrameGen() } + } + + /** off, ddfg (2x) or lsfg / lsfg3 / lsfg4 (needs the Lossless.dll). Live. */ + fun setFrameGeneration(mode: String) { + frameGen = mode + synchronized(lock) { if (attached) applyFrameGen() } + } + + override fun onFrame(frame: VideoFrame) { + val w = frame.rotatedWidth; val h = frame.rotatedHeight + synchronized(lock) { if (w != readerW || h != readerH) startReader(w, h) } + egl.onFrame(frame) + } + + private fun startReader(w: Int, h: Int) { + val old = reader + if (old != null) egl.releaseEglSurface { } + held.forEach { runCatching { it.close() } }; held.clear() + old?.close() + readerW = w; readerH = h + val next = ImageReader.newInstance(w, h, PixelFormat.RGBA_8888, 4, + HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE or HardwareBuffer.USAGE_GPU_COLOR_OUTPUT) + next.setOnImageAvailableListener({ r -> onImage(r) }, readerHandler) + reader = next + egl.createEglSurface(next.surface) + log("native video ${w}x$h") + } + + private fun onImage(r: ImageReader) { + val image = runCatching { r.acquireLatestImage() }.getOrNull() ?: return + synchronized(lock) { + if (r !== reader) { image.close(); return } + val buffer = image.hardwareBuffer + // Without frame generation a target below the stream's rate drops stream frames evenly: each frame has a + // due time one interval after the last one's, so 30 of 60 frames (or 45: three of four) reach the screen. + val now = System.nanoTime() + val target = fpsTarget + val skip = frameGen == FG_OFF && target in 1 until 60 && run { + val interval = 1_000_000_000L / target + if (nextDueNs == 0L || now - nextDueNs > interval) nextDueNs = now + if (now + 4_000_000L < nextDueNs) true else { nextDueNs += interval; false } + } + if (attached && buffer != null && !skip) { WaylandCompositor.nativeStreamFrame(buffer); frames++ } + buffer?.close() + held.addLast(image) + while (held.size > 2) held.removeFirst().close() + } + } + + private fun applyFrameGen() { + // The pacer caps generated output at this rate: the user's target, else the screen's. + val cap = if (fpsTarget > 0) fpsTarget.toFloat() else refreshHz + val mode = when { + frameGen == FG_DDFG -> FrameGen.Mode(FrameGen.ENGINE_DDFG, 2) + isLsfg(frameGen) -> FrameGen.Mode(FrameGen.ENGINE_LSFG, multiplier(frameGen)) + else -> FrameGen.Mode.OFF + } + val problem = FrameGen.apply(context, mode, cap) + log("native frame generation: $frameGen, target ${if (fpsTarget > 0) fpsTarget else "screen"} fps" + (problem?.let { " ($it)" } ?: "")) + } + + /** {planned, planned, sourceFps, presentedFps, thermal, -1}, or null while nothing is shown. */ + fun stats(): FloatArray? = synchronized(lock) { if (attached) WaylandCompositor.nativeFrameGenStats() else null } + + fun frameGenProblem(): Int = synchronized(lock) { if (attached) WaylandCompositor.nativeFrameGenProblem() else -1 } + + fun release() { + egl.release() + synchronized(lock) { + if (attached) { WaylandCompositor.nativeStreamMode(false); letGo() } + attached = false; surface = null + held.forEach { runCatching { it.close() } }; held.clear() + reader?.close(); reader = null + } + readerThread.quitSafely() + } +} 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 477ab9c50a..67d228397d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -75,16 +75,28 @@ internal fun GamesPage(s: FrontEndState, a: FrontEndActions, selected: String, o val launcherArt by androidx.compose.runtime.produceState(null, epic.version) { value = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { EpicClient.icon(pageContext, epic.version) } } - val games = remember(s.steamGames, s.shortcutPicker, epic, launcherName, launcherArt) { + LaunchedEffect(Unit) { com.droiddeck.launcher.stores.xbox.XboxCloudGames.load(pageContext) } + val cloudGames = com.droiddeck.launcher.stores.xbox.XboxCloudGames.entries.toList() + val games = remember(s.steamGames, s.shortcutPicker, epic, launcherName, launcherArt, cloudGames) { val sorted = s.steamGames.sortedByDescending { it.lastPlayed } - if (s.shortcutPicker) sorted else EpicClient.withLauncher(sorted, EpicClient.launcherEntry(pageContext, launcherName, epic, launcherArt)) + if (s.shortcutPicker) sorted else { + val installedXbox = s.steamGames.filter { it.source == com.droiddeck.launcher.stores.Store.XBOX.id }.mapNotNull { it.storeId }.toSet() + EpicClient.withLauncher(sorted, EpicClient.launcherEntry(pageContext, launcherName, epic, launcherArt)) + + com.droiddeck.launcher.stores.xbox.XboxCloudGames.rows(pageContext, installedXbox) + } } val gameCount = games.count { it.library != Library.EPIC_LAUNCHER } val narrow = LocalNarrowPane.current val current = games.firstOrNull { "app:${it.appId}" == selected } ?: games.firstOrNull() GamesDialogs(a, s.steamGames) val onAdd: (() -> Unit)? = if (s.shortcutPicker) null else ({ GamesDialogState.adding = true }) - val launch: (Library.SteamGame) -> Unit = { g -> if (g.library == Library.EPIC_LAUNCHER) a.onEpicLauncher() else a.onSteamGame(g) } + val launch: (Library.SteamGame) -> Unit = { g -> + when (g.library) { + Library.EPIC_LAUNCHER -> a.onEpicLauncher() + Library.XBOX_CLOUD -> com.droiddeck.launcher.stores.xbox.XboxCloudGames.stream(pageContext, g.storeId.orEmpty(), g.name) + else -> a.onSteamGame(g) + } + } val onEdit: (Library.SteamGame) -> Unit = { g -> g.gameFiles?.let { GamesDialogState.editing = EditRequest(it.path, openTarget = false, fromSummary = false, preview = EditPreview.of(pageContext, g, it.path)) } } @@ -120,8 +132,10 @@ internal fun GamesPage(s: FrontEndState, a: FrontEndActions, selected: String, o if (!narrow) Poster(current.art, current.name, Modifier.width(168.dp)) } } - Rise(1) { SectionTitle(stringResource(R.string.games_launch_settings), null) } - Rise(2) { LaunchSettings(s, a, host, current) } + if (current.library != Library.XBOX_CLOUD) { + Rise(1) { SectionTitle(stringResource(R.string.games_launch_settings), null) } + Rise(2) { LaunchSettings(s, a, host, current) } + } Rise(3) { GameFileFolderActions(s, a) } } return @@ -139,8 +153,10 @@ internal fun GamesPage(s: FrontEndState, a: FrontEndActions, selected: String, o GameHeroCopy(current, if (narrow) 24.sp else 32.sp) GameActions(current, s, a, onEdit, launch) } - SectionTitle(stringResource(R.string.games_launch_settings), null) - LaunchSettings(s, a, host, current) + if (current.library != Library.XBOX_CLOUD) { + SectionTitle(stringResource(R.string.games_launch_settings), null) + LaunchSettings(s, a, host, current) + } GameFileFolderActions(s, a) } } @@ -166,8 +182,25 @@ private fun GameFileFolderActions(s: FrontEndState, a: FrontEndActions) { @Composable private fun GameActions(g: Library.SteamGame, s: FrontEndState, a: FrontEndActions, onEdit: (Library.SteamGame) -> Unit, launch: (Library.SteamGame) -> Unit) { + val context = androidx.compose.ui.platform.LocalContext.current + if (g.library == Library.XBOX_CLOUD) { + androidx.compose.runtime.LaunchedEffect(g.gameId) { com.droiddeck.launcher.stores.xbox.XboxCloudGames.prefetch(context) } + Actions { + PrimaryButton("Stream", enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow) { launch(g) } + SecondaryButton("Download") { com.droiddeck.launcher.stores.StoresState.openGameRequest = "${com.droiddeck.launcher.stores.Store.XBOX.id}:${g.storeId}" } + SecondaryButton("Remove from Games", compact = true) { com.droiddeck.launcher.stores.xbox.XboxCloudGames.remove(context, g.storeId.orEmpty()) } + BusyChip(s) + } + return + } + val xboxStream by androidx.compose.runtime.produceState(false, g.gameId) { + value = g.source == com.droiddeck.launcher.stores.Store.XBOX.id && !g.storeId.isNullOrEmpty() && !s.shortcutPicker && + kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { com.droiddeck.launcher.stores.xbox.XboxCloudGames.streams(context, g.storeId!!) } + } + androidx.compose.runtime.LaunchedEffect(xboxStream) { if (xboxStream) com.droiddeck.launcher.stores.xbox.XboxCloudGames.prefetch(context) } Actions { PrimaryButton(stringResource(if (s.shortcutPicker) R.string.game_shortcut_choose else R.string.games_launch), enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow) { launch(g) } + if (xboxStream) SecondaryButton("Stream") { com.droiddeck.launcher.stores.xbox.XboxCloudGames.stream(context, g.storeId.orEmpty(), g.name) } if (g.library == Library.EPIC_LAUNCHER) { if (!s.shortcutPicker) UninstallEpicLauncher(s, a) BusyChip(s) @@ -637,6 +670,7 @@ private fun playedSpan(lastPlayed: Long): String? { @Composable private fun libraryLabel(g: Library.SteamGame): String = when { g.library == Library.EPIC_LAUNCHER -> EpicClient.status.version?.substringBefore('+')?.let { stringResource(R.string.epic_client_version, it) } ?: "" + g.library == Library.XBOX_CLOUD -> "Xbox Cloud Gaming" g.library != Library.ADDED -> if (g.library == "internal") stringResource(R.string.games_internal) else g.library g.source != Library.ADDED -> stringResource(R.string.games_store_storage) else -> "" 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 6e44aca350..1294afa9f9 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -395,6 +395,9 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } a.onNavigated() } + LaunchedEffect(com.droiddeck.launcher.stores.StoresState.openGameRequest) { + if (com.droiddeck.launcher.stores.StoresState.openGameRequest != null) selected = "stores" + } var showWirelessAdbFix by rememberSaveable { mutableStateOf(false) } var showDeveloperDisplayChoice by rememberSaveable { mutableStateOf(false) } var wirelessAdbDesiredEnabled by rememberSaveable { mutableStateOf(false) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDetail.kt index b377f02ec1..37dbd3cf7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDetail.kt @@ -51,6 +51,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.xbox.xboxCloud +import com.droiddeck.launcher.stores.xbox.xboxPc import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreAchievements import com.droiddeck.launcher.stores.StoresState @@ -127,6 +129,7 @@ internal fun StoreGameDetail(store: Store, key: String, s: FrontEndState, a: Fro launchStoreGame(ctx, store, id, s, a) } ActionChip(stringResource(R.string.stores_in_steam), ok = true) + if (store == Store.XBOX && item?.xboxCloud == true) XboxStreamButton(item) if (store == Store.XBOX) { SecondaryButton("Update / verify", enabled = download == null && !com.droiddeck.launcher.stores.xbox.XboxRuntime.isActive(id)) { runCatching { com.droiddeck.launcher.stores.xbox.XboxBackend.update(ctx, installed) } @@ -157,6 +160,10 @@ internal fun StoreGameDetail(store: Store, key: String, s: FrontEndState, a: Fro com.droiddeck.launcher.stores.download.DownloadQueue.clear(ctx, failedDownload.key) } } + store == Store.XBOX && item != null && !item.xboxPc && item.xboxCloud -> { + XboxStreamButton(item, main = true, modifier = leadOn) + XboxAddToGamesButton(item) + } item?.installable == true && StoresState.isUnfinished(item) -> { InstallButton(stringResource(R.string.stores_resume_install), leadOn) { StoresState.requestInstall(ctx, item) } ConfirmButton(stringResource(R.string.stores_dl_clear), stringResource(R.string.stores_dl_cancel_confirm), compact = true) { StoresState.clearUnfinished(ctx, item) } @@ -166,6 +173,10 @@ internal fun StoreGameDetail(store: Store, key: String, s: FrontEndState, a: Fro if (item.sizeBytes > 0) stringResource(R.string.stores_install_size, formatBytes(item.sizeBytes)) else stringResource(R.string.stores_install), leadOn, ) { StoresState.requestInstall(ctx, item) } + if (store == Store.XBOX && item.xboxCloud) { + XboxStreamButton(item) + XboxAddToGamesButton(item) + } if (!item.accessible) { SecondaryButton( when { @@ -290,3 +301,29 @@ private fun InstallButton(label: String, modifier: Modifier = Modifier, onInstal } } } + +@Composable +private fun XboxStreamButton(item: com.droiddeck.launcher.stores.CatalogItem, main: Boolean = false, modifier: Modifier = Modifier) { + val ctx = LocalContext.current + androidx.compose.runtime.LaunchedEffect(Unit) { com.droiddeck.launcher.stores.xbox.XboxCloudGames.prefetch(ctx) } + val stream = { com.droiddeck.launcher.stores.xbox.XboxCloudGames.stream(ctx, item.id, item.title) } + if (main) PrimaryButton("Stream", main = true, icon = Icons.Filled.PlayArrow, modifier = modifier) { stream() } + else SecondaryButton("Stream", modifier = modifier) { stream() } +} + +@Composable +private fun XboxAddToGamesButton(item: com.droiddeck.launcher.stores.CatalogItem) { + val ctx = LocalContext.current + androidx.compose.runtime.LaunchedEffect(Unit) { com.droiddeck.launcher.stores.xbox.XboxCloudGames.load(ctx) } + // Add and Remove replace each other; the controller focus moves to the new button instead of getting lost. + val slot = remember { androidx.compose.ui.focus.FocusRequester() } + val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current + val scope = rememberCoroutineScope() + fun refocus() { if (inputMode.inputMode == androidx.compose.ui.input.InputMode.Keyboard) scope.launch { focusSoon { slot } } } + if (com.droiddeck.launcher.stores.xbox.XboxCloudGames.isAdded(item.id)) { + ActionChip("In Games", ok = true) + SecondaryButton("Remove from Games", compact = true, modifier = Modifier.focusRequester(slot)) { + com.droiddeck.launcher.stores.xbox.XboxCloudGames.remove(ctx, item.id); refocus() + } + } else SecondaryButton("Add to Games", modifier = Modifier.focusRequester(slot)) { com.droiddeck.launcher.stores.xbox.XboxCloudGames.add(ctx, item); refocus() } +} 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 d443237c5b..0634a52710 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -97,6 +97,8 @@ import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.automirrored.filled.Login import androidx.compose.material.icons.filled.GridView import androidx.compose.material.icons.filled.Sort +import androidx.compose.material.icons.filled.FilterList +import com.droiddeck.launcher.stores.xbox.XboxLibraryFilter import androidx.compose.material.icons.filled.ViewList import androidx.compose.material.icons.filled.ViewModule import com.droiddeck.launcher.stores.sortCatalogItems @@ -290,6 +292,11 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier if (id != DOWNLOADS) tab = tabFor(Store.byId(id), if (s.storesOpenTab == SessionPrefs.STORES_OPEN_STORE) "store" else "library") move("first") } + LaunchedEffect(StoresState.openGameRequest) { + val key = StoresState.openGameRequest ?: return@LaunchedEffect + StoresState.openGameRequest = null + Store.byId(key.substringBefore(':'))?.let { store -> chip = store.id; tab = tabFor(store, "library"); query = ""; open(key) } + } var focusedChip by remember { mutableStateOf(null) } LaunchedEffect(focusedChip) { val id = focusedChip ?: return@LaunchedEffect @@ -503,7 +510,8 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier if (detailStore != null) Column( Modifier.fillMaxWidth() .onFocusChanged { detailFocused = it.hasFocus } - .focusProperties { exit = { if (coveringNow.value) androidx.compose.ui.focus.FocusRequester.Cancel else androidx.compose.ui.focus.FocusRequester.Default } } + // A step opened from the page (install location, uninstall) sits outside it and has to receive the focus. + .focusProperties { exit = { if (coveringNow.value && !StoresMotion.stepOpen) androidx.compose.ui.focus.FocusRequester.Cancel else androidx.compose.ui.focus.FocusRequester.Default } } .focusGroup(), ) { StoreGameDetail(detailStore, key, s, a, heroFocus, onBack = { closeGame() }) } } @@ -977,8 +985,10 @@ private fun Storefront( } val isSizeSort = tab == "library" && (sort == "sizeAsc" || sort == "sizeDesc") val browseItems = if (browsing) ItchBrowseState.items else emptyList() - val candidates = remember(library, everything, tab, q, s.storesShowMature, browsing, browseItems) { - if (tab == "library") library.filter(::matches) + LaunchedEffect(Unit) { XboxLibraryFilter.load(ctx) } + val xboxFilter = if (store == Store.XBOX) XboxLibraryFilter.current else XboxLibraryFilter.ALL + val candidates = remember(library, everything, tab, q, s.storesShowMature, browsing, browseItems, xboxFilter) { + if (tab == "library") library.filter { matches(it) && XboxLibraryFilter.keeps(xboxFilter, it) } else if (browsing) { val owned = library.associateBy { it.id } browseItems.map { owned[it.id] ?: it }.filter(::shown) @@ -1083,8 +1093,10 @@ private fun Storefront( item(key = "header", span = { GridItemSpan(maxLineSpan) }) { Rise(1) { val tabs = tabsFor(store) - val libraryLabel = if (loaded) stringResource(R.string.stores_tab_count, stringResource(R.string.stores_tab_library), library.size) - else stringResource(R.string.stores_tab_library) + val libraryName = if (xboxFilter == XboxLibraryFilter.ALL) stringResource(R.string.stores_tab_library) + else stringResource(R.string.stores_tab_library) + " · " + XboxLibraryFilter.label(xboxFilter) + val libraryLabel = if (loaded) stringResource(R.string.stores_tab_count, libraryName, library.count { XboxLibraryFilter.keeps(xboxFilter, it) }) + else libraryName ModeHeader( libraryLabel, query, onQuery, @@ -1096,6 +1108,7 @@ private fun Storefront( } }, ) { if (tab == "library") { + if (store == Store.XBOX) XboxFilterButton() SortButton(s, a) ViewButton(s, a) } @@ -1104,6 +1117,9 @@ private fun Storefront( else { EpicClient.install(ctx); StoresState.openDownloads = true } } SmallTextButton(stringResource(R.string.stores_refresh)) { StoresState.open(ctx, store, force = true) } + if (store == Store.XBOX) SmallTextButton("Cloud settings") { + ctx.startActivity(android.content.Intent(ctx, com.droiddeck.launcher.stores.xbox.XboxCloudSettingsActivity::class.java)) + } val name = StoresState.accounts[store] ?: "" SignOutButton(store, name) } @@ -1335,6 +1351,38 @@ private fun SortButton(s: FrontEndState, a: FrontEndActions) { } } +@Composable +private fun XboxFilterButton() { + val pal = LocalPalette.current + val ctx = LocalContext.current + val title = "Show" + var at by remember { mutableStateOf(null) } + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton(title, Icons.Filled.FilterList, "xbox-filter") { + val from = at ?: return@HeaderIconButton + StoresMotion.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = XboxLibraryFilter.ALL_FILTERS.size, + onDismiss = {}, + handle = { Text(title, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1, overflow = TextOverflow.Ellipsis) }, + ) { + StepTitle(title) + StepList { + XboxLibraryFilter.ALL_FILTERS.forEachIndexed { i, filter -> + StepChoice( + XboxLibraryFilter.label(filter), selected = filter == XboxLibraryFilter.current, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(i) + .then(if (filter == XboxLibraryFilter.current) Modifier.focusRequester(first) else Modifier), + ) { + XboxLibraryFilter.set(ctx, filter) + StoresMotion.fold() + } + } + } + }) + } + } +} + @Composable private fun ViewButton(s: FrontEndState, a: FrontEndActions) { val views = SessionPrefs.STORES_VIEWS diff --git a/app/src/main/java/com/droiddeck/launcher/ui/WinComponentsEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/WinComponentsEditor.kt index 155c6e9b27..235f2f98b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WinComponentsEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WinComponentsEditor.kt @@ -56,7 +56,7 @@ import java.io.File private fun installable(name: String, all: Map): String = WinComponents.installable(name, all) @Composable -private fun originName(origin: String): String = stringResource( +private fun originName(origin: String): String = if (origin == WinCompSources.Origin.XBOX.name) "Xbox" else stringResource( when (origin) { WinCompSources.Origin.GOG.name -> R.string.wincomp_src_gog WinCompSources.Origin.EPIC.name -> R.string.wincomp_src_epic @@ -71,6 +71,7 @@ private fun autoReason(r: WinComponents.AutoReason): String = when (r.kind) { WinCompSources.Origin.GOG.name -> stringResource(R.string.wincomp_auto_gog) WinCompSources.Origin.EPIC.name -> stringResource(R.string.wincomp_auto_epic) WinCompSources.Origin.AMAZON.name -> stringResource(R.string.wincomp_auto_amazon) + WinCompSources.Origin.XBOX.name -> "Xbox games install it with the game (${r.args.getOrElse(0) { "VC14" }})" else -> "" } diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java index 48d9b35764..4111cea2ce 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -307,6 +307,13 @@ public final class WaylandCompositor { public static native float[] nativeFrameGenStats(); + /** Stream mode: the scene is the Xbox Cloud Gaming native player's picture, handed over frame by frame. */ + public static native void nativeStreamMode(boolean on); + + public static native void nativeStreamFrame(android.hardware.HardwareBuffer buffer); + + public static native int nativeStreamFrames(); + public static void sendPointerDelta(int dx, int dy) { if (dx == 0 && dy == 0) return; nativeSendSceneInput(6, dx * 256, dy * 256); diff --git a/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java b/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java new file mode 100644 index 0000000000..2a196ed2d9 --- /dev/null +++ b/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java @@ -0,0 +1,257 @@ +package org.webrtc; + +import android.graphics.ImageFormat; +import android.media.Image; +import android.media.ImageReader; +import android.media.MediaCodec; +import android.media.MediaCodecInfo; +import android.media.MediaCodecList; +import android.media.MediaCrypto; +import android.media.MediaFormat; +import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.os.HandlerThread; +import android.os.SystemClock; +import android.view.Surface; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.HashMap; + +/** + * DroidDeck's hardware video decoder factory for the native Xbox Cloud Gaming player. It builds WebRTC's own + * AndroidVideoDecoder (hence this package) around a MediaCodec wrapper that can: + * - ask the decoder for low-latency output (Android's KEY_LOW_LATENCY and Qualcomm's low-latency / picture-order + * vendor keys; unknown keys are ignored, and a decoder that refuses them is configured without them); + * - for zero-copy, decode straight onto the player's SurfaceView instead of WebRTC's texture, rendering every + * output buffer there (no GL copy, no compositor; WebRTC then gets no decoded frames to draw). + * Without either option it behaves like WebRTC's HardwareVideoDecoderFactory. + * The route is switchable while the decoder runs (setOutputSurface): {@link #useScreen} sends frames straight to the + * screen (zero-copy) or, with null, back to WebRTC's texture (for the Vulkan compositor and frame generation); + * {@link #setZeroCopySurface} moves a zero-copy decoder to a stand-in surface while the screen surface is gone. + * The factory also reports the decoded size and the decode time (input queued to output ready), which WebRTC's + * stats lack in zero-copy. + */ +public class DroidDeckLowLatencyDecoderFactory implements VideoDecoderFactory { + /** Counts frames sent to the display in zero-copy mode (WebRTC's own stats see none). */ + public interface FrameCounter { void onFrameShown(); } + + private final HardwareVideoDecoderFactory hardware; + private final EglBase.Context sharedContext; + private final boolean lowLatency; + /** Frames go to {@link #zeroCopySurface} (the screen or the stand-in), not WebRTC's texture. */ + private volatile boolean zeroCopy; + private volatile Surface zeroCopySurface; + /** Back on WebRTC's texture: render the next buffer there, so WebRTC's pending texture frame completes. */ + private volatile boolean renderNext; + private final FrameCounter counter; + private volatile Wrapper live; + private ImageReader standIn; + private HandlerThread standInThread; + private volatile int width, height; + private final Object decodeLock = new Object(); + private final HashMap queuedAt = new HashMap<>(); + private double decodeSumMs; + private int decodeCount; + + public DroidDeckLowLatencyDecoderFactory(EglBase.Context sharedContext, boolean lowLatency, Surface zeroCopySurface, FrameCounter counter) { + this.hardware = new HardwareVideoDecoderFactory(sharedContext); + this.sharedContext = sharedContext; + this.lowLatency = lowLatency; + this.zeroCopy = zeroCopySurface != null; + this.zeroCopySurface = zeroCopySurface; + this.counter = counter; + } + + /** + * Zero-copy: the surface to decode onto from now on; null = a stand-in that drops every frame (the screen + * surface is being destroyed). Must be called before a destroyed surface's callback returns. + */ + public synchronized void setZeroCopySurface(Surface surface) { + if (!zeroCopy) return; + moveTo(surface != null ? surface : standInSurface(), surface != null ? "the screen" : "a stand-in"); + } + + /** + * Switch the route live: a surface = zero-copy onto it; null = WebRTC's texture again. Returns false when the + * decoder refused the new surface (the route is then unchanged). + */ + public synchronized boolean useScreen(Surface screen) { + if (screen != null) { + Wrapper w = live; + if (w != null && !moveTo(screen, "the screen")) return false; + zeroCopySurface = screen; + zeroCopy = true; + return true; + } + if (!zeroCopy) return true; + Wrapper w = live; + if (w != null && w.texture != null && !moveTo(w.texture, "WebRTC's texture")) return false; + zeroCopy = false; + renderNext = true; + return true; + } + + private boolean moveTo(Surface target, String what) { + Wrapper w = live; + if (w == null || target == null) { if (zeroCopy) zeroCopySurface = target; return true; } + try { + w.raw.setOutputSurface(target); + if (zeroCopy) zeroCopySurface = target; + Logging.d("DroidDeckDecoder", "decoder output moved to " + what); + return true; + } catch (RuntimeException e) { + Logging.w("DroidDeckDecoder", "decoder output change to " + what + " failed: " + e); + return false; + } + } + + private Surface standInSurface() { + if (standIn == null) { + standInThread = new HandlerThread("bl-decoder-standin"); + standInThread.start(); + standIn = ImageReader.newInstance(Math.max(width, 16), Math.max(height, 16), ImageFormat.PRIVATE, 3); + standIn.setOnImageAvailableListener(reader -> { + Image image = reader.acquireLatestImage(); + if (image != null) image.close(); + }, new Handler(standInThread.getLooper())); + } + return standIn.getSurface(); + } + + /** The decoder's picture size, or null before the first decoder is configured. */ + public String videoSize() { + return width > 0 ? width + "x" + height : null; + } + + /** Average decode time since the last call, in ms (-1 when no frame was decoded in between). */ + public double takeDecodeMs() { + synchronized (decodeLock) { + double avg = decodeCount > 0 ? decodeSumMs / decodeCount : -1; + decodeSumMs = 0; decodeCount = 0; + return avg; + } + } + + public synchronized void release() { + if (standIn != null) { standIn.close(); standIn = null; } + if (standInThread != null) { standInThread.quitSafely(); standInThread = null; } + } + + @Override + public VideoCodecInfo[] getSupportedCodecs() { + return hardware.getSupportedCodecs(); + } + + @Override + public VideoDecoder createDecoder(VideoCodecInfo info) { + VideoCodecMimeType type; + try { type = VideoCodecMimeType.valueOf(info.getName()); } catch (IllegalArgumentException e) { return hardware.createDecoder(info); } + MediaCodecInfo codec = findHardwareDecoder(type); + if (codec == null) return hardware.createDecoder(info); + Integer color = MediaCodecUtils.selectColorFormat(MediaCodecUtils.DECODER_COLOR_FORMATS, codec.getCapabilitiesForType(type.mimeType())); + if (color == null) return hardware.createDecoder(info); + return new AndroidVideoDecoder(new WrapperFactory(), codec.getName(), type, color, sharedContext); + } + + private static MediaCodecInfo findHardwareDecoder(VideoCodecMimeType type) { + for (MediaCodecInfo info : new MediaCodecList(MediaCodecList.REGULAR_CODECS).getCodecInfos()) { + if (info.isEncoder()) continue; + if (MediaCodecUtils.codecSupportsType(info, type) && MediaCodecUtils.isHardwareAccelerated(info)) return info; + } + return null; + } + + private class WrapperFactory implements MediaCodecWrapperFactory { + @Override + public MediaCodecWrapper createByCodecName(String name) throws IOException { + return new Wrapper(MediaCodec.createByCodecName(name)); + } + } + + /** MediaCodec itself (not WebRTC's wrapper) so the output surface can be changed while it runs. */ + private class Wrapper implements MediaCodecWrapper { + final MediaCodec raw; + /** WebRTC's texture surface, the route back from zero-copy. */ + Surface texture; + Wrapper(MediaCodec raw) { this.raw = raw; } + + @Override + public void configure(MediaFormat format, Surface surface, MediaCrypto crypto, int flags) { + width = format.getInteger(MediaFormat.KEY_WIDTH); + height = format.getInteger(MediaFormat.KEY_HEIGHT); + texture = surface; + live = this; + Surface target = surface; + if (zeroCopy) { synchronized (DroidDeckLowLatencyDecoderFactory.this) { target = zeroCopySurface != null ? zeroCopySurface : standInSurface(); } } + if (lowLatency) { + MediaFormat fast = MediaFormat.createVideoFormat(format.getString(MediaFormat.KEY_MIME), width, height); + copyInt(format, fast, MediaFormat.KEY_COLOR_FORMAT); + if (Build.VERSION.SDK_INT >= 30) fast.setInteger(MediaFormat.KEY_LOW_LATENCY, 1); + fast.setInteger(MediaFormat.KEY_PRIORITY, 0); + fast.setInteger("vendor.qti-ext-dec-low-latency.enable", 1); + fast.setInteger("vendor.qti-ext-dec-picture-order.enable", 1); + try { + raw.configure(fast, target, crypto, flags); + Logging.d("DroidDeckDecoder", "low-latency decoder configured" + (zeroCopy ? " (zero-copy)" : "")); + return; + } catch (RuntimeException e) { + Logging.w("DroidDeckDecoder", "decoder refused low-latency keys: " + e); + } + } + raw.configure(format, target, crypto, flags); + } + + private void copyInt(MediaFormat from, MediaFormat to, String key) { + if (from.containsKey(key)) to.setInteger(key, from.getInteger(key)); + } + + // Zero-copy: AndroidVideoDecoder renders one buffer to its texture and drops the rest until the texture + // hands the frame back, which never happens with the display surface; show every buffer instead. + @Override public void releaseOutputBuffer(int index, boolean render) { + if (zeroCopy) { raw.releaseOutputBuffer(index, true); if (counter != null) counter.onFrameShown(); } + else if (renderNext) { renderNext = false; raw.releaseOutputBuffer(index, true); } + else raw.releaseOutputBuffer(index, render); + } + + @Override public void queueInputBuffer(int index, int offset, int size, long presentationTimeUs, int flags) { + synchronized (decodeLock) { + if (queuedAt.size() > 64) queuedAt.clear(); + queuedAt.put(presentationTimeUs, SystemClock.elapsedRealtimeNanos()); + } + raw.queueInputBuffer(index, offset, size, presentationTimeUs, flags); + } + + @Override public int dequeueOutputBuffer(MediaCodec.BufferInfo info, long timeoutUs) { + int index = raw.dequeueOutputBuffer(info, timeoutUs); + if (index >= 0) synchronized (decodeLock) { + Long at = queuedAt.remove(info.presentationTimeUs); + if (at != null) { decodeSumMs += (SystemClock.elapsedRealtimeNanos() - at) / 1e6; decodeCount++; } + } + return index; + } + + @Override public MediaFormat getOutputFormat() { + MediaFormat f = raw.getOutputFormat(); + if (f.containsKey(MediaFormat.KEY_WIDTH) && f.containsKey(MediaFormat.KEY_HEIGHT)) { + width = f.containsKey("crop-right") ? f.getInteger("crop-right") - f.getInteger("crop-left") + 1 : f.getInteger(MediaFormat.KEY_WIDTH); + height = f.containsKey("crop-bottom") ? f.getInteger("crop-bottom") - f.getInteger("crop-top") + 1 : f.getInteger(MediaFormat.KEY_HEIGHT); + } + return f; + } + + @Override public void start() { raw.start(); } + @Override public void flush() { synchronized (decodeLock) { queuedAt.clear(); } raw.flush(); } + @Override public void stop() { raw.stop(); } + @Override public void release() { if (live == this) live = null; raw.release(); } + @Override public int dequeueInputBuffer(long timeoutUs) { return raw.dequeueInputBuffer(timeoutUs); } + @Override public MediaFormat getInputFormat() { return raw.getInputFormat(); } + @Override public MediaFormat getOutputFormat(int index) { return raw.getOutputFormat(index); } + @Override public ByteBuffer getInputBuffer(int index) { return raw.getInputBuffer(index); } + @Override public ByteBuffer getOutputBuffer(int index) { return raw.getOutputBuffer(index); } + @Override public Surface createInputSurface() { return raw.createInputSurface(); } + @Override public void setParameters(Bundle params) { raw.setParameters(params); } + @Override public MediaCodecInfo getCodecInfo() { return raw.getCodecInfo(); } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/WinCompSourcesTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/WinCompSourcesTest.kt index 78ac654454..b6c98b00a8 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/WinCompSourcesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/WinCompSourcesTest.kt @@ -56,6 +56,17 @@ class WinCompSourcesTest { assertEquals(emptyList(), WinCompSources.epic("Installers/LauncherHelper.exe", "Launcher Helper")) } + @Test fun xboxGamesAlwaysGetVisualCppAndTheirDeclaredRuntimes() { + val folder = tmp.newFolder("xbox") + val vc = listOf("vcredist2022" to "VC14", "vcredist2022_arm64" to "VC14") + assertEquals(vc, WinCompSources.xbox(folder)) + File(folder, "MicrosoftGame.Config").writeText("""""") + assertEquals(vc, WinCompSources.xbox(folder)) + sidecar(folder, Store.XBOX, emptyMap()) + assertEquals(listOf("vcredist2022" to WinCompSources.Origin.XBOX, "vcredist2022_arm64" to WinCompSources.Origin.XBOX), + auto(WinCompSources.forGame(app, game(folder, Store.XBOX.id))).distinct()) + } + @Test fun steamworksSharedDepotsMapToComponents() { assertEquals(listOf("vcredist2015_dll" to "VC++ 2015", "d3dx9" to "DirectX (June 2010)"), WinCompSources.steamDepots(listOf("228986", "228990", "999"))) } diff --git a/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt b/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt index 656c56c9ac..8311736999 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt @@ -31,6 +31,14 @@ class WinComponentsSupportTest { step("install_msi", "url" to "$base/ps-x86.msi"), step("install_msi", "url" to "$base/ps-x64.msi")))) } + @Test fun builtInArm64RuntimeIsRegistryOnlyInBothViews() { + val c = WinComponents.builtInArm64Runtime() + assertEquals(Support.READY, support(c)) + assertEquals(12, c.steps.count { it.action == "set_register_key" }) + assertEquals(setOf("HKLM\\Software\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\arm64", + "HKLM\\Software\\Wow6432Node\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\arm64"), c.steps.map { it.str("key") }.toSet()) + } + @Test fun installerWrappersInstallHere() { assertEquals(Support.READY, support(component("vcredist2022", step("install_exe", "url" to "$base/vcredist2022__VC_redist.x86.exe", "file_name" to "VC_redist.x86.exe"), 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 c4f95c0918..a59450e341 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 @@ -83,13 +83,14 @@ class XboxCatalogTest { assertEquals(mapOf(game to "gamepass", parent to "gamepass"), access(row(game, parent), row(parent, plan), row(plan))) } - @Test fun onlyPcPlansGrantSubscriptionAccess() { - for (pc in listOf("CFQ7TTC0KGQ8", "CFQ7TTC0KHS0", "CFQ7TTC0P85B", "CFQ7TTC0K5DJ", "CFQ7TTC10QFD")) { - assertEquals(mapOf(game to "gamepass"), access(row(game, pc), row(pc))) + @Test fun everyActivePlanGrantsSubscriptionAccess() { + for (plan in listOf("CFQ7TTC0KGQ8", "CFQ7TTC0KHS0", "CFQ7TTC0P85B", "CFQ7TTC0K5DJ", "CFQ7TTC10QFD", "CFQ7TTC0K6L8")) { + assertEquals(mapOf(game to "gamepass"), access(row(game, plan), row(plan))) } val console = "CFQ7TTC0K6L8" - assertTrue(access(row(game, console), row(console)).isEmpty()) - assertTrue(XboxCatalog.access(withMembership(envelope(row(game, console)), membership(console)), + assertEquals(mapOf(game to "gamepass"), XboxCatalog.access(withMembership(envelope(row(game, console)), membership(console)), + "test@example.test", "US", now)) + assertTrue(XboxCatalog.access(withMembership(envelope(row(game, console)), membership(console).put("status", "Expired")), "test@example.test", "US", now).isEmpty()) } @@ -165,4 +166,29 @@ class XboxCatalogTest { assertEquals(game, XboxCatalog.product(product("Windows.Desktop", "MSIXVC").put("ProductId", game.lowercase()), mapOf(game to "owned"))!!.id) assertTrue(pc.accessible); assertTrue(pc.subscription); assertFalse(pc.owned) } + + private fun product(id: String, platform: String?) = JSONObject().put("ProductId", id).put("ProductType", "Game") + .put("LocalizedProperties", JSONArray().put(JSONObject().put("ProductTitle", "A Game"))) + .put("DisplaySkuAvailabilities", JSONArray().put(JSONObject().put("Sku", JSONObject().put("Properties", JSONObject() + .put("Packages", if (platform == null) JSONArray() else JSONArray().put(JSONObject().put("PackageFormat", "MSIXVC") + .put("PlatformDependencies", JSONArray().put(JSONObject().put("PlatformName", platform))))))))) + + @Test fun cloudListsKeepStreamOnlyGamesAndMarkStreamablePcGames() { + val cloud = XboxCloudCatalog(gamePass = setOf(game), all = setOf(game, parent)) + val pc = XboxCatalog.product(product(game, "Windows.Desktop"), mapOf(game to "gamepass"), cloud)!! + assertTrue(pc.xboxPc); assertTrue(pc.xboxCloud) + val consoleOnly = XboxCatalog.product(product(parent, "Xbox.One"), mapOf(parent to "owned"), cloud)!! + assertFalse(consoleOnly.xboxPc); assertTrue(consoleOnly.xboxCloud); assertEquals(0L, consoleOnly.sizeBytes) + assertNull(XboxCatalog.product(product(parent, "Xbox.One"), mapOf(parent to "gamepass"), cloud)) + assertNull(XboxCatalog.product(product(parent, "Xbox.One"), mapOf(parent to "owned"), null)) + assertFalse(XboxCatalog.product(product(game, "Windows.Desktop"), mapOf(game to "gamepass"), null)!!.xboxCloud) + } + + @Test fun aCloudOnlyEditionFoldsIntoThePcCardWithTheSameTitle() { + val cloud = XboxCloudCatalog(gamePass = setOf(parent), all = emptySet()) + val pc = XboxCatalog.product(product(game, "Windows.Desktop"), mapOf(game to "gamepass"), cloud)!! + val console = XboxCatalog.product(product(parent, "Xbox.One"), mapOf(parent to "gamepass"), cloud)!! + val merged = mergeEditions(listOf(pc, console)).single() + assertEquals(game, merged.id); assertTrue(merged.xboxPc); assertTrue(merged.xboxCloud); assertEquals(parent, merged.xboxCloudId) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCloudTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCloudTest.kt new file mode 100644 index 0000000000..bbe2e11f90 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCloudTest.kt @@ -0,0 +1,49 @@ +package com.droiddeck.launcher.stores.xbox + +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import org.junit.Assert.* +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class XboxCloudTest { + @Test fun settingsRoundTripAndOutOfRangeValuesAreClamped() { + val settings = XboxCloudSettings(resolution = "720p", bitrateMbps = 20, volume = 200, sharpen = 4, fxaa = true, statsCorner = "left", + playerEngine = "native", frameGen = "lsfg3", fpsLimit = 120, fpsCustomOn = true, fpsCustom = 90, smallBuffer = true, zeroCopy = true) + assertEquals(settings, XboxCloudSettings.decode(settings.toJson())) + val wild = XboxCloudSettings.decode("""{"resolution":"4k","codec":"x","bitrateMbps":900,"volume":5,"statsLevel":9,"gamma":40}""") + assertEquals("1080p", wild.resolution); assertEquals("default", wild.codec); assertEquals(100, wild.bitrateMbps) + assertEquals(100, wild.volume); assertEquals(4, wild.statsLevel); assertEquals(3f, wild.gamma) + assertEquals("right", XboxCloudSettings.decode("""{"statsCorner":"middle"}""").statsCorner) + assertEquals("ddfg", XboxCloudSettings.decode("""{"frameGen":"winfg"}""").frameGen) + assertEquals(0, XboxCloudSettings.decode("""{"fpsLimit":77,"fpsCustom":500}""").fpsLimit) + assertEquals(165, XboxCloudSettings.decode("""{"fpsCustomOn":true,"fpsCustom":500}""").fpsTarget) + assertEquals(XboxCloudSettings(), XboxCloudSettings.decode("not json")) + assertEquals("android", XboxCloudSettings(resolution = "720p").osName) + assertEquals("tizen", XboxCloudSettings(resolution = "1080p_hq").osName) + } + + @Test fun addedCloudGamesKeepValidRowsOnly() { + val list = listOf(XboxCloudGames.Entry("9AAAAAAAAAAA", "A game", "https://store-images.s-microsoft.com/p", null)) + val decoded = XboxCloudGames.decode(XboxCloudGames.encode(list)) + assertEquals(1, decoded.size); assertEquals("A game", decoded[0].title); assertNull(decoded[0].hero) + assertTrue(XboxCloudGames.decode("""[{"id":"bad","title":"x"},{"id":"9BBBBBBBBBBB","title":""}]""").isEmpty()) + assertTrue(XboxCloudGames.decode("nope").isEmpty()) + assertTrue(XboxCloudGames.rowId("9AAAAAAAAAAA") < 0) + } + + @Test fun libraryFilterSplitsOwnedGamePassAndCloud() { + fun item(owned: Boolean, pass: Boolean, cloud: Boolean) = CatalogItem(Store.XBOX, "9AAAAAAAAAAA", "A", null, + owned = owned, subscription = pass, extra = mapOf("cloud" to if (cloud) "1" else "0")) + val owned = item(true, false, false); val pass = item(false, true, true) + assertTrue(XboxLibraryFilter.keeps(XboxLibraryFilter.ALL, owned)) + assertTrue(XboxLibraryFilter.keeps(XboxLibraryFilter.OWNED, owned)); assertFalse(XboxLibraryFilter.keeps(XboxLibraryFilter.OWNED, pass)) + assertTrue(XboxLibraryFilter.keeps(XboxLibraryFilter.GAME_PASS, pass)); assertFalse(XboxLibraryFilter.keeps(XboxLibraryFilter.GAME_PASS, owned)) + assertTrue(XboxLibraryFilter.keeps(XboxLibraryFilter.CLOUD, pass)); assertFalse(XboxLibraryFilter.keeps(XboxLibraryFilter.CLOUD, owned)) + } + + @Test fun cloudLaunchUrlUsesTheStreamingEdition() { + assertEquals("https://www.xbox.com/play/launch/ball-x-pit/9BBBBBBBBBBB", XboxCatalog.cloudUrl("9AAAAAAAAAAA", "BALL x PIT", "9BBBBBBBBBBB")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCacheTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCacheTest.kt index 8d545d20c4..ca0735091f 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCacheTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCacheTest.kt @@ -13,7 +13,7 @@ class XboxLibraryCacheTest { private fun game(id: String, subscription: Boolean) = CatalogItem(Store.XBOX, id, "A game", "https://example.test/hero", tallImageUrl = "https://example.test/poster", description = "Description", developer = "Developer", publisher = "Publisher", sizeBytes = 12345, owned = !subscription, subscription = subscription, storeUrl = "https://www.xbox.com/games/store/$id", - extra = mapOf("market" to "US", "access" to if (subscription) "gamepass" else "owned")) + extra = mapOf("market" to "US", "access" to if (subscription) "gamepass" else "owned", "pc" to "1", "cloud" to "0", "cloudId" to "")) @Test fun restartRestoresMetadataWithoutTurningSubscriptionsIntoPurchases() { val games = listOf(game("9AAAAAAAAAAA", false), game("9BBBBBBBBBBB", true)) @@ -28,7 +28,7 @@ class XboxLibraryCacheTest { val text = XboxLibraryCache.encode(account, "US", listOf(game("9AAAAAAAAAAA", false)), now) assertNull(XboxLibraryCache.decode(text, "other@example.test", "US", now)) assertNull(XboxLibraryCache.decode(text, account, "GB", now)) - assertNull(XboxLibraryCache.decode(text.replace("\"schema\":1", "\"schema\":2"), account, "US", now)) + assertNull(XboxLibraryCache.decode(text.replace("\"schema\":2", "\"schema\":1"), account, "US", now)) assertNull(XboxLibraryCache.decode("invalid", account, "US", now)) assertNull(XboxLibraryCache.decode(text, account, "US", now - 120_000)) } @@ -50,4 +50,13 @@ class XboxLibraryCacheTest { XboxLibraryCache.clear(app) assertNull(XboxLibraryCache.read(app, account, "US")) } + + @Test fun cloudFlagsAndTheStreamingEditionSurviveARestart() { + val stream = game("9CCCCCCCCCCC", true).copy(extra = mapOf("market" to "US", "access" to "gamepass", "pc" to "0", "cloud" to "1", "cloudId" to "")) + val folded = game("9AAAAAAAAAAA", true).copy(extra = mapOf("market" to "US", "access" to "gamepass", "pc" to "1", "cloud" to "1", "cloudId" to "9DDDDDDDDDDD")) + val cached = XboxLibraryCache.decode(XboxLibraryCache.encode(account, "US", listOf(stream, folded), now), account, "US", now)!! + assertEquals(listOf(stream, folded), cached.games) + assertFalse(cached.games[0].xboxPc); assertTrue(cached.games[0].xboxCloud) + assertEquals("9DDDDDDDDDDD", cached.games[1].xboxCloudId) + } } diff --git a/tools/tests/test_output_refresh.py b/tools/tests/test_output_refresh.py index 7b252649eb..456e230d4e 100644 --- a/tools/tests/test_output_refresh.py +++ b/tools/tests/test_output_refresh.py @@ -66,6 +66,8 @@ static void send_toplevel_configure(struct surface *s) { (void)s; resizes++; } #define pointer_button(...) ((void)0) #define scroll_event(...) ((void)0) #define axis_event(...) ((void)0) +#define stream_take(...) ((void)0) +#define stream_forget_all(...) ((void)0) #define pointer_delta(...) ((void)0) #define deliver_touch(m) ((void)0) #define deliver_pointer(m) (pointers++) diff --git a/tools/xbox/README.md b/tools/xbox/README.md index 604e8e4fe8..986fc1bd75 100644 --- a/tools/xbox/README.md +++ b/tools/xbox/README.md @@ -7,6 +7,12 @@ checksums. `runtime.lock.json` pins the Nexus Windows runtime release and each extracted PE DLL. `prepare.py` verifies both source revisions and all Nexus patch checksums before applying the local transport, launch and library patches. +`droiddeck-cloud-token.patch` adds `xodus-cli cloud-token`: the stored account's +Xbox Cloud Gaming sign-in (XSTS for `http://gssv.xboxlive.com/`, then the streaming +service's `/v2/login/user`) and the login proof token a session's `/connect` step +takes. It prints one JSON object and never opens a login or provisions a device. +Ported from Bannerlator. + `droiddeck-library-subscriptions.patch` queries fresh subscription membership alongside product entitlements using the same Store session, account and market. Android can validate a Game Pass child's parent plan when that plan is absent diff --git a/tools/xbox/droiddeck-cloud-token.patch b/tools/xbox/droiddeck-cloud-token.patch new file mode 100644 index 0000000000..57a0b61727 --- /dev/null +++ b/tools/xbox/droiddeck-cloud-token.patch @@ -0,0 +1,171 @@ +diff --git a/crates/xodus-cli/src/commands.rs b/crates/xodus-cli/src/commands.rs +index 5a66715..5b310e4 100644 +--- a/crates/xodus-cli/src/commands.rs ++++ b/crates/xodus-cli/src/commands.rs +@@ -6,6 +6,7 @@ pub mod license; + pub mod login; + pub mod logout; + pub mod profile; ++pub mod cloud_token; + pub mod game_activity; + pub mod achievements; + pub mod subscription; +diff --git a/crates/xodus-cli/src/commands/cloud_token.rs b/crates/xodus-cli/src/commands/cloud_token.rs +new file mode 100644 +index 0000000..fbd0ed0 +--- /dev/null ++++ b/crates/xodus-cli/src/commands/cloud_token.rs +@@ -0,0 +1,124 @@ ++//! Xbox Cloud Gaming streaming token for the stored account (DroidDeck). Same bearer ++//! RPS -> Xbox user -> XSTS exchange as the profile read, for the cloud gaming relying party, ++//! then the streaming service's user login (as xbox.com and Greenlight's xal-node do). ++//! Never provisions a device or opens login. ++use std::{process::ExitCode, time::Duration}; ++use serde_json::{Value, json}; ++use xodus::{models::{live::ExchangeUserTokenOutcome, secrets::Token, soap}, tokens::TokenManager}; ++ ++const GSSV_RELYING_PARTY: &str = "http://gssv.xboxlive.com/"; ++const OFFERINGS: [&str; 2] = ["xgpuweb", "xgpuwebf2p"]; ++ ++/// The stored account's compact Microsoft account ticket for one service target and policy. ++async fn ticket(tokens: &TokenManager, client: &reqwest::Client, target: &str, policy: soap::PolicyReference) -> Result<(String, String), &'static str> { ++ let (account, device, user) = super::session::prepare(tokens, client).await.map_err(|stage| { ++ super::session::diagnostic(stage); stage ++ })?; ++ let outcome = super::session::exchange(|| async { xodus::api::live::exchange_user_token(client, user.clone(), account.clone(), device.clone(), ++ None, Some("Silent".into()), "{d6d5a677-0872-4ab0-9442-bb792fce85c5}".into(), ++ &[(target.into(), Some(policy.clone()))]) ++ .await.map_err(|error| super::session::classify(&error)) }).await?; ++ let response = match outcome { ++ ExchangeUserTokenOutcome::Issued(soap::BodyContent::RequestSecurityTokenResponseCollection(mut collection)) if !collection.security_tokens.is_empty() => collection.security_tokens.remove(0), ++ ExchangeUserTokenOutcome::Issued(soap::BodyContent::RequestSecurityTokenResponse(response)) => *response, ++ _ => return Err("msa-response"), ++ }; ++ // Token::from panics on token types it does not know; only take the compact forms here. The cloud ++ // transfer purpose answers with a login proof token, which is what /connect takes (Greenlight ++ // sends the MSAL response's "lpt"). ++ let kind = response.token_type.clone(); ++ if kind == "urn:passport:loginprooftoken" { ++ let shape = match (&response.requested_security_token.binary_security_token, &response.requested_security_token.encrypted_data) { ++ (Some(token), _) if !token.value.is_empty() => "binary", ++ (_, Some(_)) => "encrypted", ++ _ => "empty", ++ }; ++ eprintln!("NEXUS_SESSION_DIAGNOSTIC_V1 login-proof-{shape}"); ++ return match response.requested_security_token.binary_security_token { ++ Some(token) if !token.value.is_empty() => Ok((account, token.value)), ++ _ => Err("msa-ticket"), ++ }; ++ } ++ let compact = matches!(kind.as_str(), "urn:passport:compact" | "urn:passport:delegationcompact") ++ && response.requested_security_token.binary_security_token.is_some(); ++ if !compact { ++ let slug: String = kind.chars().map(|c| if c.is_ascii_alphabetic() { c.to_ascii_lowercase() } else { '-' }).take(40).collect(); ++ eprintln!("NEXUS_SESSION_DIAGNOSTIC_V1 ticket-type-{slug}"); ++ return Err("msa-ticket"); ++ } ++ let Token::Compact(ticket) = Token::from(response) else { return Err("msa-ticket"); }; ++ Ok((account, ticket)) ++} ++ ++async fn xsts(tokens: &TokenManager, client: &reqwest::Client) -> Result<(String, String), &'static str> { ++ let (account, ticket) = ticket(tokens, client, "user.auth.xboxlive.com", soap::PolicyReference::mbi_ssl()).await?; ++ let user = xodus::api::xbox::authenticate_xbox_user(client, ticket).await.map_err(|_| "xbox-user")?; ++ let xsts = xodus::api::xbox::request_xsts_token(client, user.token, GSSV_RELYING_PARTY).await.map_err(|_| "xsts")?; ++ Ok((account, xsts.token)) ++} ++ ++/// The Microsoft account token a cloud session's /connect step takes (xbox.com asks MSAL for ++/// "service::http://Passport.NET/purpose::PURPOSE_XBOX_CLOUD_CONSOLE_TRANSFER_TOKEN"). ++async fn transfer_token(tokens: &TokenManager, client: &reqwest::Client) -> Result { ++ let policy = soap::PolicyReference { uri: "PURPOSE_XBOX_CLOUD_CONSOLE_TRANSFER_TOKEN".into(), val: String::default() }; ++ Ok(ticket(tokens, client, "http://Passport.NET/purpose", policy).await?.1) ++} ++ ++fn regions(value: &Value) -> Vec { ++ value["offeringSettings"]["regions"].as_array().map(|list| list.iter().filter_map(|region| { ++ let name = region["name"].as_str()?; ++ let base = reqwest::Url::parse(region["baseUri"].as_str()?).ok()?; ++ let host = base.host_str()?; ++ if base.scheme() != "https" || !host.ends_with(".xboxlive.com") || !base.username().is_empty() { return None; } ++ Some(json!({ "name": name, "baseUri": base.as_str().trim_end_matches('/'), "isDefault": region["isDefault"].as_bool().unwrap_or(false) })) ++ }).take(32).collect()).unwrap_or_default() ++} ++ ++async fn login(tokens: &TokenManager) -> Result { ++ let client = reqwest::Client::builder().redirect(reqwest::redirect::Policy::none()) ++ .timeout(super::session::REQUEST_TIMEOUT).user_agent("xodus-nexus-cloud/1").build().map_err(|_| "http-client")?; ++ let (account, xsts) = xsts(tokens, &client).await?; ++ let mut failures = Vec::new(); ++ for offering in OFFERINGS { ++ let response = client.post(format!("https://{offering}.gssv-play-prod.xboxlive.com/v2/login/user")) ++ .header("x-gssv-client", "XboxComBrowser").header("Cache-Control", "no-store, must-revalidate, no-cache") ++ .json(&json!({ "token": xsts, "offeringId": offering })).send().await.map_err(|_| "gssv-request")?; ++ let status = response.status().as_u16(); ++ let body = super::profile::bounded(response, 256 * 1024).await; ++ let Ok(body) = body else { failures.push(format!("{offering}:{status}")); continue; }; ++ let value: Value = serde_json::from_slice(&body).map_err(|_| "gssv-json")?; ++ let token = value["gsToken"].as_str().filter(|token| !token.is_empty() && token.len() <= 16384).ok_or("gs-token")?; ++ // Diagnostic lines are letters and dashes only (the app's allow-list). ++ eprintln!("NEXUS_SESSION_DIAGNOSTIC_V1 gssv-login-ok-{}", if offering == "xgpuweb" { "gamepass" } else { "free" }); ++ let transfer = transfer_token(tokens, &client).await; ++ eprintln!("NEXUS_SESSION_DIAGNOSTIC_V1 transfer-token-{}", if transfer.is_ok() { "ok" } else { "missing" }); ++ if tokens.get_user().map_err(|_| "account-changed")?.username != account { return Err("account-changed".into()); } ++ return Ok(json!({ "schema": 1, "account": account, "offering": offering, "gsToken": token, "userToken": transfer.ok(), ++ "durationInSeconds": value["durationInSeconds"].as_u64().unwrap_or(0), "market": value["market"].as_str().unwrap_or_default(), ++ "regions": regions(&value) })); ++ } ++ Err(format!("gssv-login {}", failures.join(" "))) ++} ++ ++pub async fn run(tokens: &TokenManager) -> ExitCode { ++ match tokio::time::timeout(Duration::from_secs(45), login(tokens)).await { ++ Ok(Ok(value)) => { println!("{value}"); ExitCode::SUCCESS } ++ Ok(Err(stage)) => { eprintln!("Xbox Cloud Gaming sign-in failed ({stage})."); ExitCode::FAILURE } ++ Err(_) => { eprintln!("Xbox Cloud Gaming sign-in timed out."); ExitCode::FAILURE } ++ } ++} ++ ++#[cfg(test)] ++mod tests { ++ use super::*; ++ #[test] ++ fn only_https_xboxlive_regions_are_kept() { ++ let value = json!({"offeringSettings":{"regions":[ ++ {"name":"WestEurope","baseUri":"https://weu.core.gssv-play-prod.xboxlive.com/","isDefault":true}, ++ {"name":"Evil","baseUri":"https://evil.test/"}, ++ {"name":"Plain","baseUri":"http://eus.core.gssv-play-prod.xboxlive.com"}]}}); ++ let list = regions(&value); ++ assert_eq!(list.len(), 1); ++ assert_eq!(list[0]["baseUri"], "https://weu.core.gssv-play-prod.xboxlive.com"); ++ } ++} +diff --git a/crates/xodus-cli/src/main.rs b/crates/xodus-cli/src/main.rs +index 1ae4167..4b0ac26 100644 +--- a/crates/xodus-cli/src/main.rs ++++ b/crates/xodus-cli/src/main.rs +@@ -68,6 +68,8 @@ enum SubCommand { + #[arg(long, default_value_t = false)] + json: bool, + }, ++ #[command(about = "Get an Xbox Cloud Gaming streaming token for the stored account")] ++ CloudToken, + #[command(about = "Read Xbox gamertag and gamerpic for the stored account")] + Profile { + #[arg(long, default_value_t = false)] +@@ -239,6 +241,7 @@ async fn main() -> ExitCode { + args.command, + SubCommand::Account { .. } + | SubCommand::Profile { .. } ++ | SubCommand::CloudToken + | SubCommand::GameActivity { .. } + | SubCommand::Achievements { .. } + | SubCommand::Library { .. } +@@ -304,6 +307,7 @@ async fn main() -> ExitCode { + } + }, + SubCommand::Profile { json } => commands::profile::run(&tokens, json).await, ++ SubCommand::CloudToken => commands::cloud_token::run(&tokens).await, + SubCommand::GameActivity { title_id, json } => commands::game_activity::run(&tokens, title_id, json).await, + SubCommand::Achievements { title_id, json } => commands::achievements::run(&tokens, title_id, json).await, + SubCommand::Login => commands::login::run(&client, &tokens).await, diff --git a/tools/xbox/prepare.py b/tools/xbox/prepare.py index 7a07c6335c..47564ad11a 100755 --- a/tools/xbox/prepare.py +++ b/tools/xbox/prepare.py @@ -10,7 +10,7 @@ recipe = Path(__file__).resolve().parent 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-credential-fallback.patch', 'droiddeck-credential-diagnostics.patch', 'droiddeck-cloud-token.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(): diff --git a/tools/xcloud-player/NOTICE.md b/tools/xcloud-player/NOTICE.md new file mode 100644 index 0000000000..851957ad22 --- /dev/null +++ b/tools/xcloud-player/NOTICE.md @@ -0,0 +1,20 @@ +# Xbox Cloud Gaming player + +`greenlight/lib` is the WebRTC client of **Greenlight** by **UnknownSKL (Jim Kroon)** +(https://github.com/unknownskl/greenlight, `packages/player/src/client/lib`, commit ef852c3, MIT — +see `greenlight/LICENSE`). DroidDeck changes: `player.ts` renders video with the `

    Join the DroidDeck Discord

    5F{&CUU1wC_j$9Q5>as=FVJ5`JaNnbzn02@lE8% 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 literal 0 HcmV?d00001 diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.boost b/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.boost new file mode 100644 index 0000000000..36b7cd93cd --- /dev/null +++ b/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.boost @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract b/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract new file mode 100644 index 0000000000..446f0c7829 --- /dev/null +++ b/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract @@ -0,0 +1,18 @@ + +Copyright (C) 2011-2020 Daniel Scharrer + +This software is provided 'as-is', without any express or implied +warranty. In no event will the author(s) be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. From 3f2aea4d081ae87c422026ec6d6a15b1f6815b3a Mon Sep 17 00:00:00 2001 From: K11MCH1 <81425424+K11MCH1@users.noreply.github.com> Date: Thu, 22 Oct 2026 15:56:39 +0900 Subject: [PATCH 004/174] Add File Manager Return and Exit navigation Description: - Add an Exit button at the right end of the File Manager toolbar. It finishes the File Manager activity from any directory. - Remember the directory supplied when Game files or Proton prefix opens the File Manager. Show a Return to start button in the toolbar for those launches, and use it to reopen that directory after the user switches storage locations or browses elsewhere. - When returning, restore the starting storage root and close search or favorites views. Show a message if the starting directory is no longer available. - Add accessible labels for both buttons while retaining the existing toolbar actions and File Manager styling. Why it was needed: - Exiting previously required repeatedly navigating back through directories to the original location. - Switching from the game's initial directory to Internal storage offered no direct route back, leaving users to find the path manually through Linux system storage. --- .../launcher/files/FileManagerActivity.kt | 2 +- .../launcher/files/FileManagerScreen.kt | 39 +++++++++++++++++-- app/src/main/res/values/strings.xml | 3 ++ 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt index 27cb9dbcea..1425a78e7e 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt @@ -29,7 +29,7 @@ class FileManagerActivity : ComponentActivity() { setContent { DroidDeckTheme(appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(this)) { Surface(modifier = Modifier.fillMaxSize().systemBarsPadding(), color = MaterialTheme.colorScheme.background) { - FileManagerScreen(initialDir = initialDir) + FileManagerScreen(initialDir = initialDir, onExit = { finish() }) } } } 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 03b4aa2771..6f02927e9d 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -28,6 +28,8 @@ import androidx.compose.foundation.lazy.grid.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ExitToApp +import androidx.compose.material.icons.automirrored.filled.KeyboardReturn import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.ContentPaste import androidx.compose.material.icons.filled.CreateNewFolder @@ -104,6 +106,7 @@ fun FileManagerScreen( initialDir: File? = null, pickerTitle: String? = null, onPick: ((File) -> Unit)? = null, + onExit: (() -> Unit)? = null, ) { val context = LocalContext.current val scope = rememberCoroutineScope() @@ -117,12 +120,14 @@ fun FileManagerScreen( val pickPrefs = remember { context.getSharedPreferences("file_manager", android.content.Context.MODE_PRIVATE) } val browsePrefs = pickPrefs - val rootDir = remember { + val rootDir = remember(initialDir) { initialDir?.takeIf { it.isDirectory } ?: File("/storage/emulated/0") } - + val launchDir = remember(initialDir, pickMode) { + initialDir?.takeIf { it.isDirectory && !pickMode } + } var currentDir by remember { mutableStateOf(rootDir) } - var currentRoot by remember { + val initialRoot = remember(rootDir) { val abs = rootDir.absolutePath val internal = "/storage/emulated/0" val vol = when { @@ -138,8 +143,9 @@ fun FileManagerScreen( ?: rootDir } } - mutableStateOf(vol) + vol } + var currentRoot by remember { mutableStateOf(initialRoot) } var entries by remember { mutableStateOf(listOf()) } var selectedEntry by remember { mutableStateOf(null) } var showMenuFor by remember { mutableStateOf(null) } @@ -208,6 +214,19 @@ fun FileManagerScreen( loadDirectory(dir) } + fun returnToStart() { + val dir = launchDir ?: return + if (!dir.isDirectory) { + Toast.makeText(context, R.string.fm_start_unavailable, Toast.LENGTH_SHORT).show() + return + } + showFavorites = false + showSearch = false + searchQuery = "" + currentRoot = initialRoot + loadDirectory(dir) + } + LaunchedEffect(Unit) { loadDirectory(rootDir) } BackHandler(enabled = showFavorites || currentDir != currentRoot) { @@ -669,6 +688,13 @@ fun FileManagerScreen( ) } + if (launchDir != null) { + IconButton(onClick = { returnToStart() }) { + 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( @@ -744,6 +770,11 @@ fun FileManagerScreen( Icon(Icons.Filled.StarBorder, stringResource(R.string.fm_show_favorites), tint = MaterialTheme.colorScheme.onSurfaceVariant) } } + if (!pickMode && onExit != null) { + IconButton(onClick = onExit) { + Icon(Icons.AutoMirrored.Filled.ExitToApp, stringResource(R.string.fm_exit), tint = MaterialTheme.colorScheme.onSurfaceVariant) + } + } } if (showSearch && !showFavorites) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 830e66378c..e64eb7e7dd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1543,6 +1543,9 @@ Skip Select this folder Back + Exit + Return to start + Starting folder is no longer available %1$s is mounted but not readable right now List view Grid view From 1eb1e154ab75477fddb66bfb79e0f10d81a48d5d Mon Sep 17 00:00:00 2001 From: K11MCH1 <81425424+K11MCH1@users.noreply.github.com> Date: Thu, 22 Oct 2026 20:27:07 +0900 Subject: [PATCH 005/174] Confirm navigation during File Manager operations Description: - Ask for confirmation when Exit, Return to start, Android Back, or the parent-folder controls are used while a file operation is active. - Accept cancels the active job and waits for it to finish before navigating; Decline keeps the File Manager open and lets the operation continue. - Track single-file operations as jobs and handle Back from the file picker root through the same navigation guard. - Translate the existing Exit, Return, and unavailable-folder labels plus the new confirmation dialog in all 32 supported locale resource sets. Why it was needed: - Leaving the File Manager while a batch copy, move, or delete is running cancels its composition-bound coroutine, which can stop the batch after only some files are processed without a clear result. - The new File Manager controls previously appeared in English when the app was set to another supported language. --- .../launcher/files/FileManagerScreen.kt | 101 ++++++++++++++---- .../launcher/files/FilePickerActivity.kt | 1 + app/src/main/res/values-ar/strings.xml | 7 ++ app/src/main/res/values-b+es+419/strings.xml | 7 ++ app/src/main/res/values-bg/strings.xml | 7 ++ app/src/main/res/values-cs/strings.xml | 7 ++ app/src/main/res/values-da/strings.xml | 7 ++ app/src/main/res/values-de/strings.xml | 7 ++ app/src/main/res/values-el/strings.xml | 7 ++ app/src/main/res/values-es/strings.xml | 7 ++ app/src/main/res/values-fi/strings.xml | 7 ++ app/src/main/res/values-fr/strings.xml | 7 ++ app/src/main/res/values-hi/strings.xml | 7 ++ app/src/main/res/values-hu/strings.xml | 7 ++ app/src/main/res/values-in/strings.xml | 7 ++ app/src/main/res/values-it/strings.xml | 7 ++ app/src/main/res/values-ja/strings.xml | 7 ++ app/src/main/res/values-ko/strings.xml | 7 ++ app/src/main/res/values-ms/strings.xml | 7 ++ app/src/main/res/values-nb/strings.xml | 7 ++ app/src/main/res/values-nl/strings.xml | 7 ++ app/src/main/res/values-pl/strings.xml | 7 ++ app/src/main/res/values-pt-rPT/strings.xml | 7 ++ app/src/main/res/values-pt/strings.xml | 7 ++ app/src/main/res/values-ro/strings.xml | 7 ++ app/src/main/res/values-ru/strings.xml | 7 ++ app/src/main/res/values-sv/strings.xml | 7 ++ app/src/main/res/values-th/strings.xml | 7 ++ app/src/main/res/values-tr/strings.xml | 7 ++ app/src/main/res/values-uk/strings.xml | 7 ++ app/src/main/res/values-vi/strings.xml | 7 ++ app/src/main/res/values-zh-rCN/strings.xml | 7 ++ app/src/main/res/values-zh-rHK/strings.xml | 7 ++ app/src/main/res/values-zh-rTW/strings.xml | 7 ++ app/src/main/res/values/strings.xml | 4 + 35 files changed, 309 insertions(+), 21 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 6f02927e9d..2ce9a1c47b 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -92,11 +92,14 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.droiddeck.launcher.session.SessionPrefs import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.io.File import java.util.Date +private enum class FileManagerNavigation { EXIT, RETURN_TO_START, BACK } + @OptIn(ExperimentalMaterial3Api::class) @Composable fun FileManagerScreen( @@ -156,8 +159,10 @@ fun FileManagerScreen( var pendingConflict by remember { mutableStateOf(null) } var conflictChoice by remember { mutableStateOf(null) } var conflictApplyToAll by remember { mutableStateOf(false) } - var operationJob by remember { mutableStateOf(null) } - var cancelledJob by remember { mutableStateOf(null) } + var operationJob by remember { mutableStateOf(null) } + var cancelledJob by remember { mutableStateOf(null) } + var pendingNavigation by remember { mutableStateOf(null) } + var cancellingNavigation by remember { mutableStateOf(false) } var pendingBulkDelete by remember { mutableStateOf>(emptyList()) } var searchQuery by remember { mutableStateOf("") } val visibleEntries = if (searchQuery.isBlank()) entries @@ -183,7 +188,7 @@ fun FileManagerScreen( var showFavorites by remember { mutableStateOf(false) } var favTick by remember { mutableIntStateOf(0) } - var listingJob by remember { mutableStateOf(null) } + var listingJob by remember { mutableStateOf(null) } fun loadDirectory(dir: File, resetScroll: Boolean = true) { currentDir = dir @@ -229,19 +234,67 @@ fun FileManagerScreen( LaunchedEffect(Unit) { loadDirectory(rootDir) } - BackHandler(enabled = showFavorites || currentDir != currentRoot) { - if (showFavorites) { - showFavorites = false - return@BackHandler + val canGoUp = currentDir != currentRoot && currentDir.parentFile?.exists() == true + val operationActive = isOperationRunning || operationJob?.isCompleted == false || cancelledJob?.isCompleted == false + + fun navigate(action: FileManagerNavigation) { + when (action) { + FileManagerNavigation.EXIT -> onExit?.invoke() + FileManagerNavigation.RETURN_TO_START -> returnToStart() + FileManagerNavigation.BACK -> { + if (showFavorites) showFavorites = false + else if (canGoUp) currentDir.parentFile?.let { loadDirectory(it) } + else onExit?.invoke() + } } - val parent = currentDir.parentFile - if (parent != null && parent.exists()) loadDirectory(parent) } - val canGoUp = currentDir != currentRoot && currentDir.parentFile?.exists() == true - fun goUp() { - val parent = currentDir.parentFile - if (currentDir != currentRoot && parent != null && parent.exists()) loadDirectory(parent) + fun requestNavigation(action: FileManagerNavigation) { + if (cancellingNavigation) return + if (operationActive) pendingNavigation = action else navigate(action) + } + + BackHandler(enabled = operationActive || cancellingNavigation || showFavorites || currentDir != currentRoot) { + requestNavigation(FileManagerNavigation.BACK) + } + + if (pendingNavigation != null) { + OutlinedAlertDialog( + onDismissRequest = { pendingNavigation = null }, + title = { Text(stringResource(R.string.fm_cancel_operation_title)) }, + text = { Text(stringResource(R.string.fm_cancel_operation_confirmation)) }, + confirmButton = { + TextButton(onClick = { + val action = pendingNavigation ?: return@TextButton + pendingNavigation = null + val job = operationJob?.takeUnless(Job::isCompleted) + ?: cancelledJob?.takeUnless(Job::isCompleted) + if (job == null) { + navigate(action) + } else { + cancellingNavigation = true + cancelledJob = job + job.cancel() + scope.launch { + job.join() + if (operationJob === job) operationJob = null + if (cancelledJob === job) cancelledJob = null + pendingConflict = null + isOperationRunning = false + operationDeterminate = false + if (action != FileManagerNavigation.EXIT) loadDirectory(currentDir, resetScroll = false) + cancellingNavigation = false + navigate(action) + } + } + }) { Text(stringResource(R.string.fm_accept)) } + }, + dismissButton = { + TextButton(onClick = { pendingNavigation = null }) { + Text(stringResource(R.string.fm_decline)) + } + }, + ) } fun uniqueDestination(dir: File, name: String): File { @@ -259,11 +312,13 @@ fun FileManagerScreen( } fun performDelete(file: File) { - scope.launch { + if (operationActive) return + operationJob = scope.launch { isOperationRunning = true operationLabel = context.getString(R.string.fm_op_deleting) val ok = withContext(Dispatchers.IO) { FileOps.delete(file) } isOperationRunning = false + operationJob = null loadDirectory(currentDir, resetScroll = false) if (!ok) Toast.makeText(context, R.string.fm_delete_failed, Toast.LENGTH_SHORT).show() } @@ -356,32 +411,36 @@ fun FileManagerScreen( } fun performRename(file: File, newName: String) { + if (operationActive) return val target = File(file.parentFile, newName) if (target.exists()) { Toast.makeText(context, context.getString(R.string.fm_already_exists, newName), Toast.LENGTH_SHORT).show() return } - scope.launch { + operationJob = scope.launch { isOperationRunning = true operationLabel = context.getString(R.string.fm_op_renaming) val ok = withContext(Dispatchers.IO) { file.renameTo(target) } isOperationRunning = false + operationJob = null loadDirectory(currentDir, resetScroll = false) if (!ok) Toast.makeText(context, R.string.fm_rename_failed, Toast.LENGTH_SHORT).show() } } fun createFolder(parent: File, name: String) { + if (operationActive) return val target = File(parent, name) if (target.exists()) { Toast.makeText(context, context.getString(R.string.fm_already_exists, name), Toast.LENGTH_SHORT).show() return } - scope.launch { + operationJob = scope.launch { isOperationRunning = true operationLabel = context.getString(R.string.fm_op_creating_folder) val ok = withContext(Dispatchers.IO) { target.mkdirs() } isOperationRunning = false + operationJob = null loadDirectory(currentDir, resetScroll = false) if (!ok) Toast.makeText(context, R.string.fm_create_folder_failed, Toast.LENGTH_SHORT).show() } @@ -598,7 +657,7 @@ fun FileManagerScreen( .background(MaterialTheme.colorScheme.surfaceContainer) .padding(horizontal = 8.dp, vertical = 6.dp), ) { - IconButton(onClick = { goUp() }, enabled = canGoUp) { + IconButton(onClick = { requestNavigation(FileManagerNavigation.BACK) }, enabled = canGoUp && !cancellingNavigation) { Icon(Icons.Filled.ArrowBack, stringResource(R.string.fm_back), tint = MaterialTheme.colorScheme.primary) } @@ -689,7 +748,7 @@ fun FileManagerScreen( } if (launchDir != null) { - IconButton(onClick = { returnToStart() }) { + IconButton(onClick = { requestNavigation(FileManagerNavigation.RETURN_TO_START) }, enabled = !cancellingNavigation) { 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)) @@ -771,7 +830,7 @@ fun FileManagerScreen( } } if (!pickMode && onExit != null) { - IconButton(onClick = onExit) { + IconButton(onClick = { requestNavigation(FileManagerNavigation.EXIT) }, enabled = !cancellingNavigation) { Icon(Icons.AutoMirrored.Filled.ExitToApp, stringResource(R.string.fm_exit), tint = MaterialTheme.colorScheme.onSurfaceVariant) } } @@ -1014,7 +1073,7 @@ fun FileManagerScreen( contentPadding = PaddingValues(8.dp), ) { if (canGoUp) item(key = "..", span = { GridItemSpan(maxLineSpan) }) { - ParentFolderRow(compact = compactRows, onTap = { goUp() }) + ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.BACK) }) } items(shownEntries, key = { it.absolutePath }) { file -> val isFav = remember(file.absolutePath, favTick) { @@ -1080,7 +1139,7 @@ fun FileManagerScreen( } else LazyColumn(state = listState, modifier = Modifier.fillMaxSize()) { if (canGoUp) item(key = "..") { - ParentFolderRow(compact = compactRows, onTap = { goUp() }) + ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.BACK) }) } if (entries.isEmpty()) { item { diff --git a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt index 6fd89fa99f..498ec504e8 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt @@ -50,6 +50,7 @@ class FilePickerActivity : ComponentActivity() { setResult(Activity.RESULT_OK, Intent().putExtra(EXTRA_SELECTED_FILE, file.absolutePath)) finish() }, + onExit = { finish() }, ) } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 27109fd066..56a80316fd 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1579,6 +1579,13 @@ تخطّي اختيار هذا المجلد رجوع + خروج + العودة إلى المجلد الأول + لم يعد المجلد الأول متاحًا + إلغاء العملية؟ + سيتم إلغاء العملية. هل أنت متأكد؟ + موافق + رفض تم تركيب %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 8988e18d1c..40b9c5239c 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1572,6 +1572,13 @@ Omitir Seleccionar esta carpeta Atrás + Salir + Volver a la carpeta inicial + La carpeta inicial ya no está disponible + ¿Cancelar la operación? + La operación se cancelará. ¿Estás seguro? + Aceptar + Rechazar %1$s está montado, pero ahora mismo no se puede leer Vista de lista Vista de cuadrícula diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index d48d3a0cab..cf4a7b5167 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1503,6 +1503,13 @@ Пропускане Избор на тази папка Назад + Изход + Връщане в началната папка + Началната папка вече не е достъпна + Отмяна на операцията? + Операцията ще бъде отменена. Сигурни ли сте? + Приемам + Отказвам %1$s е монтирано, но в момента не може да се прочете Изглед като списък Изглед като мрежа diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e3b3bc3c0f..da649de32a 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1541,6 +1541,13 @@ Přeskočit Vybrat tuto složku Zpět + Ukončit + Zpět do výchozí složky + Výchozí složka již není dostupná + Zrušit operaci? + Operace bude zrušena. Opravdu chcete pokračovat? + Přijmout + Odmítnout %1$s je připojeno, ale momentálně není čitelné Zobrazení seznamu Zobrazení mřížky diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 85062308d1..5f50002ece 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1503,6 +1503,13 @@ Spring over Vælg denne mappe Tilbage + Afslut + Tilbage til startmappen + Startmappen er ikke længere tilgængelig + Annuller handlingen? + Handlingen bliver annulleret. Er du sikker? + Accepter + Afvis %1$s er monteret, men kan ikke læses lige nu Listevisning Gittervisning diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 18199e20eb..284ff28d13 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1492,6 +1492,13 @@ Überspringen Diesen Ordner auswählen Zurück + Beenden + Zurück zum Startordner + Startordner ist nicht mehr verfügbar + Vorgang abbrechen? + Der Vorgang wird abgebrochen. Bist du sicher? + Akzeptieren + Ablehnen %1$s ist eingebunden, aber derzeit nicht lesbar Listenansicht Rasteransicht diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 0ff07c465a..6834955392 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1503,6 +1503,13 @@ Παράλειψη Επιλογή αυτού του φακέλου Πίσω + Έξοδος + Επιστροφή στον αρχικό φάκελο + Ο αρχικός φάκελος δεν είναι πλέον διαθέσιμος + Ακύρωση ενέργειας; + Η ενέργεια θα ακυρωθεί. Είστε σίγουροι; + Αποδοχή + Απόρριψη Το %1$s είναι προσαρτημένο αλλά δεν είναι αναγνώσιμο αυτή τη στιγμή Προβολή λίστας Προβολή πλέγματος diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 0373f7ab33..26e175bd9c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1519,6 +1519,13 @@ Omitir Seleccionar esta carpeta Atrás + Salir + Volver a la carpeta inicial + La carpeta inicial ya no está disponible + ¿Cancelar la operación? + La operación se cancelará. ¿Estás seguro? + Aceptar + Rechazar %1$s está montado, pero ahora mismo no se puede leer Vista de lista Vista de cuadrícula diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2a1f62a030..fa670786d5 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1503,6 +1503,13 @@ Ohita Valitse tämä kansio Takaisin + Poistu + Palaa aloituskansioon + Aloituskansio ei ole enää käytettävissä + Peruutetaanko toiminto? + Toiminto peruutetaan. Oletko varma? + Hyväksy + Hylkää %1$s on liitetty, mutta ei ole luettavissa juuri nyt Luettelonäkymä Ruudukkonäkymä diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d151596fb3..dbc58cad60 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1519,6 +1519,13 @@ Ignorer Sélectionner ce dossier Retour + Quitter + Revenir au dossier de départ + Le dossier de départ est indisponible + Annuler l’opération ? + Cette opération sera annulée. Confirmez-vous ? + Accepter + Refuser %1$s est monté, mais illisible pour le moment Vue en liste Vue en grille diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index af68d4524f..7a93b2ce17 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1503,6 +1503,13 @@ छोड़ें यह फ़ोल्डर चुनें बैक + बाहर निकलें + शुरुआती फ़ोल्डर पर लौटें + शुरुआती फ़ोल्डर अब उपलब्ध नहीं है + कार्रवाई रद्द करें? + कार्रवाई रद्द कर दी जाएगी। क्या आप सुनिश्चित हैं? + स्वीकार करें + अस्वीकार करें %1$s माउंट है लेकिन अभी पढ़ा नहीं जा सकता लिस्ट व्यू ग्रिड व्यू diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 67f33c54d3..81d46e4506 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1503,6 +1503,13 @@ Kihagyás Ennek a mappának a kiválasztása Vissza + Kilépés + Vissza a kezdőmappába + A kezdőmappa már nem érhető el + Művelet megszakítása? + A művelet megszakad. Biztos benne? + Elfogadom + Elutasítom A %1$s csatolva van, de jelenleg nem olvasható Listanézet Rácsnézet diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6a0371282f..58964ebdc9 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1484,6 +1484,13 @@ Lewati Pilih folder ini Kembali + Keluar + Kembali ke folder awal + Folder awal tidak lagi tersedia + Batalkan operasi? + Operasi akan dibatalkan. Anda yakin? + Terima + Tolak %1$s terpasang tetapi tidak dapat dibaca saat ini Tampilan daftar Tampilan kisi diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6cf24b19d3..8e83dad4f1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1511,6 +1511,13 @@ Salta Seleziona questa cartella Indietro + Esci + Torna alla cartella iniziale + La cartella iniziale non è più disponibile + Annullare operazione? + Questa operazione verrà annullata. Confermi? + Accetta + Rifiuta %1$s: montata ma al momento non leggibile Visualizzazione elenco Visualizzazione griglia diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a1f640853b..e5d501ed22 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1484,6 +1484,13 @@ スキップ このフォルダを選択 戻る + 終了 + 開始フォルダーに戻る + 開始フォルダーは利用できなくなりました + 操作をキャンセルしますか? + 操作がキャンセルされます。よろしいですか? + 承諾 + 拒否 %1$sはマウントされていますが、現在読み取れません リスト表示 グリッド表示 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ffd0d5a7a3..1fbf10b454 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1484,6 +1484,13 @@ 건너뛰기 이 폴더 선택 뒤로 + 종료 + 시작 폴더로 돌아가기 + 시작 폴더를 더 이상 사용할 수 없습니다 + 작업을 취소할까요? + 작업이 취소됩니다. 계속하시겠습니까? + 수락 + 거절 %1$s이(가) 마운트되었지만 지금은 읽을 수 없습니다 목록 보기 격자 보기 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 42d9888b70..7ba18fb321 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1484,6 +1484,13 @@ Langkau Pilih folder ini Kembali + Keluar + Kembali ke folder asal + Folder asal tidak lagi tersedia + Batalkan operasi? + Operasi akan dibatalkan. Adakah anda pasti? + Terima + Tolak %1$s dilekapkan tetapi tidak dapat dibaca sekarang Paparan senarai Paparan grid diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 133d053781..40d10cdb78 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1503,6 +1503,13 @@ Hopp over Velg denne mappen Tilbake + Avslutt + Tilbake til startmappen + Startmappen er ikke lenger tilgjengelig + Avbryt operasjonen? + Operasjonen blir avbrutt. Er du sikker? + Godta + Avslå %1$s er montert, men ikke lesbar akkurat nå Listevisning Rutenettvisning diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f37c875827..7486a267f7 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1503,6 +1503,13 @@ Overslaan Deze map selecteren Terug + Afsluiten + Terug naar beginmap + De beginmap is niet meer beschikbaar + Bewerking annuleren? + De bewerking wordt geannuleerd. Weet je het zeker? + Accepteren + Weigeren %1$s is gekoppeld, maar nu niet leesbaar Lijstweergave Rasterweergave diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index de29734d21..41a611bf63 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1541,6 +1541,13 @@ Pomiń Wybierz ten folder Wstecz + Wyjdź + Wróć do folderu początkowego + Folder początkowy nie jest już dostępny + Anulować operację? + Operacja zostanie anulowana. Czy na pewno? + Akceptuj + Odrzuć %1$s: zamontowano, ale obecnie nie można odczytać Widok listy Widok siatki diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index edffdf14a9..24a190b2a4 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1511,6 +1511,13 @@ Ignorar Selecionar esta pasta Voltar + Sair + Voltar à pasta inicial + A pasta inicial já não está disponível + Cancelar operação? + A operação será cancelada. Tem a certeza? + Aceitar + Recusar %1$s está montado, mas não é possível lê-lo de momento Vista de lista Vista de grelha diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a4d96ea940..dc6c63b2f0 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1511,6 +1511,13 @@ Pular Selecionar esta pasta Voltar + Sair + Voltar à pasta inicial + A pasta inicial não está mais disponível + Cancelar operação? + A operação será cancelada. Tem certeza? + Aceitar + Recusar %1$s está montado, mas não pode ser lido agora Visualização em lista Visualização em grade diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index d97af4aed0..7ef6b8d113 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1522,6 +1522,13 @@ Omite Selectează acest folder Înapoi + Ieșire + Înapoi la dosarul inițial + Dosarul inițial nu mai este disponibil + Anulați operația? + Operația va fi anulată. Sunteți sigur? + Acceptă + Refuză %1$s este montat, dar nu poate fi citit acum Vizualizare listă Vizualizare grilă diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1388738db6..37cf74d059 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1538,6 +1538,13 @@ Пропустить Выбрать эту папку Назад + Выход + Вернуться в начальную папку + Начальная папка больше недоступна + Отменить операцию? + Операция будет отменена. Вы уверены? + Принять + Отклонить %1$s: подключено, но сейчас недоступно для чтения Список Сетка diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index caf787c3a7..480d8c96ac 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1503,6 +1503,13 @@ Hoppa över Välj den här mappen Tillbaka + Avsluta + Tillbaka till startmappen + Startmappen är inte längre tillgänglig + Avbryt åtgärden? + Åtgärden avbryts. Är du säker? + Acceptera + Avböj %1$s är monterad men inte läsbar just nu Listvy Rutnätsvy diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 1107a67779..a7b8a4a648 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1484,6 +1484,13 @@ ข้าม เลือกโฟลเดอร์นี้ กลับ + ออก + กลับไปยังโฟลเดอร์เริ่มต้น + โฟลเดอร์เริ่มต้นไม่พร้อมใช้งานแล้ว + ยกเลิกการดำเนินการ? + การดำเนินการจะถูกยกเลิก คุณแน่ใจหรือไม่? + ยอมรับ + ปฏิเสธ %1$s ติดตั้งอยู่แต่อ่านไม่ได้ในขณะนี้ มุมมองรายการ มุมมองตาราง diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 05cd0192b9..30196e875b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1492,6 +1492,13 @@ Atla Bu klasörü seç Geri + Çıkış + Başlangıç klasörüne dön + Başlangıç klasörü artık kullanılamıyor + İşlem iptal edilsin mi? + İşlem iptal edilecek. Emin misiniz? + Kabul et + Reddet %1$s bağlı ancak şu anda okunamıyor Liste görünümü Izgara görünümü diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index cf16a09384..2c40b53fa2 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1541,6 +1541,13 @@ Пропустити Вибрати цю папку Назад + Вийти + Повернутися до початкової папки + Початкова папка більше недоступна + Скасувати операцію? + Операцію буде скасовано. Ви впевнені? + Прийняти + Відхилити %1$s: підключено, але читання зараз недоступне Список Сітка diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 785e8d57f3..64139f47c6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1484,6 +1484,13 @@ Bỏ qua Chọn thư mục này Quay lại + Thoát + Quay lại thư mục ban đầu + Thư mục ban đầu không còn khả dụng + Hủy thao tác? + Thao tác sẽ bị hủy. Bạn có chắc không? + Chấp nhận + Từ chối %1$s đã được gắn nhưng hiện không đọc được Xem dạng danh sách Xem dạng lưới diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 174e671587..cfbdec72b2 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1560,6 +1560,13 @@ 跳过 选择此文件夹 返回 + 退出 + 返回初始文件夹 + 初始文件夹已不可用 + 取消操作? + 操作将被取消。确定吗? + 接受 + 拒绝 %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 97d53634ea..60adfbbab3 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1484,6 +1484,13 @@ 略過 選擇此資料夾 返回 + 離開 + 返回初始資料夾 + 初始資料夾已無法使用 + 取消操作? + 操作將會取消。確定嗎? + 接受 + 拒絕 %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 2d09faba03..3f59e1d005 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1484,6 +1484,13 @@ 略過 選擇此資料夾 返回 + 離開 + 返回起始資料夾 + 起始資料夾已無法使用 + 取消操作? + 操作將會取消。確定嗎? + 接受 + 拒絕 %1$s 已掛載,但目前無法讀取 清單檢視 格狀檢視 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e64eb7e7dd..1c86ac6009 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1546,6 +1546,10 @@ Exit Return to start Starting folder is no longer available + Cancel operation? + The operation will be cancelled. Are you sure? + Accept + Decline %1$s is mounted but not readable right now List view Grid view From 0247831c7e579716f703f9f392aecdf73a7473c0 Mon Sep 17 00:00:00 2001 From: K11MCH1 <81425424+K11MCH1@users.noreply.github.com> Date: Thu, 22 Oct 2026 20:46:59 +0900 Subject: [PATCH 006/174] Make File Manager cancellation stop active file I/O Description: - Pass the active coroutine job into copy, move, and delete operations so synchronous file I/O observes cancellation while it is running. - Check for cancellation between copy chunks and recursive delete entries. Remove a newly created partial copy, and stage overwrites so cancelling a copy or move preserves the previous destination and move source. - Add focused tests for cancelling a copy, move fallback, and recursive delete. Why it was needed: - Accept cancelled the Compose coroutine, but FileOps continued its synchronous I/O work. The confirmation could therefore wait for a large copy or delete to finish instead of stopping it. - Copy and move must avoid replacing an existing destination with partial data when cancellation occurs. Copy and move safeguards adapted from upstream commit a74ff3d6 (#1029). Added and adjusted: - Added cancellation checks between file transfer chunks and recursive delete entries, including single-file and batch operations. - Adjusted FileManagerScreen to pass the active job to FileOps and check it during copy progress. Accept now waits for the file operation to stop before Exit, Return, or Back proceeds. - Adjusted overwrite handling to use a temporary file so cancellation preserves the previous destination; an incomplete new destination is removed and a move source remains intact. - Added tests for cancelling a new copy, a move fallback with an existing destination, and a recursive delete. The focused debug unit tests passed. Localization already included on this branch: - The earlier File Manager update added translations for Exit, Return to start, and the unavailable starting-folder message. - It also translated the cancel-operation title and warning, plus the Accept and Decline buttons, across all 32 supported locale resource sets alongside the English defaults. - These strings let localized users understand the navigation controls and the consequences of cancelling an in-progress operation. They were added in the preceding commit 7928effd; this commit makes Accept actually stop the file I/O. --- .../launcher/files/FileManagerScreen.kt | 13 ++- .../com/droiddeck/launcher/files/FileOps.kt | 79 ++++++++++++++++--- .../launcher/files/FileOpsCancellationTest.kt | 55 +++++++++++++ 3 files changed, 130 insertions(+), 17 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/files/FileOpsCancellationTest.kt 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 2ce9a1c47b..20bc975d63 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -93,6 +93,7 @@ import androidx.compose.ui.unit.sp import com.droiddeck.launcher.session.SessionPrefs import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job +import kotlinx.coroutines.ensureActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.io.File @@ -316,7 +317,8 @@ fun FileManagerScreen( operationJob = scope.launch { isOperationRunning = true operationLabel = context.getString(R.string.fm_op_deleting) - val ok = withContext(Dispatchers.IO) { FileOps.delete(file) } + val job = coroutineContext[Job] + val ok = withContext(Dispatchers.IO) { FileOps.delete(file) { job?.isActive == false } } isOperationRunning = false operationJob = null loadDirectory(currentDir, resetScroll = false) @@ -342,6 +344,7 @@ fun FileManagerScreen( operationDeterminate = true operationLabel = context.getString(if (cut) R.string.fm_op_moving else R.string.fm_op_copying) isOperationRunning = true + val job = coroutineContext[Job] var applyToAll: ConflictChoice? = null var failed = 0 @@ -377,6 +380,7 @@ fun FileManagerScreen( } var lastPct = -1 val onProgress = FileOps.ProgressCallback { copied, total -> + job?.ensureActive() val pct = if (total > 0) ((copied * 100) / total).toInt() else 100 if (pct != lastPct) { lastPct = pct @@ -385,8 +389,8 @@ fun FileManagerScreen( } val target = dst val ok = withContext(Dispatchers.IO) { - if (cut) FileOps.moveWithProgress(src, target, onProgress) - else FileOps.copyWithProgress(src, target, onProgress) + if (cut) FileOps.moveWithProgress(src, target, onProgress) { job?.isActive == false } + else FileOps.copyWithProgress(src, target, onProgress) { job?.isActive == false } } if (ok) done++ else failed++ } @@ -561,10 +565,11 @@ fun FileManagerScreen( selectedPaths = emptySet() operationJob = scope.launch { isOperationRunning = true + val job = coroutineContext[Job] var failed = 0 victims.forEachIndexed { i, f -> operationLabel = context.getString(R.string.fm_op_deleting_batch, i + 1, victims.size, f.name) - if (!withContext(Dispatchers.IO) { FileOps.delete(f) }) failed++ + if (!withContext(Dispatchers.IO) { FileOps.delete(f) { job?.isActive == false } }) failed++ } isOperationRunning = false operationJob = null diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt index 04b83abaa2..6105411cfa 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt @@ -9,6 +9,7 @@ import java.io.FileOutputStream import java.io.IOException import java.nio.file.Files import java.util.Locale +import java.util.concurrent.CancellationException object FileOps { private const val TAG = "FileOps" @@ -24,18 +25,20 @@ object FileOps { fun isSymlink(file: File): Boolean = try { Files.isSymbolicLink(file.toPath()) } catch (e: Exception) { false } - fun delete(target: File?): Boolean { + fun delete(target: File?, isCancelled: () -> Boolean = { false }): Boolean { + if (isCancelled()) throw CancellationException("Delete cancelled: $target") if (target == null) return false if (target.isDirectory && !isSymlink(target)) { - if (!clear(target)) return false + if (!clear(target, isCancelled)) return false } + if (isCancelled()) throw CancellationException("Delete cancelled: $target") return target.delete() } - fun clear(dir: File): Boolean { + fun clear(dir: File, isCancelled: () -> Boolean = { false }): Boolean { val children = dir.listFiles() ?: return true var ok = true - for (child in children) if (!delete(child)) ok = false + for (child in children) if (!delete(child, isCancelled)) ok = false return ok } @@ -45,22 +48,25 @@ object FileOps { return f.length() } - fun moveWithProgress(src: File, dst: File, progress: ProgressCallback?): Boolean { + fun moveWithProgress(src: File, dst: File, progress: ProgressCallback?, isCancelled: () -> Boolean = { false }): Boolean { if (sameFile(src, dst)) return true + if (isCancelled()) return false if (!dst.exists() && src.renameTo(dst)) { progress?.onProgress(1, 1) return true } - if (!copyWithProgress(src, dst, progress)) return false + if (!copyWithProgress(src, dst, progress, isCancelled)) return false + if (isCancelled()) return false return delete(src) } - fun copyWithProgress(src: File, dst: File, progress: ProgressCallback?): Boolean { + fun copyWithProgress(src: File, dst: File, progress: ProgressCallback?, isCancelled: () -> Boolean = { false }): Boolean { val total = maxOf(totalSize(src), 1L) - return copyWithProgress(src, dst, longArrayOf(0), total, progress) + return copyWithProgress(src, dst, longArrayOf(0), total, progress, isCancelled) } - private fun copyWithProgress(src: File, dst: File, done: LongArray, total: Long, progress: ProgressCallback?): Boolean { + private fun copyWithProgress(src: File, dst: File, done: LongArray, total: Long, progress: ProgressCallback?, isCancelled: () -> Boolean): Boolean { + if (isCancelled()) throw CancellationException("Copy cancelled: $src") if (isSymlink(src)) return true if (sameFile(src, dst)) return true if (src.isDirectory && isWithin(dst, src)) { @@ -71,7 +77,7 @@ object FileOps { if (!dst.exists() && !dst.mkdirs()) return false var allOk = true src.list()?.forEach { name -> - if (!copyWithProgress(File(src, name), File(dst, name), done, total, progress)) { + if (!copyWithProgress(File(src, name), File(dst, name), done, total, progress, isCancelled)) { Log.e(TAG, "Failed to copy: ${File(src, name)}") allOk = false } @@ -81,13 +87,42 @@ object FileOps { val parent = dst.parentFile if (!src.exists() || (parent != null && !parent.exists() && !parent.mkdirs())) return false val chunk = 4L * 1024 * 1024 + var staging: File? = null + var created = false + var output: java.nio.channels.FileChannel? = null try { + output = try { + java.nio.channels.FileChannel.open(dst.toPath(), java.nio.file.StandardOpenOption.WRITE, java.nio.file.StandardOpenOption.CREATE_NEW) + .also { created = true } + } catch (e: java.nio.file.FileAlreadyExistsException) { + null + } + val target = if (!created && isSymlink(dst)) dst.canonicalFile else dst + var permissions: Set? = null + if (output == null) { + if (isSymlink(target) || target.parentFile?.isDirectory != true) { + throw IOException("Destination symlink target is not a writable directory entry: $dst") + } + if (target.isDirectory) throw IOException("Destination is a directory: $target") + permissions = try { + Files.getPosixFilePermissions(target.toPath()) + } catch (e: java.nio.file.NoSuchFileException) { + null + } catch (e: UnsupportedOperationException) { + null + } + if (target.exists() && !target.canWrite()) throw IOException("Destination is not writable: $target") + val directory = Files.createTempDirectory(checkNotNull(target.absoluteFile.parentFile).toPath(), ".droiddeck-copy-") + staging = directory.toFile() + output = FileOutputStream(File(staging, "file")).channel + } FileInputStream(src).channel.use { input -> - FileOutputStream(dst).channel.use { output -> + checkNotNull(output).use { channel -> val size = input.size() var position = 0L while (position < size) { - val transferred = input.transferTo(position, minOf(chunk, size - position), output) + if (isCancelled()) throw CancellationException("Copy cancelled: $src") + val transferred = input.transferTo(position, minOf(chunk, size - position), channel) if (transferred <= 0) break position += transferred done[0] += transferred @@ -96,11 +131,29 @@ object FileOps { if (position < size) throw IOException("Incomplete copy: $position/$size bytes") } } + if (isCancelled()) throw CancellationException("Copy cancelled: $src") + staging?.let { directory -> + val copied = File(directory, "file").toPath() + if (permissions != null && Files.getPosixFilePermissions(copied) != permissions) { + Files.setPosixFilePermissions(copied, permissions) + } + if (isCancelled()) throw CancellationException("Copy cancelled: $src") + Files.move(copied, target.toPath(), java.nio.file.StandardCopyOption.ATOMIC_MOVE) + } return true + } catch (e: CancellationException) { + if (created) dst.delete() + throw e } catch (e: IOException) { Log.e(TAG, "Failed to copy file: $src to $dst", e) - dst.delete() + if (created) dst.delete() return false + } finally { + output?.close() + staging?.let { directory -> + File(directory, "file").delete() + directory.delete() + } } } diff --git a/app/src/test/java/com/droiddeck/launcher/files/FileOpsCancellationTest.kt b/app/src/test/java/com/droiddeck/launcher/files/FileOpsCancellationTest.kt new file mode 100644 index 0000000000..30c50558a5 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/files/FileOpsCancellationTest.kt @@ -0,0 +1,55 @@ +package com.droiddeck.launcher.files + +import java.io.File +import java.util.concurrent.CancellationException +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertThrows +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 + +@RunWith(RobolectricTestRunner::class) +class FileOpsCancellationTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun cancellingCopyRemovesAnIncompleteNewFile() { + val source = tmp.newFile("source").apply { writeBytes(ByteArray(5 * 1024 * 1024)) } + val destination = File(tmp.root, "destination") + + assertThrows(CancellationException::class.java) { + FileOps.copyWithProgress(source, destination, { _, _ -> throw CancellationException("cancel") }) + } + + assertTrue(source.exists()) + assertFalse(destination.exists()) + } + + @Test fun cancellingMoveFallbackPreservesTheSourceAndExistingDestination() { + val source = tmp.newFile("source").apply { writeText("replacement") } + val destination = tmp.newFile("destination").apply { writeText("original") } + + assertThrows(CancellationException::class.java) { + FileOps.moveWithProgress(source, destination, { _, _ -> throw CancellationException("cancel") }) + } + + assertEquals("replacement", source.readText()) + assertEquals("original", destination.readText()) + } + + @Test fun cancellingRecursiveDeleteStopsBeforeTheNextFile() { + val directory = tmp.newFolder("directory") + repeat(3) { File(directory, "file-$it").writeText("content") } + var checks = 0 + + assertThrows(CancellationException::class.java) { + FileOps.delete(directory) { ++checks > 3 } + } + + assertTrue(directory.exists()) + assertEquals(2, directory.listFiles()?.size) + } +} From cb153ece872485a5f46ee630af1a13e571b8d1fd Mon Sep 17 00:00:00 2001 From: K11MCH1 <81425424+K11MCH1@users.noreply.github.com> Date: Thu, 22 Oct 2026 21:29:18 +0900 Subject: [PATCH 007/174] Guard File Manager jobs and clean up cancelled copies Description: - Reject bulk delete while another operation is active. Check current operation state at action time, and clear operationJob on completion only when the finishing coroutine still owns it. - Retain the requested Return directory even when it is unavailable, so Return can display the existing unavailable-directory message while browsing starts from the valid fallback. - Observe cancellation during the recursive size scan before copying. Remove destination directories created by a cancelled copy, while preserving existing destination directories and ordinary copy-failure behavior. - After a move's copy commits, finish deleting the source instead of reporting cancellation with both copies left behind. Preserve cancellation before copying and the existing copy-failure path. - Log permission-restoration failures in staged copies and continue publishing the copied file. - Exercise cancellation signals during transfers and size scans, directory cleanup, preservation of existing directories, and committed move completion without leftover staging entries. Why it was needed: - Overlapping operations could replace the tracked job, and an older completion could clear that reference, allowing navigation before the remaining work stopped. - Cancellation could leave new partial directory trees or wait through the size scan. Late move cancellation could leave the source behind after publishing its replacement. - A missing launch directory suppressed Return entirely, and a permission-restoration error could prevent an otherwise successful overwrite. Validation: - Debug Kotlin compilation passed with skipRust=true. - Focused FileOps cancellation, copy, and link suites: 17 passed, 10 platform-dependent cases skipped on Windows, no failures. - git diff --check passed. --- .../launcher/files/FileManagerScreen.kt | 28 ++++---- .../com/droiddeck/launcher/files/FileOps.kt | 43 ++++++++---- .../launcher/files/FileOpsCancellationTest.kt | 70 ++++++++++++++++++- .../launcher/files/FileOpsCopyTest.kt | 14 ++-- 4 files changed, 119 insertions(+), 36 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 72398b63f0..be804fd0a5 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -128,7 +128,7 @@ fun FileManagerScreen( initialDir?.takeIf { it.isDirectory } ?: File("/storage/emulated/0") } val launchDir = remember(initialDir, pickMode) { - initialDir?.takeIf { it.isDirectory && !pickMode } + initialDir?.takeIf { !pickMode } } var currentDir by remember { mutableStateOf(rootDir) } val initialRoot = remember(rootDir) { @@ -236,7 +236,8 @@ fun FileManagerScreen( LaunchedEffect(Unit) { loadDirectory(rootDir) } val canGoUp = currentDir != currentRoot && currentDir.parentFile?.exists() == true - val operationActive = isOperationRunning || operationJob?.isCompleted == false || cancelledJob?.isCompleted == false + fun isOperationActive() = isOperationRunning || operationJob?.isCompleted == false || cancelledJob?.isCompleted == false + val operationActive = isOperationActive() fun navigate(action: FileManagerNavigation) { when (action) { @@ -252,7 +253,7 @@ fun FileManagerScreen( fun requestNavigation(action: FileManagerNavigation) { if (cancellingNavigation) return - if (operationActive) pendingNavigation = action else navigate(action) + if (isOperationActive()) pendingNavigation = action else navigate(action) } BackHandler(enabled = operationActive || cancellingNavigation || showFavorites || currentDir != currentRoot) { @@ -313,14 +314,14 @@ fun FileManagerScreen( } fun performDelete(file: File) { - if (operationActive) return + if (isOperationActive()) return operationJob = scope.launch { isOperationRunning = true operationLabel = context.getString(R.string.fm_op_deleting) val job = coroutineContext[Job] val ok = withContext(Dispatchers.IO) { FileOps.delete(file) { job?.isActive == false } } isOperationRunning = false - operationJob = null + if (operationJob === job) operationJob = null loadDirectory(currentDir, resetScroll = false) if (!ok) Toast.makeText(context, R.string.fm_delete_failed, Toast.LENGTH_SHORT).show() } @@ -335,7 +336,7 @@ fun FileManagerScreen( fun performPaste() { val sources = clipboardFiles - if (sources.isEmpty() || isOperationRunning || operationJob?.isActive == true || cancelledJob?.isCompleted == false) return + if (sources.isEmpty() || isOperationActive()) return val dstDir = currentDir val cut = isCutOperation @@ -397,7 +398,7 @@ fun FileManagerScreen( isOperationRunning = false operationDeterminate = false - operationJob = null + if (operationJob === job) operationJob = null clipboardFiles = emptyList() isCutOperation = false selectionMode = false @@ -415,36 +416,38 @@ fun FileManagerScreen( } fun performRename(file: File, newName: String) { - if (operationActive) return + if (isOperationActive()) return val target = File(file.parentFile, newName) if (target.exists()) { Toast.makeText(context, context.getString(R.string.fm_already_exists, newName), Toast.LENGTH_SHORT).show() return } operationJob = scope.launch { + val job = coroutineContext[Job] isOperationRunning = true operationLabel = context.getString(R.string.fm_op_renaming) val ok = withContext(Dispatchers.IO) { file.renameTo(target) } isOperationRunning = false - operationJob = null + if (operationJob === job) operationJob = null loadDirectory(currentDir, resetScroll = false) if (!ok) Toast.makeText(context, R.string.fm_rename_failed, Toast.LENGTH_SHORT).show() } } fun createFolder(parent: File, name: String) { - if (operationActive) return + if (isOperationActive()) return val target = File(parent, name) if (target.exists()) { Toast.makeText(context, context.getString(R.string.fm_already_exists, name), Toast.LENGTH_SHORT).show() return } operationJob = scope.launch { + val job = coroutineContext[Job] isOperationRunning = true operationLabel = context.getString(R.string.fm_op_creating_folder) val ok = withContext(Dispatchers.IO) { target.mkdirs() } isOperationRunning = false - operationJob = null + if (operationJob === job) operationJob = null loadDirectory(currentDir, resetScroll = false) if (!ok) Toast.makeText(context, R.string.fm_create_folder_failed, Toast.LENGTH_SHORT).show() } @@ -560,6 +563,7 @@ fun FileManagerScreen( }, confirmButton = { TextButton(onClick = { + if (isOperationActive()) return@TextButton pendingBulkDelete = emptyList() selectionMode = false selectedPaths = emptySet() @@ -572,7 +576,7 @@ fun FileManagerScreen( if (!withContext(Dispatchers.IO) { FileOps.delete(f) { job?.isActive == false } }) failed++ } isOperationRunning = false - operationJob = null + if (operationJob === job) operationJob = null loadDirectory(currentDir, resetScroll = false) if (failed > 0) { Toast.makeText(context, context.resources.getQuantityString(R.plurals.fm_delete_some_failed, failed, failed), Toast.LENGTH_SHORT).show() diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt index c14bb6eddd..05d467ef51 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt @@ -42,9 +42,10 @@ object FileOps { return ok } - fun totalSize(f: File?): Long { + fun totalSize(f: File?, isCancelled: () -> Boolean = { false }): Long { + if (isCancelled()) throw CancellationException("Size scan cancelled: $f") if (f == null || !f.exists() || isSymlink(f)) return 0 - if (f.isDirectory) return f.listFiles()?.sumOf { totalSize(it) } ?: 0 + if (f.isDirectory) return f.listFiles()?.sumOf { totalSize(it, isCancelled) } ?: 0 return f.length() } @@ -56,12 +57,12 @@ object FileOps { return true } if (!copyWithProgress(src, dst, progress, isCancelled)) return false - if (isCancelled()) return false - return delete(src, isCancelled) + // Once the destination is committed, finish deleting the source. + return delete(src) } fun copyWithProgress(src: File, dst: File, progress: ProgressCallback?, isCancelled: () -> Boolean = { false }): Boolean { - val total = maxOf(totalSize(src), 1L) + val total = maxOf(totalSize(src, isCancelled), 1L) return copyWithProgress(src, dst, longArrayOf(0), total, progress, isCancelled) } @@ -74,15 +75,23 @@ object FileOps { return false } if (src.isDirectory) { - if (!dst.exists() && !dst.mkdirs()) return false - var allOk = true - src.list()?.forEach { name -> - if (!copyWithProgress(File(src, name), File(dst, name), done, total, progress, isCancelled)) { - Log.e(TAG, "Failed to copy: ${File(src, name)}") - allOk = false + val created = if (dst.exists()) false else { + if (!dst.mkdirs()) return false + true + } + try { + var allOk = true + src.list()?.forEach { name -> + if (!copyWithProgress(File(src, name), File(dst, name), done, total, progress, isCancelled)) { + Log.e(TAG, "Failed to copy: ${File(src, name)}") + allOk = false + } } + return allOk + } catch (e: CancellationException) { + if (created) delete(dst) + throw e } - return allOk } val parent = dst.parentFile if (!src.exists() || (parent != null && !parent.exists() && !parent.mkdirs())) return false @@ -134,8 +143,14 @@ object FileOps { } staging?.let { directory -> val copied = File(directory, "file").toPath() - if (permissions != null && Files.getPosixFilePermissions(copied) != permissions) { - Files.setPosixFilePermissions(copied, permissions) + if (permissions != null) { + try { + if (Files.getPosixFilePermissions(copied) != permissions) { + Files.setPosixFilePermissions(copied, permissions) + } + } catch (e: Exception) { + Log.w(TAG, "Failed to restore destination permissions: $target", e) + } } if (isCancelled()) throw java.util.concurrent.CancellationException("Copy cancelled: $src") Files.move(copied, target.toPath(), java.nio.file.StandardCopyOption.ATOMIC_MOVE) diff --git a/app/src/test/java/com/droiddeck/launcher/files/FileOpsCancellationTest.kt b/app/src/test/java/com/droiddeck/launcher/files/FileOpsCancellationTest.kt index 30c50558a5..8ba15591e4 100644 --- a/app/src/test/java/com/droiddeck/launcher/files/FileOpsCancellationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/files/FileOpsCancellationTest.kt @@ -19,9 +19,10 @@ class FileOpsCancellationTest { @Test fun cancellingCopyRemovesAnIncompleteNewFile() { val source = tmp.newFile("source").apply { writeBytes(ByteArray(5 * 1024 * 1024)) } val destination = File(tmp.root, "destination") + var cancelled = false assertThrows(CancellationException::class.java) { - FileOps.copyWithProgress(source, destination, { _, _ -> throw CancellationException("cancel") }) + FileOps.copyWithProgress(source, destination, { _, _ -> cancelled = true }) { cancelled } } assertTrue(source.exists()) @@ -31,15 +32,80 @@ class FileOpsCancellationTest { @Test fun cancellingMoveFallbackPreservesTheSourceAndExistingDestination() { val source = tmp.newFile("source").apply { writeText("replacement") } val destination = tmp.newFile("destination").apply { writeText("original") } + var cancelled = false assertThrows(CancellationException::class.java) { - FileOps.moveWithProgress(source, destination, { _, _ -> throw CancellationException("cancel") }) + FileOps.moveWithProgress(source, destination, { _, _ -> cancelled = true }) { cancelled } } assertEquals("replacement", source.readText()) assertEquals("original", destination.readText()) } + @Test fun aCommittedMoveFinishesRemovingTheSourceDespiteCancellation() { + val source = tmp.newFile("source").apply { writeText("replacement") } + val destination = tmp.newFile("destination").apply { writeText("original") } + val isCancelled = { destination.readText() == "replacement" } + + assertTrue(FileOps.moveWithProgress(source, destination, null, isCancelled)) + + assertTrue(isCancelled()) + assertEquals("replacement", destination.readText()) + assertFalse(source.exists()) + assertEquals(setOf("destination"), tmp.root.list()!!.toSet()) + } + + @Test fun cancellingTheSizeScanStopsBeforeCreatingTheDestination() { + val source = tmp.newFolder("source") + repeat(3) { File(source, "file-$it").writeText("content") } + val destination = File(tmp.root, "destination") + var checks = 0 + + assertThrows(CancellationException::class.java) { + FileOps.copyWithProgress(source, destination, null) { + assertFalse(destination.exists()) + ++checks > 2 + } + } + + assertEquals(3, checks) + assertFalse(destination.exists()) + assertEquals(3, source.listFiles()?.size) + } + + @Test fun cancellingCopyRemovesANewDestinationDirectory() { + val source = tmp.newFolder("source") + val payload = File(source, "nested/payload").apply { + parentFile!!.mkdirs() + writeText("content") + } + val destination = File(tmp.root, "destination") + + assertThrows(CancellationException::class.java) { + FileOps.copyWithProgress(source, destination, { _, _ -> throw CancellationException("cancel") }) + } + + assertEquals("content", payload.readText()) + assertFalse(destination.exists()) + } + + @Test fun cancellingCopyPreservesAnExistingDestinationDirectory() { + val source = tmp.newFolder("source") + File(source, "nested/payload").apply { + parentFile!!.mkdirs() + writeText("replacement") + } + val destination = tmp.newFolder("destination") + val existing = File(destination, "keep").apply { writeText("original") } + + assertThrows(CancellationException::class.java) { + FileOps.copyWithProgress(source, destination, { _, _ -> throw CancellationException("cancel") }) + } + + assertEquals("original", existing.readText()) + assertEquals(setOf("keep"), destination.list()!!.toSet()) + } + @Test fun cancellingRecursiveDeleteStopsBeforeTheNextFile() { val directory = tmp.newFolder("directory") repeat(3) { File(directory, "file-$it").writeText("content") } diff --git a/app/src/test/java/com/droiddeck/launcher/files/FileOpsCopyTest.kt b/app/src/test/java/com/droiddeck/launcher/files/FileOpsCopyTest.kt index ac13ac7814..e92ca2aec7 100644 --- a/app/src/test/java/com/droiddeck/launcher/files/FileOpsCopyTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/files/FileOpsCopyTest.kt @@ -53,27 +53,25 @@ class FileOpsCopyTest { assertEquals("replacement", src.readText()) } - @Test fun cancellingStopsATreeOfEmptyFiles() { + @Test fun cancellingRemovesANewTreeOfEmptyFiles() { val src = tmp.newFolder("source") for (name in listOf("a", "b", "c")) File(src, name).createNewFile() val dst = File(tmp.root, "dest") - var checks = 0 assertThrows(CancellationException::class.java) { - FileOps.copyWithProgress(src, dst, null) { checks++ > 1 } + FileOps.copyWithProgress(src, dst, null) { dst.list()?.isNotEmpty() == true } } - assertEquals(1, dst.list()!!.size) + assertFalse(dst.exists()) assertEquals(3, src.list()!!.size) } - @Test fun cancellingStopsATreeOfEmptyFolders() { + @Test fun cancellingRemovesANewTreeOfEmptyFolders() { val src = tmp.newFolder("source") for (name in listOf("a", "b", "c")) File(src, name).mkdir() val dst = File(tmp.root, "dest") - var checks = 0 assertThrows(CancellationException::class.java) { - FileOps.copyWithProgress(src, dst, null) { checks++ > 1 } + FileOps.copyWithProgress(src, dst, null) { dst.list()?.isNotEmpty() == true } } - assertEquals(1, dst.list()!!.size) + assertFalse(dst.exists()) } @Test fun aCompletedCopyReplacesTheDestination() { From 3b1dfadcf929303f6f5c3403c117edaaadae6d90 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Thu, 22 Oct 2026 10:29:24 -0400 Subject: [PATCH 008/174] fix: keep deferred back inside selected drive root --- .../launcher/files/FileManagerScreen.kt | 11 ++++++++-- .../files/FileManagerNavigationTest.kt | 20 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/files/FileManagerNavigationTest.kt 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 be804fd0a5..627761c2da 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -101,6 +101,9 @@ import java.util.Date private enum class FileManagerNavigation { EXIT, RETURN_TO_START, BACK } +internal fun canNavigateUp(currentDir: File, currentRoot: File): Boolean = + currentDir != currentRoot && currentDir.parentFile?.exists() == true + @OptIn(ExperimentalMaterial3Api::class) @Composable fun FileManagerScreen( @@ -192,6 +195,7 @@ fun FileManagerScreen( var listingJob by remember { mutableStateOf(null) } fun loadDirectory(dir: File, resetScroll: Boolean = true) { + if (cancellingNavigation) return currentDir = dir if (pickMode) pickPrefs.edit().putString("lastFilePickerDir", dir.absolutePath).apply() listingJob?.cancel() @@ -216,11 +220,13 @@ fun FileManagerScreen( } fun openDrive(dir: File) { + if (cancellingNavigation) return currentRoot = dir loadDirectory(dir) } fun returnToStart() { + if (cancellingNavigation) return val dir = launchDir ?: return if (!dir.isDirectory) { Toast.makeText(context, R.string.fm_start_unavailable, Toast.LENGTH_SHORT).show() @@ -240,12 +246,13 @@ fun FileManagerScreen( val operationActive = isOperationActive() fun navigate(action: FileManagerNavigation) { + if (cancellingNavigation) return when (action) { FileManagerNavigation.EXIT -> onExit?.invoke() FileManagerNavigation.RETURN_TO_START -> returnToStart() FileManagerNavigation.BACK -> { if (showFavorites) showFavorites = false - else if (canGoUp) currentDir.parentFile?.let { loadDirectory(it) } + else if (canNavigateUp(currentDir, currentRoot)) currentDir.parentFile?.let { loadDirectory(it) } else onExit?.invoke() } } @@ -284,8 +291,8 @@ fun FileManagerScreen( pendingConflict = null isOperationRunning = false operationDeterminate = false - if (action != FileManagerNavigation.EXIT) loadDirectory(currentDir, resetScroll = false) cancellingNavigation = false + if (action != FileManagerNavigation.EXIT) loadDirectory(currentDir, resetScroll = false) navigate(action) } } diff --git a/app/src/test/java/com/droiddeck/launcher/files/FileManagerNavigationTest.kt b/app/src/test/java/com/droiddeck/launcher/files/FileManagerNavigationTest.kt new file mode 100644 index 0000000000..cbcf207553 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/files/FileManagerNavigationTest.kt @@ -0,0 +1,20 @@ +package com.droiddeck.launcher.files + +import java.io.File +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class FileManagerNavigationTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun backCannotNavigateAboveTheCurrentDriveRoot() { + val drive = tmp.newFolder("drive") + val child = File(drive, "folder").apply { mkdir() } + + assertTrue(canNavigateUp(child, drive)) + assertFalse(canNavigateUp(drive, drive)) + } +} From 430e77178e95146452816cf287b4d7c9345fe5f1 Mon Sep 17 00:00:00 2001 From: ovurrsl Date: Sat, 17 Oct 2026 06:35:50 +0300 Subject: [PATCH 009/174] fix: one refused thermal or power query no longer drops the others from the session report Thermal status, thermal headroom and power saver are now read one by one, so a vendor that throws on one of them still gets the other two lines, and the refused one shows as unknown. --- .../com/droiddeck/launcher/core/DeviceReport.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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 903851a5a9..f10eeb1c12 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -152,13 +152,17 @@ object DeviceReport { k("RAM total", FileUtils.sizeToString(mi.totalMem)) k("RAM available", FileUtils.sizeToString(mi.availMem)) } - runCatching { - val pm = context.getSystemService(Context.POWER_SERVICE) as PowerManager - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) k("Thermal status", thermalStatusName(pm.currentThermalStatus)) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - k("Thermal headroom (10 s)", pm.getThermalHeadroom(10).let { if (it.isNaN()) "not reported" else String.format(Locale.US, "%.2f", it) }) + val pm = runCatching { context.getSystemService(Context.POWER_SERVICE) as? PowerManager }.getOrNull() + if (pm != null) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + k("Thermal status", runCatching { thermalStatusName(pm.currentThermalStatus) }.getOrNull()) } - k("Power saver", pm.isPowerSaveMode) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + k("Thermal headroom (10 s)", runCatching { + pm.getThermalHeadroom(10).let { if (it.isNaN()) "not reported" else String.format(Locale.US, "%.2f", it) } + }.getOrNull()) + } + k("Power saver", runCatching { pm.isPowerSaveMode }.getOrNull()) } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { val rate = runCatching { context.getSystemService(PerformanceHintManager::class.java)?.preferredUpdateRateNanos }.getOrNull() From 663da2948c66b9de6ffa53c06e9fb719c593c787 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 22 Oct 2026 22:12:20 +0000 Subject: [PATCH 010/174] fix(steam): the last change to a game's compatibility tool wins A game's tool can be chosen in DroidDeck (per-game Proton) and in Steam's game properties. When they disagreed, DroidDeck always put its own choice back: the live helper within a second of the change, and again at every session start. Resetting the game's DroidDeck profile made it worse - it saved "use the default" (null), which was then forced onto the game. A DroidDeck choice is now applied once, and the client's later pick stands: a pick of one of DroidDeck's Protons becomes the DroidDeck choice too, any other pick (FEX, a Steam Linux Runtime, clearing the forced tool) ends it. "Use the default" and a profile reset are applied once and then dropped, so the game follows the default like one DroidDeck never touched. What was applied is kept in state.json (games_applied); choices an earlier build already applied count as applied. games.json is rewritten only if the app did not replace it meanwhile. An x86-only Proton picked in Steam is still replaced, since it cannot start on the phone. --- .../usr/local/bin/droiddeck-steam-compat | 13 ++- .../overlay/usr/local/bin/steam-compatibility | 102 +++++++++++++++++- tools/tests/test_steam_compat_live.py | 82 ++++++++++++++ 3 files changed, 187 insertions(+), 10 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 3972faa9b3..e751d1f95d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -583,9 +583,8 @@ class Helper: picked = COMPAT["picked_apps"](state) runnable = {t["name"].lower() for t in live} apps = sorted(set(installed) | set(picks) | set(prior_auto) | native_choices, key=COMPAT["app_order"]) - overrides = COMPAT["requested_games"]( - COMPAT["game_requests"](), catalog, [t["name"] for t in live]) - apps = sorted(set(apps) | set(overrides), key=COMPAT["app_order"]) + asked = [app for app, request in COMPAT["game_requests"]().items() if COMPAT["valid_game_request"](app, request)] + apps = sorted(set(apps) | set(asked), key=COMPAT["app_order"]) current = dict(page.compat("many(%s)" % json.dumps(apps)) or {}) refused = set(apps) - set(current) refused_native = native_choices & refused @@ -597,7 +596,6 @@ class Helper: if isinstance(state.get("auto"), dict): state["auto"] = prior_auto native_choices -= refused - overrides = {app: tool for app, tool in overrides.items() if app not in refused} current["0"] = top["selected"] native = COMPAT["native_targets"](self.steam_root, apps) raw_mapping = COMPAT["read_config_mapping"]( @@ -619,6 +617,10 @@ class Helper: current[app] = "" elif not current.get(app): current.pop(app, None) + # The client's pick of a tool the app chose for a game wins once the app's choice was applied. + requests = COMPAT["settled_game_requests"](state, current, catalog) + overrides = COMPAT["requested_games"](requests, catalog, [t["name"] for t in live]) + overrides = {app: tool for app, tool in overrides.items() if app not in refused} changes, auto = COMPAT["plan_mapping"]( current, installed, [t["name"] for t in live], default, COMPAT["followers"](state, current), native, picks, overrides, @@ -630,7 +632,8 @@ class Helper: state.update( auto={app: tool for app, tool in auto.items() if tool is not COMPAT["NATIVE_CHOICE"]}, native_choices=sorted(refused_native | {app for app, tool in auto.items() if tool is COMPAT["NATIVE_CHOICE"]}), - picked=COMPAT["picked_after"](current, changes), tools=catalog, live=True) + picked=COMPAT["picked_after"](current, changes), tools=catalog, live=True, + games_applied=COMPAT["applied_game_requests"](requests, overrides, state)) state.pop("native", None) if waiting: state["pending"] = wanted diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 41a37a9aa5..055f33ede5 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -1113,10 +1113,99 @@ def requested_tool(request, catalog): def game_requests(directory=None): - value = read_json(state_path("games.json", directory)) - if value.get("version") != 1 or not isinstance(value.get("games"), dict): - return {} - return value["games"] + return read_game_requests(directory)[0] + + +def read_game_requests(directory=None): + """The app's per-game Proton choices, and the file's text so a rewrite can tell the app wrote it since.""" + try: + with open(state_path("games.json", directory), encoding="utf-8") as f: + text = f.read() + value = json.loads(text) + except (OSError, ValueError): + return {}, None + if not isinstance(value, dict) or value.get("version") != 1 or not isinstance(value.get("games"), dict): + return {}, text + return value["games"], text + + +def write_game_requests(requests, original, directory=None): + """Rewrites games.json unless the app replaced it after it was read; that newer choice wins.""" + path = state_path("games.json", directory) + try: + with open(path, encoding="utf-8") as f: + if f.read() != original: + return False + except OSError: + if original is not None: + return False + return write_json(path, {"version": 1, "games": requests}) + + +def valid_game_request(app, request): + return (isinstance(app, str) and re.fullmatch(r"[1-9][0-9]*", app) is not None and int(app) <= 0xFFFFFFFF and + (request is None or isinstance(request, dict) and isinstance(request.get("dir"), str) and + request["dir"] != "" and isinstance(request.get("valve"), bool))) + + +def settle_game_requests(requests, state, current, catalog, missing_is_cleared=False): + """Whichever side changed a game's tool last wins. A choice the app makes is applied once; after + that the client's own pick stands: a pick of one of our Protons becomes the app's choice too, any + other pick (FEX, a Steam Linux Runtime, clearing the forced tool) ends the app's choice. "Use the + default" (null, also what a profile reset writes) is applied once and then dropped, so the game + follows the default like one the app never touched. Returns the new requests and whether they changed.""" + recorded = state.get("games_applied") + if isinstance(recorded, dict): + applied = dict(recorded) + else: + # Builds before this one kept no record but had already applied every choice they found; a + # first start has applied nothing yet. + applied = dict(requests) if "tools" in state else {} + by_name = {t["name"]: t for t in catalog} + out = dict(requests) + for app, request in requests.items(): + if not valid_game_request(app, request) or app not in applied or applied[app] != request: + continue + if request is None: + del out[app] + continue + wanted = requested_tool(request, catalog) + if wanted is None: + continue + if app in current: + picked = current[app] + elif missing_is_cleared: + picked = "" + else: + continue + if picked == wanted: + continue + tool = by_name.get(picked) + if tool and tool["dir"]: + out[app] = {"valve": tool["valve"], "dir": tool["dir"]} + else: + del out[app] + return out, out != requests + + +def settled_game_requests(state, current, catalog, missing_is_cleared=False, directory=None): + """Reads the app's choices, settles them against the client's picks and stores the result. When the + app rewrote the file meanwhile, its newer choices are settled again; they are never overwritten.""" + for _ in range(2): + requests, text = read_game_requests(directory) + settled, moved = settle_game_requests(requests, state, current, catalog, missing_is_cleared) + if not moved or write_game_requests(settled, text, directory): + return settled + return settled + + +def applied_game_requests(requests, overrides, state): + """What the app asked for that is now in the mapping; a tool not installed yet stays unapplied.""" + recorded = state.get("games_applied") + before = recorded if isinstance(recorded, dict) else {} + return {app: request if overrides.get(app) is not DEFERRED_GAME_TOOL else before.get(app) + for app, request in requests.items() if app in overrides and + (overrides.get(app) is not DEFERRED_GAME_TOOL or app in before)} def requested_games(requests, catalog, runnable=None): @@ -1306,7 +1395,9 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non else: default = state.get("default") if state.get("default") in names else TOOL steam_root = os.path.dirname(os.path.dirname(os.path.abspath(config_path))) - overrides = requested_games(game_requests(directory), catalog) + # With the client stopped, config.vdf is what it last kept: an app missing from it has no forced tool. + requests = settled_game_requests(state, current, catalog, not steam_running(), directory) + overrides = requested_games(requests, catalog) managed = state.get("auto", {}).keys() if isinstance(state.get("auto"), dict) else () native_choices = state.get("native_choices", ()) native = native_targets(steam_root, set(apps) | set(picks) | set(managed) | set(native_choices)) @@ -1325,6 +1416,7 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non state["auto"] = {app: tool for app, tool in auto.items() if tool is not NATIVE_CHOICE} state["native_choices"] = sorted(app for app, tool in auto.items() if tool is NATIVE_CHOICE) state["picked"] = picked_after(current, changes) + state["games_applied"] = applied_game_requests(requests, overrides, state) state.pop("native", None) state["tools"] = catalog state.setdefault("default", default) diff --git a/tools/tests/test_steam_compat_live.py b/tools/tests/test_steam_compat_live.py index a86aab8644..5b793c313c 100644 --- a/tools/tests/test_steam_compat_live.py +++ b/tools/tests/test_steam_compat_live.py @@ -641,6 +641,88 @@ class ReconcileTest(unittest.TestCase): self.assertEqual(page.mapping["10"], "GE-Proton9-1") self.assertEqual(state["auto"], {"11": TOOL}) + def games(self): + return json.loads((self.state / "games.json").read_text())["games"] + + def write_games(self, games): + (self.state / "games.json").write_text(json.dumps({"version": 1, "games": games})) + + def test_a_steam_pick_after_the_app_choice_is_kept_live(self): + page = FakePage({"0": TOOL, "10": TOOL, "11": TOOL}, [TOOL, TOOL_11, COMPAT["FEX_TOOL"]]) + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + state = self.reconcile(page) + self.assertEqual(page.sets, [("10", TOOL_11)]) + self.assertEqual(state["games_applied"], {"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + + page.sets.clear() + page.mapping["10"] = COMPAT["FEX_TOOL"] + state = self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(page.mapping["10"], COMPAT["FEX_TOOL"]) + self.assertEqual(self.games(), {}) + self.assertEqual(state["games_applied"], {}) + + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + self.reconcile(page) + self.assertEqual(page.sets, [("10", TOOL_11)]) + + def test_a_steam_pick_of_our_proton_becomes_the_app_choice_live(self): + page = FakePage({"0": TOOL, "10": TOOL, "11": TOOL}, [TOOL, TOOL_11]) + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + self.reconcile(page) + page.sets.clear() + page.mapping["10"] = TOOL + state = self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(self.games(), {"10": {"valve": True, "dir": "Proton Experimental (ARM64)"}}) + self.assertEqual(state["games_applied"], self.games()) + + def test_use_the_default_applies_once_then_steam_picks_stand_live(self): + page = FakePage({"0": TOOL, "10": TOOL_11, "11": TOOL}, [TOOL, TOOL_11, COMPAT["FEX_TOOL"]]) + self.write_games({"10": None}) + self.reconcile(page) + self.assertEqual(page.sets, [("10", TOOL)]) + + page.sets.clear() + self.reconcile(page) + self.assertEqual(self.games(), {}) + page.mapping["10"] = COMPAT["FEX_TOOL"] + self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(page.mapping["10"], COMPAT["FEX_TOOL"]) + + def test_choices_an_earlier_build_applied_give_way_to_steam_picks_live(self): + (self.state / "state.json").write_text(json.dumps({"default": TOOL, "auto": {"11": TOOL}, "tools": []})) + self.write_games({"10": None, "11": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + page = FakePage({"0": TOOL, "10": COMPAT["FEX_TOOL"], "11": "steamlinuxruntime_sniper"}, + [TOOL, TOOL_11, COMPAT["FEX_TOOL"]]) + self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(self.games(), {}) + + def test_an_app_choice_written_during_a_sync_is_not_overwritten(self): + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + requests, text = COMPAT["read_game_requests"]() + self.write_games({"10": {"valve": True, "dir": "Proton Experimental (ARM64)"}}) + self.assertFalse(COMPAT["write_game_requests"]({}, text)) + self.assertEqual(self.games(), {"10": {"valve": True, "dir": "Proton Experimental (ARM64)"}}) + + def test_a_steam_pick_is_kept_at_the_next_start(self): + config = self.steam / "config/config.vdf" + config.parent.mkdir(parents=True) + vdf = '"InstallConfigStore" { "Software" { "Valve" { "Steam" { "CompatToolMapping" { %s } } } } }' + entry = '"%s" { "name" "%s" "config" "" "priority" "250" }' + catalog = COMPAT["tool_catalog"](str(self.steam)) + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + config.write_text(vdf % (entry % ("0", TOOL) + entry % ("10", TOOL))) + with mock.patch.dict(COMPAT["register_default"].__globals__, steam_running=lambda: False): + COMPAT["register_default"](str(config), ["10"], catalog=catalog, directory=str(self.state), settle=True) + self.assertIn(entry % ("10", TOOL_11), " ".join(config.read_text().split())) + config.write_text(vdf % (entry % ("0", TOOL) + entry % ("10", COMPAT["FEX_TOOL"]))) + COMPAT["register_default"](str(config), ["10"], catalog=catalog, directory=str(self.state), settle=True) + self.assertIn(entry % ("10", COMPAT["FEX_TOOL"]), " ".join(config.read_text().split())) + self.assertEqual(self.games(), {}) + def test_file_mode_defers_to_the_live_helper(self): (self.state / "live.pid").write_text("%d\n" % os.getpid()) self.assertTrue(COMPAT["live_helper_running"]()) From 449dc301bd1d9320824662568397cea6c0c9afca Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 22 Oct 2026 22:29:03 +0000 Subject: [PATCH 011/174] fix(steam): keep the applied record for a game the client did not report, and apply nothing after a lost write Review: a game the client briefly refused lost its games_applied record, so its unchanged request later looked new and overwrote the Steam pick; it now keeps what was applied before. When the app rewrote games.json during both tries, the stale second read was applied; that pass now applies no per-game choice and keeps the record. --- .../usr/local/bin/droiddeck-steam-compat | 2 +- .../overlay/usr/local/bin/steam-compatibility | 18 ++++++++----- tools/tests/test_steam_compat_live.py | 26 +++++++++++++++++++ 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index e751d1f95d..2793365bc8 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -619,7 +619,7 @@ class Helper: current.pop(app, None) # The client's pick of a tool the app chose for a game wins once the app's choice was applied. requests = COMPAT["settled_game_requests"](state, current, catalog) - overrides = COMPAT["requested_games"](requests, catalog, [t["name"] for t in live]) + overrides = COMPAT["requested_games"](requests or {}, catalog, [t["name"] for t in live]) overrides = {app: tool for app, tool in overrides.items() if app not in refused} changes, auto = COMPAT["plan_mapping"]( current, installed, [t["name"] for t in live], default, diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 055f33ede5..69030a6b09 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -1190,22 +1190,26 @@ def settle_game_requests(requests, state, current, catalog, missing_is_cleared=F def settled_game_requests(state, current, catalog, missing_is_cleared=False, directory=None): """Reads the app's choices, settles them against the client's picks and stores the result. When the - app rewrote the file meanwhile, its newer choices are settled again; they are never overwritten.""" + app rewrote the file meanwhile, its newer choices are settled again; they are never overwritten. + None when the app kept rewriting it: this pass then applies no per-game choice and records nothing.""" for _ in range(2): requests, text = read_game_requests(directory) settled, moved = settle_game_requests(requests, state, current, catalog, missing_is_cleared) if not moved or write_game_requests(settled, text, directory): return settled - return settled + return None def applied_game_requests(requests, overrides, state): - """What the app asked for that is now in the mapping; a tool not installed yet stays unapplied.""" + """What the app asked for that is now in the mapping. A tool not installed yet stays unapplied, and a + game this pass did not handle (the client refused to report it) keeps what was applied before.""" recorded = state.get("games_applied") before = recorded if isinstance(recorded, dict) else {} - return {app: request if overrides.get(app) is not DEFERRED_GAME_TOOL else before.get(app) - for app, request in requests.items() if app in overrides and - (overrides.get(app) is not DEFERRED_GAME_TOOL or app in before)} + if requests is None: + return dict(before) + return {app: request if app in overrides and overrides[app] is not DEFERRED_GAME_TOOL else before[app] + for app, request in requests.items() + if app in overrides and overrides[app] is not DEFERRED_GAME_TOOL or app in before} def requested_games(requests, catalog, runnable=None): @@ -1397,7 +1401,7 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non steam_root = os.path.dirname(os.path.dirname(os.path.abspath(config_path))) # With the client stopped, config.vdf is what it last kept: an app missing from it has no forced tool. requests = settled_game_requests(state, current, catalog, not steam_running(), directory) - overrides = requested_games(requests, catalog) + overrides = requested_games(requests or {}, catalog) managed = state.get("auto", {}).keys() if isinstance(state.get("auto"), dict) else () native_choices = state.get("native_choices", ()) native = native_targets(steam_root, set(apps) | set(picks) | set(managed) | set(native_choices)) diff --git a/tools/tests/test_steam_compat_live.py b/tools/tests/test_steam_compat_live.py index 5b793c313c..af2d8cfb62 100644 --- a/tools/tests/test_steam_compat_live.py +++ b/tools/tests/test_steam_compat_live.py @@ -707,6 +707,32 @@ class ReconcileTest(unittest.TestCase): self.assertFalse(COMPAT["write_game_requests"]({}, text)) self.assertEqual(self.games(), {"10": {"valve": True, "dir": "Proton Experimental (ARM64)"}}) + def test_an_app_the_client_briefly_refuses_keeps_its_applied_choice_live(self): + page = FakePage({"0": TOOL, "10": TOOL, "11": TOOL}, [TOOL, TOOL_11, COMPAT["FEX_TOOL"]]) + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + self.reconcile(page) + page.refused = {"10"} + state = self.reconcile(page) + self.assertEqual(state["games_applied"], {"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + page.refused = set() + page.sets.clear() + page.mapping["10"] = COMPAT["FEX_TOOL"] + self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(page.mapping["10"], COMPAT["FEX_TOOL"]) + + def test_an_app_rewriting_its_choices_during_both_tries_applies_none_of_them_live(self): + page = FakePage({"0": TOOL, "10": TOOL, "11": TOOL}, [TOOL, TOOL_11, COMPAT["FEX_TOOL"]]) + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + self.reconcile(page) + page.sets.clear() + page.mapping["10"] = COMPAT["FEX_TOOL"] + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}, "11": None}) + with mock.patch.dict(COMPAT["settled_game_requests"].__globals__, write_game_requests=lambda *_: False): + state = self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(state["games_applied"], {"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + def test_a_steam_pick_is_kept_at_the_next_start(self): config = self.steam / "config/config.vdf" config.parent.mkdir(parents=True) From 0127fa24aaf4ae81f4f27e65270a7ce40cc090ca Mon Sep 17 00:00:00 2001 From: SuziJay <112842168+ZiYan416@users.noreply.github.com> Date: Fri, 23 Oct 2026 09:36:54 +0800 Subject: [PATCH 012/174] feat: show dot-prefixed folders in game picker --- .../droiddeck/launcher/frontend/AddedGames.kt | 4 +-- .../droiddeck/launcher/ui/ExePickerDialog.kt | 25 ++++++++++++++----- .../droiddeck/launcher/ui/FrontEndGames.kt | 3 ++- .../droiddeck/launcher/ui/PickListingTest.kt | 11 ++++++++ 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index 5de835f6e1..2a83d57e5b 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -274,7 +274,7 @@ object AddedGames { class FolderResult(val added: List, val already: Int) - fun addFolder(context: Context, dir: File, onGame: (Game) -> Unit = {}, onChecking: (String?) -> Unit = {}): FolderResult { + fun addFolder(context: Context, dir: File, onGame: (Game) -> Unit = {}, onChecking: (String?) -> Unit = {}, showHidden: Boolean = false): FolderResult { val app = context.applicationContext // Binds are mounted at session start, so a new one reaches the session from the next start. if (guestPath(app, dir) == null) bindFolder(app, dir) @@ -283,7 +283,7 @@ object AddedGames { var already = 0 val fresh = ArrayList() val added = ArrayList() - for (sub in dir.listFiles { f -> f.isDirectory && !f.name.startsWith(".") }?.sortedBy { it.name.lowercase() }.orEmpty()) { + for (sub in dir.listFiles { f -> f.isDirectory && (showHidden || !f.name.startsWith(".")) }?.sortedBy { it.name.lowercase() }.orEmpty()) { val path = canonical(sub) if (listed.any { it == path || inside(path, it) || inside(it, path) }) { already++; continue } onChecking(sub.name) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ExePickerDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ExePickerDialog.kt index 901bf64850..9fd3631553 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ExePickerDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ExePickerDialog.kt @@ -27,6 +27,8 @@ import androidx.compose.material.icons.outlined.Image import androidx.compose.material.icons.outlined.InsertDriveFile import androidx.compose.material.icons.outlined.SdCard import androidx.compose.material.icons.outlined.Smartphone +import androidx.compose.material.icons.outlined.Visibility +import androidx.compose.material.icons.outlined.VisibilityOff import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -81,8 +83,8 @@ internal class PickFolder(val dir: File, val readable: Boolean) internal class PickListing(val folders: List, val files: List) -internal fun pickListing(dir: File, kind: PickKind): PickListing { - val all = dir.listFiles()?.filter { !it.name.startsWith(".") }.orEmpty().sortedBy { it.name.lowercase() } +internal fun pickListing(dir: File, kind: PickKind, showHidden: Boolean = false): PickListing { + val all = dir.listFiles()?.filter { showHidden || !it.name.startsWith(".") }.orEmpty().sortedBy { it.name.lowercase() } return PickListing( all.filter { it.isDirectory }.map { PickFolder(it, it.canRead() && it.list() != null) }, all.filter { it.isFile && it.extension.lowercase() in kind.extensions }, @@ -92,11 +94,13 @@ internal fun pickListing(dir: File, kind: PickKind): PickListing { @Composable internal fun ExePickerDialog( title: String, kind: PickKind = PickKind.EXE, start: File? = null, - onAddAll: ((File) -> Unit)? = null, onPick: (File) -> Unit, onDismiss: () -> Unit, + onAddAll: ((File, Boolean) -> Unit)? = null, onPick: (File) -> Unit, onDismiss: () -> Unit, ) { val ctx = LocalContext.current val colors = MaterialTheme.colorScheme val density = LocalDensity.current + val prefs = remember(ctx) { ctx.getSharedPreferences("game_picker", Context.MODE_PRIVATE) } + var showHidden by remember { mutableStateOf(prefs.getBoolean("show_hidden", false)) } val shown = rememberShown(onDismiss) val close = { shown.targetState = false } val volumes = remember { pickVolumes(ctx) } @@ -107,14 +111,23 @@ internal fun ExePickerDialog( val back = { if (dir == null) close() else up() } val first = remember(dir) { FocusRequester() } LaunchedEffect(dir) { focusWithinFrames({ false }) { first } } - val listing = remember(dir) { dir?.let { pickListing(it, kind) } } + val listing = remember(dir, showHidden) { dir?.let { pickListing(it, kind, showHidden) } } var locked by remember { mutableStateOf(null) } AppDialog( shown, close, "filePicker", wide = false, maxWidth = 520.dp, width = locked, fitContent = locked == null, back = back, modifier = Modifier.onSizeChanged { if (locked == null && it.width > 0) locked = with(density) { it.width.toDp() } }, ) { Column(verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth()) { - DialogTitleRow(title, onClose = close) + DialogTitleRow(title, onClose = close, leading = { + SmallIconButton( + if (showHidden) Icons.Outlined.VisibilityOff else Icons.Outlined.Visibility, + stringResource(if (showHidden) R.string.fm_hide_hidden else R.string.fm_show_hidden), + if (showHidden) colors.primary else colors.onSurfaceVariant, + ) { + showHidden = !showHidden + prefs.edit().putBoolean("show_hidden", showHidden).apply() + } + }) if (dir != null && volume != null) { val crumbs = listOf(volume.label) + dir!!.path.removePrefix(volume.root.path).split('/').filter { it.isNotEmpty() } Text(crumbs.joinToString(" › "), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) @@ -135,7 +148,7 @@ internal fun ExePickerDialog( val shownListing = listing ?: PickListing(emptyList(), emptyList()) PickerRow(Icons.AutoMirrored.Outlined.ArrowBack, "..", null, focus = first, onClick = up) if (onAddAll != null && shownListing.folders.any { it.readable }) { - PickerRow(Icons.Filled.Add, stringResource(R.string.games_add_all), null, accent = true) { onAddAll(dir!!); close() } + PickerRow(Icons.Filled.Add, stringResource(R.string.games_add_all), null, accent = true) { onAddAll(dir!!, showHidden); close() } } for (f in shownListing.folders) key(f.dir.path) { PickerRow(Icons.Outlined.Folder, f.dir.name, null, enabled = f.readable) { dir = f.dir } 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 c7b78ee05c..477ab9c50a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -424,7 +424,7 @@ private fun GamesDialogs(a: FrontEndActions, games: List) { val st = GamesDialogState if (st.adding) ExePickerDialog( stringResource(R.string.games_add_title), - onAddAll = { dir -> + onAddAll = { dir, showHidden -> st.summary = emptyList() to 0 st.checking = dir.name scope.launch { @@ -433,6 +433,7 @@ private fun GamesDialogs(a: FrontEndActions, games: List) { ctx.applicationContext, dir, onGame = { g -> scope.launch { st.summary?.let { (list, n) -> st.summary = (list + g) to n } } }, onChecking = { name -> scope.launch { st.checking = name } }, + showHidden = showHidden, ) } st.checking = null diff --git a/app/src/test/java/com/droiddeck/launcher/ui/PickListingTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/PickListingTest.kt index 9ed572671c..d1487fcacf 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/PickListingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/PickListingTest.kt @@ -29,6 +29,17 @@ class PickListingTest { assertEquals(listOf("alarms", "Android", "DCIM", "Documents", "Download", "Games", "Winlator"), listing.folders.map { it.dir.name }) } + @Test fun hiddenDirectoriesAndExecutablesCanBeShownOnRequest() { + val root = storage() + val hidden = File(root, ".Games").apply { mkdirs() } + File(hidden, "Game.exe").writeText("game") + assertFalse(pickListing(root, PickKind.EXE).folders.any { it.dir.name == ".Games" }) + val listing = pickListing(root, PickKind.EXE, showHidden = true) + assertTrue(listing.folders.any { it.dir.name == ".Games" }) + assertTrue(listing.files.any { it.name == ".hidden.exe" }) + assertEquals(listOf("Game.exe"), pickListing(hidden, PickKind.EXE).files.map { it.name }) + } + @Test fun onlyExesForAGameOnlyImagesForArt() { val root = storage() assertEquals(listOf("game.EXE", "Setup.exe"), pickListing(root, PickKind.EXE).files.map { it.name }) From 4bcd4e3cca3a4ff2398b2f327a4c21c1ed678b27 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 09:02:47 -0400 Subject: [PATCH 013/174] perf: droiddeck-ntsync without signal-mask syscalls, waits that skip the queue, and per-thread device references --- README.md | 2 +- tools/linuxfs/preload/ntsync.c | 283 +++++++++++++----- tools/tests/test_ntsync_preload.py | 456 +++++++++++++++++++++++++++++ 3 files changed, 671 insertions(+), 70 deletions(-) create mode 100644 tools/tests/test_ntsync_preload.py diff --git a/README.md b/README.md index fb86fa6534..7fd8cfbdbd 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Compatibility and performance vary by device; hardware validation is limited. De ## Credits and licence -GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. +GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. XR glasses support builds on WinNative's VITURE glasses work. VITURE protocol details were checked against [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) by [@wheaney](https://github.com/wheaney), including the VITURE protocol header it ships, [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) by [@badicsalex](https://github.com/badicsalex) and the [go-macos/iokit VITURE package](https://pkg.go.dev/github.com/go-macos/iokit/viture); the optional VITURE SDK belongs to VITURE and is not included. RayNeo support adapts [@informalTechCode](https://github.com/informalTechCode)'s [RayNeo-Air-Series-3DoF-Scaffold](https://github.com/informalTechCode/RayNeo-Air-Series-3DoF-Scaffold) (Apache-2.0) and references [@verncat](https://github.com/verncat)'s [RayNeo-Air-3S-Pro-OpenVR](https://github.com/verncat/RayNeo-Air-3S-Pro-OpenVR) (MIT) and [Monado](https://gitlab.freedesktop.org/monado/monado) (BSL-1.0); see [docs/third-party/rayneo](docs/third-party/rayneo/README.md). XREAL 1S support references [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) by [@rohitsangwan01](https://github.com/rohitsangwan01) (MIT) and [xr-tools](https://github.com/0xcaff/xr-tools) by [@0xcaff](https://github.com/0xcaff). Rokid support follows the Rokid protocol notes in [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/), and [Monado](https://gitlab.freedesktop.org/monado/monado)'s Rokid driver. The REDMAGIC glasses-display findings draw on [@mekhontsev](https://github.com/mekhontsev)'s [MagicDesk investigation](https://github.com/mekhontsev/magicdesk/blob/main/docs/xr-resolution-fix.md) and [@Coding-BR](https://github.com/Coding-BR)'s [decompiled Nubia kernel](https://github.com/Coding-BR/android_kernel_nubia_sm8850_qwjujube). VITURE, RayNeo, XREAL, Rokid and REDMAGIC are trademarks of their owners; this project is not affiliated with them. diff --git a/tools/linuxfs/preload/ntsync.c b/tools/linuxfs/preload/ntsync.c index b920b49f92..2b1c790459 100644 --- a/tools/linuxfs/preload/ntsync.c +++ b/tools/linuxfs/preload/ntsync.c @@ -68,12 +68,13 @@ struct ns_wait_args { #define NS_PROCS 256u #define NS_FDS 65536 #define NS_DEVS 8 -#define NS_VERSION 1u +#define NS_VERSION 2u #define NS_HEAD_MAGIC 0x31434e5953544e44ull #define NS_DEV_MAGIC 0x4e54445600000000ull #define NS_OBJ_MAGIC 0x27ull #define NS_WAITERS 0x80000000u #define NS_SWEEP_NS 2000000000ull +#define NS_SPIN_NS 4000ull #define NS_DEAD 0xffffffffu #ifndef CLOSE_RANGE_CLOEXEC @@ -144,6 +145,7 @@ struct ns_q { uint32_t waiting; uint32_t inuse; uint32_t next_free; + uint32_t sleeping; struct ns_ent ent[NS_ENTS]; }; @@ -255,19 +257,104 @@ static void ns_unlock(uint32_t *w) { } } -static void ns_block(sigset_t *old) { - sigset_t s; - sigfillset(&s); - sigdelset(&s, SIGSEGV); - sigdelset(&s, SIGBUS); - sigdelset(&s, SIGILL); - sigdelset(&s, SIGFPE); - sigdelset(&s, SIGTRAP); - pthread_sigmask(SIG_BLOCK, &s, old); +#define NS_DEFER 4 + +struct ns_cs { + int depth; + int count; + int sigs[NS_DEFER]; + siginfo_t info[NS_DEFER]; +}; + +static __thread struct ns_cs ns_cs; +static uintptr_t ns_handlers[_NSIG]; +static uint8_t ns_siginfo[_NSIG]; + +int bl_from_ntdll(const void *caller) __attribute__((visibility("hidden"))); + +static int ns_deferrable(int sig) { + return sig > 0 && sig < _NSIG && sig != SIGKILL && sig != SIGSTOP && sig != SIGSEGV && sig != SIGBUS && sig != SIGILL + && sig != SIGFPE && sig != SIGTRAP && sig != SIGSYS; } -static void ns_restore(const sigset_t *old) { - pthread_sigmask(SIG_SETMASK, old, NULL); +static int ns_defer(int sig, const siginfo_t *si) { + struct ns_cs *cs = &ns_cs; + if (sig < SIGRTMIN) + for (int i = 0; i < cs->count; i++) + if (cs->sigs[i] == sig) return 1; + if (cs->count >= NS_DEFER) return 0; + cs->sigs[cs->count] = sig; + if (si) memcpy(&cs->info[cs->count], si, sizeof(*si)); + else memset(&cs->info[cs->count], 0, sizeof(*si)); + cs->count++; + return 1; +} + +static void ns_trampoline(int sig, siginfo_t *si, void *uc) { + if (__atomic_load_n(&ns_cs.depth, __ATOMIC_RELAXED) > 0 && ns_defer(sig, si)) return; + uintptr_t h = __atomic_load_n(&ns_handlers[sig], __ATOMIC_ACQUIRE); + if (!h) return; + if (__atomic_load_n(&ns_siginfo[sig], __ATOMIC_RELAXED)) ((void (*)(int, siginfo_t *, void *))h)(sig, si, uc); + else ((void (*)(int))h)(sig); +} + +static void ns_flush(void) { + struct ns_cs *cs = &ns_cs; + int n = cs->count, sigs[NS_DEFER]; + siginfo_t info[NS_DEFER]; + memcpy(sigs, cs->sigs, sizeof(sigs)); + memcpy(info, cs->info, sizeof(info)); + cs->count = 0; + int saved = errno; + pid_t pid = getpid(), tid = (pid_t)ns_self(); + for (int i = 0; i < n; i++) + if (syscall(SYS_rt_tgsigqueueinfo, pid, tid, sigs[i], &info[i]) != 0) syscall(SYS_tgkill, pid, tid, sigs[i]); + errno = saved; +} + +static void ns_block(void) { + ns_cs.depth++; + __atomic_signal_fence(__ATOMIC_SEQ_CST); +} + +static void ns_restore(void) { + __atomic_signal_fence(__ATOMIC_SEQ_CST); + if (--ns_cs.depth == 0) { + __atomic_signal_fence(__ATOMIC_SEQ_CST); + if (ns_cs.count) ns_flush(); + } +} + +int sigaction(int sig, const struct sigaction *act, struct sigaction *old) { + static int (*real)(int, const struct sigaction *, struct sigaction *); + if (!real) real = (int (*)(int, const struct sigaction *, struct sigaction *))dlsym(RTLD_NEXT, "sigaction"); + if (!real) { + errno = ENOSYS; + return -1; + } + if (!ns_deferrable(sig) || !ns_on()) return real(sig, act, old); + uintptr_t prev = __atomic_load_n(&ns_handlers[sig], __ATOMIC_ACQUIRE); + uint8_t prev_info = __atomic_load_n(&ns_siginfo[sig], __ATOMIC_RELAXED); + struct sigaction mine; + const struct sigaction *use = act; + if (act && act->sa_handler != SIG_DFL && act->sa_handler != SIG_IGN && bl_from_ntdll(__builtin_return_address(0))) { + mine = *act; + mine.sa_sigaction = ns_trampoline; + mine.sa_flags |= SA_SIGINFO; + __atomic_store_n(&ns_siginfo[sig], (act->sa_flags & SA_SIGINFO) ? 1 : 0, __ATOMIC_RELAXED); + __atomic_store_n(&ns_handlers[sig], (uintptr_t)act->sa_sigaction, __ATOMIC_RELEASE); + use = &mine; + } + int r = real(sig, use, old); + if (r != 0 && use == &mine) { + __atomic_store_n(&ns_siginfo[sig], prev_info, __ATOMIC_RELAXED); + __atomic_store_n(&ns_handlers[sig], prev, __ATOMIC_RELEASE); + } + if (r == 0 && old && old->sa_sigaction == ns_trampoline) { + old->sa_sigaction = (void (*)(int, siginfo_t *, void *))prev; + if (!prev_info) old->sa_flags &= ~SA_SIGINFO; + } + return r; } static inline struct ns_obj *ns_obj(struct ns_head *h, uint32_t s) { @@ -378,10 +465,11 @@ static int ns_claim(struct ns_q *q, int32_t index) { if (dead) return 0; } int32_t want = -1; - return __atomic_compare_exchange_n(&q->signaled, &want, index, 0, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); + return __atomic_compare_exchange_n(&q->signaled, &want, index, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED); } static void ns_wake(struct ns_q *q) { + if (!__atomic_load_n(&q->sleeping, __ATOMIC_SEQ_CST)) return; int saved = errno; ns_futex(&q->signaled, FUTEX_WAKE, 1, NULL, 0); errno = saved; @@ -618,14 +706,13 @@ static void ns_dev_put_locked(struct ns_dev *d) { static void ns_dev_put(struct ns_dev *d) { if (__atomic_sub_fetch(&d->refs, 1, __ATOMIC_ACQ_REL)) return; - sigset_t old; int saved = errno; - ns_block(&old); + ns_block(); pthread_mutex_lock(&ns_mx); uint32_t zero = 0; if (d->h && __atomic_compare_exchange_n(&d->refs, &zero, NS_DEAD, 0, __ATOMIC_ACQ_REL, __ATOMIC_ACQUIRE)) ns_release(d); pthread_mutex_unlock(&ns_mx); - ns_restore(&old); + ns_restore(); errno = saved; } @@ -682,20 +769,18 @@ static void ns_forget_locked(int fd) { } static void ns_forget(int fd) { - sigset_t old; int saved = errno; - ns_block(&old); + ns_block(); pthread_mutex_lock(&ns_mx); ns_forget_locked(fd); pthread_mutex_unlock(&ns_mx); - ns_restore(&old); + ns_restore(); errno = saved; } static uint64_t ns_adopt(struct ns_dev *d, uint32_t tag, int fd, uint32_t gen, uint32_t s) { uint64_t e = 0; - sigset_t old; - ns_block(&old); + ns_block(); pthread_mutex_lock(&ns_mx); if (!d->h || d->tag != tag || !ns_table() || ns_attach(d) < 0 || s >= NS_SLOTS) goto out; if ((e = __atomic_load_n(&ns_fdt[fd], __ATOMIC_ACQUIRE))) goto out; @@ -710,7 +795,7 @@ static uint64_t ns_adopt(struct ns_dev *d, uint32_t tag, int fd, uint32_t gen, u ns_unlock(&o->lock); out: pthread_mutex_unlock(&ns_mx); - ns_restore(&old); + ns_restore(); return e; } @@ -719,8 +804,7 @@ static uint64_t ns_note_device(int fd) { uint64_t e = 0; if (syscall(SYS_fstat, fd, &st) != 0 || !S_ISREG(st.st_mode)) return 0; if (((uint64_t)st.st_size & ~0xffffull) != NS_DEV_MAGIC) return 0; - sigset_t old; - ns_block(&old); + ns_block(); pthread_mutex_lock(&ns_mx); struct ns_dev *d = ns_table() ? ns_map(fd, (uint32_t)st.st_size & 0xffff, (uint64_t)st.st_ino) : NULL; if (d) { @@ -732,7 +816,7 @@ static uint64_t ns_note_device(int fd) { } } pthread_mutex_unlock(&ns_mx); - ns_restore(&old); + ns_restore(); return e; } @@ -773,15 +857,14 @@ static int ns_ready(struct ns_dev *d) { static void ns_thread_gone(void *p) { struct ns_tls *t = p; - if (!t || !t->d || !t->q) return; - sigset_t old; + if (!t || !t->d) return; struct ns_dev *d = t->d; - ns_block(&old); - ns_free_q(d->h, t->q - 1); + ns_block(); + if (t->q) ns_free_q(d->h, t->q - 1); t->q = 0; t->waiting = 0; t->d = NULL; - ns_restore(&old); + ns_restore(); ns_dev_put(d); } @@ -789,24 +872,36 @@ static void ns_key_init(void) { pthread_key_create(&ns_key, ns_thread_gone); } -static struct ns_q *ns_thread_q(struct ns_dev *d, uint32_t *qi) { - struct ns_head *h = d->h; - if (ns_tq.d && ns_tq.q && ns_tq.waiting) { - ns_drop_q(ns_tq.d->h, ns_tq.q - 1); - ns_tq.waiting = 0; - } - if (ns_tq.d == d && ns_tq.q) { - *qi = ns_tq.q - 1; - return ns_q(h, *qi); - } - if (ns_tq.d && ns_tq.q) { - struct ns_dev *old = ns_tq.d; - ns_free_q(old->h, ns_tq.q - 1); +static int ns_hold(struct ns_dev *d) { + if (ns_tq.d == d) return 1; + if (!ns_dev_get(d)) return 0; + struct ns_dev *old = ns_tq.d; + if (old) { + ns_block(); + if (ns_tq.q) ns_free_q(old->h, ns_tq.q - 1); ns_tq.q = 0; + ns_tq.waiting = 0; ns_tq.d = NULL; + ns_restore(); ns_dev_put(old); } pthread_once(&ns_once, ns_key_init); + ns_tq.d = d; + pthread_setspecific(ns_key, &ns_tq); + return 1; +} + +static struct ns_q *ns_thread_q(struct ns_dev *d, uint32_t *qi) { + struct ns_head *h = d->h; + if (ns_tq.d != d) return NULL; + if (ns_tq.q && ns_tq.waiting) { + ns_drop_q(h, ns_tq.q - 1); + ns_tq.waiting = 0; + } + if (ns_tq.q) { + *qi = ns_tq.q - 1; + return ns_q(h, *qi); + } uint32_t i; if (!ns_pop(h, &h->q_free, 0, &i) && !ns_grow(&h->q_hwm, NS_QS, &i)) { ns_sweep_dead(h); @@ -815,22 +910,19 @@ static struct ns_q *ns_thread_q(struct ns_dev *d, uint32_t *qi) { struct ns_q *q = ns_q(h, i); q->proc = (uint32_t)d->proc; q->waiting = 0; + q->sleeping = 0; q->inuse = 1; - __atomic_add_fetch(&d->refs, 1, __ATOMIC_ACQ_REL); - ns_tq.d = d; ns_tq.q = i + 1; ns_tq.waiting = 0; - pthread_setspecific(ns_key, &ns_tq); *qi = i; return q; } static int ns_create(struct ns_dev *d, int type, uint32_t a, uint32_t b) { struct ns_head *h = d->h; - sigset_t old; int fd = -1, err = 0; uint32_t s = 0; - ns_block(&old); + ns_block(); pthread_mutex_lock(&ns_mx); if (!ns_table() || ns_attach(d) < 0) { err = ENOMEM; @@ -879,7 +971,7 @@ static int ns_create(struct ns_dev *d, int type, uint32_t a, uint32_t b) { ns_unlock(&o->lock); out: pthread_mutex_unlock(&ns_mx); - ns_restore(&old); + ns_restore(); if (fd < 0) errno = err; return fd; } @@ -890,6 +982,20 @@ static int ns_expired(const struct ns_wait_args *args) { return (uint64_t)now.tv_sec * 1000000000ull + (uint64_t)now.tv_nsec >= args->timeout; } +static uint64_t ns_now(void) { + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + return (uint64_t)now.tv_sec * 1000000000ull + (uint64_t)now.tv_nsec; +} + +static void ns_spin(struct ns_q *q) { + uint64_t end = ns_now() + NS_SPIN_NS; + for (unsigned i = 1; __atomic_load_n(&q->signaled, __ATOMIC_ACQUIRE) == -1; i++) { + ns_relax(); + if (!(i & 63) && ns_now() >= end) return; + } +} + static int ns_sleep(struct ns_q *q, const struct ns_wait_args *args) { struct timespec ts, *tsp = NULL; int op = FUTEX_WAIT_BITSET | ((args->flags & NS_WAIT_REALTIME) ? FUTEX_CLOCK_REALTIME : 0); @@ -898,14 +1004,45 @@ static int ns_sleep(struct ns_q *q, const struct ns_wait_args *args) { ts.tv_nsec = (long)(args->timeout % 1000000000ull); tsp = &ts; } - while (__atomic_load_n(&q->signaled, __ATOMIC_ACQUIRE) == -1) { - if (tsp && ns_expired(args)) return ETIMEDOUT; - if (ns_futex(&q->signaled, op, (uint32_t)-1, tsp, FUTEX_BITSET_MATCH_ANY) == -1) { - if (errno == ETIMEDOUT) return ETIMEDOUT; - if (errno == EINTR) return EINTR; - } + ns_spin(q); + int ret = 0; + __atomic_store_n(&q->sleeping, 1, __ATOMIC_SEQ_CST); + while (!ret && __atomic_load_n(&q->signaled, __ATOMIC_SEQ_CST) == -1) { + if (tsp && ns_expired(args)) ret = ETIMEDOUT; + else if (ns_futex(&q->signaled, op, (uint32_t)-1, tsp, FUTEX_BITSET_MATCH_ANY) == -1 && (errno == ETIMEDOUT || errno == EINTR)) + ret = errno; } - return 0; + __atomic_store_n(&q->sleeping, 0, __ATOMIC_RELAXED); + return ret; +} + +static int ns_try_any(struct ns_head *h, const uint32_t *slots, const uint32_t *gens, uint32_t total, uint32_t owner, int *dead) { + for (uint32_t i = 0; i < total; i++) { + struct ns_obj *o = ns_obj(h, slots[i]); + ns_lock(&o->lock); + int busy = o->type == NS_FREE || o->gen != gens[i] || o->any_head || o->all_hint; + if (!busy && ns_signaled(o, owner)) { + switch (o->type) { + case NS_SEM: + o->a--; + break; + case NS_MUTEX: + *dead = (int)o->ownerdead; + o->ownerdead = 0; + o->a++; + o->b = owner; + break; + case NS_EVENT: + if (!o->a) o->b = 0; + break; + } + ns_unlock(&o->lock); + return (int)i; + } + ns_unlock(&o->lock); + if (busy) return -1; + } + return -2; } static int ns_wait(struct ns_dev *d, struct ns_wait_args *ua, int all) { @@ -927,12 +1064,23 @@ static int ns_wait(struct ns_dev *d, struct ns_wait_args *ua, int all) { for (uint32_t j = 0; j < i; j++) if (slots[j] == slots[i]) return EINVAL; } - sigset_t old; - ns_block(&old); + ns_block(); + if (!all && !ns_tq.waiting) { + int dead = 0, got = ns_try_any(h, slots, gens, total, args.owner, &dead); + if (got >= 0) { + ns_restore(); + ua->index = (uint32_t)got; + return dead ? EOWNERDEAD : 0; + } + if (got == -2 && args.timeout != UINT64_MAX && ns_expired(&args)) { + ns_restore(); + return ETIMEDOUT; + } + } uint32_t qi; struct ns_q *q = ns_ready(d) ? ns_thread_q(d, &qi) : NULL; if (!q) { - ns_restore(&old); + ns_restore(); return ENOMEM; } ns_maybe_sweep(h); @@ -1004,16 +1152,15 @@ static int ns_wait(struct ns_dev *d, struct ns_wait_args *ua, int all) { } int ret = 0; if (!bad && __atomic_load_n(&q->signaled, __ATOMIC_ACQUIRE) == -1) { - sigset_t held; - ns_restore(&old); + ns_restore(); ret = ns_sleep(q, &args); - ns_block(&held); + ns_block(); } ns_drop_q(h, qi); ns_tq.waiting = 0; int32_t got = __atomic_load_n(&q->signaled, __ATOMIC_ACQUIRE); int dead = (int)q->ownerdead; - ns_restore(&old); + ns_restore(); if (bad) return EINVAL; if (got != -1) { ua->index = (uint32_t)got; @@ -1061,12 +1208,11 @@ static int ns_obj_ioctl(struct ns_dev *d, uint64_t e, unsigned long req, void *a return ENOTTY; } if (type != (uint32_t)want) return EINVAL; - sigset_t old; - ns_block(&old); + ns_block(); int all = ns_lock_obj(h, o); if (o->type != (uint32_t)want || o->gen != gen) { ns_unlock_obj(h, o, all); - ns_restore(&old); + ns_restore(); return EINVAL; } switch (req) { @@ -1133,7 +1279,7 @@ static int ns_obj_ioctl(struct ns_dev *d, uint64_t e, unsigned long req, void *a } } ns_unlock_obj(h, o, all); - ns_restore(&old); + ns_restore(); if (ret) return ret; if (req == NS_SEM_RELEASE || req == NS_EVENT_SET || req == NS_EVENT_RESET || req == NS_EVENT_PULSE) memcpy(arg, &prev, sizeof(prev)); @@ -1176,9 +1322,8 @@ int bl_ntsync_ioctl(int fd, unsigned long req, void *arg, int *rc) { uint64_t e = ns_lookup(fd); if (!e) return 0; struct ns_dev *d = &ns_devs[(e >> 56) & 7]; - if (!ns_dev_get(d)) return 0; + if (!ns_hold(d)) return 0; int out = 0, err = (e & NS_E_DEVICE) ? ns_dev_ioctl(d, req, arg, &out) : ns_obj_ioctl(d, e, req, arg); - ns_dev_put(d); if (err) { errno = err; *rc = -1; diff --git a/tools/tests/test_ntsync_preload.py b/tools/tests/test_ntsync_preload.py new file mode 100644 index 0000000000..e05178c8d4 --- /dev/null +++ b/tools/tests/test_ntsync_preload.py @@ -0,0 +1,456 @@ +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +NTDLL = r""" +#define _GNU_SOURCE +#include +#include + +int install_handler(int sig, void (*fn)(int, siginfo_t *, void *), void **seen) { + struct sigaction sa, old; + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction = fn; + sa.sa_flags = SA_SIGINFO | SA_RESTART; + sigemptyset(&sa.sa_mask); + if (sigaction(sig, &sa, NULL) != 0) return -1; + if (sigaction(sig, NULL, &old) != 0) return -1; + *seen = (void *)old.sa_sigaction; + return 0; +} +""" + +PROGRAM = r""" +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct sem_args { uint32_t count, max; }; +struct mutex_args { uint32_t owner, count; }; +struct event_args { uint32_t manual, signaled; }; +struct wait_args { uint64_t timeout, objs; uint32_t count, index, flags, owner, alert, pad; }; +#define NT_CREATE_SEM _IOW('N', 0x80, struct sem_args) +#define NT_SEM_RELEASE _IOWR('N', 0x81, uint32_t) +#define NT_WAIT_ANY _IOWR('N', 0x82, struct wait_args) +#define NT_WAIT_ALL _IOWR('N', 0x83, struct wait_args) +#define NT_CREATE_MUTEX _IOW('N', 0x84, struct mutex_args) +#define NT_MUTEX_UNLOCK _IOWR('N', 0x85, struct mutex_args) +#define NT_MUTEX_KILL _IOW('N', 0x86, uint32_t) +#define NT_CREATE_EVENT _IOW('N', 0x87, struct event_args) +#define NT_EVENT_SET _IOR('N', 0x88, uint32_t) +#define NT_EVENT_RESET _IOR('N', 0x89, uint32_t) +#define NT_EVENT_PULSE _IOR('N', 0x8a, uint32_t) +#define NT_SEM_READ _IOR('N', 0x8b, struct sem_args) +#define NT_MUTEX_READ _IOR('N', 0x8c, struct mutex_args) +#define NT_EVENT_READ _IOR('N', 0x8d, struct event_args) + +int install_handler(int sig, void (*fn)(int, siginfo_t *, void *), void **seen); + +static int dev, fails; +#define CHECK(name, cond) do { if (!(cond)) { printf("FAIL %s line %d errno %d\n", name, __LINE__, errno); fails++; } } while (0) + +static uint64_t mono_ns(int64_t delta_ms) { + struct timespec t; + clock_gettime(CLOCK_MONOTONIC, &t); + return (uint64_t)t.tv_sec * 1000000000ull + (uint64_t)t.tv_nsec + (uint64_t)(delta_ms * 1000000); +} + +static int wait_on(unsigned long req, const int *objs, uint32_t count, uint32_t owner, int alert, uint64_t timeout, uint32_t *index) { + struct wait_args w = {timeout, (uintptr_t)objs, count, 0xdead, 0, owner, (uint32_t)alert, 0}; + int r = ioctl(dev, req, &w); + if (index) *index = w.index; + return r < 0 ? errno : 0; +} + +static int event(int manual, int signaled) { + struct event_args a = {(uint32_t)manual, (uint32_t)signaled}; + return ioctl(dev, NT_CREATE_EVENT, &a); +} + +static int sem(uint32_t count, uint32_t max) { + struct sem_args a = {count, max}; + return ioctl(dev, NT_CREATE_SEM, &a); +} + +static int mutex(uint32_t owner, uint32_t count) { + struct mutex_args a = {owner, count}; + return ioctl(dev, NT_CREATE_MUTEX, &a); +} + +static uint32_t prev_of(int fd, unsigned long req, uint32_t in) { + uint32_t v = in; + if (ioctl(fd, req, &v) < 0) return 0xffffffff; + return v; +} + +static void semaphores(void) { + struct sem_args bad = {3, 2}, r; + CHECK("sem_create_invalid", ioctl(dev, NT_CREATE_SEM, &bad) < 0 && errno == EINVAL); + int s = sem(2, 2); + CHECK("sem_create", s >= 0); + uint32_t idx; + CHECK("sem_wait1", wait_on(NT_WAIT_ANY, &s, 1, 1, 0, 0, &idx) == 0 && idx == 0); + CHECK("sem_wait2", wait_on(NT_WAIT_ANY, &s, 1, 1, 0, 0, &idx) == 0); + CHECK("sem_empty", wait_on(NT_WAIT_ANY, &s, 1, 1, 0, 0, NULL) == ETIMEDOUT); + CHECK("sem_release_prev", prev_of(s, NT_SEM_RELEASE, 1) == 0); + CHECK("sem_overflow", prev_of(s, NT_SEM_RELEASE, 2) == 0xffffffff && errno == EOVERFLOW); + CHECK("sem_read", ioctl(s, NT_SEM_READ, &r) == 0 && r.count == 1 && r.max == 2); + close(s); +} + +static void mutexes(void) { + struct mutex_args bad = {0, 1}, r, u; + CHECK("mutex_create_invalid", ioctl(dev, NT_CREATE_MUTEX, &bad) < 0 && errno == EINVAL); + int m = mutex(0, 0); + uint32_t idx; + CHECK("mutex_owner_zero", wait_on(NT_WAIT_ANY, &m, 1, 0, 0, 0, NULL) == EINVAL); + CHECK("mutex_take", wait_on(NT_WAIT_ANY, &m, 1, 7, 0, 0, &idx) == 0 && idx == 0); + CHECK("mutex_recurse", wait_on(NT_WAIT_ANY, &m, 1, 7, 0, 0, NULL) == 0); + CHECK("mutex_other", wait_on(NT_WAIT_ANY, &m, 1, 8, 0, 0, NULL) == ETIMEDOUT); + CHECK("mutex_read", ioctl(m, NT_MUTEX_READ, &r) == 0 && r.owner == 7 && r.count == 2); + u = (struct mutex_args){8, 0}; + CHECK("mutex_unlock_eperm", ioctl(m, NT_MUTEX_UNLOCK, &u) < 0 && errno == EPERM); + u = (struct mutex_args){0, 0}; + CHECK("mutex_unlock_einval", ioctl(m, NT_MUTEX_UNLOCK, &u) < 0 && errno == EINVAL); + u = (struct mutex_args){7, 0}; + CHECK("mutex_unlock_prev", ioctl(m, NT_MUTEX_UNLOCK, &u) == 0 && u.count == 2); + uint32_t who = 8; + CHECK("mutex_kill_eperm", ioctl(m, NT_MUTEX_KILL, &who) < 0 && errno == EPERM); + who = 7; + CHECK("mutex_kill", ioctl(m, NT_MUTEX_KILL, &who) == 0); + CHECK("mutex_read_dead", ioctl(m, NT_MUTEX_READ, &r) < 0 && errno == EOWNERDEAD && r.owner == 0 && r.count == 0); + CHECK("mutex_abandoned", wait_on(NT_WAIT_ANY, &m, 1, 9, 0, 0, &idx) == EOWNERDEAD && idx == 0); + CHECK("mutex_after_abandon", ioctl(m, NT_MUTEX_READ, &r) == 0 && r.owner == 9 && r.count == 1); + close(m); +} + +static void events(void) { + int a = event(0, 1), m = event(1, 0); + struct event_args r; + CHECK("auto_take", wait_on(NT_WAIT_ANY, &a, 1, 1, 0, 0, NULL) == 0); + CHECK("auto_consumed", wait_on(NT_WAIT_ANY, &a, 1, 1, 0, 0, NULL) == ETIMEDOUT); + CHECK("set_prev0", prev_of(m, NT_EVENT_SET, 0) == 0); + CHECK("set_prev1", prev_of(m, NT_EVENT_SET, 0) == 1); + CHECK("manual_kept", wait_on(NT_WAIT_ANY, &m, 1, 1, 0, 0, NULL) == 0 && wait_on(NT_WAIT_ANY, &m, 1, 1, 0, 0, NULL) == 0); + CHECK("reset_prev", prev_of(m, NT_EVENT_RESET, 0) == 1); + CHECK("pulse_prev", prev_of(m, NT_EVENT_PULSE, 0) == 0); + CHECK("pulse_leaves_unsignaled", ioctl(m, NT_EVENT_READ, &r) == 0 && r.manual == 1 && r.signaled == 0); + close(a); + close(m); +} + +static void any_order(void) { + int o[4] = {event(1, 0), sem(1, 5), event(1, 1), sem(0, 5)}; + int alert = event(0, 1); + uint32_t idx; + CHECK("any_lowest", wait_on(NT_WAIT_ANY, o, 4, 1, alert, 0, &idx) == 0 && idx == 1); + CHECK("any_next", wait_on(NT_WAIT_ANY, o, 4, 1, alert, 0, &idx) == 0 && idx == 2); + prev_of(o[2], NT_EVENT_RESET, 0); + CHECK("any_alert", wait_on(NT_WAIT_ANY, o, 4, 1, alert, 0, &idx) == 0 && idx == 4); + CHECK("any_alert_consumed", wait_on(NT_WAIT_ANY, o, 4, 1, alert, 0, NULL) == ETIMEDOUT); + int dup[3] = {o[3], o[0], o[3]}; + prev_of(o[3], NT_SEM_RELEASE, 1); + CHECK("any_duplicate_lowest", wait_on(NT_WAIT_ANY, dup, 3, 1, 0, 0, &idx) == 0 && idx == 0); + int many[65]; + for (int i = 0; i < 65; i++) many[i] = o[0]; + CHECK("any_too_many", wait_on(NT_WAIT_ANY, many, 65, 1, 0, 0, NULL) == EINVAL); + int badfd = 0; + CHECK("any_invalid_fd", wait_on(NT_WAIT_ANY, &badfd, 1, 1, 0, 0, NULL) == EINVAL); + CHECK("any_timeout", wait_on(NT_WAIT_ANY, o, 1, 1, 0, mono_ns(30), NULL) == ETIMEDOUT); + for (int i = 0; i < 4; i++) close(o[i]); + close(alert); +} + +static void all_semantics(void) { + int s = sem(1, 5), e = event(0, 0), m = mutex(0, 0); + int o[3] = {s, e, m}; + struct sem_args sr; + uint32_t idx; + CHECK("all_not_ready", wait_on(NT_WAIT_ALL, o, 3, 4, 0, 0, NULL) == ETIMEDOUT); + CHECK("all_untouched", ioctl(s, NT_SEM_READ, &sr) == 0 && sr.count == 1); + prev_of(e, NT_EVENT_SET, 0); + CHECK("all_ready", wait_on(NT_WAIT_ALL, o, 3, 4, 0, 0, &idx) == 0 && idx == 0); + CHECK("all_took_sem", ioctl(s, NT_SEM_READ, &sr) == 0 && sr.count == 0); + int dup[2] = {s, s}; + CHECK("all_duplicate", wait_on(NT_WAIT_ALL, dup, 2, 4, 0, 0, NULL) == EINVAL); + int alert = event(1, 1); + CHECK("all_alert", wait_on(NT_WAIT_ALL, o, 3, 4, alert, 0, &idx) == 0 && idx == 3); + close(s); + close(e); + close(m); + close(alert); +} + +static int wake_obj; +static uint32_t wake_index; +static int wake_ret; +static void *waiter(void *p) { + int all = (int)(intptr_t)p; + int objs[2] = {wake_obj, wake_obj + 0}; + wake_ret = wait_on(all ? NT_WAIT_ALL : NT_WAIT_ANY, objs, 1, 3, 0, UINT64_MAX, &wake_index); + return NULL; +} + +static void cross_thread(void) { + wake_obj = event(0, 0); + pthread_t t; + pthread_create(&t, NULL, waiter, NULL); + usleep(30000); + prev_of(wake_obj, NT_EVENT_SET, 0); + pthread_join(t, NULL); + CHECK("thread_wake", wake_ret == 0 && wake_index == 0); + struct event_args r; + CHECK("thread_auto_reset", ioctl(wake_obj, NT_EVENT_READ, &r) == 0 && r.signaled == 0); + close(wake_obj); + int s = sem(0, 10); + wake_obj = s; + pthread_t ts[3]; + for (int i = 0; i < 3; i++) pthread_create(&ts[i], NULL, waiter, NULL); + usleep(30000); + CHECK("sem_release_three", prev_of(s, NT_SEM_RELEASE, 3) == 0); + for (int i = 0; i < 3; i++) pthread_join(ts[i], NULL); + struct sem_args sr; + CHECK("sem_all_taken", ioctl(s, NT_SEM_READ, &sr) == 0 && sr.count == 0); + close(s); +} + +static void cross_process(void) { + int sv[2]; + CHECK("socketpair", socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); + int inherited = event(0, 0); + pid_t pid = fork(); + if (pid == 0) { + uint32_t idx; + int r1 = wait_on(NT_WAIT_ANY, &inherited, 1, 5, 0, mono_ns(5000), &idx); + char c; + struct iovec io = {&c, 1}; + char cbuf[CMSG_SPACE(sizeof(int))]; + struct msghdr msg = {0}; + msg.msg_iov = &io; + msg.msg_iovlen = 1; + msg.msg_control = cbuf; + msg.msg_controllen = sizeof(cbuf); + int got = -1; + if (recvmsg(sv[1], &msg, 0) == 1) memcpy(&got, CMSG_DATA(CMSG_FIRSTHDR(&msg)), sizeof(int)); + int r2 = wait_on(NT_WAIT_ANY, &got, 1, 5, 0, mono_ns(5000), NULL); + _exit(r1 == 0 && r2 == 0 ? 0 : 1); + } + usleep(30000); + prev_of(inherited, NT_EVENT_SET, 0); + int sent = sem(0, 1); + char c = 'x'; + struct iovec io = {&c, 1}; + char cbuf[CMSG_SPACE(sizeof(int))]; + struct msghdr msg = {0}; + msg.msg_iov = &io; + msg.msg_iovlen = 1; + msg.msg_control = cbuf; + msg.msg_controllen = sizeof(cbuf); + struct cmsghdr *cm = CMSG_FIRSTHDR(&msg); + cm->cmsg_level = SOL_SOCKET; + cm->cmsg_type = SCM_RIGHTS; + cm->cmsg_len = CMSG_LEN(sizeof(int)); + memcpy(CMSG_DATA(cm), &sent, sizeof(int)); + sendmsg(sv[0], &msg, 0); + usleep(30000); + prev_of(sent, NT_SEM_RELEASE, 1); + int status = 0; + waitpid(pid, &status, 0); + CHECK("process_wake", WIFEXITED(status) && WEXITSTATUS(status) == 0); + close(inherited); + close(sent); + close(sv[0]); + close(sv[1]); +} + +static int ping_obj, pong_obj, stress_sem; +static void *stress_ponger(void *p) { + long n = (long)p; + uint32_t v; + for (long i = 0; i < n; i++) { + if (wait_on(NT_WAIT_ANY, &ping_obj, 1, 21, 0, UINT64_MAX, NULL) != 0) return (void *)1; + ioctl(pong_obj, NT_EVENT_SET, &v); + } + return NULL; +} +static void *stress_hammer(void *p) { + long n = (long)p; + for (long i = 0; i < n; i++) { + if (wait_on(NT_WAIT_ANY, &stress_sem, 1, 22, 0, UINT64_MAX, NULL) != 0) return (void *)1; + uint32_t c = 1; + ioctl(stress_sem, NT_SEM_RELEASE, &c); + } + return NULL; +} + +static void stress(void) { + long rounds = 20000; + ping_obj = event(0, 0); + pong_obj = event(0, 0); + pthread_t t; + void *bad = NULL; + pthread_create(&t, NULL, stress_ponger, (void *)rounds); + uint32_t v; + int ok = 1; + for (long i = 0; i < rounds && ok; i++) { + ioctl(ping_obj, NT_EVENT_SET, &v); + ok = wait_on(NT_WAIT_ANY, &pong_obj, 1, 20, 0, UINT64_MAX, NULL) == 0; + } + pthread_join(t, &bad); + CHECK("stress_pingpong", ok && bad == NULL); + stress_sem = sem(1, 1); + pthread_t th[4]; + for (int i = 0; i < 4; i++) pthread_create(&th[i], NULL, stress_hammer, (void *)5000L); + int hammer_ok = 1; + for (int i = 0; i < 4; i++) { + pthread_join(th[i], &bad); + hammer_ok &= bad == NULL; + } + struct sem_args sr; + CHECK("stress_contended", hammer_ok && ioctl(stress_sem, NT_SEM_READ, &sr) == 0 && sr.count == 1); + close(ping_obj); + close(pong_obj); + close(stress_sem); +} + +static int busy_obj; +static volatile int handled, stop_worker; +static sem_t parked, unpark; +static void reentrant(int sig, siginfo_t *si, void *uc) { + (void)sig; (void)si; (void)uc; + uint32_t v = 0; + ioctl(busy_obj, NT_EVENT_SET, &v); + handled++; +} +static void suspending(int sig, siginfo_t *si, void *uc) { + (void)sig; (void)si; (void)uc; + sem_post(&parked); + while (sem_wait(&unpark) != 0) {} + handled++; +} +static void *worker(void *p) { + (void)p; + uint32_t v; + while (!stop_worker) { + ioctl(busy_obj, NT_EVENT_SET, &v); + wait_on(NT_WAIT_ANY, &busy_obj, 1, 11, 0, 0, NULL); + } + return NULL; +} + +static void signals(void) { + void *seen = NULL; + busy_obj = event(0, 0); + CHECK("install_reentrant", install_handler(SIGUSR1, reentrant, &seen) == 0); + CHECK("query_original", seen == (void *)reentrant); + pthread_t w; + stop_worker = 0; + handled = 0; + pthread_create(&w, NULL, worker, NULL); + for (int i = 0; i < 2000; i++) { + pthread_kill(w, SIGUSR1); + if (i % 64 == 0) usleep(100); + } + usleep(20000); + stop_worker = 1; + pthread_join(w, NULL); + CHECK("reentrant_ran", handled > 0); + sem_init(&parked, 0, 0); + sem_init(&unpark, 0, 0); + CHECK("install_suspending", install_handler(SIGUSR1, suspending, &seen) == 0); + stop_worker = 0; + handled = 0; + pthread_create(&w, NULL, worker, NULL); + uint32_t v; + for (int i = 0; i < 300; i++) { + pthread_kill(w, SIGUSR1); + while (sem_wait(&parked) != 0) {} + ioctl(busy_obj, NT_EVENT_SET, &v); + wait_on(NT_WAIT_ANY, &busy_obj, 1, 12, 0, 0, NULL); + sem_post(&unpark); + } + stop_worker = 1; + pthread_join(w, NULL); + CHECK("suspend_ran", handled == 300); + close(busy_obj); +} + +int main(void) { + alarm(60); + dev = open("/dev/ntsync", O_RDWR | O_CLOEXEC); + if (dev < 0) { + printf("no device %d\n", errno); + return 1; + } + semaphores(); + mutexes(); + events(); + any_order(); + all_semantics(); + cross_thread(); + cross_process(); + stress(); + signals(); + printf("done fails=%d\n", fails); + return fails != 0; +} +""" + + +class NtsyncPreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + if not shutil.which("cc"): + raise unittest.SkipTest("no compiler") + cls.tmp = tempfile.TemporaryDirectory() + tmp = Path(cls.tmp.name) + (tmp / "ntdll.c").write_text(NTDLL) + (tmp / "prog.c").write_text(PROGRAM) + sources = sorted(str(p) for p in PRELOAD.glob("*.c")) + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(tmp / "libblsession.so"), *sources, "-ldl"], + check=True) + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-o", str(tmp / "ntdll.so"), str(tmp / "ntdll.c")], check=True) + subprocess.run(["cc", "-O1", "-pthread", "-o", str(tmp / "prog"), str(tmp / "prog.c"), str(tmp / "ntdll.so"), + "-Wl,-rpath," + str(tmp)], check=True) + cls.program = tmp / "prog" + cls.preload = tmp / "libblsession.so" + + @classmethod + def tearDownClass(cls): + cls.tmp.cleanup() + + def run_program(self): + env = dict(os.environ, LD_PRELOAD=str(self.preload), BL_SYNC="1") + return subprocess.run([str(self.program)], env=env, capture_output=True, text=True, timeout=90) + + def test_emulation_matches_the_ntsync_driver(self): + out = self.run_program() + self.assertEqual(out.returncode, 0, out.stdout + out.stderr) + self.assertIn("done fails=0", out.stdout) + + def test_repeated_runs_stay_consistent(self): + for _ in range(3): + out = self.run_program() + self.assertEqual(out.returncode, 0, out.stdout + out.stderr) + + +if __name__ == "__main__": + unittest.main() From f7acb7fcd7b0dad2ccbaccf39e8aed288b38fa71 Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Fri, 23 Oct 2026 04:50:32 +0300 Subject: [PATCH 014/174] Inner Gamer RGB theme with a speed slider; keep the colour picker's hex box in view above the keyboard The hex box sat at the bottom of the picker, so with the keyboard up the dialog was cut off and the field could not be seen. While the box has focus the dialog now scrolls to its end, and again whenever the visible height changes, so the hex box and OK / Cancel stay above the keyboard. Inner Gamer is a new theme just above Gradient. Its accent walks round the colour wheel on a Compose infinite transition, so Android's animation clock drives it and it holds still when animations are off. The hue moves in 3 degree steps so the app restyles only when the colour visibly changes. Setup shows a Speed slider (1 to 10) while it is selected. The palette comes from ThemeColors.palette, so button text stays readable at every hue. --- .../launcher/session/SessionPrefs.kt | 8 +++ .../com/droiddeck/launcher/ui/AddAppDialog.kt | 3 +- .../launcher/ui/ColorPickerDialog.kt | 7 ++- .../droiddeck/launcher/ui/FrontEndSetup.kt | 8 +++ .../java/com/droiddeck/launcher/ui/Theme.kt | 55 +++++++++++++++++++ .../com/droiddeck/launcher/ui/ThemeColors.kt | 4 +- app/src/main/res/values-ar/strings.xml | 4 ++ app/src/main/res/values-b+es+419/strings.xml | 4 ++ app/src/main/res/values-bg/strings.xml | 4 ++ app/src/main/res/values-cs/strings.xml | 4 ++ app/src/main/res/values-da/strings.xml | 4 ++ app/src/main/res/values-de/strings.xml | 4 ++ app/src/main/res/values-el/strings.xml | 4 ++ app/src/main/res/values-es/strings.xml | 4 ++ app/src/main/res/values-fi/strings.xml | 4 ++ app/src/main/res/values-fr/strings.xml | 4 ++ app/src/main/res/values-hi/strings.xml | 4 ++ app/src/main/res/values-hu/strings.xml | 4 ++ app/src/main/res/values-in/strings.xml | 4 ++ app/src/main/res/values-it/strings.xml | 4 ++ app/src/main/res/values-ja/strings.xml | 4 ++ app/src/main/res/values-ko/strings.xml | 4 ++ app/src/main/res/values-ms/strings.xml | 4 ++ app/src/main/res/values-nb/strings.xml | 4 ++ app/src/main/res/values-nl/strings.xml | 4 ++ app/src/main/res/values-pl/strings.xml | 4 ++ app/src/main/res/values-pt-rPT/strings.xml | 4 ++ app/src/main/res/values-pt/strings.xml | 4 ++ app/src/main/res/values-ro/strings.xml | 4 ++ app/src/main/res/values-ru/strings.xml | 4 ++ app/src/main/res/values-sv/strings.xml | 4 ++ app/src/main/res/values-th/strings.xml | 4 ++ app/src/main/res/values-tr/strings.xml | 4 ++ app/src/main/res/values-uk/strings.xml | 4 ++ app/src/main/res/values-vi/strings.xml | 4 ++ app/src/main/res/values-zh-rCN/strings.xml | 4 ++ app/src/main/res/values-zh-rHK/strings.xml | 4 ++ app/src/main/res/values-zh-rTW/strings.xml | 4 ++ app/src/main/res/values/strings.xml | 4 ++ .../droiddeck/launcher/ui/ThemeColorsTest.kt | 36 ++++++++++++ docs/development/themes.md | 14 +++++ 41 files changed, 263 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 d9d2d8e1d3..f28c687342 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -764,6 +764,14 @@ object SessionPrefs { it.getInt("gradientSecondary", com.droiddeck.launcher.ui.Themes.DEFAULT_SECONDARY) } + /** How fast the Inner Gamer theme cycles its colours, 1 to 10. */ + fun rgbSpeed(context: Context): Int = + prefs(context).getInt("innerGamerSpeed", com.droiddeck.launcher.ui.Themes.DEFAULT_RGB_SPEED).coerceIn(1, com.droiddeck.launcher.ui.Themes.RGB_SPEEDS) + + fun setRgbSpeed(context: Context, speed: Int) { + prefs(context).edit().putInt("innerGamerSpeed", speed.coerceIn(1, com.droiddeck.launcher.ui.Themes.RGB_SPEEDS)).apply() + } + fun setGradientColors(context: Context, primary: Int, secondary: Int) { prefs(context).edit().putInt("gradientPrimary", primary).putInt("gradientSecondary", secondary).apply() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt index 5e63d7b0f2..b3b88f0aa4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt @@ -308,6 +308,7 @@ internal fun AppDialog( width: Dp? = null, fitContent: Boolean = false, back: (() -> Unit)? = null, scrollable: Boolean = true, + scrollState: androidx.compose.foundation.ScrollState = rememberScrollState(), content: @Composable ColumnScope.() -> Unit, ) { val pal = LocalPalette.current @@ -345,7 +346,7 @@ internal fun AppDialog( .blockTouches() .controllerBack(back ?: close) .then(modifier) - .then(if (scrollable) Modifier.verticalScroll(rememberScrollState()) else Modifier) + .then(if (scrollable) Modifier.verticalScroll(scrollState) else Modifier) .padding(horizontal = 18.dp, vertical = 16.dp), content = content, ) 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 e94f193e95..d83e1abe10 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable @@ -70,12 +71,15 @@ internal fun ColorPickerDialog(title: String, initial: Int, onDismiss: () -> Uni var hexText by remember { mutableStateOf(ThemeColors.hex(initial)) } val current = ThemeColors.fromHsv(hue, sat, value) val first = remember { FocusRequester() } + val scroll = rememberScrollState() + var typingHex by remember { mutableStateOf(false) } LaunchedEffect(Unit) { focusSoon { first } } + LaunchedEffect(typingHex, scroll.maxValue) { if (typingHex) scroll.animateScrollTo(scroll.maxValue) } fun picked(h: Float = hue, s: Float = sat, v: Float = value) { 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) { + AppDialog(shown, close, "colorPicker", wide = false, maxWidth = 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) } @@ -95,6 +99,7 @@ internal fun ColorPickerDialog(title: String, initial: Int, onDismiss: () -> Uni 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()) { 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 b5bbaa2e91..c2582837f0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -359,6 +359,7 @@ internal fun SetupPanel( } } } + if (s.theme == Themes.INNER_GAMER) RgbSpeedRow() if (s.theme == Themes.GRADIENT) GradientColorRows() ChoiceRow( host, "app-scale", stringResource(R.string.setup_app_scale), stringResource(R.string.setup_app_scale_hint), @@ -792,6 +793,13 @@ private fun LanguageRow(host: MenuHost, chosen: String, onPick: (String) -> Unit } } +/** How fast Inner Gamer cycles its colours. */ +@Composable +private fun RgbSpeedRow() { + val ctx = androidx.compose.ui.platform.LocalContext.current.applicationContext + SliderRow(stringResource(R.string.theme_rgb_speed), stringResource(R.string.theme_rgb_speed_hint), Themes.rgbSpeed, 1..Themes.RGB_SPEEDS) { Themes.setRgbSpeed(ctx, it) } +} + /** The two colours of the Gradient theme, each a small square that opens the colour picker. */ @Composable private fun GradientColorRows() { 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 0f3843fcac..4eae384e22 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -3,7 +3,14 @@ package com.droiddeck.launcher.ui import androidx.annotation.StringRes import androidx.compose.material3.MaterialTheme import androidx.compose.material3.darkColorScheme +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.runtime.getValue @@ -13,6 +20,7 @@ import android.content.Context import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.luminance +import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import com.droiddeck.launcher.R import androidx.compose.ui.platform.LocalConfiguration @@ -33,6 +41,7 @@ object Themes { const val PAPER = "paper" const val ICON_BLUE = "blue" const val ELECTRIC = "electric" + const val INNER_GAMER = "inner_gamer" const val GRADIENT = "gradient" const val DEFAULT_PRIMARY = 0xFF8B5CF6.toInt() @@ -42,10 +51,42 @@ object Themes { var gradientColors by mutableStateOf(DEFAULT_PRIMARY to DEFAULT_SECONDARY) private set + const val RGB_SPEEDS = 10 + const val DEFAULT_RGB_SPEED = 3 + const val RGB_HUE_STEP = 3f + + /** How fast Inner Gamer cycles, 1 (slow) to [RGB_SPEEDS] (fast). */ + var rgbSpeed by mutableStateOf(DEFAULT_RGB_SPEED) + private set + + /** Where Inner Gamer is on the colour wheel, in whole [RGB_HUE_STEP] steps so the app restyles only when the colour visibly moves. */ + var rgbHue by mutableStateOf(0f) + private set + + fun setRgbHue(hue: Float) { + rgbHue = hue + } + + fun setRgbSpeed(context: Context, speed: Int) { + val value = speed.coerceIn(1, RGB_SPEEDS) + SessionPrefs.setRgbSpeed(context, value) + rgbSpeed = value + } + + /** Milliseconds for one trip round the colour wheel. */ + fun rgbCycleMillis(speed: Int): Int = 30_000 / speed.coerceIn(1, RGB_SPEEDS) + fun loadGradient(context: Context) { gradientColors = SessionPrefs.gradientColors(context) + rgbSpeed = SessionPrefs.rgbSpeed(context) } + /** The Inner Gamer palette at one point on the colour wheel. */ + fun innerGamer(hue: Float): Palette = ThemeColors.palette( + Color.hsv(hue % 360f, 0.9f, 1f).toArgb(), Color.hsv((hue + 60f) % 360f, 0.9f, 1f).toArgb(), + R.string.theme_inner_gamer, R.string.theme_inner_gamer_detail, INNER_GAMER, + ) + fun setGradient(context: Context, primary: Int, secondary: Int) { SessionPrefs.setGradientColors(context, primary, secondary) gradientColors = primary to secondary @@ -87,10 +128,12 @@ object Themes { primary = Color(0xFF2E86FF), primary2 = Color(0xFF2684FF), onPrimary = Color(0xFF03111F), signal = Color(0xFF2E86FF), good = Color(0xFF4CD37F), ), + innerGamer(0f), ThemeColors.palette(DEFAULT_PRIMARY, DEFAULT_SECONDARY, R.string.theme_gradient, R.string.theme_gradient_detail), ) fun byId(id: String): Palette { + if (id == INNER_GAMER) return innerGamer(rgbHue) 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] } @@ -103,6 +146,7 @@ val Palette.onSignal: Color get() = if (signal.luminance() > 0.18f) Color(0xFF03 @Composable fun DroidDeckTheme(theme: String? = null, appScale: Int = AppUiPrefs.DEFAULT_SCALE, content: @Composable () -> Unit) { val id = theme ?: SessionPrefs.theme(LocalContext.current) + if (id == Themes.INNER_GAMER) InnerGamerHue(Themes.rgbSpeed) val p = Themes.byId(id) val scheme = darkColorScheme( primary = p.primary, onPrimary = p.onPrimary, secondary = p.onSurfaceVariant, @@ -121,3 +165,14 @@ fun DroidDeckTheme(theme: String? = null, appScale: Int = AppUiPrefs.DEFAULT_SCA LocalConfiguration provides configuration, ) { MaterialTheme(colorScheme = scheme, content = content) } } + +/** Turns the colour wheel on the system's own animation clock; with animations off, in the app or in Android, the colour holds still. */ +@Composable +private fun InnerGamerHue(speed: Int) { + if (Motion.scale == 0f) return + val hue by rememberInfiniteTransition(label = "innerGamer").animateFloat( + 0f, 360f, infiniteRepeatable(tween(Motion.ms(Themes.rgbCycleMillis(speed)).coerceAtLeast(1), easing = LinearEasing), RepeatMode.Restart), label = "hue", + ) + val step = Themes.RGB_HUE_STEP + SideEffect { Themes.setRgbHue((hue / step).toInt() * step) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ThemeColors.kt b/app/src/main/java/com/droiddeck/launcher/ui/ThemeColors.kt index b4b57737e1..b2db635623 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ThemeColors.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ThemeColors.kt @@ -132,7 +132,7 @@ internal object ThemeColors { } } - fun palette(primary: Int, secondary: Int, label: Int, detail: Int): Palette { + fun palette(primary: Int, secondary: Int, label: Int, detail: Int, id: String = Themes.GRADIENT): Palette { val seen = readable(primary) val seenSecond = readable(secondary) val ink = inkFor(seen, seenSecond) @@ -146,7 +146,7 @@ internal object ThemeColors { second = nextSecond } return Palette( - Themes.GRADIENT, label, detail, + id, label, detail, background = tint(first, 0.50f, 0.045f), surface = tint(first, 0.45f, 0.075f), surfaceVariant = tint(first, 0.42f, 0.115f), line = tint(first, 0.40f, 0.16f), line2 = tint(first, 0.36f, 0.22f), onBackground = tint(first, 0.05f, 0.97f), onSurfaceVariant = tint(first, 0.16f, 0.68f), diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index c7528035f4..c3d790b845 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1457,6 +1457,10 @@ خلفية سوداء ونص أبيض، والأزرق لكل عنصر محدَّد أو مُركَّز عليه أو مضغوط. كحلي كهربائي أزرق أكثر سطوعًا، على أسطح تميل إلى الكحلي بدلاً من الرمادي. + Inner Gamer + ألوان تتدرّج عبر ألوان قوس قزح. تتبع إعدادات الرسوم المتحركة في Android. + السرعة + مدى سرعة تغيّر الألوان. تدرج لوني لونك الأساسي والثانوي، ممزوجان على الأزرار وعناصر التمييز. الأساسي 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 d6a7aa64ef..0464089bd2 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1466,6 +1466,10 @@ Fondo negro, texto blanco y el azul para todo lo seleccionado, enfocado o presionado. Azul marino eléctrico Un azul más vivo, sobre superficies que tiran a azul marino en vez de gris. + Inner Gamer + Colores que recorren el arcoíris. Respeta los ajustes de animación de Android. + Velocidad + Qué tan rápido cambian los colores. Degradado Tus propios colores primario y secundario, combinados en botones y resaltados. Primario diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index e5ec507d77..97b8246700 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1401,6 +1401,10 @@ Черен фон, бял текст, синьото за всичко избрано, на фокус или натиснато. Яркосиньо По-яркото синьо, върху повърхности, по-близки до тъмносиньо, вместо сиво. + Inner Gamer + Цветове, които преминават през дъгата. Следва настройките за анимации на Android. + Скорост + Колко бързо се сменят цветовете. Градиент Вашите основен и вторичен цвят, смесени в бутоните и акцентите. Основен diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 7ff26b0873..f8f659b8ac 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1429,6 +1429,10 @@ Černé pozadí, bílé písmo, modrá pro vše vybrané, zaměřené nebo stisknuté. Elektrická modř Jasnější modrá na povrchách, které jsou spíše tmavomodré než šedé. + Inner Gamer + Barvy, které procházejí celou duhu. Respektuje nastavení animací v Androidu. + Rychlost + Jak rychle se barvy střídají. Přechod Vaše vlastní primární a sekundární barva, prolnuté na tlačítkách a zvýrazněních. Primární diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index dbe4594973..a2686e54e6 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1401,6 +1401,10 @@ Sort baggrund, hvid skrift, blå til alt, der er valgt, fokuseret eller trykket. Elektrisk marineblå Den blå er klarere, på overflader der trækker mod marineblåt i stedet for gråt. + Inner Gamer + Farver, der skifter gennem regnbuen. Følger Androids animationsindstillinger. + Hastighed + Hvor hurtigt farverne skifter. Gradient Dine egne primære og sekundære farver, blandet på knapper og fremhævninger. Primær diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 73fa6ae853..e686712397 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1393,6 +1393,10 @@ Schwarzer Grund, weiße Schrift, das Blau für alles Ausgewählte, Fokussierte oder Gedrückte. Elektrisches Marineblau Das Blau heller, auf Flächen, die eher zu Marineblau als zu Grau tendieren. + Inner Gamer + Farben, die durch den Regenbogen wechseln. Folgt den Animationseinstellungen von Android. + Geschwindigkeit + Wie schnell die Farben wechseln. Farbverlauf Eigene Primär- und Sekundärfarbe, als Verlauf auf Schaltflächen und Hervorhebungen. Primär diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 097d18c2bb..0667040d42 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1401,6 +1401,10 @@ Μαύρο φόντο, λευκά γράμματα, το μπλε για ό,τι είναι επιλεγμένο, εστιασμένο ή πατημένο. Ηλεκτρικό ναυτικό μπλε Το μπλε πιο έντονο, σε επιφάνειες που τείνουν προς το ναυτικό μπλε αντί για γκρι. + Inner Gamer + Χρώματα που διατρέχουν το ουράνιο τόξο. Ακολουθεί τις ρυθμίσεις animation του Android. + Ταχύτητα + Πόσο γρήγορα αλλάζουν τα χρώματα. Διαβάθμιση Δικά σας πρωτεύον και δευτερεύον χρώμα, σε μίξη στα κουμπιά και τις επισημάνσεις. Πρωτεύον diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index edbccd44d0..57b09bf6b0 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1417,6 +1417,10 @@ Fondo negro, texto blanco y el azul para todo lo seleccionado, enfocado o pulsado. Azul marino eléctrico Un azul más vivo, sobre superficies que tiran a azul marino en vez de gris. + Inner Gamer + Colores que recorren el arcoíris. Respeta los ajustes de animación de Android. + Velocidad + Con qué rapidez cambian los colores. Degradado Tus propios colores primario y secundario, combinados en botones y resaltados. Primario diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2d8d8a12b2..2b462ab886 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1401,6 +1401,10 @@ Musta pohja, valkoinen teksti, sininen kaikessa valitussa, kohdistetussa tai painetussa. Sähköinen laivastonsininen Sininen kirkkaampana pinnoilla, jotka taittuvat harmaan sijaan laivastonsiniseen. + Inner Gamer + Värit, jotka kiertävät sateenkaaren läpi. Noudattaa Androidin animaatioasetuksia. + Nopeus + Kuinka nopeasti värit vaihtuvat. Liukuväri Omat ensisijainen ja toissijainen värisi, sulautettuina painikkeisiin ja korostuksiin. Ensisijainen diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b268e9efd2..54342beae7 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1417,6 +1417,10 @@ Fond noir, texte blanc, et le bleu pour tout élément sélectionné, ciblé ou pressé. Marine électrique Un bleu plus vif, sur des surfaces qui tirent vers le marine plutôt que vers le gris. + Inner Gamer + Des couleurs qui parcourent l\'arc-en-ciel. Respecte les réglages d\'animation d\'Android. + Vitesse + La vitesse de défilement des couleurs. Dégradé Vos propres couleurs primaire et secondaire, fondues sur les boutons et les éléments en surbrillance. Primaire diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d08626be6c..5113e7764f 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1401,6 +1401,10 @@ काली ज़मीन, सफ़ेद टाइप, चुने, फ़ोकस या दबाए गए हर चीज़ के लिए ब्लू रंग। इलेक्ट्रिक नेवी ब्लू रंग ज़्यादा चमकीला, उन सतहों पर जो ग्रे के बजाय नेवी की ओर झुकती हैं। + Inner Gamer + इंद्रधनुष के रंगों में बदलते रंग। Android की एनिमेशन सेटिंग का पालन करता है। + गति + रंग कितनी तेज़ी से बदलें। ग्रेडिएंट आपके अपने प्राथमिक और द्वितीयक रंग, बटनों और हाइलाइट पर मिश्रित। प्राथमिक diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6be57ffd28..5e26a3d04c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1401,6 +1401,10 @@ Fekete alap, fehér betűk, a kék minden kijelölt, fókuszált vagy lenyomott elemhez. Elektromos tengerészkék Fényesebb kék, szürke helyett tengerészkék felületeken. + Inner Gamer + A szivárvány színein végigfutó színek. Követi az Android animációs beállításait. + Sebesség + Milyen gyorsan váltanak a színek. Színátmenet Saját elsődleges és másodlagos színed, átmenettel a gombokon és a kiemeléseken. Elsődleges diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 776885a847..89e8a72dac 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1387,6 +1387,10 @@ Dasar hitam, tipe putih, biru untuk semua yang dipilih, difokuskan, atau ditekan. Navy elektrik Biru yang lebih cerah, pada permukaan yang condong ke navy, bukan abu-abu. + Inner Gamer + Warna yang berganti menyusuri pelangi. Mengikuti pengaturan animasi Android. + Kecepatan + Seberapa cepat warna berganti. Gradasi Warna primer dan sekunder pilihan Anda, dipadukan pada tombol dan sorotan. Primer diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d5fde44e5a..38bafda84c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1407,6 +1407,10 @@ Fondo nero, testo bianco, il blu per tutto ciò che è selezionato, attivo o premuto. Blu elettrico Il blu più brillante, su superfici che tendono al blu navy invece che al grigio. + Inner Gamer + Colori che scorrono lungo l\'arcobaleno. Rispetta le impostazioni di animazione di Android. + Velocità + Quanto velocemente cambiano i colori. Gradiente I tuoi colori primario e secondario, sfumati su pulsanti ed evidenziazioni. Primario diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 962a16946f..18db0ce6f2 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1389,6 +1389,10 @@ 黒の背景に白の文字、選択・フォーカス・押下時には青を使用します。 エレクトリックネイビー より明るい青を、グレーではなくネイビー寄りの画面に使用します。 + Inner Gamer + 虹色に変化し続けるカラー。Android のアニメーション設定に従います。 + 速度 + 色が切り替わる速さ。 グラデーション 自分で選んだプライマリとセカンダリの色を、ボタンやハイライトにグラデーションで使います。 プライマリ diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7d58f7a917..70e71aebaa 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1389,6 +1389,10 @@ 검은색 배경에 흰색 글자, 선택·포커스·누름 상태에는 파란색을 사용합니다. 일렉트릭 네이비 회색 대신 네이비 톤의 화면에 더 밝은 파란색을 사용합니다. + Inner Gamer + 무지개 색으로 계속 바뀌는 색상입니다. Android의 애니메이션 설정을 따릅니다. + 속도 + 색상이 바뀌는 속도입니다. 그라데이션 직접 고른 기본색과 보조색이 버튼과 강조 표시에 섞여 적용됩니다. 기본색 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 3309b0ce84..37ec6b6cb8 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1387,6 +1387,10 @@ Latar hitam, teks putih, biru untuk semua yang dipilih, difokus atau ditekan. Navy elektrik Biru lebih cerah, pada permukaan yang lebih cenderung navy daripada kelabu. + Inner Gamer + Warna yang bertukar merentasi pelangi. Mengikut tetapan animasi Android. + Kelajuan + Seberapa pantas warna bertukar. Kecerunan Warna utama dan sekunder pilihan anda, diadun pada butang dan sorotan. Utama diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 67ba109eb6..d0ba1beaf6 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1401,6 +1401,10 @@ Svart bakgrunn, hvit skrift, det blå for alt som er valgt, fokusert eller trykket. Elektrisk marineblå Det blå lysere, på flater som lener mer mot marineblått enn grått. + Inner Gamer + Farger som går gjennom regnbuen. Følger Androids animasjonsinnstillinger. + Hastighet + Hvor raskt fargene skifter. Gradient Dine egne primær- og sekundærfarger, blandet på knapper og uthevinger. Primær diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 183254ed4c..a004d04e65 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1401,6 +1401,10 @@ Zwarte achtergrond, witte tekst, het blauw voor alles wat geselecteerd, gefocust of ingedrukt is. Elektrisch marineblauw Het blauw feller, op vlakken die naar marineblauw neigen in plaats van grijs. + Inner Gamer + Kleuren die door de regenboog lopen. Volgt de animatie-instellingen van Android. + Snelheid + Hoe snel de kleuren wisselen. Kleurverloop Je eigen primaire en secundaire kleur, doorlopend op knoppen en accenten. Primair diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 92c261d45f..776ec2150b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1429,6 +1429,10 @@ Czarne tło, biały tekst i niebieski dla wszystkiego, co zaznaczone, aktywne lub naciśnięte. Elektryczny granat Jaśniejszy niebieski na powierzchniach wpadających w granat zamiast w szarość. + Inner Gamer + Kolory przechodzące przez całą tęczę. Szanuje ustawienia animacji Androida. + Prędkość + Jak szybko zmieniają się kolory. Gradient Własny kolor podstawowy i dodatkowy, płynnie przechodzące na przyciskach i wyróżnieniach. Podstawowy diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index c5dc17cb07..5c0b038094 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1407,6 +1407,10 @@ Fundo preto, texto branco e o azul para tudo o que está selecionado, focado ou premido. Azul-marinho elétrico O azul mais vivo, em superfícies que tendem para o azul-marinho em vez do cinzento. + Inner Gamer + Cores que percorrem o arco-íris. Respeita as definições de animação do Android. + Velocidade + Com que rapidez as cores mudam. Gradiente As suas próprias cores primária e secundária, combinadas nos botões e destaques. Primária diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a94b36b002..1af04d01d9 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1407,6 +1407,10 @@ Fundo preto, texto branco e o azul em tudo que estiver selecionado, em foco ou pressionado. Marinho elétrico O azul mais vivo, sobre superfícies puxadas para o marinho em vez do cinza. + Inner Gamer + Cores que percorrem o arco-íris. Respeita as configurações de animação do Android. + Velocidade + Com que rapidez as cores mudam. Gradiente Suas próprias cores primária e secundária, combinadas em botões e destaques. Primária diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 1fdb69d8ec..5295bc5b94 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1415,6 +1415,10 @@ Fundal negru, text alb, albastrul pentru tot ce este selectat, focalizat sau apăsat. Bleumarin electric Albastrul mai strălucitor, pe suprafețe care tind spre bleumarin în loc de gri. + Inner Gamer + Culori care parcurg curcubeul. Respectă setările de animație din Android. + Viteză + Cât de repede se schimbă culorile. Gradient Culorile tale primară și secundară, combinate pe butoane și evidențieri. Primară diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c782aae6b0..f03db36876 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1431,6 +1431,10 @@ Черный фон, белый текст, синий — для всего выбранного, активного или нажатого. Электрик Более яркий синий на поверхностях темно-синего, а не серого оттенка. + Inner Gamer + Цвета, плавно переходящие по всей радуге. Учитывает настройки анимации Android. + Скорость + Как быстро меняются цвета. Градиент Ваши основной и дополнительный цвета, плавно переходящие на кнопках и выделениях. Основной diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index c6659abfd5..4f50f51a03 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1401,6 +1401,10 @@ Svart bakgrund, vit text, den blå färgen för allt som är markerat, i fokus eller nedtryckt. Elektrisk marinblå Den blå färgen klarare, på ytor som lutar åt marinblått i stället för grått. + Inner Gamer + Färger som växlar genom regnbågen. Följer Androids animationsinställningar. + Hastighet + Hur snabbt färgerna växlar. Gradient Dina egna primära och sekundära färger, blandade på knappar och markeringar. Primär diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 7dd606217c..f486774a5d 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1387,6 +1387,10 @@ พื้นดำ ตัวอักษรขาว สีฟ้าสำหรับทุกสิ่งที่ถูกเลือก โฟกัส หรือกด กรมท่าไฟฟ้า สีฟ้าสว่างขึ้น บนพื้นผิวที่เอียงไปทางกรมท่ามากกว่าเทา + Inner Gamer + สีที่เปลี่ยนวนไปตามสายรุ้ง ทำงานตามการตั้งค่าแอนิเมชันของ Android + ความเร็ว + สีเปลี่ยนเร็วแค่ไหน ไล่เฉดสี สีหลักและสีรองที่คุณเลือกเอง ผสมกันบนปุ่มและส่วนที่เน้น สีหลัก diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 5422b926cd..c112dd6b63 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1395,6 +1395,10 @@ Siyah zemin, beyaz yazı; seçilen, odaklanan veya basılan her şey için mavi. Elektrik laciverti Daha parlak mavi; gri yerine laciverte çalan yüzeylerde. + Inner Gamer + Gökkuşağında dolaşan renkler. Android\'in animasyon ayarlarına uyar. + Hız + Renklerin ne kadar hızlı değiştiği. Geçiş Kendi birincil ve ikincil renklerin, düğmelerde ve vurgularda harmanlanır. Birincil diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e1753cba3d..b361c61fab 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1429,6 +1429,10 @@ Чорне тло, білий текст і синій для всього вибраного, у фокусі чи натиснутого. Електричний темно-синій Яскравіший синій на поверхнях із темно-синім відтінком замість сірого. + Inner Gamer + Кольори, що плавно змінюються по всій веселці. Враховує налаштування анімації Android. + Швидкість + Як швидко змінюються кольори. Градієнт Ваші основний і додатковий кольори, що плавно переходять на кнопках і виділеннях. Основний diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 91bf30f13e..a5aa6f9ffc 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1387,6 +1387,10 @@ Nền đen, chữ trắng, xanh cho mọi thứ được chọn, lấy nét hoặc nhấn. Xanh điện navy Màu xanh sáng hơn, trên các bề mặt nghiêng về navy thay vì xám. + Inner Gamer + Màu sắc chuyển dần qua cả dải cầu vồng. Tuân theo cài đặt hiệu ứng động của Android. + Tốc độ + Màu đổi nhanh đến mức nào. Chuyển màu Màu chính và màu phụ do bạn chọn, hòa trộn trên các nút và phần nổi bật. 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 e4a6c69335..ca9a75287c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1465,6 +1465,10 @@ 黑色背景、白色文字,选中、聚焦或按下的元素使用蓝色。 电光藏青 更明亮的蓝色,配以偏藏青而非灰色的界面。 + Inner Gamer + 在彩虹色之间循环变化的颜色。遵循 Android 的动画设置。 + 速度 + 颜色循环的快慢。 渐变 你自己选择的主色和辅色,在按钮和高亮处渐变呈现。 主色 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 72cc6cddab..74460d1512 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1389,6 +1389,10 @@ 黑色背景、白色文字,所有已選取、焦點所在或按下的項目都使用藍色。 電光海軍藍 更明亮的藍色,搭配偏海軍藍而非灰色的介面。 + Inner Gamer + 在彩虹色之間循環變化的顏色。遵循 Android 的動畫設定。 + 速度 + 顏色循環的快慢。 漸層 你自行選擇的主色與輔色,在按鈕與強調處以漸層呈現。 主色 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 19d11a7e8c..795be8c5e0 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1389,6 +1389,10 @@ 黑色背景、白色文字,選取、聚焦或按下的項目使用藍色。 電光藏青 更亮的藍色,搭配偏藏青而非灰色的介面。 + Inner Gamer + 在彩虹色之間循環變化的顏色。遵循 Android 的動畫設定。 + 速度 + 顏色循環的快慢。 漸層 你自行選擇的主色與輔色,在按鈕與強調處以漸層呈現。 主色 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cf80262af5..e62952c4f7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1458,6 +1458,10 @@ Black ground, white type, the blue for everything selected, focused or pressed. Electric navy The blue brighter, on surfaces that lean navy instead of grey. + Inner Gamer + Colors that cycle through the rainbow. Follows Android\'s animation settings. + Speed + How fast the colors cycle. Gradient Your own primary and secondary colors, blended on buttons and highlights. Primary 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 b6f4de2044..851c3dfc4d 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt @@ -132,4 +132,40 @@ class ThemeColorsTest { assertTrue(Themes.all.any { it.id == Themes.GRADIENT }) assertEquals(Themes.GRAPHITE, Themes.byId("nonsense").id) } + + @Test fun innerGamerSitsJustAboveGradientInTheThemeList() { + val ids = Themes.all.map { it.id } + assertEquals(ids.indexOf(Themes.GRADIENT) - 1, ids.indexOf(Themes.INNER_GAMER)) + } + + @Test fun innerGamerButtonTextIsReadableAlongTheGradientAtEveryHue() { + var hue = 0f + while (hue < 360f) { + val p = Themes.innerGamer(hue) + assertEquals(Themes.INNER_GAMER, p.id) + for (i in 0..100) { + val f = i / 100f + val blend = Color( + p.primary.red + (p.primary2.red - p.primary.red) * f, + p.primary.green + (p.primary2.green - p.primary.green) * f, + p.primary.blue + (p.primary2.blue - p.primary.blue) * f, + ) + assertTrue("hue $hue at $f", contrast(p.onPrimary, blend) >= 4.49f) + } + hue += Themes.RGB_HUE_STEP + } + } + + @Test fun innerGamerFollowsTheHueAndTheSpeedIsSavedAndKeptInRange() { + Themes.setRgbHue(120f) + assertEquals(Themes.innerGamer(120f).primary, Themes.byId(Themes.INNER_GAMER).primary) + Themes.setRgbSpeed(app, 7) + assertEquals(7, SessionPrefs.rgbSpeed(app)) + Themes.setRgbSpeed(app, 99) + assertEquals(Themes.RGB_SPEEDS, Themes.rgbSpeed) + Themes.setRgbSpeed(app, 0) + assertEquals(1, SessionPrefs.rgbSpeed(app)) + Themes.setRgbSpeed(app, 1) + assertTrue(Themes.rgbCycleMillis(1) > Themes.rgbCycleMillis(10)) + } } diff --git a/docs/development/themes.md b/docs/development/themes.md index b7f1a01eb3..e7855c43f3 100644 --- a/docs/development/themes.md +++ b/docs/development/themes.md @@ -23,3 +23,17 @@ Setup shows Primary and Secondary under the theme when Gradient is chosen, each square. It opens `ColorPickerDialog`: a wheel (hue and saturation, touch), hue / saturation / brightness sliders (they work with a controller) and a hex box, with the old and new colour side by side. OK applies it. + +## 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. + +`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. +The duration goes through `Motion.ms`, so the colour holds still when animations are off in the app +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 c7961bdacfe91b120feadaa160d789407da9797b Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Fri, 23 Oct 2026 05:12:36 +0300 Subject: [PATCH 015/174] Fix the build: rename moveRgbHue to avoid clashing with the rgbHue setter; Hindi verb agreement --- app/src/main/java/com/droiddeck/launcher/ui/Theme.kt | 4 ++-- app/src/main/res/values-hi/strings.xml | 2 +- .../test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 4eae384e22..01196ae87f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -63,7 +63,7 @@ object Themes { var rgbHue by mutableStateOf(0f) private set - fun setRgbHue(hue: Float) { + fun moveRgbHue(hue: Float) { rgbHue = hue } @@ -174,5 +174,5 @@ private fun InnerGamerHue(speed: Int) { 0f, 360f, infiniteRepeatable(tween(Motion.ms(Themes.rgbCycleMillis(speed)).coerceAtLeast(1), easing = LinearEasing), RepeatMode.Restart), label = "hue", ) val step = Themes.RGB_HUE_STEP - SideEffect { Themes.setRgbHue((hue / step).toInt() * step) } + SideEffect { Themes.moveRgbHue((hue / step).toInt() * step) } } diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 5113e7764f..7dbcf20490 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1402,7 +1402,7 @@ इलेक्ट्रिक नेवी ब्लू रंग ज़्यादा चमकीला, उन सतहों पर जो ग्रे के बजाय नेवी की ओर झुकती हैं। Inner Gamer - इंद्रधनुष के रंगों में बदलते रंग। Android की एनिमेशन सेटिंग का पालन करता है। + इंद्रधनुष के रंगों में बदलते रंग। Android की एनिमेशन सेटिंग का पालन करती है। गति रंग कितनी तेज़ी से बदलें। ग्रेडिएंट 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 851c3dfc4d..fdbb8b44be 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt @@ -157,7 +157,7 @@ class ThemeColorsTest { } @Test fun innerGamerFollowsTheHueAndTheSpeedIsSavedAndKeptInRange() { - Themes.setRgbHue(120f) + Themes.moveRgbHue(120f) assertEquals(Themes.innerGamer(120f).primary, Themes.byId(Themes.INNER_GAMER).primary) Themes.setRgbSpeed(app, 7) assertEquals(7, SessionPrefs.rgbSpeed(app)) From 6b010baa9e06e036be549dd34966ba6686605219 Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Fri, 23 Oct 2026 08:07:33 +0300 Subject: [PATCH 016/174] Inner Gamer: read the animated hue while composing so the colors keep cycling --- app/src/main/java/com/droiddeck/launcher/ui/Theme.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 01196ae87f..f633e0c12b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -173,6 +173,6 @@ private fun InnerGamerHue(speed: Int) { val hue by rememberInfiniteTransition(label = "innerGamer").animateFloat( 0f, 360f, infiniteRepeatable(tween(Motion.ms(Themes.rgbCycleMillis(speed)).coerceAtLeast(1), easing = LinearEasing), RepeatMode.Restart), label = "hue", ) - val step = Themes.RGB_HUE_STEP - SideEffect { Themes.moveRgbHue((hue / step).toInt() * step) } + val stepped = (hue / Themes.RGB_HUE_STEP).toInt() * Themes.RGB_HUE_STEP + SideEffect { Themes.moveRgbHue(stepped) } } From 5a1819a7134c3fa0f261089175a17088a37ab6ac Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Fri, 23 Oct 2026 08:28:23 +0300 Subject: [PATCH 017/174] Themes.current also reloads the saved Inner Gamer speed --- app/src/main/java/com/droiddeck/launcher/ui/Theme.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f633e0c12b..13f01211de 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -95,7 +95,7 @@ object Themes { /** The theme the person chose, with the custom colours read first; for code that is not in a composition. */ fun current(context: Context): Palette { val id = SessionPrefs.theme(context) - if (id == GRADIENT) loadGradient(context) + if (id == GRADIENT || id == INNER_GAMER) loadGradient(context) return byId(id) } From 5f341dda16af51c6c77f84c9d83eeff603be5309 Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Fri, 23 Oct 2026 16:12:18 +0300 Subject: [PATCH 018/174] Inner Gamer: a new speed takes over at once, continuing from the current colour --- app/src/main/java/com/droiddeck/launcher/ui/Theme.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 13f01211de..24f01b6115 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -10,6 +10,7 @@ import androidx.compose.animation.core.infiniteRepeatable import androidx.compose.animation.core.rememberInfiniteTransition import androidx.compose.animation.core.tween import androidx.compose.runtime.Composable +import androidx.compose.runtime.key import androidx.compose.runtime.SideEffect import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.staticCompositionLocalOf @@ -170,9 +171,16 @@ fun DroidDeckTheme(theme: String? = null, appScale: Int = AppUiPrefs.DEFAULT_SCA @Composable private fun InnerGamerHue(speed: Int) { if (Motion.scale == 0f) return + key(speed) { InnerGamerCycle(speed) } +} + +/** One run of the cycle at one speed, picking up from the colour on screen so a new speed takes over at once without a jump. */ +@Composable +private fun InnerGamerCycle(speed: Int) { + val start = remember { Themes.rgbHue } val hue by rememberInfiniteTransition(label = "innerGamer").animateFloat( - 0f, 360f, infiniteRepeatable(tween(Motion.ms(Themes.rgbCycleMillis(speed)).coerceAtLeast(1), easing = LinearEasing), RepeatMode.Restart), label = "hue", + start, start + 360f, infiniteRepeatable(tween(Motion.ms(Themes.rgbCycleMillis(speed)).coerceAtLeast(1), easing = LinearEasing), RepeatMode.Restart), label = "hue", ) - val stepped = (hue / Themes.RGB_HUE_STEP).toInt() * Themes.RGB_HUE_STEP + val stepped = ((hue % 360f) / Themes.RGB_HUE_STEP).toInt() * Themes.RGB_HUE_STEP SideEffect { Themes.moveRgbHue(stepped) } } From b88eebe09bbe4e988d70fdfa8c47c72206448a07 Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Fri, 23 Oct 2026 16:29:04 +0300 Subject: [PATCH 019/174] Inner Gamer: let Compose apply the animator scale once --- app/src/main/java/com/droiddeck/launcher/ui/Theme.kt | 2 +- docs/development/themes.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 24f01b6115..14527f5949 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -179,7 +179,7 @@ private fun InnerGamerHue(speed: Int) { private fun InnerGamerCycle(speed: Int) { val start = remember { Themes.rgbHue } val hue by rememberInfiniteTransition(label = "innerGamer").animateFloat( - start, start + 360f, infiniteRepeatable(tween(Motion.ms(Themes.rgbCycleMillis(speed)).coerceAtLeast(1), easing = LinearEasing), RepeatMode.Restart), label = "hue", + start, start + 360f, infiniteRepeatable(tween(Themes.rgbCycleMillis(speed).coerceAtLeast(1), easing = LinearEasing), RepeatMode.Restart), label = "hue", ) val stepped = ((hue % 360f) / Themes.RGB_HUE_STEP).toInt() * Themes.RGB_HUE_STEP SideEffect { Themes.moveRgbHue(stepped) } diff --git a/docs/development/themes.md b/docs/development/themes.md index e7855c43f3..4bb122c6f3 100644 --- a/docs/development/themes.md +++ b/docs/development/themes.md @@ -33,7 +33,7 @@ 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. -The duration goes through `Motion.ms`, so the colour holds still when animations are off in the app -or in Android's own settings. The hue is written to `Themes.rgbHue` in 3° steps, which restyles the +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 53c63b6dc2dc0662a4f8da6ec7a817c19184a771 Mon Sep 17 00:00:00 2001 From: 0x1Nawaf Date: Fri, 23 Oct 2026 15:43:52 +0000 Subject: [PATCH 020/174] fix: keep a slightly early vsync tick for frame pacing --- app/src/main/cpp/waylandcomp/src/compositor.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 95a8bf83a6..fb15d50c32 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -807,11 +807,21 @@ static uint32_t nominal_refresh_ns(void) { return (uint32_t)(1000000000000LL / (int64_t)mhz); } +/* Gamescope paces from this timestamp (#717). The Choreographer tick is often still + * slightly ahead of this thread, because the UI thread queues the callback, and that + * used to throw the tick away (render_ns < tick) and report the draw time instead. + * Keep a tick within one refresh of the draw, ahead or behind. A missing tick, or one + * more than a refresh away, falls back to the draw time. Never report the next refresh: + * gamescope would wake a frame late. */ static int64_t presented_ns(int64_t render_ns) { - if (!g_tick_vsync_ns || render_ns - g_last_vsync_ns > (int64_t)nominal_refresh_ns() || - render_ns < g_tick_vsync_ns) + int64_t tick = g_tick_vsync_ns; + int64_t refresh = (int64_t)nominal_refresh_ns(); + if (!tick || render_ns - g_last_vsync_ns > refresh) return render_ns; - return g_tick_vsync_ns; + int64_t delta = render_ns - tick; + if (delta > refresh || -delta > refresh) + return render_ns; + return tick; } static void feedback_present_all(struct wl_list *list, int64_t t) { From 7aeb7779bbdbaec65b1a5520653abbcd7091610e Mon Sep 17 00:00:00 2001 From: ovurrsl Date: Thu, 22 Oct 2026 21:27:28 +0300 Subject: [PATCH 021/174] fix: fall back to Valve's stable Steam client when the beta one keeps failing The native arm64 client follows steamdeck_publicbeta, so a Valve beta regression reaches every user at once. If the repaired beta client is still started twice without being shown, or the beta manifest carries no arm64 client, droiddeck-steam-install now installs steamdeck_stable, keeps it, and logs why (listing the manifest's blocks in the second case). The session asks the installer for the channel, so -clientbeta and package/beta stay in sync. BL_STEAM_CHANNEL or ~/.config/droiddeck/steam-channel (beta|stable) pins it. Valve's 2026-10-15 beta moved the x86 client into a Steam Runtime container. In case the arm64 client follows, its session now exports STEAM_STEAMRT_RECURSION_GUARD=1 and, only if steamrtarm64 carries pv-runtime or a steam-runtime-check-requirements probe, starts it through the same steamrt shim the x86-64 client uses (now droiddeck-steamrt-shim) and logs it. --- .../launcher/session/SessionFiles.kt | 1 + docs/development/arm64-steam-client.md | 42 +++++++ docs/development/x86-64-steam-client.md | 3 +- .../overlay/usr/local/bin/droiddeck-session | 13 +- .../usr/local/bin/droiddeck-steam-install | 96 ++++++++++---- .../overlay/usr/local/bin/droiddeck-steam-x64 | 35 +----- .../usr/local/bin/droiddeck-steamrt-shim | 49 ++++++++ tools/tests/test_steam_install.py | 88 ++++++++++++- tools/tests/test_steamrt_shim.py | 117 ++++++++++++++++++ 9 files changed, 379 insertions(+), 65 deletions(-) create mode 100644 docs/development/arm64-steam-client.md create mode 100755 tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim create mode 100644 tools/tests/test_steamrt_shim.py 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 0dab068d85..47ffb2c934 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -78,6 +78,7 @@ object SessionFiles { "usr/local/bin/droiddeck-steam-games" to "usr/local/bin/droiddeck-steam-games", "usr/local/bin/droiddeck-pad-defaults" to "usr/local/bin/droiddeck-pad-defaults", "usr/local/bin/droiddeck-steam-x64" to "usr/local/bin/droiddeck-steam-x64", + "usr/local/bin/droiddeck-steamrt-shim" to "usr/local/bin/droiddeck-steamrt-shim", "usr/local/bin/droiddeck-x64-arm-proton" to "usr/local/bin/droiddeck-x64-arm-proton", "usr/local/bin/droiddeck-x64-arm-webhelper" to "usr/local/bin/droiddeck-x64-arm-webhelper", "usr/local/bin/droiddeck-x64-webhelper" to "usr/local/bin/droiddeck-x64-webhelper", diff --git a/docs/development/arm64-steam-client.md b/docs/development/arm64-steam-client.md new file mode 100644 index 0000000000..bb1efc04f4 --- /dev/null +++ b/docs/development/arm64-steam-client.md @@ -0,0 +1,42 @@ +# Native arm64 Steam client: channel and runtime + +The default client is Valve's arm64 Linux build (`steamrtarm64/steam`). Valve does not support it, but +publishes it on the Steam Deck client channels. `droiddeck-steam-install` installs it and +`droiddeck-session` starts it with `STEAM_RUNTIME=1`. + +## Channel + +- The default is `steamdeck_publicbeta` (manifest `steam_client_steamdeck_publicbeta_linuxarm64`). + Valve also publishes `steam_client_steamdeck_stable_linuxarm64`. +- `droiddeck-steam-install --channel` prints the channel in use. The session passes that value as + `-clientbeta` and writes it to `package/beta`. The two must match, or the client loops on rc 42. +- Setting: `BL_STEAM_CHANNEL`, otherwise `~/.config/droiddeck/steam-channel`, set to `beta` or + `stable`. A set channel never changes on its own. +- With no setting, the client falls back to `steamdeck_stable` automatically. It stays on stable + (`package/droiddeck-channel`) until a setting says otherwise. The fallback happens: + - when the client was started two more times without being shown after the start-failure repair + (`package/droiddeck-unconfirmed`: two unconfirmed starts trigger a repair, which writes + `repaired`; two more unconfirmed starts trigger the fallback); + - when the beta manifest has no `*_linuxarm64_linuxarm64` component. The install log then lists the + manifest's block names, so a renamed or removed arm64 build can be seen. +- The x86-64 client keeps `steamdeck_publicbeta` (see [x86-64-steam-client.md](x86-64-steam-client.md)). + +## Steam Runtime container + +Valve's 2026-10-15 beta made the x86 Linux client 64-bit and put it in a Steam Runtime container +(pressure-vessel). The container needs unprivileged user and mount namespaces and a D-Bus session bus, +which an Android app does not have. The x86-64 path already works around this. The arm64 client gets the +same treatment if Valve containerizes it too: + +- `STEAM_STEAMRT_RECURSION_GUARD=1` is exported for both clients. It tells the client that it is + already inside its container, so after an update it does not re-execute itself through + `pressure-vessel-wrap` (bwrap). +- `droiddeck-steamrt-shim ` builds the shim when the client carries + `pv-runtime/steam-runtime-steamrt` or a `steam-runtime-check-requirements` probe: + - Valve's runtime is linked file by file; + - the probe is replaced with `exit 0`; + - its own `steam-runtime-launch-client` runs commands directly. + + For the arm64 client the session then starts it with `STEAM_RUNTIME_STEAMRT` and `PATH` pointing + at `~/.droiddeck-steamrt-shim` and logs "Valve containerized the arm64 Steam client". Without those + files the shim is not built and the start is unchanged. diff --git a/docs/development/x86-64-steam-client.md b/docs/development/x86-64-steam-client.md index f11923fe7d..3e0d867a26 100644 --- a/docs/development/x86-64-steam-client.md +++ b/docs/development/x86-64-steam-client.md @@ -53,7 +53,8 @@ arm64 client down first. ("Steam now requires user namespaces") when `steam-runtime-check-requirements`' bwrap probe cannot create a user namespace, which no Android app can. `STEAM_RUNTIME_STEAMRT` points at `steamrt-shim`: Valve's runtime linked file by file with only the probe replaced (`exit 0`). proot - is the container, as for the arm64 client. + is the container, as for the arm64 client. `droiddeck-steamrt-shim` builds it, and builds the same + shim for the arm64 client if that one is containerized too ([arm64-steam-client.md](arm64-steam-client.md)). - **Re-exec after an update.** The client re-executes itself inside the SteamRT container through `pressure-vessel-wrap` (bwrap). `STEAM_STEAMRT_RECURSION_GUARD=1` says it is already inside one; the FEX rootfs with the client's `steamrt64` libraries is that container. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 688d0c19bb..c33b785524 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -403,6 +403,11 @@ case $mode in droiddeck-steam-x64 --sync-login || true fi steam_client=("$steam_root/steamrtarm64/steam") + _bl_srt_shim=$HOME/.droiddeck-steamrt-shim + if droiddeck-steamrt-shim "$steam_root/steamrtarm64" "$_bl_srt_shim"; then + echo "== steam: Valve containerized the arm64 Steam client (it carries a Steam Runtime container); starting it through $_bl_srt_shim" + steam_client=(env STEAM_RUNTIME_STEAMRT="$_bl_srt_shim" PATH="$_bl_srt_shim/bin:$PATH" "${steam_client[@]}") + fi fi _bl_proton_root=$steam_root if [ "$steam_x64" = 1 ]; then @@ -746,10 +751,13 @@ BUSCONF fi # The UI bridge launches SteamVR, which needs the guest agent's library environment. - _bl_compat_env=(env -u LD_LIBRARY_PATH -u STEAM_RUNTIME) + _bl_compat_env=(env -u LD_LIBRARY_PATH -u STEAM_RUNTIME -u STEAM_STEAMRT_RECURSION_GUARD) [ "${LD_LIBRARY_PATH+x}" ] && _bl_compat_env+=("LD_LIBRARY_PATH=$LD_LIBRARY_PATH") [ "${STEAM_RUNTIME+x}" ] && _bl_compat_env+=("STEAM_RUNTIME=$STEAM_RUNTIME") + [ "${STEAM_STEAMRT_RECURSION_GUARD+x}" ] && _bl_compat_env+=("STEAM_STEAMRT_RECURSION_GUARD=$STEAM_STEAMRT_RECURSION_GUARD") export STEAM_RUNTIME=1 + # A containerized client re-executes itself through pressure-vessel-wrap (bwrap) unless told it is already inside. + export STEAM_STEAMRT_RECURSION_GUARD=1 export LD_LIBRARY_PATH=$steam_root/steamrtarm64:$steam_root/steamrtarm64/panorama${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export SDL_VIDEO_X11_DGAMOUSE=0 decky_loader=$HOME/homebrew/services/PluginLoader @@ -829,6 +837,9 @@ BUSCONF unset _stale _f fi steam_channel=steamdeck_publicbeta + if [ "$steam_x64" = 0 ]; then + steam_channel=$(droiddeck-steam-install --channel 2>/dev/null || echo steamdeck_publicbeta) + fi _bl_lang=() [ -n "${BL_STEAM_LANGUAGE:-}" ] && _bl_lang=(-language "$BL_STEAM_LANGUAGE") steam_beta=$steam_root/package/beta diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install index 3ce263c0d7..8ebef7ea5d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install @@ -1,9 +1,26 @@ #!/bin/bash set -eu cdn_list="https://client-update.steamstatic.com https://client-update.akamai.steamstatic.com https://client-update.fastly.steamstatic.com" -steam_channel=steamdeck_publicbeta -manifest=steam_client_${steam_channel}_linuxarm64 +beta_channel=steamdeck_publicbeta +stable_channel=steamdeck_stable steam_root=${XDG_DATA_HOME:-$HOME/.local/share}/Steam +channel_state=$steam_root/package/droiddeck-channel +pinned=1 +wanted=${BL_STEAM_CHANNEL:-$(cat "$HOME/.config/droiddeck/steam-channel" 2>/dev/null || true)} +case $wanted in + stable|"$stable_channel") steam_channel=$stable_channel ;; + beta|"$beta_channel") steam_channel=$beta_channel ;; + *) + pinned= + steam_channel=$beta_channel + [ "$(cat "$channel_state" 2>/dev/null)" = "$stable_channel" ] && steam_channel=$stable_channel + ;; +esac +if [ "${1:-}" = --channel ]; then + echo "$steam_channel" + exit 0 +fi +manifest=steam_client_${steam_channel}_linuxarm64 stamp=$steam_root/package/droiddeck-installed legacy_stamp=$steam_root/package/bannerlator-installed unconfirmed=$steam_root/package/droiddeck-unconfirmed @@ -12,11 +29,21 @@ if [ -f "$legacy_stamp" ] && [ ! -f "$stamp" ]; then mv -f "$legacy_stamp" "$stamp" || true fi repair="" +fallback="" +starts=0 +[ -f "$unconfirmed" ] && starts=$(grep -cx start "$unconfirmed" || true) if [ -e "$repair_request" ]; then repair="requested" -elif [ -f "$unconfirmed" ] && ! grep -qx repaired "$unconfirmed" \ - && [ "$(grep -cx start "$unconfirmed")" -ge 2 ]; then - repair="the client was started $(grep -cx start "$unconfirmed") times without showing anything" +elif [ "$starts" -ge 2 ] && ! grep -qx repaired "$unconfirmed"; then + repair="the client was started $starts times without showing anything" +elif [ "$starts" -ge 2 ] && [ -z "$pinned" ] && [ "$steam_channel" = "$beta_channel" ] && [ "${1:-}" != --sync ]; then + repair="the repaired $beta_channel client was started $starts more times without showing anything" + fallback=1 +fi +if [ -n "$fallback" ]; then + echo "== STEP $(date -u +%H:%M:%S) falling back to Valve's $stable_channel Steam client: $repair" + steam_channel=$stable_channel + manifest=steam_client_${steam_channel}_linuxarm64 fi if [ -n "$repair" ]; then echo "== STEP $(date -u +%H:%M:%S) repairing the Steam client ($repair)" @@ -42,20 +69,42 @@ fi work=$(mktemp -d) trap 'rm -rf "$work"' EXIT -cdn="" -for candidate in $cdn_list; do - if curl -fsSL --connect-timeout 10 --max-time 30 --retry 2 --retry-connrefused --retry-delay 3 \ - "$candidate/$manifest" -o "$work/manifest"; then - cdn=$candidate - break +fetch_manifest() { + cdn="" + for candidate in $cdn_list; do + if curl -fsSL --connect-timeout 10 --max-time 30 --retry 2 --retry-connrefused --retry-delay 3 \ + "$candidate/$manifest" -o "$work/manifest"; then + cdn=$candidate + break + fi + done + [ -n "$cdn" ] || { echo "droiddeck-steam-install: no Steam client CDN answered for $manifest" >&2; exit 1; } + cdn_order=("$cdn") + for candidate in $cdn_list; do + [ "$candidate" = "$cdn" ] || cdn_order+=("$candidate") + done + version=$(awk -F'"' '$2 == "version" { print $4; exit }' "$work/manifest") + awk -F'"' ' + /^\t"/ && NF >= 3 && $4 == "" { block = $2 } + $2 == "file" { file[block] = $4 } + $2 == "sha2" { sha[block] = $4 } + END { for (b in file) if (b ~ /_all$/ || b ~ /_linuxarm64_linuxarm64$/) print b, file[b], sha[b] } + ' "$work/manifest" | sort > "$work/parts" + [ -s "$work/parts" ] && return 0 + echo "droiddeck-steam-install: no client components in $manifest; its blocks are:" \ + "$(awk -F'"' '/^\t"/ && NF >= 3 && $4 == "" { printf "%s ", $2 }' "$work/manifest")" >&2 + return 1 +} +if ! fetch_manifest; then + if [ -n "$sync" ] || [ -n "$pinned" ] || [ "$steam_channel" = "$stable_channel" ]; then + exit 1 fi -done -[ -n "$cdn" ] || { echo "droiddeck-steam-install: no Steam client CDN answered for $manifest" >&2; exit 1; } -cdn_order=("$cdn") -for candidate in $cdn_list; do - [ "$candidate" = "$cdn" ] || cdn_order+=("$candidate") -done -version=$(awk -F'"' '$2 == "version" { print $4; exit }' "$work/manifest") + echo "== STEP $(date -u +%H:%M:%S) falling back to Valve's $stable_channel Steam client: $manifest has no arm64 client" + steam_channel=$stable_channel + manifest=steam_client_${steam_channel}_linuxarm64 + fallback=1 + fetch_manifest || exit 1 +fi if [ -n "$sync" ]; then installed=$(awk -F'"' '$2 == "version" { print $4; exit }' "$steam_root/package/$manifest.manifest" 2>/dev/null || true) if [ -x "$steam_root/steamrtarm64/steam" ] && [ "$installed" = "$version" ]; then @@ -64,13 +113,6 @@ if [ -n "$sync" ]; then fi echo "== STEP $(date -u +%H:%M:%S) updating the arm64 Steam client to $version (was ${installed:-none}) for the x86-64 client" fi -awk -F'"' ' - /^\t"/ && NF >= 3 && $4 == "" { block = $2 } - $2 == "file" { file[block] = $4 } - $2 == "sha2" { sha[block] = $4 } - END { for (b in file) if (b ~ /_all$/ || b ~ /_linuxarm64_linuxarm64$/) print b, file[b], sha[b] } -' "$work/manifest" | sort > "$work/parts" -[ -s "$work/parts" ] || { echo "droiddeck-steam-install: no client components in $manifest" >&2; exit 1; } total=$(grep -c . "$work/parts" 2>/dev/null || echo 0) mkdir -p "$steam_root/package" @@ -117,6 +159,10 @@ ln -sfn "$steam_root/linuxarm64" "$HOME/.steam/sdkarm64" ln -sfn "$steam_root/steamrtarm64" "$HOME/.steam/binarm64" ln -sfn "$steam_root/linux32" "$HOME/.steam/sdk32" echo "$version" > "$stamp" +if [ -n "$fallback" ]; then + echo "$stable_channel" > "$channel_state" + echo "== STEP $(date -u +%H:%M:%S) the Steam client now follows $stable_channel (beta in ~/.config/droiddeck/steam-channel returns to $beta_channel)" +fi if [ -n "$repair" ]; then echo repaired > "$unconfirmed" rm -f "$repair_request" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 index e52a4e9858..df9ec941b7 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 @@ -520,39 +520,8 @@ ln -sfn "$STEAM_X64/ubuntu12_32" "$X64_HOME/.steam/bin32" ln -sfn "$STEAM_X64/ubuntu12_64" "$X64_HOME/.steam/bin64" ln -sfn "$STEAM_X64/linux32" "$X64_HOME/.steam/sdk32" ln -sfn "$STEAM_X64/linux64" "$X64_HOME/.steam/sdk64" -# The client's bwrap probe (steam-runtime-check-requirements) needs user namespaces, which no Android app has. -srt_real=$STEAM_X64/steamrt64/pv-runtime/steam-runtime-steamrt -srt_shim=$X64_HOME/steamrt-shim -if [ -d "$srt_real" ]; then - rm -rf "$srt_shim" - mkdir -p "$srt_shim/bin" - for e in "$srt_real"/* "$srt_real"/.[!.]*; do - [ -e "$e" ] || continue - [ "$(basename "$e")" = bin ] || ln -s "$e" "$srt_shim/$(basename "$e")" - done - for e in "$srt_real"/bin/*; do ln -s "$e" "$srt_shim/bin/$(basename "$e")"; done - rm -f "$srt_shim/bin/steam-runtime-check-requirements" - printf '#!/bin/sh -exit 0 -' > "$srt_shim/bin/steam-runtime-check-requirements" - chmod 755 "$srt_shim/bin/steam-runtime-check-requirements" - rm -f "$srt_shim/bin/steam-runtime-launch-client" - cat > "$srt_shim/bin/steam-runtime-launch-client" <<'LAUNCH' -#!/bin/sh -while [ $# -gt 0 ]; do - case $1 in - --) shift; break ;; - --directory=*) cd "${1#--directory=}" || exit 127 ;; - --env=*) export "${1#--env=}" ;; - --unset-env=*) unset "${1#--unset-env=}" ;; - esac - shift -done -[ $# -gt 0 ] || exit 0 -exec "$@" -LAUNCH - chmod 755 "$srt_shim/bin/steam-runtime-launch-client" -fi +# Valve's Steam Runtime container needs user namespaces and a session-bus launcher; steamrt-shim stands in for both. +droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim" || true # Valve's platform libraries ship without soname links (pressure-vessel makes them); ldconfig adds them here. srt_libs=$X64_HOME/steamrt-libs rm -rf "$srt_libs" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim new file mode 100755 index 0000000000..96e851bc9b --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim @@ -0,0 +1,49 @@ +#!/bin/bash +# droiddeck-steamrt-shim +# Builds from the Steam Runtime container the client carries and exits 0, or removes it and exits 1 +# when the client carries none. +set -eu +client=$1 +shim=$2 +srt_real=$client/pv-runtime/steam-runtime-steamrt +if [ ! -d "$srt_real" ]; then + probe=$(find "$client" -maxdepth 4 -name steam-runtime-check-requirements -path '*/bin/*' -print -quit 2>/dev/null || true) + srt_real=${probe:+${probe%/bin/*}} +fi +if [ -z "$srt_real" ] || [ ! -d "$srt_real" ]; then + rm -rf "$shim" + exit 1 +fi +rm -rf "$shim" +mkdir -p "$shim/bin" +for e in "$srt_real"/* "$srt_real"/.[!.]*; do + [ -e "$e" ] || continue + [ "$(basename "$e")" = bin ] || ln -s "$e" "$shim/$(basename "$e")" +done +for e in "$srt_real"/bin/*; do + [ -e "$e" ] || continue + ln -s "$e" "$shim/bin/$(basename "$e")" +done +# The client's bwrap probe (steam-runtime-check-requirements) needs user namespaces, which no Android app has. +rm -f "$shim/bin/steam-runtime-check-requirements" +printf '#!/bin/sh +exit 0 +' > "$shim/bin/steam-runtime-check-requirements" +chmod 755 "$shim/bin/steam-runtime-check-requirements" +# Valve's launcher asks a service on the session bus; proot is already the container, so the command runs here. +rm -f "$shim/bin/steam-runtime-launch-client" +cat > "$shim/bin/steam-runtime-launch-client" <<'LAUNCH' +#!/bin/sh +while [ $# -gt 0 ]; do + case $1 in + --) shift; break ;; + --directory=*) cd "${1#--directory=}" || exit 127 ;; + --env=*) export "${1#--env=}" ;; + --unset-env=*) unset "${1#--unset-env=}" ;; + esac + shift +done +[ $# -gt 0 ] || exit 0 +exec "$@" +LAUNCH +chmod 755 "$shim/bin/steam-runtime-launch-client" diff --git a/tools/tests/test_steam_install.py b/tools/tests/test_steam_install.py index 8692d56492..256e711332 100644 --- a/tools/tests/test_steam_install.py +++ b/tools/tests/test_steam_install.py @@ -56,7 +56,7 @@ cp "$TEST_CDN/${url##*/}" "$out" self.env = dict(os.environ, HOME=str(self.home), XDG_DATA_HOME=str(self.data), PATH=str(self.bin) + os.pathsep + os.environ['PATH'], TEST_CDN=str(self.cdn), TEST_REQUESTS=str(self.requests)) - for channel in ('steamdeck_publicbeta',): + for channel in ('steamdeck_publicbeta', 'steamdeck_stable'): archive = self.cdn / (channel + '.zip') with zipfile.ZipFile(archive, 'w') as package: package.writestr('steamrtarm64/steam', channel) @@ -68,12 +68,17 @@ cp "$TEST_CDN/${url##*/}" "$out" f'\t\t"file" "{archive.name}"\n\t\t"sha2" "{digest}"\n' '\t}\n}\n') - def install(self, fail_host=None): + def install(self, fail_host=None, *args, **extra): env = self.env if fail_host is None else dict(self.env, TEST_FAIL_HOST=fail_host) - return subprocess.run(['bash', str(SCRIPT)], env=env, text=True, capture_output=True) + return subprocess.run(['bash', str(SCRIPT), *args], env=dict(env, **extra), text=True, capture_output=True) - def assert_installed(self, channel='steamdeck_publicbeta', fail_host=None, expected=None): - result = self.install(fail_host) + def channel(self, **extra): + result = self.install(None, '--channel', **extra) + self.assertEqual(0, result.returncode, result.stderr) + return result.stdout.strip() + + def assert_installed(self, channel='steamdeck_publicbeta', fail_host=None, expected=None, **extra): + result = self.install(fail_host, **extra) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual(channel + '\n', (self.steam / 'package/beta').read_text()) self.assertEqual('123456\n', (self.steam / 'package/droiddeck-installed').read_text()) @@ -87,6 +92,7 @@ cp "$TEST_CDN/${url##*/}" "$out" 'https://client-update.steamstatic.com/' + channel + '.zip', ] self.assertEqual(expected, self.requests.read_text().splitlines()) + return result def test_downloads_the_deck_beta_client(self): self.assert_installed() @@ -155,8 +161,80 @@ cp "$TEST_CDN/${url##*/}" "$out" self.requests.unlink() with (package / 'droiddeck-unconfirmed').open('a') as marker: marker.write('start\nstart\nstart\n') + self.assertEqual(0, self.install(BL_STEAM_CHANNEL='beta').returncode) + self.assertFalse(self.requests.exists()) + + def test_the_default_channel_is_the_deck_beta(self): + self.assertEqual('steamdeck_publicbeta', self.channel()) + + def stable_requests(self, beta_manifest=True): + stable = [ + 'https://client-update.steamstatic.com/steam_client_steamdeck_stable_linuxarm64', + 'https://client-update.steamstatic.com/steamdeck_stable.zip', + ] + if beta_manifest: + stable.insert(0, 'https://client-update.steamstatic.com/steam_client_steamdeck_publicbeta_linuxarm64') + return stable + + def test_a_repaired_beta_client_that_still_shows_nothing_falls_back_to_stable(self): + package = self.break_client(2) + self.assertEqual(0, self.install().returncode) + self.requests.unlink() + with (package / 'droiddeck-unconfirmed').open('a') as marker: + marker.write('start\nstart\n') + result = self.assert_installed('steamdeck_stable', expected=self.stable_requests(False)) + self.assertIn("falling back to Valve's steamdeck_stable Steam client", result.stdout) + self.assertEqual('steamdeck_stable\n', (package / 'droiddeck-channel').read_text()) + self.assertEqual('repaired\n', (package / 'droiddeck-unconfirmed').read_text()) + self.assertEqual('steamdeck_stable', self.channel()) + + def test_the_stable_fallback_is_not_repeated(self): + self.test_a_repaired_beta_client_that_still_shows_nothing_falls_back_to_stable() + self.requests.unlink() + with (self.steam / 'package/droiddeck-unconfirmed').open('a') as marker: + marker.write('start\nstart\nstart\n') self.assertEqual(0, self.install().returncode) self.assertFalse(self.requests.exists()) + self.assertEqual('steamdeck_stable\n', (self.steam / 'package/beta').read_text()) + + def test_a_pinned_beta_channel_never_falls_back(self): + package = self.break_client(2) + self.assertEqual(0, self.install().returncode) + with (package / 'droiddeck-unconfirmed').open('a') as marker: + marker.write('start\nstart\n') + self.assertEqual('steamdeck_publicbeta', self.channel(BL_STEAM_CHANNEL='beta')) + self.assertEqual(0, self.install(BL_STEAM_CHANNEL='beta').returncode) + self.assertFalse((package / 'droiddeck-channel').exists()) + + def test_the_channel_setting_selects_stable(self): + setting = self.home / '.config/droiddeck/steam-channel' + setting.parent.mkdir(parents=True) + setting.write_text('stable\n') + self.assertEqual('steamdeck_stable', self.channel()) + self.assert_installed('steamdeck_stable', expected=self.stable_requests(False)) + self.assertFalse((self.steam / 'package/droiddeck-channel').exists()) + + def empty_beta_manifest(self): + (self.cdn / 'steam_client_steamdeck_publicbeta_linuxarm64').write_text( + '"linuxarm64"\n{\n\t"version" "123457"\n' + '\t"client_steamrtarm64_linuxarm64"\n\t{\n' + '\t\t"file" "client.zip"\n\t\t"sha2" "00"\n' + '\t}\n}\n') + + def test_a_beta_manifest_without_an_arm64_client_falls_back_to_stable(self): + self.empty_beta_manifest() + result = self.assert_installed('steamdeck_stable', expected=self.stable_requests()) + self.assertIn('no client components in steam_client_steamdeck_publicbeta_linuxarm64', result.stderr) + self.assertIn('client_steamrtarm64_linuxarm64', result.stderr) + self.assertEqual('steamdeck_stable\n', (self.steam / 'package/droiddeck-channel').read_text()) + self.assertEqual('steamdeck_stable', self.channel()) + + def test_a_pinned_beta_manifest_without_an_arm64_client_fails_and_names_its_blocks(self): + self.empty_beta_manifest() + result = self.install(BL_STEAM_CHANNEL='beta') + self.assertNotEqual(0, result.returncode) + self.assertIn('client_steamrtarm64_linuxarm64', result.stderr) + self.assertFalse((self.steam / 'package/droiddeck-installed').exists()) def test_requested_repair_runs_once_and_is_retried_until_it_completes(self): package = self.break_client(0) diff --git a/tools/tests/test_steamrt_shim.py b/tools/tests/test_steamrt_shim.py new file mode 100644 index 0000000000..54f105eeb0 --- /dev/null +++ b/tools/tests/test_steamrt_shim.py @@ -0,0 +1,117 @@ +import os +from pathlib import Path +import re +import subprocess +import tempfile +import unittest + + +BIN = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin' +SHIM = BIN / 'droiddeck-steamrt-shim' +SESSION = (BIN / 'droiddeck-session').read_text() +X64 = (BIN / 'droiddeck-steam-x64').read_text() + + +class SteamrtShimTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.root = Path(self.temp.name) + self.client = self.root / 'steamrtarm64' + self.client.mkdir() + self.shim = self.root / 'shim' + + def runtime(self, path): + runtime = self.client / path + (runtime / 'bin').mkdir(parents=True) + (runtime / 'bin/steam-runtime-check-requirements').write_text('#!/bin/sh\nexit 1\n') + (runtime / 'bin/steam-runtime-system-info').write_text('#!/bin/sh\necho info\n') + (runtime / 'files').mkdir() + (runtime / 'files/marker').write_text('runtime files') + return runtime + + def build(self): + return subprocess.run(['bash', str(SHIM), str(self.client), str(self.shim)], + capture_output=True, text=True, timeout=30) + + def sh(self, *args): + return subprocess.run(['sh', *map(str, args)], capture_output=True, text=True, timeout=30) + + def assert_shim(self): + result = self.build() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual(0, self.sh(self.shim / 'bin/steam-runtime-check-requirements').returncode) + self.assertEqual('info\n', self.sh(self.shim / 'bin/steam-runtime-system-info').stdout) + self.assertEqual('runtime files', (self.shim / 'files/marker').read_text()) + launched = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--env=BL_SHIM_TEST=yes', + f'--directory={self.root}', '--', 'sh', '-c', 'echo "$BL_SHIM_TEST $(basename "$PWD")"') + self.assertEqual(f'yes {self.root.name}\n', launched.stdout) + + def test_a_client_without_a_container_gets_no_shim(self): + self.shim.mkdir() + self.assertEqual(1, self.build().returncode) + self.assertFalse(self.shim.exists()) + + def test_the_pressure_vessel_runtime_is_shimmed(self): + self.runtime('pv-runtime/steam-runtime-steamrt') + self.assert_shim() + + def test_a_requirements_probe_elsewhere_is_shimmed(self): + self.runtime('steam-runtime') + self.assert_shim() + + def test_the_arm64_session_starts_a_containerized_client_through_the_shim(self): + block = re.search(r'\n( +steam_client=\("\$steam_root/steamrtarm64/steam"\)\n.*?\n fi\n)', SESSION, re.S).group(1) + stub = self.root / 'droiddeck-steamrt-shim' + for status, shimmed in ((1, False), (0, True)): + stub.write_text(f'#!/bin/bash\nexit {status}\n') + stub.chmod(0o755) + script = 'if :; then\n' + block + 'printf "%s\\n" "${steam_client[@]}"\n' + env = dict(os.environ, HOME=str(self.root), steam_root='/steam', + PATH=str(self.root) + os.pathsep + os.environ['PATH']) + result = subprocess.run(['bash', '-c', script], env=env, capture_output=True, text=True, timeout=30) + self.assertEqual(0, result.returncode, result.stderr) + lines = result.stdout.splitlines() + self.assertEqual('/steam/steamrtarm64/steam', lines[-1]) + self.assertEqual(shimmed, 'Valve containerized the arm64 Steam client' in result.stdout) + self.assertEqual(shimmed, any(line.startswith('STEAM_RUNTIME_STEAMRT=') and + line.endswith('/.droiddeck-steamrt-shim') for line in lines)) + + def test_both_clients_are_told_they_already_run_inside_the_container(self): + guard = SESSION.index('export STEAM_STEAMRT_RECURSION_GUARD=1') + self.assertLess(guard, SESSION.index('"${steam_client[@]}" "${_bl_ui[@]}"')) + self.assertIn('-u STEAM_STEAMRT_RECURSION_GUARD', SESSION[:guard]) + self.assertIn('export STEAM_STEAMRT_RECURSION_GUARD=1', X64) + self.assertIn('droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim"', X64) + + +class SessionChannelTest(unittest.TestCase): + BLOCK = re.search(r'\n( +steam_channel=steamdeck_publicbeta\n.*?\n +fi\n)', SESSION, re.S).group(1) + + def channel(self, x64, installer): + with tempfile.TemporaryDirectory() as temp: + stub = Path(temp) / 'droiddeck-steam-install' + stub.write_text('#!/bin/bash\n' + installer + '\n') + stub.chmod(0o755) + env = dict(os.environ, steam_x64=x64, PATH=temp + os.pathsep + os.environ['PATH']) + result = subprocess.run(['bash', '-c', self.BLOCK + 'echo "$steam_channel"\n'], env=env, + capture_output=True, text=True, timeout=30) + self.assertEqual(0, result.returncode, result.stderr) + return result.stdout.strip() + + def test_the_arm64_client_follows_the_installed_channel(self): + self.assertEqual('steamdeck_stable', self.channel('0', '[ "$1" = --channel ] && echo steamdeck_stable')) + + def test_an_installer_without_an_answer_keeps_the_deck_beta(self): + self.assertEqual('steamdeck_publicbeta', self.channel('0', 'exit 1')) + + def test_the_x86_client_keeps_its_own_channel(self): + self.assertEqual('steamdeck_publicbeta', self.channel('1', 'echo steamdeck_stable')) + + def test_the_client_branch_on_disk_and_clientbeta_use_the_same_channel(self): + self.assertIn('-clientbeta "$steam_channel"', SESSION) + self.assertIn('echo "$steam_channel" > "$steam_beta"', SESSION) + + +if __name__ == '__main__': + unittest.main() From 2eb18f55403df99fed982d1b6e2ce101641609e2 Mon Sep 17 00:00:00 2001 From: ovurrsl Date: Fri, 23 Oct 2026 01:30:15 +0300 Subject: [PATCH 022/174] fix: document which Steam client builds Valve's arm64 manifests carry --- docs/development/arm64-steam-client.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/development/arm64-steam-client.md b/docs/development/arm64-steam-client.md index bb1efc04f4..bb9120017b 100644 --- a/docs/development/arm64-steam-client.md +++ b/docs/development/arm64-steam-client.md @@ -40,3 +40,20 @@ same treatment if Valve containerizes it too: For the arm64 client the session then starts it with `STEAM_RUNTIME_STEAMRT` and `PATH` pointing at `~/.droiddeck-steamrt-shim` and logs "Valve containerized the arm64 Steam client". Without those files the shim is not built and the start is unchanged. + +## What Valve's manifests carry (checked 2026-10-22) + +- `steam_client_steamdeck_publicbeta_linuxarm64` (1792626604) and `steam_client_steamdeck_stable_linuxarm64` + (1792618285) have the same blocks. Three platforms share them: + - `*_linuxarm64_linuxarm64`: the native client (`steamrtarm64/`, `linuxarm64/`). No pressure-vessel, no + `steam-runtime-check-requirements`. These are the only platform blocks the installer keeps. + - `*_steamrt_linuxarm64`: Valve's x86-64 SteamRT 3c client (`steamrt64/steam` is an x86-64 ELF) with + `steamrt64/pv-runtime/steam-runtime-steamrt` (pressure-vessel, `steam-runtime-check-requirements`, + `steam-runtime-launch-client`). This is the containerized client the 2026-10-15 beta made the default on + x86. Valve ships it to arm64 hosts as well, presumably to run under FEX. The installer skips it. + - `bins_androidarm64_linuxarm64`: `androidarm64/libsteamclient.so`, `steamservice.so` and friends. +- `steam_client_steamdeck_publicbeta_ubuntu12` has stopped at 1792108788, while stable `ubuntu12` follows + stable (1792618285). On beta the 32-bit `ubuntu12` client no longer gets updates. +- If a future manifest drops `*_linuxarm64_linuxarm64`, the installer logs the block list and moves to + stable. If stable drops it too, the remaining option is the x86-64 client under FEX + ([x86-64-steam-client.md](x86-64-steam-client.md)). From 70eec3cc32e326765f3a2dbe8f02ec53af9a4fd7 Mon Sep 17 00:00:00 2001 From: ovurrsl Date: Fri, 23 Oct 2026 01:32:15 +0300 Subject: [PATCH 023/174] fix: a half-built steamrt shim is removed, and its launcher accepts --directory DIR --- tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 | 2 +- .../linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim | 9 +++++++++ tools/tests/test_steamrt_shim.py | 8 +++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 index df9ec941b7..f6f11d1873 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 @@ -521,7 +521,7 @@ ln -sfn "$STEAM_X64/ubuntu12_64" "$X64_HOME/.steam/bin64" ln -sfn "$STEAM_X64/linux32" "$X64_HOME/.steam/sdk32" ln -sfn "$STEAM_X64/linux64" "$X64_HOME/.steam/sdk64" # Valve's Steam Runtime container needs user namespaces and a session-bus launcher; steamrt-shim stands in for both. -droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim" || true +droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim" || rm -rf "$X64_HOME/steamrt-shim" # Valve's platform libraries ship without soname links (pressure-vessel makes them); ldconfig adds them here. srt_libs=$X64_HOME/steamrt-libs rm -rf "$srt_libs" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim index 96e851bc9b..feb4c5711f 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim @@ -15,6 +15,7 @@ if [ -z "$srt_real" ] || [ ! -d "$srt_real" ]; then exit 1 fi rm -rf "$shim" +trap 'rm -rf "$shim"' ERR mkdir -p "$shim/bin" for e in "$srt_real"/* "$srt_real"/.[!.]*; do [ -e "$e" ] || continue @@ -40,6 +41,14 @@ while [ $# -gt 0 ]; do --directory=*) cd "${1#--directory=}" || exit 127 ;; --env=*) export "${1#--env=}" ;; --unset-env=*) unset "${1#--unset-env=}" ;; + --directory|--env|--unset-env) + [ $# -ge 2 ] || exit 127 + case $1 in + --directory) cd "$2" || exit 127 ;; + --env) export "$2" ;; + --unset-env) unset "$2" ;; + esac + shift ;; esac shift done diff --git a/tools/tests/test_steamrt_shim.py b/tools/tests/test_steamrt_shim.py index 54f105eeb0..05f7345fe1 100644 --- a/tools/tests/test_steamrt_shim.py +++ b/tools/tests/test_steamrt_shim.py @@ -46,6 +46,12 @@ class SteamrtShimTest(unittest.TestCase): launched = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--env=BL_SHIM_TEST=yes', f'--directory={self.root}', '--', 'sh', '-c', 'echo "$BL_SHIM_TEST $(basename "$PWD")"') self.assertEqual(f'yes {self.root.name}\n', launched.stdout) + launched = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--env', 'BL_SHIM_TEST=split', + '--directory', self.root, '--', 'sh', '-c', 'echo "$BL_SHIM_TEST $(basename "$PWD")"') + self.assertEqual(f'split {self.root.name}\n', launched.stdout) + missing = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--directory', self.root / 'missing', + '--', 'true') + self.assertEqual(127, missing.returncode) def test_a_client_without_a_container_gets_no_shim(self): self.shim.mkdir() @@ -82,7 +88,7 @@ class SteamrtShimTest(unittest.TestCase): self.assertLess(guard, SESSION.index('"${steam_client[@]}" "${_bl_ui[@]}"')) self.assertIn('-u STEAM_STEAMRT_RECURSION_GUARD', SESSION[:guard]) self.assertIn('export STEAM_STEAMRT_RECURSION_GUARD=1', X64) - self.assertIn('droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim"', X64) + self.assertIn('droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim" || rm -rf "$X64_HOME/steamrt-shim"', X64) class SessionChannelTest(unittest.TestCase): From 77dd04ec8c3fe7c2d3074e625dc62e5ec56de501 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 12:15:43 -0400 Subject: [PATCH 024/174] fix: droiddeck-ntsync keeps protection when more than four signals arrive and keeps waits intact when a handler waits again - A fifth distinct signal inside a critical section is now held pending with the thread's signal mask and released once the section ends, instead of running its handler while an object lock is held. - A wait from a signal handler during another wait's sleep uses its own queue and, for a second device, a reference for that call only, so the outer wait keeps its queue and can't return the inner wait's result. --- tools/linuxfs/preload/ntsync.c | 84 ++++++++++++++++++++++------- tools/tests/test_ntsync_preload.py | 87 ++++++++++++++++++++++++++++++ 2 files changed, 153 insertions(+), 18 deletions(-) diff --git a/tools/linuxfs/preload/ntsync.c b/tools/linuxfs/preload/ntsync.c index 2b1c790459..76e50972d4 100644 --- a/tools/linuxfs/preload/ntsync.c +++ b/tools/linuxfs/preload/ntsync.c @@ -17,6 +17,7 @@ #include #include #include +#include #include struct ns_sem_args { @@ -170,6 +171,7 @@ struct ns_tls { struct ns_dev *d; uint32_t q; int waiting; + int sleep; }; static struct ns_dev ns_devs[NS_DEVS]; @@ -262,8 +264,10 @@ static void ns_unlock(uint32_t *w) { struct ns_cs { int depth; int count; + int nheld; int sigs[NS_DEFER]; siginfo_t info[NS_DEFER]; + sigset_t held; }; static __thread struct ns_cs ns_cs; @@ -290,8 +294,26 @@ static int ns_defer(int sig, const siginfo_t *si) { return 1; } +static int ns_park(int sig, const siginfo_t *si, ucontext_t *uc) { + sigset_t one; + sigemptyset(&one); + sigaddset(&one, sig); + int saved = errno; + pthread_sigmask(SIG_BLOCK, &one, NULL); + pid_t pid = getpid(), tid = (pid_t)ns_self(); + int ok = (si && syscall(SYS_rt_tgsigqueueinfo, pid, tid, sig, si) == 0) || syscall(SYS_tgkill, pid, tid, sig) == 0; + if (!ok) pthread_sigmask(SIG_UNBLOCK, &one, NULL); + errno = saved; + if (!ok) return 0; + sigaddset(&uc->uc_sigmask, sig); + if (!ns_cs.nheld) sigemptyset(&ns_cs.held); + sigaddset(&ns_cs.held, sig); + ns_cs.nheld = 1; + return 1; +} + static void ns_trampoline(int sig, siginfo_t *si, void *uc) { - if (__atomic_load_n(&ns_cs.depth, __ATOMIC_RELAXED) > 0 && ns_defer(sig, si)) return; + if (__atomic_load_n(&ns_cs.depth, __ATOMIC_RELAXED) > 0 && (ns_defer(sig, si) || (uc && ns_park(sig, si, uc)))) return; uintptr_t h = __atomic_load_n(&ns_handlers[sig], __ATOMIC_ACQUIRE); if (!h) return; if (__atomic_load_n(&ns_siginfo[sig], __ATOMIC_RELAXED)) ((void (*)(int, siginfo_t *, void *))h)(sig, si, uc); @@ -321,7 +343,19 @@ static void ns_restore(void) { __atomic_signal_fence(__ATOMIC_SEQ_CST); if (--ns_cs.depth == 0) { __atomic_signal_fence(__ATOMIC_SEQ_CST); + int nheld = ns_cs.nheld; + sigset_t held; + if (nheld) { + held = ns_cs.held; + ns_cs.nheld = 0; + __atomic_signal_fence(__ATOMIC_SEQ_CST); + } if (ns_cs.count) ns_flush(); + if (nheld) { + int saved = errno; + pthread_sigmask(SIG_UNBLOCK, &held, NULL); + errno = saved; + } } } @@ -875,6 +909,7 @@ static void ns_key_init(void) { static int ns_hold(struct ns_dev *d) { if (ns_tq.d == d) return 1; if (!ns_dev_get(d)) return 0; + if (ns_tq.sleep) return 2; struct ns_dev *old = ns_tq.d; if (old) { ns_block(); @@ -891,6 +926,22 @@ static int ns_hold(struct ns_dev *d) { return 1; } +static struct ns_q *ns_new_q(struct ns_dev *d, uint32_t *qi) { + struct ns_head *h = d->h; + uint32_t i; + if (!ns_pop(h, &h->q_free, 0, &i) && !ns_grow(&h->q_hwm, NS_QS, &i)) { + ns_sweep_dead(h); + if (!ns_pop(h, &h->q_free, 0, &i)) return NULL; + } + struct ns_q *q = ns_q(h, i); + q->proc = (uint32_t)d->proc; + q->waiting = 0; + q->sleeping = 0; + q->inuse = 1; + *qi = i; + return q; +} + static struct ns_q *ns_thread_q(struct ns_dev *d, uint32_t *qi) { struct ns_head *h = d->h; if (ns_tq.d != d) return NULL; @@ -902,19 +953,10 @@ static struct ns_q *ns_thread_q(struct ns_dev *d, uint32_t *qi) { *qi = ns_tq.q - 1; return ns_q(h, *qi); } - uint32_t i; - if (!ns_pop(h, &h->q_free, 0, &i) && !ns_grow(&h->q_hwm, NS_QS, &i)) { - ns_sweep_dead(h); - if (!ns_pop(h, &h->q_free, 0, &i)) return NULL; - } - struct ns_q *q = ns_q(h, i); - q->proc = (uint32_t)d->proc; - q->waiting = 0; - q->sleeping = 0; - q->inuse = 1; - ns_tq.q = i + 1; + struct ns_q *q = ns_new_q(d, qi); + if (!q) return NULL; + ns_tq.q = *qi + 1; ns_tq.waiting = 0; - *qi = i; return q; } @@ -1064,8 +1106,9 @@ static int ns_wait(struct ns_dev *d, struct ns_wait_args *ua, int all) { for (uint32_t j = 0; j < i; j++) if (slots[j] == slots[i]) return EINVAL; } + int nested = ns_tq.sleep > 0; ns_block(); - if (!all && !ns_tq.waiting) { + if (!all && (nested || !ns_tq.waiting)) { int dead = 0, got = ns_try_any(h, slots, gens, total, args.owner, &dead); if (got >= 0) { ns_restore(); @@ -1078,7 +1121,7 @@ static int ns_wait(struct ns_dev *d, struct ns_wait_args *ua, int all) { } } uint32_t qi; - struct ns_q *q = ns_ready(d) ? ns_thread_q(d, &qi) : NULL; + struct ns_q *q = !ns_ready(d) ? NULL : nested ? ns_new_q(d, &qi) : ns_thread_q(d, &qi); if (!q) { ns_restore(); return ENOMEM; @@ -1100,7 +1143,7 @@ static int ns_wait(struct ns_dev *d, struct ns_wait_args *ua, int all) { } q->total = total; q->waiting = 1; - ns_tq.waiting = 1; + if (!nested) ns_tq.waiting = 1; int bad = 0; if (!all) { for (uint32_t i = 0; i < total && !bad; i++) { @@ -1152,14 +1195,17 @@ static int ns_wait(struct ns_dev *d, struct ns_wait_args *ua, int all) { } int ret = 0; if (!bad && __atomic_load_n(&q->signaled, __ATOMIC_ACQUIRE) == -1) { + ns_tq.sleep++; ns_restore(); ret = ns_sleep(q, &args); ns_block(); + ns_tq.sleep--; } ns_drop_q(h, qi); - ns_tq.waiting = 0; + if (!nested) ns_tq.waiting = 0; int32_t got = __atomic_load_n(&q->signaled, __ATOMIC_ACQUIRE); int dead = (int)q->ownerdead; + if (nested) ns_free_q(h, qi); ns_restore(); if (bad) return EINVAL; if (got != -1) { @@ -1322,8 +1368,10 @@ int bl_ntsync_ioctl(int fd, unsigned long req, void *arg, int *rc) { uint64_t e = ns_lookup(fd); if (!e) return 0; struct ns_dev *d = &ns_devs[(e >> 56) & 7]; - if (!ns_hold(d)) return 0; + int held = ns_hold(d); + if (!held) return 0; int out = 0, err = (e & NS_E_DEVICE) ? ns_dev_ioctl(d, req, arg, &out) : ns_obj_ioctl(d, e, req, arg); + if (held == 2) ns_dev_put(d); if (err) { errno = err; *rc = -1; diff --git a/tools/tests/test_ntsync_preload.py b/tools/tests/test_ntsync_preload.py index e05178c8d4..34f3eaea45 100644 --- a/tools/tests/test_ntsync_preload.py +++ b/tools/tests/test_ntsync_preload.py @@ -393,6 +393,91 @@ static void signals(void) { close(busy_obj); } +static volatile int burst_count; +static void bursting(int sig, siginfo_t *si, void *uc) { + (void)sig; (void)si; (void)uc; + uint32_t v = 0; + ioctl(busy_obj, NT_EVENT_SET, &v); + __atomic_add_fetch(&burst_count, 1, __ATOMIC_RELAXED); +} + +static void bursts(void) { + void *seen = NULL; + busy_obj = event(0, 0); + for (int s = 0; s < 8; s++) CHECK("install_burst", install_handler(SIGRTMIN + s, bursting, &seen) == 0); + pthread_t w; + stop_worker = 0; + burst_count = 0; + pthread_create(&w, NULL, worker, NULL); + union sigval val = {0}; + int sent = 0; + for (int i = 0; i < 400; i++) { + for (int s = 0; s < 8; s++) + if (pthread_sigqueue(w, SIGRTMIN + s, val) == 0) sent++; + usleep(200); + } + for (int i = 0; i < 2000 && __atomic_load_n(&burst_count, __ATOMIC_RELAXED) < sent; i++) usleep(1000); + stop_worker = 1; + pthread_join(w, NULL); + CHECK("burst_all_handled", burst_count == sent && sent > 0); + close(busy_obj); +} + +static int outer_obj, inner_obj, other_dev, other_obj; +static volatile int nested_ok, nested_done, outer_done; +static void nesting(int sig, siginfo_t *si, void *uc) { + (void)sig; (void)si; (void)uc; + uint32_t idx = 99; + int ok = wait_on(NT_WAIT_ANY, &inner_obj, 1, 21, 0, mono_ns(50), &idx) == 0 && idx == 0; + struct wait_args w = {mono_ns(2), (uintptr_t)&other_obj, 1, 0xdead, 0, 22, 0, 0}; + ok = ok && ioctl(other_dev, NT_WAIT_ANY, &w) < 0 && errno == ETIMEDOUT; + nested_ok += ok; + __atomic_store_n(&nested_done, 1, __ATOMIC_RELEASE); +} +static void *outer_waiter(void *p) { + struct wait_args w = {mono_ns(3000), (uintptr_t)&outer_obj, 1, 99, 0, 23, 0, 0}; + int r; + do { r = ioctl(dev, NT_WAIT_ANY, &w); } while (r < 0 && errno == EINTR); + *(int *)p = r == 0 && w.index == 0; + __atomic_store_n(&outer_done, 1, __ATOMIC_RELEASE); + return NULL; +} + +static void nested_waits(void) { + void *seen = NULL; + other_dev = open("/dev/ntsync", O_RDWR | O_CLOEXEC); + CHECK("second_device", other_dev >= 0); + struct event_args ea = {0, 0}; + other_obj = ioctl(other_dev, NT_CREATE_EVENT, &ea); + inner_obj = event(1, 1); + CHECK("install_nesting", install_handler(SIGUSR2, nesting, &seen) == 0); + int good = 0, early = 0; + nested_ok = 0; + for (int i = 0; i < 40; i++) { + outer_obj = event(0, 0); + int result = 0; + pthread_t t; + nested_done = outer_done = 0; + pthread_create(&t, NULL, outer_waiter, &result); + usleep(5000); + pthread_kill(t, SIGUSR2); + while (!__atomic_load_n(&nested_done, __ATOMIC_ACQUIRE)) usleep(200); + usleep(5000); + early += __atomic_load_n(&outer_done, __ATOMIC_ACQUIRE); + uint32_t v = 0; + ioctl(outer_obj, NT_EVENT_SET, &v); + pthread_join(t, NULL); + good += result; + close(outer_obj); + } + CHECK("outer_wait_not_woken_by_nested_wait", early == 0); + CHECK("outer_wait_survives_nested_waits", good == 40); + CHECK("nested_waits_complete", nested_ok == 40); + close(inner_obj); + close(other_obj); + close(other_dev); +} + int main(void) { alarm(60); dev = open("/dev/ntsync", O_RDWR | O_CLOEXEC); @@ -409,6 +494,8 @@ int main(void) { cross_process(); stress(); signals(); + bursts(); + nested_waits(); printf("done fails=%d\n", fails); return fails != 0; } From 6b6d7d2ac777bd8190199f7d0bcd63cc09b19a8b Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 23 Oct 2026 11:13:19 -0400 Subject: [PATCH 025/174] feat: lift paused frame into a grey card with a glass resume button --- .../com/droiddeck/launcher/SessionActivity.kt | 45 ++- .../launcher/session/SessionService.kt | 11 + .../launcher/session/SessionState.kt | 4 + .../droiddeck/launcher/ui/SessionLoading.kt | 35 --- .../launcher/ui/SessionPausedOverlay.kt | 257 ++++++++++++++++++ 5 files changed, 316 insertions(+), 36 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 6de07a00dc..c416e4f3a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -329,6 +329,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var glassesSettings by mutableStateOf(Glasses.settings.value) private var glassesScreen: GlassesScreen? = null private var glassesOutputActive by mutableStateOf(false) + private var pausedFrame by mutableStateOf(null) private var trackingRecovery by mutableStateOf(null) private var glasses3dForVr = false private var ended = false @@ -1013,9 +1014,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionAchievements(inFront.game, inFront.title, onClose = ::closeAchievements) } com.droiddeck.launcher.ui.AchievementNotificationOverlay() - if (SessionState.suspended) SessionPausedOverlay( + SessionPausedOverlay( + suspended = SessionState.suspended, + engaged = SessionState.resumeRequested || SessionState.resuming, + failures = SessionState.resumeFailures, + frame = pausedFrame, title = pausedTitle(), onResume = { SessionService.resume(this@SessionActivity) }, + onHidden = { pausedFrame = null }, ) if (leaving) com.droiddeck.launcher.ui.FloodSpread( com.droiddeck.launcher.ui.LocalPalette.current.signal, @@ -2860,6 +2866,40 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (down || code !in gestureKeysDown) WaylandCompositor.nativeSendKey(code, if (down) 1 else 0) } + // The frozen game cannot draw again, so the paused overlay shows a copy taken while the surface still holds its frame. + private fun capturePausedFrame() { + if (!SessionState.running || pipUi || isInPictureInPictureMode || glassesOutputActive) return + if (suspendPolicy == SessionPrefs.SUSPEND_NEVER || !::surfaceView.isInitialized) return + if (surfaceView.holder.surface?.isValid != true) return + val width = surfaceView.width + val height = surfaceView.height + if (width <= 0 || height <= 0) return + val scale = minOf(1f, PAUSED_FRAME_MAX_EDGE / maxOf(width, height).toFloat()) + val bitmap = try { + android.graphics.Bitmap.createBitmap( + maxOf(1, (width * scale).toInt()), maxOf(1, (height * scale).toInt()), android.graphics.Bitmap.Config.ARGB_8888, + ) + } catch (_: OutOfMemoryError) { + return + } + val surfaceAt = IntArray(2).also { surfaceView.getLocationInWindow(it) } + val overlayAt = IntArray(2).also { sessionOverlay.getLocationInWindow(it) } + val left = surfaceAt[0] - overlayAt[0] + val top = surfaceAt[1] - overlayAt[1] + val bounds = android.graphics.Rect(left, top, left + width, top + height) + try { + android.view.PixelCopy.request(surfaceView, bitmap, { result -> + if (result == android.view.PixelCopy.SUCCESS && !isDestroyed) { + pausedFrame = com.droiddeck.launcher.ui.PausedFrame(bitmap.asImageBitmap(), bounds) + } else { + bitmap.recycle() + } + }, uiHandler) + } catch (_: IllegalArgumentException) { + bitmap.recycle() + } + } + private fun pipBounds(): android.graphics.Rect { val rect = android.graphics.Rect() if (!::surfaceView.isInitialized || !surfaceView.getGlobalVisibleRect(rect)) return rect @@ -2990,6 +3030,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } applyFollowOrientation(resources.configuration) if (runtimeRemovalBlocked) return + if (!SessionState.suspended) pausedFrame = null com.droiddeck.launcher.ui.Motion.refresh(this) refreshHomeApp() if (intent?.action == SessionService.ACTION_RESUME) { @@ -3015,6 +3056,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onPause() { if (runtimeRemovalBlocked) { super.onPause(); return } + capturePausedFrame() sessionClipboard.stop() if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel() if (::touchpad.isInitialized) touchpad.cancel() @@ -3512,6 +3554,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { const val EXTRA_STEAMVR = "steamVr" const val EXTRA_REPAIR_RUNTIME = "repairRuntime" private const val LEAVE_TIMEOUT_MS = 1_500L + private const val PAUSED_FRAME_MAX_EDGE = 1920f private const val TAG = "SessionActivity" private var startedScreens = 0 private const val FEX_MISSING = "droiddeck-fex: x86 Linux programs need" 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 31c63ff469..cfead3d70f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -328,6 +328,8 @@ class SessionService : Service() { suspendAttemptFailed = false suspendController = null SessionState.suspended = false + SessionState.resumeRequested = false + SessionState.resuming = false SessionState.pipActive = false pipTask = false SessionState.program = intent?.getStringExtra(EXTRA_PROGRAM) @@ -1210,6 +1212,7 @@ class SessionService : Service() { } private fun resumeSession(panelVisible: Boolean = true) { + if (SessionState.suspended) SessionState.resumeRequested = true if (panelVisible) activityVisible = true screenOn = readScreenOn() manualPauseRequested = false @@ -1436,6 +1439,7 @@ class SessionService : Service() { freezeCancelled = true controller.cancelFreeze() } + if (shouldSuspend && SessionState.suspended && !suspendOperationPending) SessionState.resumeRequested = false if (suspendOperationPending || suspendAttemptFailed || shouldSuspend == SessionState.suspended) return val gen = sessionGen suspendOperationPending = true @@ -1477,16 +1481,20 @@ class SessionService : Service() { } } else { acquireLocks() + SessionState.resuming = true controller.resume { success -> mainHandler.post { if (gen != sessionGen || !SessionState.running) return@post suspendOperationPending = false + SessionState.resuming = false + SessionState.resumeRequested = false if (success) { SessionState.suspended = false SessionEvents.transition(SessionEvents.resumePhase(), "session.resumed") refreshNotification() } else { suspendAttemptFailed = true + SessionState.resumeFailures++ Log.w(TAG, "could not confirm that the session resumed") } updateSuspendPolicy() @@ -1576,6 +1584,8 @@ class SessionService : Service() { return@post } SessionState.suspended = false + SessionState.resumeRequested = false + SessionState.resuming = false SessionState.pipActive = false pipTask = false SessionState.guestPid = -1 @@ -2022,6 +2032,7 @@ class SessionService : Service() { fun resume(context: Context) { if (!SessionState.running) return + if (SessionState.suspended) SessionState.resumeRequested = true context.startService(Intent(context, SessionService::class.java).setAction(ACTION_RESUME)) } 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 cebc33caa0..03741cd0d4 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.session import java.io.File import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue @@ -46,6 +47,9 @@ object SessionState { @Volatile var runtimeDriver: String? = null var suspended by mutableStateOf(false) + var resumeRequested by mutableStateOf(false) + var resuming by mutableStateOf(false) + var resumeFailures by mutableIntStateOf(0) @Volatile var pipActive = false @Volatile var program: String? = null diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt index 4a0adea2d4..d1c478eb08 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -24,7 +24,6 @@ import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.animation.core.tween import androidx.compose.material.icons.Icons import androidx.compose.foundation.layout.heightIn -import androidx.compose.material.icons.filled.Pause import androidx.compose.foundation.rememberScrollState import androidx.compose.material3.Icon import androidx.compose.foundation.Canvas @@ -345,37 +344,3 @@ private fun CancelHint(onCancel: () -> Unit, modifier: Modifier = Modifier) { Text(stringResource(R.string.common_cancel), fontSize = 13.sp, color = colors.onSurfaceVariant) } } - -@Composable -fun SessionPausedOverlay(title: String = stringResource(R.string.load_steam_paused), onResume: () -> Unit) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val resumeFocus = remember { FocusRequester() } - LaunchedEffect(Unit) { - androidx.compose.runtime.withFrameNanos { } - runCatching { resumeFocus.requestFocus() } - } - Box( - modifier = Modifier - .fillMaxSize() - .background(pal.background.copy(alpha = 0.94f)) - .blockTouches(), - contentAlignment = Alignment.Center, - ) { - Column( - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.spacedBy(10.dp), - modifier = Modifier.widthIn(max = 440.dp).padding(32.dp), - ) { - Box(contentAlignment = Alignment.Center, modifier = Modifier.padding(bottom = 6.dp).size(64.dp).border(2.dp, pal.line2, CircleShape)) { - Icon(Icons.Filled.Pause, contentDescription = null, tint = colors.onBackground, modifier = Modifier.size(30.dp)) - } - Text(title, fontSize = 28.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, textAlign = TextAlign.Center) - PrimaryButton( - stringResource(R.string.resume_session), - modifier = Modifier.padding(top = 14.dp).focusRequester(resumeFocus).controllerConfirm(onClick = onResume), - onClick = onResume, - ) - } - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt new file mode 100644 index 0000000000..691c25bd91 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt @@ -0,0 +1,257 @@ +package com.droiddeck.launcher.ui + +import android.os.Build +import androidx.compose.animation.core.Animatable +import androidx.compose.animation.core.CubicBezierEasing +import androidx.compose.animation.core.FastOutLinearInEasing +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.LinearOutSlowInEasing +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.keyframes +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.PlayArrow +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.State +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.runtime.withFrameNanos +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.blur +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawWithContent +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.ColorMatrix +import androidx.compose.ui.graphics.ImageBitmap +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.drawscope.rotate +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.unit.IntOffset +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.R +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.launch + +/** The last game frame, captured as the session left the screen, and where it sat in the overlay. */ +class PausedFrame(val image: ImageBitmap, val bounds: android.graphics.Rect) + +private const val CARD_SCALE = 0.82f +private val PopEasing = CubicBezierEasing(0.3f, 1.5f, 0.4f, 1f) + +private fun tone(saturation: Float, brightness: Float): ColorMatrix = + ColorMatrix().apply { + setToSaturation(saturation) + timesAssign(ColorMatrix().apply { setToScale(brightness, brightness, brightness, 1f) }) + } + +@Composable +fun SessionPausedOverlay( + suspended: Boolean, + engaged: Boolean, + failures: Int, + frame: PausedFrame?, + title: String, + onResume: () -> Unit, + onHidden: () -> Unit, +) { + var shown by remember { mutableStateOf(suspended) } + val lift = remember { Animatable(if (suspended) 1f else 0f) } + val orb = remember { Animatable(if (suspended) 1f else 0f) } + val press = remember { Animatable(1f) } + val ring = remember { Animatable(0f) } + val shake = remember { Animatable(0f) } + + LaunchedEffect(suspended, engaged) { + when { + suspended && !engaged -> { + shown = true + launch { press.animateTo(1f, Motion.sp(0.5f, Spring.StiffnessMedium)) } + launch { ring.animateTo(0f, Motion.tw(200)) } + launch { lift.animateTo(1f, Motion.tw(520)) } + orb.animateTo(1f, Motion.tw(380, delay = if (orb.value < 0.5f) 260 else 0, easing = PopEasing)) + } + suspended -> { + shown = true + launch { orb.animateTo(1f, Motion.tw(200)) } + launch { lift.animateTo(1f, Motion.tw(300)) } + launch { press.animateTo(0.92f, Motion.tw(140)) } + ring.animateTo(0.25f, Motion.tw(140)) + ring.animateTo(0.8f, Motion.tw(650, easing = CubicBezierEasing(0.1f, 0.6f, 0.3f, 1f))) + ring.animateTo(0.92f, Motion.tw(2000, easing = LinearOutSlowInEasing)) + } + shown -> { + ring.animateTo(1f, Motion.tw(110)) + coroutineScope { + launch { orb.animateTo(0f, Motion.tw(220, easing = FastOutLinearInEasing)) } + lift.animateTo(0f, Motion.sp(0.62f, 380f)) + } + shown = false + ring.snapTo(0f) + press.snapTo(1f) + onHidden() + } + } + } + + val seenFailures = remember { mutableIntStateOf(failures) } + LaunchedEffect(failures) { + if (failures == seenFailures.intValue) return@LaunchedEffect + seenFailures.intValue = failures + if (!shown || Motion.scale == 0f) return@LaunchedEffect + shake.animateTo(0f, keyframes { + durationMillis = Motion.ms(360) + 10f at Motion.ms(60) + -8f at Motion.ms(140) + 5f at Motion.ms(220) + -2f at Motion.ms(300) + }) + } + + if (!shown) return + + val presence = lift.value.coerceIn(0f, 1f) + val idle = suspended && !engaged + val focus = remember { FocusRequester() } + LaunchedEffect(Unit) { + withFrameNanos { } + runCatching { focus.requestFocus() } + } + val resumeLabel = stringResource(R.string.resume_session) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier + .fillMaxSize() + .semantics { contentDescription = title } + .focusRequester(focus) + .controllerConfirm(enabled = idle, onClick = onResume) + .clickable( + interactionSource = remember { MutableInteractionSource() }, + indication = null, + role = Role.Button, + onClickLabel = resumeLabel, + ) { if (idle) onResume() }, + ) { + if (frame != null) { + PausedCard(frame, lift.value, presence) + } else { + Box(Modifier.fillMaxSize().graphicsLayer { alpha = presence }.background(Color.Black.copy(alpha = 0.55f))) + } + ResumeOrb(orb.value, press.value, ring.value, shake.value, idle) + } +} + +@Composable +private fun BoxScope.PausedCard(frame: PausedFrame, lift: Float, presence: Float) { + val density = LocalDensity.current + val bounds = frame.bounds + val ambient = remember { ColorFilter.colorMatrix(tone(0.1f, 0.3f)) } + Box(Modifier.fillMaxSize().graphicsLayer { alpha = presence }.background(Color.Black)) { + Image( + frame.image, contentDescription = null, contentScale = ContentScale.Crop, colorFilter = ambient, + modifier = Modifier.fillMaxSize().then(if (Build.VERSION.SDK_INT >= 31) Modifier.blur(32.dp) else Modifier), + ) + } + Image( + frame.image, contentDescription = null, contentScale = ContentScale.FillBounds, + colorFilter = ColorFilter.colorMatrix(tone(1f - 0.92f * presence, 1f - 0.45f * presence)), + modifier = Modifier + .align(Alignment.TopStart) + .offset { IntOffset(bounds.left, bounds.top) } + .size(with(density) { bounds.width().toDp() }, with(density) { bounds.height().toDp() }) + .graphicsLayer { + val scale = 1f - (1f - CARD_SCALE) * lift + scaleX = scale + scaleY = scale + shape = RoundedCornerShape((20f * presence).dp) + clip = true + shadowElevation = 24.dp.toPx() * presence + }, + ) +} + +@Composable +private fun ResumeOrb(presence: Float, press: Float, ring: Float, shake: Float, idle: Boolean) { + val glintAlpha by animateFloatAsState(if (idle) 1f else 0f, Motion.tw(160), label = "glintAlpha") + val glint: State? = if (Motion.scale > 0f) { + rememberInfiniteTransition(label = "glint").animateFloat( + 0f, 360f, infiniteRepeatable(tween(Motion.ms(3600), easing = LinearEasing)), label = "glintAngle", + ) + } else null + Box( + contentAlignment = Alignment.Center, + modifier = Modifier + .size(96.dp) + .graphicsLayer { + val scale = press * (0.4f + 0.6f * presence) + scaleX = scale + scaleY = scale + alpha = presence.coerceIn(0f, 1f) + translationX = shake.dp.toPx() + } + .shadow(16.dp, CircleShape, clip = false) + .clip(CircleShape) + .background(Color.White.copy(alpha = 0.08f)) + .drawWithContent { + drawContent() + val stroke = 2.5.dp.toPx() + val radius = size.minDimension / 2f * 0.92f + if (glint != null && glintAlpha > 0f) { + rotate(glint.value) { + drawCircle( + Brush.sweepGradient( + 0f to Color.Transparent, + 0.083f to Color.White.copy(alpha = 0.4f * glintAlpha), + 0.166f to Color.Transparent, + 1f to Color.Transparent, + ), + radius = radius, style = Stroke(stroke), + ) + } + } + if (ring > 0f) { + drawArc( + Color.White, startAngle = -90f, sweepAngle = 360f * ring.coerceAtMost(1f), useCenter = false, + topLeft = Offset(center.x - radius, center.y - radius), size = Size(radius * 2f, radius * 2f), + style = Stroke(stroke, cap = StrokeCap.Round), + ) + } + }, + ) { + Icon(Icons.Rounded.PlayArrow, contentDescription = null, tint = Color.White, modifier = Modifier.size(48.dp)) + } +} From f683ca1dea50810e0e0f18e1265eae12bb105c4d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 23 Oct 2026 12:06:42 -0400 Subject: [PATCH 026/174] fix: show the paused card already settled, skip it on auto resume, and cancel manual pauses on a quick return --- .../com/droiddeck/launcher/SessionActivity.kt | 25 +++++++++++-- .../launcher/session/SessionService.kt | 8 +++++ .../launcher/session/SessionState.kt | 1 + .../launcher/ui/SessionPausedOverlay.kt | 35 ++++++++++++++----- 4 files changed, 59 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index c416e4f3a3..b4fd3fd4b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -330,6 +330,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var glassesScreen: GlassesScreen? = null private var glassesOutputActive by mutableStateOf(false) private var pausedFrame by mutableStateOf(null) + private var pausedFrameWanted = false private var trackingRecovery by mutableStateOf(null) private var glasses3dForVr = false private var ended = false @@ -1014,14 +1015,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionAchievements(inFront.game, inFront.title, onClose = ::closeAchievements) } com.droiddeck.launcher.ui.AchievementNotificationOverlay() + // Auto and Native resume on their own as the session comes back; only a failed resume needs the button. + val autoResume = suspendPolicy == SessionPrefs.SUSPEND_AUTO || suspendPolicy == SessionPrefs.SUSPEND_NATIVE SessionPausedOverlay( - suspended = SessionState.suspended, + suspended = SessionState.suspended && (!autoResume || SessionState.resumeFailed), engaged = SessionState.resumeRequested || SessionState.resuming, failures = SessionState.resumeFailures, frame = pausedFrame, title = pausedTitle(), onResume = { SessionService.resume(this@SessionActivity) }, - onHidden = { pausedFrame = null }, + onFrameNeeded = ::requestPausedFrame, + onHidden = { + pausedFrame = null + pausedFrameWanted = false + }, ) if (leaving) com.droiddeck.launcher.ui.FloodSpread( com.droiddeck.launcher.ui.LocalPalette.current.signal, @@ -2869,6 +2876,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { // The frozen game cannot draw again, so the paused overlay shows a copy taken while the surface still holds its frame. private fun capturePausedFrame() { if (!SessionState.running || pipUi || isInPictureInPictureMode || glassesOutputActive) return + if (SessionState.suspended && pausedFrame != null) return if (suspendPolicy == SessionPrefs.SUSPEND_NEVER || !::surfaceView.isInitialized) return if (surfaceView.holder.surface?.isValid != true) return val width = surfaceView.width @@ -2891,6 +2899,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { android.view.PixelCopy.request(surfaceView, bitmap, { result -> if (result == android.view.PixelCopy.SUCCESS && !isDestroyed) { pausedFrame = com.droiddeck.launcher.ui.PausedFrame(bitmap.asImageBitmap(), bounds) + pausedFrameWanted = false } else { bitmap.recycle() } @@ -2900,6 +2909,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } + // Sessions that froze from picture-in-picture, or before onPause could copy a frame, have none; the + // compositor shows the frozen frame again once its output is back, so copy it from there. + private fun requestPausedFrame() { + if (pausedFrame != null) return + pausedFrameWanted = true + if (resumed && surfaceW > 0) capturePausedFrame() + } + private fun pipBounds(): android.graphics.Rect { val rect = android.graphics.Rect() if (!::surfaceView.isInitialized || !surfaceView.getGlobalVisibleRect(rect)) return rect @@ -3295,6 +3312,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { surfaceView.visibility = if (glassesOutputActive) View.INVISIBLE else View.VISIBLE Log.i(TAG, "compositor output attached: " + if (glassesOutputActive) "glasses display ${glassesScreen?.display?.displayId}" else "phone") + if (pausedFrameWanted) uiHandler.postDelayed({ + if (pausedFrameWanted && pausedFrame == null && resumed) capturePausedFrame() + }, PAUSED_FRAME_REDRAW_MS) } private fun restorePhoneOutput(screen: GlassesScreen) { @@ -3555,6 +3575,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { const val EXTRA_REPAIR_RUNTIME = "repairRuntime" private const val LEAVE_TIMEOUT_MS = 1_500L private const val PAUSED_FRAME_MAX_EDGE = 1920f + private const val PAUSED_FRAME_REDRAW_MS = 150L private const val TAG = "SessionActivity" private var startedScreens = 0 private const val FEX_MISSING = "droiddeck-fex: x86 Linux programs need" 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 cfead3d70f..3db04cabc7 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -330,6 +330,7 @@ class SessionService : Service() { SessionState.suspended = false SessionState.resumeRequested = false SessionState.resuming = false + SessionState.resumeFailed = false SessionState.pipActive = false pipTask = false SessionState.program = intent?.getStringExtra(EXTRA_PROGRAM) @@ -1414,6 +1415,9 @@ class SessionService : Service() { suspendPolicy != SessionPrefs.SUSPEND_NEVER && hidden && downloadActive && !suspendDownloadNow if (suspendPolicy == SessionPrefs.SUSPEND_MANUAL && hidden && !downloadsBlockingSuspend) { manualPauseRequested = true + } else if (!hidden && !SessionState.suspended) { + // Coming back before the freeze finished keeps the game running instead of pausing it a moment later. + manualPauseRequested = false } val controller = suspendController ?: return if (downloadsBlockingSuspend) acquireLocks() @@ -1463,6 +1467,7 @@ class SessionService : Service() { freezePending = false if (success) { SessionState.suspended = true + SessionState.resumeFailed = false SessionEvents.transition(SessionPhase.SUSPENDED, "session.suspended") releaseLocks() refreshNotification() @@ -1490,11 +1495,13 @@ class SessionService : Service() { SessionState.resumeRequested = false if (success) { SessionState.suspended = false + SessionState.resumeFailed = false SessionEvents.transition(SessionEvents.resumePhase(), "session.resumed") refreshNotification() } else { suspendAttemptFailed = true SessionState.resumeFailures++ + SessionState.resumeFailed = true Log.w(TAG, "could not confirm that the session resumed") } updateSuspendPolicy() @@ -1586,6 +1593,7 @@ class SessionService : Service() { SessionState.suspended = false SessionState.resumeRequested = false SessionState.resuming = false + SessionState.resumeFailed = false SessionState.pipActive = false pipTask = false SessionState.guestPid = -1 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 03741cd0d4..5ff739e478 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -50,6 +50,7 @@ object SessionState { var resumeRequested by mutableStateOf(false) var resuming by mutableStateOf(false) var resumeFailures by mutableIntStateOf(0) + var resumeFailed by mutableStateOf(false) @Volatile var pipActive = false @Volatile var program: String? = null diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt index 691c25bd91..b7f5cbfebe 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt @@ -34,6 +34,8 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.runtime.snapshotFlow import androidx.compose.runtime.setValue import androidx.compose.runtime.withFrameNanos import androidx.compose.ui.Alignment @@ -41,7 +43,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.blur import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.drawWithContent -import androidx.compose.ui.draw.shadow +import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.geometry.Offset @@ -65,13 +67,15 @@ import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import com.droiddeck.launcher.R import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.flow.first import kotlinx.coroutines.launch +import kotlinx.coroutines.withTimeoutOrNull /** The last game frame, captured as the session left the screen, and where it sat in the overlay. */ class PausedFrame(val image: ImageBitmap, val bounds: android.graphics.Rect) private const val CARD_SCALE = 0.82f -private val PopEasing = CubicBezierEasing(0.3f, 1.5f, 0.4f, 1f) +private const val FRAME_WAIT_MS = 600L private fun tone(saturation: Float, brightness: Float): ColorMatrix = ColorMatrix().apply { @@ -87,8 +91,10 @@ fun SessionPausedOverlay( frame: PausedFrame?, title: String, onResume: () -> Unit, + onFrameNeeded: () -> Unit, onHidden: () -> Unit, ) { + val currentFrame by rememberUpdatedState(frame) var shown by remember { mutableStateOf(suspended) } val lift = remember { Animatable(if (suspended) 1f else 0f) } val orb = remember { Animatable(if (suspended) 1f else 0f) } @@ -99,16 +105,26 @@ fun SessionPausedOverlay( LaunchedEffect(suspended, engaged) { when { suspended && !engaged -> { - shown = true + if (!shown) { + if (currentFrame == null) { + onFrameNeeded() + withTimeoutOrNull(FRAME_WAIT_MS) { snapshotFlow { currentFrame }.first { it != null } } + } + // Pausing mostly happens while the screen is off or the app is away, so it appears already settled. + press.snapTo(1f) + ring.snapTo(0f) + lift.snapTo(1f) + orb.snapTo(1f) + shown = true + return@LaunchedEffect + } launch { press.animateTo(1f, Motion.sp(0.5f, Spring.StiffnessMedium)) } launch { ring.animateTo(0f, Motion.tw(200)) } - launch { lift.animateTo(1f, Motion.tw(520)) } - orb.animateTo(1f, Motion.tw(380, delay = if (orb.value < 0.5f) 260 else 0, easing = PopEasing)) + orb.animateTo(1f, Motion.tw(200)) } suspended -> { - shown = true + if (!shown) return@LaunchedEffect launch { orb.animateTo(1f, Motion.tw(200)) } - launch { lift.animateTo(1f, Motion.tw(300)) } launch { press.animateTo(0.92f, Motion.tw(140)) } ring.animateTo(0.25f, Motion.tw(140)) ring.animateTo(0.8f, Motion.tw(650, easing = CubicBezierEasing(0.1f, 0.6f, 0.3f, 1f))) @@ -223,7 +239,10 @@ private fun ResumeOrb(presence: Float, press: Float, ring: Float, shake: Float, alpha = presence.coerceIn(0f, 1f) translationX = shake.dp.toPx() } - .shadow(16.dp, CircleShape, clip = false) + .drawBehind { + val halo = size.minDimension * 0.8f + drawCircle(Brush.radialGradient(0.6f to Color.Black.copy(alpha = 0.35f), 1f to Color.Transparent, radius = halo), radius = halo) + } .clip(CircleShape) .background(Color.White.copy(alpha = 0.08f)) .drawWithContent { From f88227ed74793f168018179ba9a442b97beccd43 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 23 Oct 2026 10:47:29 -0400 Subject: [PATCH 027/174] feat: toggle Steam shader pre-caching from DroidDeck's Steam settings --- .../droiddeck/launcher/FrontEndActivity.kt | 4 + .../launcher/session/SessionFiles.kt | 1 + .../launcher/session/SessionPrefs.kt | 18 ++++ .../launcher/session/SessionService.kt | 1 + .../launcher/storage/SteamStorage.kt | 3 + .../launcher/ui/ModeSettingsDialog.kt | 8 ++ app/src/main/res/values/strings.xml | 2 + .../launcher/storage/SteamStorageTest.kt | 16 ++++ .../overlay/usr/local/bin/droiddeck-session | 4 + .../usr/local/bin/droiddeck-steam-shaders | 61 +++++++++++++ .../usr/local/bin/droiddeck-steam-ui-scale | 15 ++-- tools/tests/test_steam_shaders.py | 88 +++++++++++++++++++ 12 files changed, 216 insertions(+), 5 deletions(-) create mode 100755 tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shaders create mode 100644 tools/tests/test_steam_shaders.py diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 1081cb8948..8ff9a1a487 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -120,6 +120,7 @@ class FrontEndActivity : ComponentActivity() { private var glThread by mutableStateOf(true) private var noGlError by mutableStateOf(true) private var returnAfterGame by mutableStateOf(true) + private var shaderPrecache by mutableStateOf(true) private var steamRepairQueued by mutableStateOf(false) private var mangoapp by mutableStateOf(true) private var steamController by mutableStateOf(SessionPrefs.CONTROLLER_DECK) @@ -1634,6 +1635,7 @@ class FrontEndActivity : ComponentActivity() { syncBackend = if (mode == SessionService.MODE_STEAM) SessionPrefs.syncBackendOf(fastSync, fsyncFirst, syncFallback) else null, steamClientArch = if (mode == SessionService.MODE_STEAM) steamClientArch else null, returnAfterGame = if (mode == SessionService.MODE_STEAM) returnAfterGame else null, + shaderPrecache = if (mode == SessionService.MODE_STEAM) shaderPrecache else null, steamRepairQueued = steamRepairQueued, mangoapp = mangoapp, steamController = if (mode == SessionService.MODE_STEAM) steamController else null, @@ -1723,6 +1725,7 @@ class FrontEndActivity : ComponentActivity() { onSteamClientArch = { id -> SessionPrefs.setSteamClientArch(this, id); steamClientArch = id; refresh() }, onMangoapp = { on -> SessionPrefs.setMangoapp(this, on); mangoapp = on }, onReturnAfterGame = { on -> SessionPrefs.setReturnAfterGame(this, on); returnAfterGame = on }, + onShaderPrecache = { on -> SessionPrefs.setShaderPrecache(this, on); shaderPrecache = on }, onSteamController = { id -> SessionPrefs.setSteamController(this, id); steamController = id }, onRunSteamAtStartup = { on -> SessionPrefs.setRunSteamAtStartup(this, on) @@ -1892,6 +1895,7 @@ class FrontEndActivity : ComponentActivity() { steamRepairQueued = SteamRepair.queued(this) mangoapp = SessionPrefs.mangoapp(this) returnAfterGame = SessionPrefs.returnAfterGame(this) + shaderPrecache = SessionPrefs.shaderPrecache(this) steamController = SessionPrefs.steamController(this) runSteamAtStartup = SessionPrefs.runSteamAtStartup(this) loadBootMovie() 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 47ffb2c934..4824a44424 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -58,6 +58,7 @@ object SessionFiles { "usr/local/bin/droiddeck-steam-install" to "usr/local/bin/droiddeck-steam-install", "usr/local/bin/droiddeck-steam-ui-scale" to "usr/local/bin/droiddeck-steam-ui-scale", "usr/local/bin/droiddeck-steam-language" to "usr/local/bin/droiddeck-steam-language", + "usr/local/bin/droiddeck-steam-shaders" to "usr/local/bin/droiddeck-steam-shaders", "usr/local/bin/droiddeck-steam-desktop-ui" to "usr/local/bin/droiddeck-steam-desktop-ui", "usr/local/bin/droiddeck-steam-library" to "usr/local/bin/droiddeck-steam-library", "usr/local/bin/droiddeck-seed-redists" to "usr/local/bin/droiddeck-seed-redists", 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 f28c687342..057f870708 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -304,6 +304,24 @@ object SessionPrefs { prefs(context).edit().putBoolean("returnAfterGame", on).apply() } + /** + * Shader pre-caching as the launcher last set it, until the next session writes it into the + * client's config.vdf; after that the client's own toggle is the user's again. + */ + fun pendingShaderPrecache(context: Context): Boolean? = + prefs(context).takeIf { it.contains("shaderPrecache") }?.getBoolean("shaderPrecache", true) + + fun setShaderPrecache(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("shaderPrecache", on).apply() + } + + fun takeShaderPrecache(context: Context): Boolean? = + pendingShaderPrecache(context)?.also { prefs(context).edit().remove("shaderPrecache").apply() } + + fun shaderPrecache(context: Context): Boolean = pendingShaderPrecache(context) + ?: runCatching { com.droiddeck.launcher.storage.SteamStorage.shaderPrecache( + java.io.File(steamRoot(context, steamClientArch(context)), "config/config.vdf").readText()) }.getOrDefault(true) + fun stretch16x9(context: Context): Boolean = prefs(context).getBoolean("stretch16x9", false) fun setStretch16x9(context: Context, on: Boolean) { 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 3db04cabc7..253b0fa301 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -673,6 +673,7 @@ class SessionService : Service() { com.droiddeck.launcher.core.AppLanguage.system(this).country, )) guest.add("TZ=" + java.util.TimeZone.getDefault().id) + if (SessionState.mode == MODE_STEAM) SessionPrefs.takeShaderPrecache(this)?.let { guest.add("BL_SHADER_PRECACHE=" + if (it) "1" else "0") } guest.add("XDG_RUNTIME_DIR=" + LinuxRuntime.GUEST_RUNTIME_DIR) guest.add("XDG_SESSION_TYPE=wayland") guest.add("WAYLAND_DISPLAY=wayland-0") diff --git a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt index e707fd59fc..7fecd5aba1 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt @@ -28,6 +28,7 @@ object SteamStorage { private val LAST_PLAYED = Regex("^\\s*\"LastPlayed\"\\s*\"(\\d+)\"", RegexOption.MULTILINE) private val MAPPING = Regex("\"(\\d+)\"\\s*\\{\\s*\"name\"\\s*\"([^\"]*)\"") private val COMPAT_NAME = Regex("\"compat_tools\"\\s*\\{\\s*\"([^\"]+)\"") + private val SHADER_CACHE_OFF = Regex("\"DisableShaderCache\"\\s*\"1\"", RegexOption.IGNORE_CASE) data class Manifest( val file: File, val appId: Int, val name: String, val installDir: String?, @@ -118,6 +119,8 @@ object SteamStorage { return MAPPING.findAll(configVdf.substring(open, end)).associate { it.groupValues[1] to it.groupValues[2] } } + fun shaderPrecache(configVdf: String): Boolean = !SHADER_CACHE_OFF.containsMatchIn(configVdf) + fun compatToolName(compatibilityToolVdf: String): String? = COMPAT_NAME.find(compatibilityToolVdf)?.groupValues?.get(1) private val ARM_IN_NAME = Regex("arm64|aarch64") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index a444f37115..c546a34c35 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -82,6 +82,8 @@ class ModeSettings( val steamClientArch: String? = null, /** Steam only: a game launched from the front end returns there when it closes; null hides the row. */ val returnAfterGame: Boolean? = null, + /** Steam only: the client's Shader Pre-Caching setting; null hides the row. */ + val shaderPrecache: Boolean? = null, val steamRepairQueued: Boolean = false, val mangoapp: Boolean = true, val steamController: String? = null, @@ -136,6 +138,7 @@ class ModeSettingsActions( val onSteamClientArch: (String) -> Unit = {}, val onMangoapp: (Boolean) -> Unit = {}, val onReturnAfterGame: (Boolean) -> Unit = {}, + val onShaderPrecache: (Boolean) -> Unit = {}, val onSteamController: (String) -> Unit = {}, val onUnfoldedControls: (Boolean) -> Unit = {}, val onUnfoldedControlsWithController: (Boolean) -> Unit = {}, @@ -478,6 +481,11 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: stringResource(R.string.mode_return_after_game_hint), s.returnAfterGame, onChange = a.onReturnAfterGame, ) + if (s.shaderPrecache != null) ToggleRow( + host, "shaderprecache", stringResource(R.string.mode_shader_precache), + stringResource(R.string.mode_shader_precache_hint), + s.shaderPrecache, onChange = a.onShaderPrecache, + ) SettingsRow( stringResource(R.string.mode_steam_repair), stringResource(if (s.steamRepairQueued) R.string.mode_steam_repair_queued else R.string.mode_steam_repair_hint), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e62952c4f7..6986345870 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -320,6 +320,8 @@ Turn off if games crash or go black in Deck mode. Applies next session. Return to DroidDeck after a game When a game you started from DroidDeck or another launcher closes, Steam exits cleanly (cloud saves finish first) and you go back there. Off: stay in Steam. + Shader pre-caching + Steam downloads shaders prebuilt for your games and processes them in the background, so games stutter less. Off saves data, storage and battery; games build shaders as they play instead. The same setting as Steam’s Downloads > Shader Pre-Caching. Applies next session. Repair Steam client Downloads the Steam client again the next time Steam starts. Use it if Steam stays on its loading screen. Games, sign-in and settings are kept. The Steam client will be downloaded again the next time Steam starts. diff --git a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt index 794e01d44d..6041c7591f 100644 --- a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt @@ -92,6 +92,22 @@ class SteamStorageTest { assertEquals(emptyMap(), SteamStorage.compatMappings("\"x\" {}")) } + @Test fun readsShaderPrecacheFromConfig() { + val vdf = """ + "InstallConfigStore" + { + "Software" { "Valve" { "Steam" { "ShaderCacheManager" + { + "HasCurrentBucket" "1" + "DisableShaderCache" "1" + } } } } + } + """.trimIndent() + assertEquals(false, SteamStorage.shaderPrecache(vdf)) + assertEquals(true, SteamStorage.shaderPrecache(vdf.replace("\"DisableShaderCache\"\t\t\"1\"", "\"DisableShaderCache\"\t\t\"0\""))) + assertEquals(true, SteamStorage.shaderPrecache("\"InstallConfigStore\" {}")) + } + @Test fun readsCustomToolName() { val vdf = "\"compatibilitytools\"\n{\n \"compat_tools\"\n {\n \"GE-Proton11-9-aarch64\"\n {\n \"install_path\" \".\"\n }\n }\n}" assertEquals("GE-Proton11-9-aarch64", SteamStorage.compatToolName(vdf)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index c33b785524..809b5d4da2 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -531,6 +531,10 @@ case $mode in fi droiddeck-seed-redists "$steam_root" || true fi + if [ -n "${BL_SHADER_PRECACHE:-}" ]; then + droiddeck-steam-shaders "$BL_SHADER_PRECACHE" "$XDG_DATA_HOME/Steam" \ + "${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam" || true + fi if [ "$steam_x64" = 0 ] && [ ! -f "$steam_root/steamapps/appmanifest_4427310.acf" ]; then step "asking the client to fetch the ARM64 Proton" set -- "$@" steam://install/4427310 diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shaders b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shaders new file mode 100755 index 0000000000..da93ebec4c --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shaders @@ -0,0 +1,61 @@ +#!/usr/bin/python3 +"""Sets the Steam client's shader pre-caching (Settings > Downloads), before the client starts. + + droiddeck-steam-shaders <0|1> ... + +The client stores the toggle as InstallConfigStore/Software/Valve/Steam/ShaderCacheManager/ +DisableShaderCache in config/config.vdf: "1" when off, "0" when on. It keeps the setting in memory +and writes config.vdf back on exit, so this runs only while the client is stopped. The launcher +passes a value only after its own toggle changes; otherwise the client's toggle stays the user's.""" +from pathlib import Path +import runpy +import sys + + +VDF = runpy.run_path(str(Path(__file__).with_name("droiddeck-steam-ui-scale"))) +PATH = ("Software", "Valve", "Steam", "ShaderCacheManager", "DisableShaderCache") + + +def set_text(text, enabled): + value = "0" if enabled else "1" + updated, changed = VDF["seed_value"](text, PATH, value) + if changed: + return updated, True + block = VDF["parse"](text).get("InstallConfigStore") + for section in PATH[:-1]: + block = block.get(section) + current = block.get(PATH[-1]) + if isinstance(current, VDF["Block"]): + raise ValueError("invalid DisableShaderCache setting") + if current == value: + return text, False + at = block.offset(PATH[-1]) + end = VDF["TOKEN"].match(text, at).end() + return text[:at] + f'"{value}"' + text[end:], True + + +def apply(steam_root, enabled): + config = Path(steam_root) / "config/config.vdf" + text = config.read_text() if config.exists() else '"InstallConfigStore"\n{\n}\n' + updated, changed = set_text(text, enabled) + if changed: + VDF["atomic_write"](config, updated) + return changed + + +if __name__ == "__main__": + if len(sys.argv) < 3 or sys.argv[1] not in ("0", "1"): + print("usage: droiddeck-steam-shaders <0|1> ...", file=sys.stderr) + sys.exit(2) + enabled = sys.argv[1] == "1" + status = 0 + for root in sys.argv[2:]: + if not Path(root).is_dir(): + continue + try: + if apply(root, enabled): + print(f"== steam: shader pre-caching {'on' if enabled else 'off'} in {root}") + except (OSError, ValueError, RecursionError) as error: + print(f"== steam: left shader pre-caching unchanged in {root}: {error}", file=sys.stderr) + status = 1 + sys.exit(status) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-ui-scale b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-ui-scale index 4a59976842..af809d1245 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-ui-scale +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-ui-scale @@ -26,9 +26,10 @@ TOKEN = re.compile(r'\s+|//[^\n]*|"(?:\\.|[^"\\])*"|[{}]') class Block: - def __init__(self, pairs, end): + def __init__(self, pairs, end, offsets=()): self.pairs = pairs self.end = end + self.offsets = offsets def get(self, name): matches = [value for key, value in self.pairs if key.lower() == name.lower()] @@ -36,6 +37,9 @@ class Block: raise ValueError("duplicate UI setting") return matches[0] if matches else None + def offset(self, name): + return next(at for (key, _), at in zip(self.pairs, self.offsets) if key.lower() == name.lower()) + def parse(text): tokens = [] @@ -51,17 +55,17 @@ def parse(text): raise ValueError("invalid config.vdf") def block(index, nested=False): - pairs = [] + pairs, offsets = [], [] while index < len(tokens): token, offset = tokens[index] if token == '}': if not nested: raise ValueError("unexpected closing brace") - return Block(pairs, offset), index + 1 + return Block(pairs, offset, offsets), index + 1 if not token.startswith('"') or index + 1 == len(tokens): raise ValueError("missing config value") key = token[1:-1] - value = tokens[index + 1][0] + value, at = tokens[index + 1] index += 2 if value == '{': value, index = block(index, True) @@ -70,9 +74,10 @@ def parse(text): else: raise ValueError("invalid config value") pairs.append((key, value)) + offsets.append(at) if nested: raise ValueError("unclosed config block") - return Block(pairs, len(text)), index + return Block(pairs, len(text), offsets), index return block(0)[0] diff --git a/tools/tests/test_steam_shaders.py b/tools/tests/test_steam_shaders.py new file mode 100644 index 0000000000..1d273215a3 --- /dev/null +++ b/tools/tests/test_steam_shaders.py @@ -0,0 +1,88 @@ +from pathlib import Path +import runpy +import tempfile +import unittest + + +BIN = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin' +MODULE = runpy.run_path(str(BIN / 'droiddeck-steam-shaders')) +apply = MODULE['apply'] +set_text = MODULE['set_text'] +parse = runpy.run_path(str(BIN / 'droiddeck-steam-ui-scale'))['parse'] + +THOR = '''"InstallConfigStore" +{ +\t"Software" +\t{ +\t\t"Valve" +\t\t{ +\t\t\t"Steam" +\t\t\t{ +\t\t\t\t"ShaderCacheManager" +\t\t\t\t{ +\t\t\t\t\t"HasCurrentBucket"\t\t"1" +\t\t\t\t\t"ProcessingQueue"\t\t"207140;848350;" +\t\t\t\t\t"App" +\t\t\t\t\t{ +\t\t\t\t\t} +\t\t\t\t} +\t\t\t} +\t\t} +\t} +} +''' + + +def disabled(text): + steam = parse(text).get('InstallConfigStore').get('Software').get('Valve').get('Steam') + return steam.get('ShaderCacheManager').get('DisableShaderCache') + + +class SteamShadersTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.root = Path(self.temp.name) + self.config = self.root / 'config/config.vdf' + self.config.parent.mkdir() + + def test_off_adds_the_key_the_client_writes(self): + text, changed = set_text(THOR, False) + self.assertTrue(changed) + self.assertEqual('1', disabled(text)) + self.assertIn('\t\t\t\t\t"DisableShaderCache"\t\t"1"\n\t\t\t\t}', text) + self.assertIn('"ProcessingQueue"\t\t"207140;848350;"', text) + + def test_existing_value_is_replaced_in_place(self): + off, _ = set_text(THOR, False) + on, changed = set_text(off, True) + self.assertTrue(changed) + self.assertEqual('0', disabled(on)) + self.assertEqual(off.replace('"DisableShaderCache"\t\t"1"', '"DisableShaderCache"\t\t"0"'), on) + + def test_matching_value_leaves_the_file_alone(self): + off, _ = set_text(THOR, False) + self.assertEqual((off, False), set_text(off, False)) + + def test_missing_sections_are_created(self): + text, changed = set_text('"InstallConfigStore"\n{\n}\n', False) + self.assertTrue(changed) + self.assertEqual('1', disabled(text)) + + def test_apply_writes_config_and_creates_a_fresh_one(self): + self.config.write_text(THOR) + self.assertTrue(apply(self.root, False)) + self.assertEqual('1', disabled(self.config.read_text())) + self.assertFalse(apply(self.root, False)) + fresh = Path(self.temp.name) / 'fresh' + fresh.mkdir() + self.assertTrue(apply(fresh, True)) + self.assertEqual('0', disabled((fresh / 'config/config.vdf').read_text())) + + def test_invalid_config_is_rejected(self): + with self.assertRaises(ValueError): + set_text('"InstallConfigStore" {', False) + + +if __name__ == '__main__': + unittest.main() From b76f13f7acc0af0cc00369dde61fb88e40529e6d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 23 Oct 2026 11:33:43 -0400 Subject: [PATCH 028/174] fix: keep the shader pre-caching choice until a session confirms it, and read it from its own VDF section --- .../droiddeck/launcher/FrontEndActivity.kt | 7 ++++- .../launcher/session/SessionPrefs.kt | 26 +++++++++++++------ .../launcher/session/SessionService.kt | 2 +- .../launcher/storage/SteamStorage.kt | 25 ++++++++++++++++-- .../launcher/storage/SteamStorageTest.kt | 8 ++++++ .../overlay/usr/local/bin/droiddeck-session | 3 ++- 6 files changed, 58 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 8ff9a1a487..0180539df3 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1722,7 +1722,12 @@ class FrontEndActivity : ComponentActivity() { syncFallback = SessionPrefs.syncFallback(this) }, onSteamRepair = { steamRepairQueued = SteamRepair.queue(this) }, - onSteamClientArch = { id -> SessionPrefs.setSteamClientArch(this, id); steamClientArch = id; refresh() }, + onSteamClientArch = { id -> + SessionPrefs.setSteamClientArch(this, id) + steamClientArch = id + shaderPrecache = SessionPrefs.shaderPrecache(this) + refresh() + }, onMangoapp = { on -> SessionPrefs.setMangoapp(this, on); mangoapp = on }, onReturnAfterGame = { on -> SessionPrefs.setReturnAfterGame(this, on); returnAfterGame = on }, onShaderPrecache = { on -> SessionPrefs.setShaderPrecache(this, on); shaderPrecache = on }, 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 057f870708..0b8ef2824e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -304,19 +304,29 @@ object SessionPrefs { prefs(context).edit().putBoolean("returnAfterGame", on).apply() } + private fun shaderPrecacheApplied(context: Context) = + java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.bl-shader-precache-applied") + /** - * Shader pre-caching as the launcher last set it, until the next session writes it into the + * Shader pre-caching as the launcher last set it, until a session reports it written into the * client's config.vdf; after that the client's own toggle is the user's again. */ - fun pendingShaderPrecache(context: Context): Boolean? = - prefs(context).takeIf { it.contains("shaderPrecache") }?.getBoolean("shaderPrecache", true) - - fun setShaderPrecache(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("shaderPrecache", on).apply() + fun pendingShaderPrecache(context: Context): Boolean? { + val prefs = prefs(context) + if (!prefs.contains("shaderPrecache")) return null + val on = prefs.getBoolean("shaderPrecache", true) + val applied = shaderPrecacheApplied(context) + val written = runCatching { applied.readText().trim() }.getOrNull() ?: return on + applied.delete() + if (written != if (on) "1" else "0") return on + prefs.edit().remove("shaderPrecache").apply() + return null } - fun takeShaderPrecache(context: Context): Boolean? = - pendingShaderPrecache(context)?.also { prefs(context).edit().remove("shaderPrecache").apply() } + fun setShaderPrecache(context: Context, on: Boolean) { + shaderPrecacheApplied(context).delete() + prefs(context).edit().putBoolean("shaderPrecache", on).apply() + } fun shaderPrecache(context: Context): Boolean = pendingShaderPrecache(context) ?: runCatching { com.droiddeck.launcher.storage.SteamStorage.shaderPrecache( 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 253b0fa301..f014207e9b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -673,7 +673,7 @@ class SessionService : Service() { com.droiddeck.launcher.core.AppLanguage.system(this).country, )) guest.add("TZ=" + java.util.TimeZone.getDefault().id) - if (SessionState.mode == MODE_STEAM) SessionPrefs.takeShaderPrecache(this)?.let { guest.add("BL_SHADER_PRECACHE=" + if (it) "1" else "0") } + if (SessionState.mode == MODE_STEAM) SessionPrefs.pendingShaderPrecache(this)?.let { guest.add("BL_SHADER_PRECACHE=" + if (it) "1" else "0") } guest.add("XDG_RUNTIME_DIR=" + LinuxRuntime.GUEST_RUNTIME_DIR) guest.add("XDG_SESSION_TYPE=wayland") guest.add("WAYLAND_DISPLAY=wayland-0") diff --git a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt index 7fecd5aba1..9697addd64 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt @@ -28,7 +28,8 @@ object SteamStorage { private val LAST_PLAYED = Regex("^\\s*\"LastPlayed\"\\s*\"(\\d+)\"", RegexOption.MULTILINE) private val MAPPING = Regex("\"(\\d+)\"\\s*\\{\\s*\"name\"\\s*\"([^\"]*)\"") private val COMPAT_NAME = Regex("\"compat_tools\"\\s*\\{\\s*\"([^\"]+)\"") - private val SHADER_CACHE_OFF = Regex("\"DisableShaderCache\"\\s*\"1\"", RegexOption.IGNORE_CASE) + private val VDF_TOKEN = Regex("\"((?:\\\\.|[^\"\\\\])*)\"|[{}]|//[^\n]*") + private val SHADER_CACHE_OFF = listOf("InstallConfigStore", "Software", "Valve", "Steam", "ShaderCacheManager", "DisableShaderCache") data class Manifest( val file: File, val appId: Int, val name: String, val installDir: String?, @@ -119,7 +120,27 @@ object SteamStorage { return MAPPING.findAll(configVdf.substring(open, end)).associate { it.groupValues[1] to it.groupValues[2] } } - fun shaderPrecache(configVdf: String): Boolean = !SHADER_CACHE_OFF.containsMatchIn(configVdf) + fun shaderPrecache(configVdf: String): Boolean = vdfValue(configVdf, SHADER_CACHE_OFF) != "1" + + private fun vdfValue(text: String, path: List): String? { + val blocks = ArrayList() + var key: String? = null + for (token in VDF_TOKEN.findAll(text)) { + val name = key + when { + token.value.startsWith("//") -> {} + token.value == "{" -> { blocks.add(name.orEmpty()); key = null } + token.value == "}" -> { blocks.removeLastOrNull(); key = null } + name == null -> key = token.groupValues[1] + else -> { + val at = blocks + name + if (at.size == path.size && at.zip(path).all { (a, b) -> a.equals(b, ignoreCase = true) }) return token.groupValues[1] + key = null + } + } + } + return null + } fun compatToolName(compatibilityToolVdf: String): String? = COMPAT_NAME.find(compatibilityToolVdf)?.groupValues?.get(1) diff --git a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt index 6041c7591f..0cfbf2e054 100644 --- a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt @@ -106,6 +106,14 @@ class SteamStorageTest { assertEquals(false, SteamStorage.shaderPrecache(vdf)) assertEquals(true, SteamStorage.shaderPrecache(vdf.replace("\"DisableShaderCache\"\t\t\"1\"", "\"DisableShaderCache\"\t\t\"0\""))) assertEquals(true, SteamStorage.shaderPrecache("\"InstallConfigStore\" {}")) + assertEquals(true, SteamStorage.shaderPrecache(""" + "InstallConfigStore" + { + // "DisableShaderCache" "1" + "Other" { "DisableShaderCache" "1" } + "Software" { "Valve" { "Steam" { "ShaderCacheManager" { "DisableShaderCache" "0" } } } } + } + """.trimIndent())) } @Test fun readsCustomToolName() { diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 809b5d4da2..3badd65ec9 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -533,7 +533,8 @@ case $mode in fi if [ -n "${BL_SHADER_PRECACHE:-}" ]; then droiddeck-steam-shaders "$BL_SHADER_PRECACHE" "$XDG_DATA_HOME/Steam" \ - "${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam" || true + "${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam" && + echo "$BL_SHADER_PRECACHE" > "$HOME/.bl-shader-precache-applied" || true fi if [ "$steam_x64" = 0 ] && [ ! -f "$steam_root/steamapps/appmanifest_4427310.acf" ]; then step "asking the client to fetch the ARM64 Proton" From 7c51e6e904ec0caa6015ab9da09ea3fc5fd3fda0 Mon Sep 17 00:00:00 2001 From: 0x1Nawaf Date: Fri, 23 Oct 2026 15:53:11 +0000 Subject: [PATCH 029/174] fix: draw the gamescope cursor only when that option is on The extra plane costs frames on a phone, so compositing stays off unless Performance asks for it. --- .../droiddeck/launcher/FrontEndActivity.kt | 6 ++++- .../launcher/session/SessionPrefs.kt | 7 ++++++ .../launcher/session/SessionService.kt | 1 + .../launcher/session/SettingsReset.kt | 2 +- .../launcher/ui/PerformanceDialog.kt | 7 ++++++ app/src/main/res/values/strings.xml | 2 ++ .../overlay/usr/local/bin/droiddeck-session | 4 +++- tools/tests/test_session_cursor_routing.py | 22 +++++++++++++------ 8 files changed, 41 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 0180539df3..1a06392013 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -155,6 +155,7 @@ class FrontEndActivity : ComponentActivity() { private var gpuClockPin by mutableStateOf(false) private var prootNoSeccomp by mutableStateOf(false) private var prootFastPath by mutableStateOf(true) + private var cursorComposite by mutableStateOf(false) private var guestHostname by mutableStateOf(SessionPrefs.DEFAULT_GUEST_HOSTNAME) private var phantomWarning by mutableStateOf(null) private var phantomProcessStatus by mutableStateOf(PhantomProcessStatus.NOT_APPLICABLE) @@ -1771,7 +1772,8 @@ class FrontEndActivity : ComponentActivity() { fsyncFirst = fsyncFirst, gamescopeRealtime = gamescopeRealtime, gpuClockPin = gpuClockPin, - prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, guestHostname = guestHostname, phantomWarning = phantomWarning, + prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, cursorComposite = cursorComposite, + guestHostname = guestHostname, phantomWarning = phantomWarning, onClientOverride = { on -> SessionPrefs.setClientCpusOverride(this, on); clientOverride = on }, onTuSysmem = { on -> SessionPrefs.setTuSysmem(this, on); tuSysmem = on }, onZinkLazy = { on -> SessionPrefs.setZinkLazy(this, on); zinkLazy = on }, @@ -1785,6 +1787,7 @@ class FrontEndActivity : ComponentActivity() { onGpuClockPin = { on -> SessionPrefs.setGpuClockPin(this, on); gpuClockPin = on }, onProotNoSeccomp = { on -> SessionPrefs.setProotNoSeccomp(this, on); prootNoSeccomp = on }, onProotFastPath = { on -> SessionPrefs.setProotFastPath(this, on); prootFastPath = on }, + onCursorComposite = { on -> SessionPrefs.setCursorComposite(this, on); cursorComposite = on }, onGuestHostname = { name -> SessionPrefs.setGuestHostname(this, name) }, onClientCore = { core, on -> clientCores = if (on) clientCores + core else clientCores - core @@ -1967,6 +1970,7 @@ class FrontEndActivity : ComponentActivity() { gpuClockPin = SessionPrefs.gpuClockPin(this) prootNoSeccomp = SessionPrefs.prootNoSeccomp(this) prootFastPath = SessionPrefs.prootFastPath(this) + cursorComposite = SessionPrefs.cursorComposite(this) guestHostname = SessionPrefs.guestHostname(this) refreshPhantomStatus() } 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 0b8ef2824e..5d5861d3a7 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -472,6 +472,13 @@ object SessionPrefs { prefs(context).edit().putBoolean("prootFastPath", on).apply() } + /** gamescope draws the cursor itself. Off by default: on a phone that plane costs frames. */ + fun cursorComposite(context: Context): Boolean = prefs(context).getBoolean("cursorComposite", false) + + fun setCursorComposite(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("cursorComposite", on).apply() + } + const val DEFAULT_GUEST_HOSTNAME = "DroidDeck" @JvmStatic 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 f014207e9b..44f6cc4c4c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -720,6 +720,7 @@ class SessionService : Service() { guest.add("BL_SYNC_FALLBACK=" + (if (SessionPrefs.syncFallback(this)) "1" else "0")) guest.add("BL_FSYNC_FIRST=" + (if (SessionPrefs.fsyncFirst(this)) "1" else "0")) guest.add("BL_GAMESCOPE_REALTIME=" + (if (SessionPrefs.gamescopeRealtime(this)) "1" else "0")) + if (SessionPrefs.cursorComposite(this)) guest.add("BL_CURSOR_COMPOSITE=1") if (com.droiddeck.launcher.core.ZramSupport.supported()) guest.add("BL_ZRAM=1") guest.add("BANNER_AUDIO_DIRECT_DECAY=0") val extra = extraEnv() + com.droiddeck.launcher.agent.AgentEnv.beginSession(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 0c430c1c5e..27bc081b0d 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 { "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", - "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", + "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "cursorComposite", "guestHostname", "fexPreset", "forceSsbs", "logs", "storageDiagnostics", "upscaler", "upscaleSharpness", "screenEffects", "textureAnisotropy", "textureLodBias", "steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds", 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 b46133463a..25f344a77a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -46,6 +46,7 @@ fun PerformancePage( gpuClockPin: Boolean, prootNoSeccomp: Boolean, prootFastPath: Boolean, + cursorComposite: Boolean, guestHostname: String, phantomWarning: String?, onClientOverride: (Boolean) -> Unit, @@ -61,6 +62,7 @@ fun PerformancePage( onGpuClockPin: (Boolean) -> Unit, onProotNoSeccomp: (Boolean) -> Unit, onProotFastPath: (Boolean) -> Unit, + onCursorComposite: (Boolean) -> Unit, onGuestHostname: (String) -> Unit, onClientCore: (Int, Boolean) -> Unit, onGameCore: (Int, Boolean) -> Unit, @@ -158,6 +160,11 @@ fun PerformancePage( else stringResource(R.string.perf_fastpath_hint), prootFastPath && !prootNoSeccomp, enabled = !prootNoSeccomp, onChange = onProotFastPath, ) + ToggleRow( + host, "cursorcomposite", stringResource(R.string.perf_cursor_composite), + stringResource(R.string.perf_cursor_composite_hint), + cursorComposite, onChange = onCursorComposite, + ) } SettingsGroup(stringResource(R.string.perf_identity)) { var draft by remember(guestHostname) { mutableStateOf(guestHostname) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6986345870..26fe5a93e8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -568,6 +568,8 @@ proot fast path Needs proot\'s seccomp filter. Faster file lookups and less stutter. Turn off if a program can\'t find its files. + Draw the cursor inside gamescope + Gamescope paints the pointer itself instead of handing it to Android. Turn on for a controller-driven cursor. Off is faster on a phone. Applies next session. Session identity Host name The name Steam sees for this device. Blank restores %1$s. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 3badd65ec9..d8a44be52f 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -227,7 +227,9 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== gamescope: games at ${nested}x${height} stretched to the ${width}x${height} output" fi fi - if [ "$mode" = steam ]; then + # Off unless Performance asks for it. Compositing the cursor here adds a second + # plane on the phone's compositor; a controller-driven cursor is the reason to turn it on. + if [ "$mode" = steam ] && [ "${BL_CURSOR_COMPOSITE:-0}" = 1 ]; then export gamescope_cursor_composite=2 fi args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$height") diff --git a/tools/tests/test_session_cursor_routing.py b/tools/tests/test_session_cursor_routing.py index fdc88f75d8..60d28edc41 100644 --- a/tools/tests/test_session_cursor_routing.py +++ b/tools/tests/test_session_cursor_routing.py @@ -1,4 +1,4 @@ -"""The XTest cursor path is enabled only for Steam sessions.""" +"""Gamescope composites the cursor only when a Steam session asks for it.""" import os from pathlib import Path import re @@ -8,29 +8,37 @@ import unittest SESSION = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session' SOURCE = SESSION.read_text() MATCH = re.search( - r'^ if \[ "\$mode" = steam \]; then\n.*?^ fi\n', SOURCE, re.M | re.S) + r'^ if \[ "\$mode" = steam \] && \[ "\$\{BL_CURSOR_COMPOSITE:-0\}" = 1 \]; then\n.*?^ fi\n', + SOURCE, re.M | re.S) assert MATCH is not None CURSOR_SETUP = MATCH.group(0) class SessionCursorRoutingTest(unittest.TestCase): - def run_setup(self, mode, initial=None): + def run_setup(self, mode, initial=None, composite=None): env = dict(os.environ, mode=mode) if initial is not None: env['gamescope_cursor_composite'] = initial else: env.pop('gamescope_cursor_composite', None) + if composite is not None: + env['BL_CURSOR_COMPOSITE'] = composite + else: + env.pop('BL_CURSOR_COMPOSITE', None) result = subprocess.run( ['bash', '-c', CURSOR_SETUP + 'printf "%s\n" "${gamescope_cursor_composite-}"'], env=env, text=True, capture_output=True, check=True) return result.stdout.strip() - def test_steam_enables_manual_composition_for_the_nested_cursor(self): - self.assertEqual('2', self.run_setup('steam')) + def test_steam_leaves_the_cursor_with_the_host_unless_asked(self): + self.assertEqual('', self.run_setup('steam')) + + def test_steam_composites_the_cursor_when_the_setting_is_on(self): + self.assertEqual('2', self.run_setup('steam', composite='1')) def test_other_sessions_keep_their_existing_cursor_composition(self): - self.assertEqual('', self.run_setup('desktop')) - self.assertEqual('1', self.run_setup('run', '1')) + self.assertEqual('', self.run_setup('desktop', composite='1')) + self.assertEqual('1', self.run_setup('run', '1', composite='1')) if __name__ == '__main__': From 74d5daaa5d759d22f9196b08b8205f2e4eb83467 Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 12:50:08 -0400 Subject: [PATCH 030/174] ci: parallelize regression checks and isolate component caches --- .github/workflows/build.yml | 94 ++++++++++++++++++++------- tools/ci/install-ubuntu-packages.sh | 12 ++++ tools/tests/test_ci_checks.py | 29 +++++++++ tools/tests/test_xbox_build_source.py | 6 +- 4 files changed, 117 insertions(+), 24 deletions(-) create mode 100644 tools/ci/install-ubuntu-packages.sh create mode 100644 tools/tests/test_ci_checks.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ebfd545ca2..f2edd43a20 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ concurrency: cancel-in-progress: ${{ github.event_name == 'pull_request' }} env: - PRELOAD_CACHE_VERSION: v6 + PRELOAD_CACHE_VERSION: v7 jobs: xbox: @@ -68,8 +68,7 @@ jobs: if: steps.xbox-cache.outputs.cache-hit != 'true' run: | rustup toolchain install 1.99.0 --profile minimal - sudo apt-get update -qq - sudo apt-get install -y build-essential pkg-config libssl-dev protobuf-compiler cmake xz-utils + bash tools/ci/install-ubuntu-packages.sh build-essential pkg-config libssl-dev protobuf-compiler cmake xz-utils bash tools/xbox/build.sh - uses: actions/upload-artifact@v4 with: @@ -87,7 +86,7 @@ jobs: build: needs: xbox - name: Compile and test APK + name: Compile APK and Android tests if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} runs-on: ubuntu-24.04 timeout-minutes: 45 @@ -254,16 +253,17 @@ jobs: id: preloads uses: actions/cache@v4 with: - path: app/src/main/assets/linuxfs - key: preloads-${{ env.PRELOAD_CACHE_VERSION }}-${{ hashFiles('app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/cpp/adrenotools/src/hook/kgsl.h', 'tools/quest/*', 'tools/linuxfs/preload/*.c', 'tools/linuxfs/build-x86-preloads.sh', 'tools/linuxfs/fex/*', 'tools/linuxfs/clipboard/*.c', 'tools/linuxfs/ssbs/*.c', 'tools/proot/fastpath/*.c', 'tools/linuxfs/overlay/usr/local/bin/*', 'tools/linuxfs/overlay/usr/bin/**', 'tools/linuxfs/desktop/*', 'tools/gamescope/release.env', 'tools/wlroots/release.env', 'tools/linuxfs/uruntime.env', 'tools/linuxfs/licenses/*', 'tools/mangoapp/*', 'tools/msitools/**', 'tools/comet/**', 'tools/xbox/**', 'tools/linuxfs/debian-image.env', 'tools/vr/**') }} + path: | + app/src/main/assets/linuxfs + !app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet + !app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox + key: preloads-${{ env.PRELOAD_CACHE_VERSION }}-${{ hashFiles('app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/cpp/adrenotools/src/hook/kgsl.h', 'tools/quest/*', 'tools/linuxfs/preload/*.c', 'tools/linuxfs/build-x86-preloads.sh', 'tools/linuxfs/fex/*', 'tools/linuxfs/clipboard/*.c', 'tools/linuxfs/ssbs/*.c', 'tools/proot/fastpath/*.c', 'tools/linuxfs/overlay/usr/local/bin/*', 'tools/linuxfs/overlay/usr/bin/**', 'tools/linuxfs/desktop/*', 'tools/gamescope/release.env', 'tools/wlroots/release.env', 'tools/linuxfs/uruntime.env', 'tools/linuxfs/licenses/*', 'tools/mangoapp/*', 'tools/msitools/**', 'tools/linuxfs/debian-image.env', 'tools/pipewire/**', 'tools/ci/install-ubuntu-packages.sh', 'tools/vr/**') }} - name: Build libfakeinput.so and libblsession.so (glibc aarch64) if: steps.preloads.outputs.cache-hit != 'true' run: | set -euo pipefail - sudo apt-get -o Dir::Etc::sourcelist=sources.list.d/ubuntu.sources \ - -o Dir::Etc::sourceparts=- -o Acquire::Retries=3 update -qq - sudo apt-get install -y -qq gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libvulkan1 mesa-vulkan-drivers >/dev/null + bash tools/ci/install-ubuntu-packages.sh gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libvulkan1 mesa-vulkan-drivers D=app/src/main/assets/linuxfs mkdir -p "$D" aarch64-linux-gnu-g++ -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \ @@ -525,9 +525,10 @@ jobs: ~/.cargo/git/db ~/.cargo/bin/cargo-ndk app/src/main/rust/stores/target - key: stores-${{ steps.rust.outputs.rustc }}-${{ hashFiles('app/src/main/rust/stores/Cargo.lock') }} + key: stores-v2-${{ runner.os }}-${{ runner.arch }}-${{ env.NDK_VERSION }}-${{ steps.rust.outputs.rustc }}-${{ hashFiles('app/src/main/rust/stores/Cargo.lock') }}-${{ hashFiles('app/src/main/rust/stores/src/**', 'app/src/main/rust/stores/Cargo.toml', 'app/src/main/rust/stores/build.rs', 'app/src/main/rust/stores/.cargo/**', 'app/build.gradle') }} restore-keys: | - stores-${{ steps.rust.outputs.rustc }}- + stores-v2-${{ runner.os }}-${{ runner.arch }}-${{ env.NDK_VERSION }}-${{ steps.rust.outputs.rustc }}-${{ hashFiles('app/src/main/rust/stores/Cargo.lock') }}- + stores-v2-${{ runner.os }}-${{ runner.arch }}-${{ env.NDK_VERSION }}-${{ steps.rust.outputs.rustc }}- - name: cargo-ndk run: | @@ -550,9 +551,19 @@ jobs: name: xbox-arm64 path: app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox + - name: Cache GOG Galaxy companion + id: comet + uses: actions/cache@v4 + with: + path: app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet + key: comet-${{ runner.os }}-${{ runner.arch }}-rust1.90.0-${{ hashFiles('tools/comet/**') }} + - name: Build GOG Galaxy companion - if: steps.preloads.outputs.cache-hit != 'true' + if: steps.comet.outputs.cache-hit != 'true' run: | + if ! command -v aarch64-linux-gnu-gcc >/dev/null; then + bash tools/ci/install-ubuntu-packages.sh gcc-aarch64-linux-gnu + fi rustup toolchain install 1.90.0 --profile minimal rustup target add --toolchain 1.90.0 aarch64-unknown-linux-gnu RUSTUP_TOOLCHAIN=1.90.0 bash tools/comet/build.sh @@ -598,14 +609,6 @@ jobs: path: app/src/main/rust/stores/Cargo.lock if-no-files-found: ignore - - name: Install Python test dependencies - run: | - sudo apt-get update -qq - sudo apt-get install -y -qq python3-yaml gcc-aarch64-linux-gnu qemu-user - - - name: Steam import and game environment tests - run: python3 -m unittest discover -s tools/tests -p 'test_*.py' - - name: Unit tests id: unit-tests run: | @@ -699,7 +702,7 @@ jobs: echo "The \`droiddeck-apk\` artifact is [on this run]($RUN_URL), signed with the public test key." echo if [ "$SAME_REPO" = true ]; then - echo "A release-signed tester build that installs over Stable or Preview is being published now and will appear in DroidDeck's **Test builds** list. Label the PR \`no-test-build\` to skip that." + echo "After the parallel regression tests pass, a release-signed tester build that installs over Stable or Preview will be published and will appear in DroidDeck's **Test builds** list. Label the PR \`no-test-build\` to skip that." else echo "**Maintainer:** add the \`publish-test\` label to publish a release-signed tester build that installs over Stable or Preview and appears in DroidDeck's **Test builds** list. The label is removed automatically after publishing." fi @@ -761,8 +764,53 @@ jobs: gh api -X POST "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" -F body=@/tmp/pr-report.md >/dev/null fi + python-tests: + name: Python and native regression tests + needs: xbox + if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} + runs-on: ubuntu-24.04 + timeout-minutes: 15 + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + fetch-depth: 0 + persist-credentials: false + - name: Merge the pinned APK base + if: github.event_name == 'pull_request' + env: + BUILD_BASE_SHA: ${{ needs.xbox.outputs.base-sha }} + run: | + set -euo pipefail + git fetch --no-tags origin "$BUILD_BASE_SHA" + git config user.name "ci" + git config user.email "ci@users.noreply.github.com" + git merge --no-ff --no-edit FETCH_HEAD + - name: Verify backend and test source match + env: + XBOX_SOURCE_TREE: ${{ needs.xbox.outputs.tree-sha }} + run: test "$(git rev-parse 'HEAD^{tree}')" = "$XBOX_SOURCE_TREE" + - name: Install Python test dependencies + timeout-minutes: 5 + run: bash tools/ci/install-ubuntu-packages.sh python3-yaml gcc-aarch64-linux-gnu qemu-user libvulkan1 mesa-vulkan-drivers + - name: Steam import and game environment tests + run: python3 -m unittest discover -s tools/tests -p 'test_*.py' + + checks: + name: Compile and test APK + needs: [build, python-tests] + if: ${{ always() && (github.event_name != 'pull_request' || !github.event.pull_request.draft) }} + runs-on: ubuntu-24.04 + timeout-minutes: 5 + steps: + - name: Require compilation and every test job + env: + BUILD_RESULT: ${{ needs.build.result }} + PYTHON_RESULT: ${{ needs.python-tests.result }} + run: test "$BUILD_RESULT" = success && test "$PYTHON_RESULT" = success + sign: - needs: build + needs: [build, checks] if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' permissions: contents: read @@ -774,7 +822,7 @@ jobs: secrets: inherit packs: - needs: build + needs: [build, checks] if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' permissions: contents: read diff --git a/tools/ci/install-ubuntu-packages.sh b/tools/ci/install-ubuntu-packages.sh new file mode 100644 index 0000000000..d235531789 --- /dev/null +++ b/tools/ci/install-ubuntu-packages.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -euo pipefail +options=( + -o Dir::Etc::sourcelist=sources.list.d/ubuntu.sources + -o Dir::Etc::sourceparts=- + -o Acquire::Retries=3 + -o Acquire::http::Timeout=30 + -o Acquire::https::Timeout=30 + -o DPkg::Lock::Timeout=60 +) +sudo apt-get "${options[@]}" -o APT::Update::Error-Mode=any update -qq +sudo env DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get "${options[@]}" install -y -qq --no-install-recommends "$@" diff --git a/tools/tests/test_ci_checks.py b/tools/tests/test_ci_checks.py new file mode 100644 index 0000000000..edeb6dec0d --- /dev/null +++ b/tools/tests/test_ci_checks.py @@ -0,0 +1,29 @@ +import itertools +import os +from pathlib import Path +import subprocess +import unittest + +import yaml + + +ROOT = Path(__file__).resolve().parents[2] + + +class CiChecksTest(unittest.TestCase): + def test_required_status_rejects_failed_cancelled_or_skipped_test_jobs(self): + 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.assertIn('always()', gate['if']) + for build, python in itertools.product(('success', 'failure', 'cancelled', 'skipped'), repeat=2): + with self.subTest(build=build, python=python): + result = subprocess.run( + ['bash', '-c', gate['steps'][0]['run']], + env=dict(os.environ, BUILD_RESULT=build, PYTHON_RESULT=python), + capture_output=True) + self.assertEqual(result.returncode == 0, build == python == 'success') + for publisher in ('sign', 'packs'): + self.assertIn('checks', jobs[publisher]['needs']) + diff --git a/tools/tests/test_xbox_build_source.py b/tools/tests/test_xbox_build_source.py index 8177a1cbcc..15e35ca5e5 100644 --- a/tools/tests/test_xbox_build_source.py +++ b/tools/tests/test_xbox_build_source.py @@ -31,7 +31,7 @@ class XboxBuildSourceTest(unittest.TestCase): git('switch', '-q', 'main') (root / 'backend').write_text('merged backend') git('commit', '-qam', 'backend changed after branch') - for name in ('xbox', 'apk'): + for name in ('xbox', 'apk', 'tests'): git('clone', '-q', str(root), str(root / name)) git('checkout', '-q', head, cwd=root / name) output = root / 'output' @@ -46,3 +46,7 @@ class XboxBuildSourceTest(unittest.TestCase): subprocess.run(['bash', '-c', step('build', 'Verify backend and APK source match')], cwd=root / 'apk', env=env, check=True, capture_output=True) self.assertEqual((root / 'apk/backend').read_text(), 'merged backend') self.assertEqual(git('rev-parse', 'HEAD^{tree}', cwd=root / 'apk'), tree) + + subprocess.run(['bash', '-c', step('python-tests', 'Merge the pinned APK base')], cwd=root / 'tests', env=env, check=True, capture_output=True) + subprocess.run(['bash', '-c', step('python-tests', 'Verify backend and test source match')], cwd=root / 'tests', env=env, check=True, capture_output=True) + self.assertEqual(git('rev-parse', 'HEAD^{tree}', cwd=root / 'tests'), tree) From fcf4c09c505d3d856ea1963e9db533f1b460235d Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 12:52:02 -0400 Subject: [PATCH 031/174] test: verify dependency installation fails closed --- tools/tests/test_ci_checks.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tools/tests/test_ci_checks.py b/tools/tests/test_ci_checks.py index edeb6dec0d..dd26885fbe 100644 --- a/tools/tests/test_ci_checks.py +++ b/tools/tests/test_ci_checks.py @@ -2,6 +2,7 @@ import itertools import os from pathlib import Path import subprocess +import tempfile import unittest import yaml @@ -11,6 +12,28 @@ ROOT = Path(__file__).resolve().parents[2] class CiChecksTest(unittest.TestCase): + def test_dependency_update_errors_block_installation(self): + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + sudo = root / 'sudo' + sudo.write_text('#!/bin/bash\nprintf "%s\\n" "$*" >> "$APT_LOG"\nexit "${APT_RESULT:-0}"\n') + sudo.chmod(0o755) + log = root / 'apt.log' + env = dict(os.environ, PATH=str(root) + os.pathsep + os.environ['PATH'], APT_LOG=str(log)) + installer = ROOT / 'tools/ci/install-ubuntu-packages.sh' + result = subprocess.run(['bash', str(installer), 'qemu-user'], env=dict(env, APT_RESULT='17')) + self.assertEqual(result.returncode, 17) + self.assertEqual(len(log.read_text().splitlines()), 1) + log.unlink() + subprocess.run(['bash', str(installer), 'qemu-user'], env=env, check=True) + update, install = log.read_text().splitlines() + for command in (update, install): + self.assertIn('Dir::Etc::sourceparts=-', command) + self.assertIn('Acquire::https::Timeout=30', command) + self.assertIn('Acquire::Retries=3', command) + self.assertIn('APT::Update::Error-Mode=any', update) + self.assertIn('install -y -qq --no-install-recommends qemu-user', install) + def test_required_status_rejects_failed_cancelled_or_skipped_test_jobs(self): jobs = yaml.safe_load((ROOT / '.github/workflows/build.yml').read_text())['jobs'] gate = jobs['checks'] From 8355c1495b2751e682fc02d5bcce1911dedd00a9 Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 13:00:46 -0400 Subject: [PATCH 032/174] ci: bound apt phases and retry the official Ubuntu mirror --- .github/workflows/build.yml | 2 +- tools/ci/install-ubuntu-packages.sh | 40 ++++++++++++++++++++++++----- tools/tests/test_ci_checks.py | 11 +++++--- 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2edd43a20..6cbc9a6c01 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -791,7 +791,7 @@ jobs: XBOX_SOURCE_TREE: ${{ needs.xbox.outputs.tree-sha }} run: test "$(git rev-parse 'HEAD^{tree}')" = "$XBOX_SOURCE_TREE" - name: Install Python test dependencies - timeout-minutes: 5 + timeout-minutes: 7 run: bash tools/ci/install-ubuntu-packages.sh python3-yaml gcc-aarch64-linux-gnu qemu-user libvulkan1 mesa-vulkan-drivers - name: Steam import and game environment tests run: python3 -m unittest discover -s tools/tests -p 'test_*.py' diff --git a/tools/ci/install-ubuntu-packages.sh b/tools/ci/install-ubuntu-packages.sh index d235531789..1597613aaa 100644 --- a/tools/ci/install-ubuntu-packages.sh +++ b/tools/ci/install-ubuntu-packages.sh @@ -1,12 +1,40 @@ #!/usr/bin/env bash set -euo pipefail +missing=() +for package in "$@"; do + if [ "$(dpkg-query -W -f='${Status}' "$package" 2>/dev/null || true)" != 'install ok installed' ]; then + missing+=("$package") + fi +done +if [ "${#missing[@]}" = 0 ]; then + echo "Ubuntu build dependencies are already installed." + exit 0 +fi options=( -o Dir::Etc::sourcelist=sources.list.d/ubuntu.sources -o Dir::Etc::sourceparts=- - -o Acquire::Retries=3 - -o Acquire::http::Timeout=30 - -o Acquire::https::Timeout=30 - -o DPkg::Lock::Timeout=60 + -o Acquire::Retries=1 + -o Acquire::http::Timeout=15 + -o Acquire::https::Timeout=15 + -o DPkg::Lock::Timeout=30 ) -sudo apt-get "${options[@]}" -o APT::Update::Error-Mode=any update -qq -sudo env DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get "${options[@]}" install -y -qq --no-install-recommends "$@" +install_packages() { + echo "Updating Ubuntu package indexes." + sudo timeout --kill-after=10s 60s apt-get "${options[@]}" -o APT::Update::Error-Mode=any update -q || return $? + echo "Installing: ${missing[*]}" + sudo timeout --kill-after=10s 120s env DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get "${options[@]}" install -y -q --no-install-recommends "${missing[@]}" +} +if install_packages; then + exit 0 +fi +echo "::warning::Runner mirror failed or timed out; retrying with the official Ubuntu mirror." +sources=$(mktemp --suffix=.sources) +trap 'rm -f "$sources"' EXIT +mirror=https://archive.ubuntu.com/ubuntu +case "$(dpkg --print-architecture)" in + arm64) mirror=https://ports.ubuntu.com/ubuntu-ports ;; +esac +sed -E "s@^URIs:.*@URIs: $mirror@" /etc/apt/sources.list.d/ubuntu.sources > "$sources" +chmod 644 "$sources" +options[1]="Dir::Etc::sourcelist=$sources" +install_packages diff --git a/tools/tests/test_ci_checks.py b/tools/tests/test_ci_checks.py index dd26885fbe..df472a47d5 100644 --- a/tools/tests/test_ci_checks.py +++ b/tools/tests/test_ci_checks.py @@ -18,21 +18,24 @@ class CiChecksTest(unittest.TestCase): sudo = root / 'sudo' sudo.write_text('#!/bin/bash\nprintf "%s\\n" "$*" >> "$APT_LOG"\nexit "${APT_RESULT:-0}"\n') sudo.chmod(0o755) + query = root / 'dpkg-query' + query.write_text('#!/bin/sh\nexit 1\n') + query.chmod(0o755) log = root / 'apt.log' env = dict(os.environ, PATH=str(root) + os.pathsep + os.environ['PATH'], APT_LOG=str(log)) installer = ROOT / 'tools/ci/install-ubuntu-packages.sh' result = subprocess.run(['bash', str(installer), 'qemu-user'], env=dict(env, APT_RESULT='17')) self.assertEqual(result.returncode, 17) - self.assertEqual(len(log.read_text().splitlines()), 1) + self.assertEqual(len(log.read_text().splitlines()), 2) log.unlink() subprocess.run(['bash', str(installer), 'qemu-user'], env=env, check=True) update, install = log.read_text().splitlines() for command in (update, install): self.assertIn('Dir::Etc::sourceparts=-', command) - self.assertIn('Acquire::https::Timeout=30', command) - self.assertIn('Acquire::Retries=3', command) + self.assertIn('Acquire::https::Timeout=15', command) + self.assertIn('Acquire::Retries=1', command) self.assertIn('APT::Update::Error-Mode=any', update) - self.assertIn('install -y -qq --no-install-recommends qemu-user', install) + self.assertIn('install -y -q --no-install-recommends qemu-user', install) def test_required_status_rejects_failed_cancelled_or_skipped_test_jobs(self): jobs = yaml.safe_load((ROOT / '.github/workflows/build.yml').read_text())['jobs'] From a4447039b9b377bbd8366bb07826bbfa22f7aa38 Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 13:09:42 -0400 Subject: [PATCH 033/174] ci: install native Vulkan and ARM64 C headers for tests --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6cbc9a6c01..94dbf6baf8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -792,7 +792,7 @@ jobs: run: test "$(git rev-parse 'HEAD^{tree}')" = "$XBOX_SOURCE_TREE" - name: Install Python test dependencies timeout-minutes: 7 - run: bash tools/ci/install-ubuntu-packages.sh python3-yaml gcc-aarch64-linux-gnu qemu-user libvulkan1 mesa-vulkan-drivers + run: bash tools/ci/install-ubuntu-packages.sh python3-yaml gcc-aarch64-linux-gnu libc6-dev-arm64-cross qemu-user libvulkan-dev mesa-vulkan-drivers - name: Steam import and game environment tests run: python3 -m unittest discover -s tools/tests -p 'test_*.py' From fc768a3c4517ba266a0234132751c89685097786 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 23 Oct 2026 10:55:46 -0400 Subject: [PATCH 034/174] feat: add an A740 UBWC compatibility override --- .../com/droiddeck/launcher/DriverMenus.kt | 14 +++++ .../droiddeck/launcher/FrontEndActivity.kt | 1 + .../com/droiddeck/launcher/SessionActivity.kt | 2 +- .../droiddeck/launcher/core/DeviceReport.kt | 7 ++- .../com/droiddeck/launcher/gpu/TpUbwcHint.kt | 23 ++++++--- .../launcher/session/SessionPrefs.kt | 13 +++++ .../launcher/session/SessionService.kt | 4 +- .../droiddeck/launcher/ui/GpuDriversPanel.kt | 25 +++++++++ .../launcher/wayland/CompositorHost.kt | 3 +- app/src/main/res/values/strings.xml | 3 ++ .../droiddeck/launcher/DriverMenusAutoTest.kt | 14 +++++ .../droiddeck/launcher/gpu/TpUbwcHintTest.kt | 19 +++++++ .../launcher/session/TpUbwcPrefsTest.kt | 51 +++++++++++++++++++ 13 files changed, 168 insertions(+), 11 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index 7ccbba7f55..a630cc184f 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -55,6 +55,9 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl private set private var runtimePending by mutableStateOf(false) private var sessionRunning by mutableStateOf(false) + private var initialTpUbwcMode: String? = null + var tpUbwcMode: String by mutableStateOf(SessionPrefs.TP_UBWC_AUTO) + private set val uiMode: String get() = when (mode) { SessionPrefs.GPU_DRIVERS_AUTO -> GPU_MODE_AUTO @@ -73,8 +76,17 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl mode = uiMode, display = displaySlot(), runtime = runtimeSlot(), canRestart = !sessionRunning, checkedAt = TurnipReleases.cached(activity)?.checkedAt ?: 0L, + tpUbwcMode = tpUbwcMode.takeIf { gpu.model == 740 }, + tpUbwcRestartRequired = (initialTpUbwcMode != null && tpUbwcMode != initialTpUbwcMode) || + com.droiddeck.launcher.gpu.TpUbwcHint.restartRequired(activity), ) + fun chooseTpUbwcMode(mode: String) { + if (gpu.model != 740) return + SessionPrefs.setTpUbwcMode(activity, mode) + tpUbwcMode = mode + } + private fun slotSource(chosenDefault: Boolean, defaultLabel: Int): String = activity.getString(when { uiMode == GPU_MODE_AUTO -> R.string.gpu_src_auto uiMode == GPU_MODE_PAIR && pairRows.any { it.active } -> R.string.gpu_src_pair @@ -124,6 +136,8 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl var androidSelected by mutableStateOf("") fun refreshDrivers() { + tpUbwcMode = SessionPrefs.tpUbwcMode(activity) + if (initialTpUbwcMode == null) initialTpUbwcMode = tpUbwcMode val lm = LinuxVulkanDriverManager(activity) fun origin(id: String) = if (TurnipReleases.isDownloaded(activity, id)) DriverRow.DOWNLOADED else DriverRow.IMPORTED val bundles = DriverBundle.all(activity) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 1a06392013..52aed25cbc 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1511,6 +1511,7 @@ class FrontEndActivity : ComponentActivity() { onRestoreBundled = { TurnipDriver(this).restoreBundled(); drivers.refreshDrivers() }, onMode = { m -> drivers.chooseMode(m) }, onRestart = { drivers.restartApp() }, + onTpUbwcMode = { drivers.chooseTpUbwcMode(it) }, ), protons = com.droiddeck.launcher.ui.ProtonsState( rows = protons.protonRows, busyId = protons.protonBusyId, stage = protons.protonStage, percent = protons.protonPercent, diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index b4fd3fd4b6..4f159908bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1706,7 +1706,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } com.droiddeck.launcher.gpu.DriverSetupLog.write(this, "compositor.start driver=$driverId") CompositorHost.startOrAttach( - holder.surface, runtimeDir.path, + this, holder.surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(), outputFpsLimit(), ) 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 903851a5a9..1e59fb577e 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -200,7 +200,12 @@ object DeviceReport { h("Drivers") val gpu = com.droiddeck.launcher.gpu.GpuInfo.detect() k("GPU", "${gpu.name} · ${gpu.family.label} · ${gpu.supportText}" + if (gpu.oneUi8Gen2) " · One UI 8 Gen 2" else "") - if (gpu.model == 740) k("TP UBWC hint", com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice() ?: "driver default") + if (gpu.model == 740) { + val hint = com.droiddeck.launcher.gpu.TpUbwcHint + k("TP UBWC hint", hint.forThisDevice(context) ?: "driver default") + k("TP UBWC mode", hint.activeMode ?: SessionPrefs.TP_UBWC_AUTO) + if (hint.restartRequired(context)) k("TP UBWC pending", "${SessionPrefs.tpUbwcMode(context)} (restart required)") + } k("Driver mode", SessionPrefs.gpuDriverMode(context) + (com.droiddeck.launcher.gpu.DriverPairs.recommendedKey(gpu, com.droiddeck.launcher.gpu.DriverPairs.from( com.droiddeck.launcher.gpu.TurnipReleases.cached(context)), com.droiddeck.launcher.gpu.TurnipReleases.autoPicks(context), diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt index 1ccee78e24..40ca3fb7fc 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher.gpu +import android.content.Context import android.util.Log +import com.droiddeck.launcher.session.SessionPrefs object TpUbwcHint { const val ENV = "FD_DEV_FEATURES" @@ -8,31 +10,40 @@ object TpUbwcHint { @Volatile private var resolved = false @Volatile private var cached: String? = null + @Volatile var activeMode: String? = null + private set // On Adreno 740, TPL1_DBG_ECO_CNTL1.TP_UBWC_FLAG_HINT is shared by every driver on the GPU and must // match the system driver: blob v6xx leaves it off, newer blobs set it. A mismatch corrupts Android UI. // Samsung's One UI firmware sets it whatever blob version it reports. - internal fun features(model: Int, systemDriverVersion: String?, samsung: Boolean = false): String? { + internal fun features(model: Int, systemDriverVersion: String?, samsung: Boolean = false, + mode: String = SessionPrefs.TP_UBWC_AUTO): String? { if (model != 740) return null + if (mode == SessionPrefs.TP_UBWC_ON) return "enable_tp_ubwc_flag_hint=1" + if (mode == SessionPrefs.TP_UBWC_OFF) return "enable_tp_ubwc_flag_hint=0" if (samsung) return "enable_tp_ubwc_flag_hint=1" val blob = systemDriverVersion?.split('.')?.getOrNull(1)?.toIntOrNull() ?: return null return "enable_tp_ubwc_flag_hint=" + if (blob >= 700) "1" else "0" } @Synchronized - fun forThisDevice(): String? { + fun forThisDevice(context: Context): String? { if (resolved) return cached + val mode = SessionPrefs.tpUbwcMode(context) val gpu = GpuInfo.detect() val model = gpu.model val version = if (model == 740) VulkanInfo.query()["driver_version"] else null - cached = features(model, version, gpu.oneUi8Gen2) + cached = features(model, version, gpu.oneUi8Gen2, mode) + activeMode = mode resolved = true - Log.i(TAG, "Adreno $model${if (gpu.oneUi8Gen2) " (One UI)" else ""}, system driver ${version ?: "n/a"}: ${cached ?: "driver default"}") + Log.i(TAG, "Adreno $model${if (gpu.oneUi8Gen2) " (One UI)" else ""}, system driver ${version ?: "n/a"}, mode $mode: ${cached ?: "driver default"}") return cached } - fun applyToProcess() { - val value = forThisDevice() ?: return + fun restartRequired(context: Context): Boolean = resolved && activeMode != SessionPrefs.tpUbwcMode(context) + + fun applyToProcess(context: Context) { + val value = forThisDevice(context) ?: return runCatching { android.system.Os.setenv(ENV, value, true) } .onFailure { Log.w(TAG, "setenv $ENV failed: ${it.javaClass.simpleName}") } } 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 5d5861d3a7..7c7a6d4192 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -263,6 +263,19 @@ object SessionPrefs { const val GPU_DRIVERS_MANUAL = "manual" const val GPU_DRIVERS_MIX = "mix" + const val TP_UBWC_AUTO = "auto" + const val TP_UBWC_ON = "on" + const val TP_UBWC_OFF = "off" + + fun tpUbwcMode(context: Context): String = + prefs(context).getString("tpUbwcMode", TP_UBWC_AUTO) + ?.takeIf { it in setOf(TP_UBWC_AUTO, TP_UBWC_ON, TP_UBWC_OFF) } ?: TP_UBWC_AUTO + + fun setTpUbwcMode(context: Context, mode: String) { + require(mode in setOf(TP_UBWC_AUTO, TP_UBWC_ON, TP_UBWC_OFF)) + prefs(context).edit().putString("tpUbwcMode", mode).commit() + } + fun gpuDriverMode(context: Context): String = prefs(context).getString("gpuDriverMode", GPU_DRIVERS_AUTO) ?: GPU_DRIVERS_AUTO 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 44f6cc4c4c..723b4d36db 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -397,7 +397,7 @@ class SessionService : Service() { private fun runSession(gen: Int) { SessionTerminal.clear() - com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice() + com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice(this) try { LinuxRuntime.writeAccounts(this) } catch (e: Exception) { @@ -696,7 +696,7 @@ class SessionService : Service() { val tuOverride = tuDebugOverride() val tuDriver = sysmemDriver(linuxDriverId) (tuOverride ?: "sysmem".takeIf { tuDriver || SessionPrefs.tuSysmem(this) })?.let { guest.add("TU_DEBUG=$it") } - com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice()?.let { guest.add("${com.droiddeck.launcher.gpu.TpUbwcHint.ENV}=$it") } + com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice(this)?.let { guest.add("${com.droiddeck.launcher.gpu.TpUbwcHint.ENV}=$it") } if (SessionPrefs.zinkLazy(this)) { guest.add("ZINK_DESCRIPTORS=lazy") guest.add("ZINK_DEBUG=compact") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt index 47905485db..8474050c34 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt @@ -23,6 +23,7 @@ import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.AnnotatedString import com.droiddeck.launcher.gpu.DeviceInfo +import com.droiddeck.launcher.session.SessionPrefs import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import androidx.compose.ui.res.stringResource @@ -128,6 +129,8 @@ class GpuDriversState( val runtime: DriverSlot = DriverSlot(), val canRestart: Boolean = true, val checkedAt: Long = 0L, + val tpUbwcMode: String? = null, + val tpUbwcRestartRequired: Boolean = false, ) { val activePair: PairRow? get() = pairs.firstOrNull { it.active } } @@ -147,6 +150,7 @@ class GpuDriversActions( val onRestoreBundled: () -> Unit = {}, val onMode: (String) -> Unit = {}, val onRestart: () -> Unit = {}, + val onTpUbwcMode: (String) -> Unit = {}, ) @Composable @@ -259,6 +263,27 @@ internal fun GpuDriversBody( GPU_MODE_PAIR -> PairBody(gpu, actions) else -> MixBody(single, actions, slotFocus, onOpenSlot) } + gpu.tpUbwcMode?.let { selected -> + var advanced by rememberSaveable { mutableStateOf(false) } + SecondaryButton(stringResource(R.string.gpu_advanced) + if (advanced) " ▴" else " ▾", modifier = Modifier.fillMaxWidth()) { advanced = !advanced } + AnimatedVisibility(advanced) { + Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { + ChoiceRow( + rememberMenuHost(), "tp-ubwc", stringResource(R.string.gpu_ubwc_title), + stringResource(R.string.gpu_ubwc_hint), + listOf( + SessionPrefs.TP_UBWC_AUTO to stringResource(R.string.common_auto), + SessionPrefs.TP_UBWC_ON to stringResource(R.string.widgets_on), + SessionPrefs.TP_UBWC_OFF to stringResource(R.string.widgets_off), + ), selected, onPick = actions.onTpUbwcMode, + ) + if (gpu.tpUbwcRestartRequired) { + Text(stringResource(R.string.gpu_ubwc_restart), fontSize = 13.sp, color = AttentionAmber) + if (gpu.canRestart) SecondaryButton(stringResource(R.string.gpu_restart_now), onClick = actions.onRestart) + } + } + } + } } } diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt index bb466c1330..348e8ff1fb 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt @@ -23,6 +23,7 @@ object CompositorHost { @Synchronized fun startOrAttach( + context: android.content.Context, surface: Surface, xdgRuntimeDir: String, driverPath: String?, @@ -41,7 +42,7 @@ object CompositorHost { resumeVsync() return false } - com.droiddeck.launcher.gpu.TpUbwcHint.applyToProcess() + com.droiddeck.launcher.gpu.TpUbwcHint.applyToProcess(context) WaylandCompositor.nativeStartWithSurface( surface, xdgRuntimeDir, driverPath, libraryName, nativeLibDir, ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 26fe5a93e8..3f33d6dc2e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1103,6 +1103,9 @@ Hide drivers for other GPUs Show drivers for other GPUs Advanced + UBWC compatibility + Try On or Off if Steam or Android shows stripes or flickering. Applies to both drivers after restarting DroidDeck. + Restart DroidDeck to apply. Set together with the display driver: %1$s carries both. Set together with the runtime driver: %1$s carries both. Used by games and the desktop. diff --git a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt index afcb0d4b5d..2a1286a2ea 100644 --- a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt @@ -53,4 +53,18 @@ class DriverMenusAutoTest { assertEquals("chosen-display", SessionPrefs.androidDriver(activity)) assertEquals("chosen-linux", SessionPrefs.linuxDriver(activity)) } + + @Test fun driverMenusCanBeConstructedBeforeActivityContextIsAttached() { + val menus = DriverMenus(Activity(), Handler(Looper.getMainLooper())) + assertEquals(SessionPrefs.TP_UBWC_AUTO, menus.tpUbwcMode) + } + + @Test fun refreshingDriversLoadsTheSavedUbwcModeAfterContextAttachment() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + SessionPrefs.setTpUbwcMode(activity, SessionPrefs.TP_UBWC_ON) + val menus = DriverMenus(activity, Handler(Looper.getMainLooper())) + menus.refreshDrivers() + assertEquals(SessionPrefs.TP_UBWC_ON, menus.tpUbwcMode) + assertFalse(menus.state().tpUbwcRestartRequired) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt index fe5183cfa2..774a5ab9bc 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.gpu import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test +import com.droiddeck.launcher.session.SessionPrefs class TpUbwcHintTest { @Test fun a740OnABlobV6xxTurnsTheHintOff() { @@ -18,6 +19,24 @@ class TpUbwcHintTest { assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, null, samsung = true)) } + @Test fun onOverridesThePocoRuleEvenWhenTheVersionIsUnreadable() { + for (version in listOf("512.676.1", "512.676.53", "garbage", null)) { + assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, version, mode = SessionPrefs.TP_UBWC_ON)) + } + } + + @Test fun offOverridesSamsungAndNewerBlobs() { + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, "512.762.10", mode = SessionPrefs.TP_UBWC_OFF)) + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, null, samsung = true, mode = SessionPrefs.TP_UBWC_OFF)) + } + + @Test fun overridesDoNotApplyToOtherGpus() { + for (mode in listOf(SessionPrefs.TP_UBWC_ON, SessionPrefs.TP_UBWC_OFF)) { + assertNull(TpUbwcHint.features(750, "512.762.10", mode = mode)) + assertNull(TpUbwcHint.features(0, null, mode = mode)) + } + } + @Test fun otherGpusKeepTheirDriverDefault() { assertNull(TpUbwcHint.features(750, "512.762.10")) assertNull(TpUbwcHint.features(830, "512.676.53")) diff --git a/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt new file mode 100644 index 0000000000..205fc66e88 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt @@ -0,0 +1,51 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import com.droiddeck.launcher.gpu.TpUbwcHint +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 + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class TpUbwcPrefsTest { + private val context: Context get() = RuntimeEnvironment.getApplication() + + @Before fun reset() { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + } + + @Test fun missingOrInvalidChoiceUsesAuto() { + assertEquals(SessionPrefs.TP_UBWC_AUTO, SessionPrefs.tpUbwcMode(context)) + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putString("tpUbwcMode", "invalid").commit() + assertEquals(SessionPrefs.TP_UBWC_AUTO, SessionPrefs.tpUbwcMode(context)) + } + + @Test fun overrideIsStoredWithoutChangingDriverChoices() { + SessionPrefs.setAndroidDriver(context, "display") + SessionPrefs.setLinuxDriver(context, "runtime") + for (mode in listOf(SessionPrefs.TP_UBWC_ON, SessionPrefs.TP_UBWC_OFF, SessionPrefs.TP_UBWC_AUTO)) { + SessionPrefs.setTpUbwcMode(context, mode) + assertEquals(mode, SessionPrefs.tpUbwcMode(context)) + assertEquals("display", SessionPrefs.androidDriver(context)) + assertEquals("runtime", SessionPrefs.linuxDriver(context)) + } + } + + @Test fun changingTheSavedChoiceKeepsTheProcessChoiceUntilRestart() { + SessionPrefs.setTpUbwcMode(context, SessionPrefs.TP_UBWC_ON) + val initial = TpUbwcHint.forThisDevice(context) + SessionPrefs.setTpUbwcMode(context, SessionPrefs.TP_UBWC_OFF) + assertTrue(TpUbwcHint.restartRequired(context)) + assertEquals(SessionPrefs.TP_UBWC_ON, TpUbwcHint.activeMode) + assertEquals(initial, TpUbwcHint.forThisDevice(context)) + SessionPrefs.setTpUbwcMode(context, SessionPrefs.TP_UBWC_ON) + assertFalse(TpUbwcHint.restartRequired(context)) + } +} From dccd5a7c694dcef4032a6eebbfc45a9f978e18f2 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 23 Oct 2026 09:24:25 -0400 Subject: [PATCH 035/174] fix: match the A740 UBWC hint on driver 512.676.76 Co-authored-by: Vabian124 <82999916+Vabian124@users.noreply.github.com> --- .../main/cpp/waylandcomp/src/framegen_bridge.c | 15 ++++++++++++--- app/src/main/cpp/waylandcomp/src/vk_present.c | 4 ++++ .../java/com/droiddeck/launcher/gpu/TpUbwcHint.kt | 9 ++++++--- .../com/droiddeck/launcher/gpu/TpUbwcHintTest.kt | 8 ++++++++ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/framegen_bridge.c b/app/src/main/cpp/waylandcomp/src/framegen_bridge.c index 94bb581a02..9de2824d78 100644 --- a/app/src/main/cpp/waylandcomp/src/framegen_bridge.c +++ b/app/src/main/cpp/waylandcomp/src/framegen_bridge.c @@ -238,7 +238,7 @@ static int ensure_ring(uint32_t w, uint32_t h, VkFormat fmt, uint32_t n) { } g_ring_w = w; g_ring_h = h; g_ring_fmt = fmt; LOGD("framegen: generation ring %ux%u x%u", w, h, n); - return 1; + return 2; } @@ -350,6 +350,7 @@ int vkp_framegen_run(VkCommandBuffer cmd, VkImage scene, VkImageView scene_view, fge_configure((uint32_t)mult, (uint32_t)atomic_load(&g_target), flow, hz, atomic_load(&g_model), atomic_load(&g_preset)); } + const int size_changed = g_built_w != (uint32_t)w || g_built_h != (uint32_t)h || g_built_fmt != fmt; if (!fge_prepare((uint32_t)w, (uint32_t)h, fmt)) { if (fmt != VK_FORMAT_R8G8B8A8_UNORM && fge_unavailable()) { refuse_format(fmt, kind, w, h, "build its chain"); @@ -361,17 +362,25 @@ int vkp_framegen_run(VkCommandBuffer cmd, VkImage scene, VkImageView scene_view, } return 0; } - if (g_built_w != (uint32_t)w || g_built_h != (uint32_t)h || g_built_fmt != fmt) { + if (size_changed) { g_built_w = (uint32_t)w; g_built_h = (uint32_t)h; g_built_fmt = fmt; g_generating_logged = 0; } uint32_t want = (uint32_t)(mult - 1); - if (!ensure_ring((uint32_t)w, (uint32_t)h, fmt, want)) { + const int ring = ensure_ring((uint32_t)w, (uint32_t)h, fmt, want); + if (!ring) { if (fmt != VK_FORMAT_R8G8B8A8_UNORM) { refuse_format(fmt, kind, w, h, "make its generation ring"); return 0; } FGLOG("no memory for the generation ring (%dx%d x%u); frame generation stays off", w, h, want); mark_failed(kind); return 0; } + /* The ring and the engine's images are new on this frame. Dispatching into them now + * null-dereferenced Turnip (vkp_framegen_run, first Steam frame, 2560x1440 to the panel). + * Show this frame as it is; generation starts once the size has settled. */ + if (size_changed || ring == 2) { + FGLOG("frame generation catches up at %dx%d; this frame is shown as it is", w, h); + return 0; + } /* The pacer's source rate must be the game's, not this loop's: a loop slowed by its own * generations would otherwise read as a slower game and justify even more generations. */ diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.c b/app/src/main/cpp/waylandcomp/src/vk_present.c index 96d0b415d3..d7f1c99030 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.c +++ b/app/src/main/cpp/waylandcomp/src/vk_present.c @@ -1626,6 +1626,10 @@ 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); + /* Frame generation samples every output pixel. Upscaling first made it interpolate + * the whole panel (3200x1440 on a 1440p phone) and rebuild on Steam's first frame. + * Grade at the game's size instead; the screen blit still scales to the panel. */ + if (fg) { mapped_w = scene_w; mapped_h = scene_h; } vkp_effects_set_formats(scene_fmt, scene_fmt); result = vkp_effects_run(cmd, scene_img, scene_w, scene_h, mapped_w, mapped_h, &rw, &rh); result_layout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL; diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt index 40ca3fb7fc..893d569a60 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt @@ -14,7 +14,7 @@ object TpUbwcHint { private set // On Adreno 740, TPL1_DBG_ECO_CNTL1.TP_UBWC_FLAG_HINT is shared by every driver on the GPU and must - // match the system driver: blob v6xx leaves it off, newer blobs set it. A mismatch corrupts Android UI. + // match the system driver. A mismatch corrupts Android UI. // Samsung's One UI firmware sets it whatever blob version it reports. internal fun features(model: Int, systemDriverVersion: String?, samsung: Boolean = false, mode: String = SessionPrefs.TP_UBWC_AUTO): String? { @@ -22,8 +22,11 @@ object TpUbwcHint { if (mode == SessionPrefs.TP_UBWC_ON) return "enable_tp_ubwc_flag_hint=1" if (mode == SessionPrefs.TP_UBWC_OFF) return "enable_tp_ubwc_flag_hint=0" if (samsung) return "enable_tp_ubwc_flag_hint=1" - val blob = systemDriverVersion?.split('.')?.getOrNull(1)?.toIntOrNull() ?: return null - return "enable_tp_ubwc_flag_hint=" + if (blob >= 700) "1" else "0" + val parts = systemDriverVersion?.split('.') ?: return null + val blob = parts.getOrNull(1)?.toIntOrNull() ?: return null + val patch = parts.getOrNull(2)?.toIntOrNull() ?: 0 + val on = blob >= 700 || (blob == 676 && patch >= 76) + return "enable_tp_ubwc_flag_hint=" + if (on) "1" else "0" } @Synchronized diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt index 774a5ab9bc..28d39e0f53 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt @@ -8,6 +8,14 @@ import com.droiddeck.launcher.session.SessionPrefs class TpUbwcHintTest { @Test fun a740OnABlobV6xxTurnsTheHintOff() { assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, "512.676.53")) + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, "512.676.75")) + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, "512.676")) + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, "512.699.10")) + } + + @Test fun a740OnThePocoBlobTurnsTheHintOn() { + assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, "512.676.76")) + assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, "512.676.80")) } @Test fun a740OnANewerBlobTurnsTheHintOn() { From 2e1156038e8edea66407e86bfeb0d0dc301c7ba2 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 23 Oct 2026 09:31:55 -0400 Subject: [PATCH 036/174] test: cover the inclusive A740 blob 700 boundary --- app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt index 28d39e0f53..3335a55aaa 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt @@ -19,6 +19,7 @@ class TpUbwcHintTest { } @Test fun a740OnANewerBlobTurnsTheHintOn() { + assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, "512.700.0")) assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, "512.762.10")) } From e06b942e67b6815e2f9e23363ab6f854bfb85f76 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 23 Oct 2026 11:06:18 -0400 Subject: [PATCH 037/174] fix: warn about UBWC restart only after a hint is active --- .../com/droiddeck/launcher/DriverMenus.kt | 5 +--- .../droiddeck/launcher/DriverMenusAutoTest.kt | 24 +++++++++++++++++++ .../launcher/session/TpUbwcPrefsTest.kt | 4 ++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index a630cc184f..344aa7452a 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -55,7 +55,6 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl private set private var runtimePending by mutableStateOf(false) private var sessionRunning by mutableStateOf(false) - private var initialTpUbwcMode: String? = null var tpUbwcMode: String by mutableStateOf(SessionPrefs.TP_UBWC_AUTO) private set @@ -77,8 +76,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl canRestart = !sessionRunning, checkedAt = TurnipReleases.cached(activity)?.checkedAt ?: 0L, tpUbwcMode = tpUbwcMode.takeIf { gpu.model == 740 }, - tpUbwcRestartRequired = (initialTpUbwcMode != null && tpUbwcMode != initialTpUbwcMode) || - com.droiddeck.launcher.gpu.TpUbwcHint.restartRequired(activity), + tpUbwcRestartRequired = com.droiddeck.launcher.gpu.TpUbwcHint.restartRequired(activity), ) fun chooseTpUbwcMode(mode: String) { @@ -137,7 +135,6 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl fun refreshDrivers() { tpUbwcMode = SessionPrefs.tpUbwcMode(activity) - if (initialTpUbwcMode == null) initialTpUbwcMode = tpUbwcMode val lm = LinuxVulkanDriverManager(activity) fun origin(id: String) = if (TurnipReleases.isDownloaded(activity, id)) DriverRow.DOWNLOADED else DriverRow.IMPORTED val bundles = DriverBundle.all(activity) diff --git a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt index 2a1286a2ea..4be7a14e6c 100644 --- a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt @@ -6,9 +6,11 @@ import android.os.Handler import android.os.Looper import com.droiddeck.launcher.session.QuestExperimental import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.gpu.TpUbwcHint import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -17,11 +19,15 @@ import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.shadows.ShadowBuild +import org.robolectric.util.ReflectionHelpers @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) class DriverMenusAutoTest { @Before fun reset() { + ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "resolved", false) + ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "cached", null) + ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "activeMode", null) RuntimeEnvironment.getApplication().getSharedPreferences("session", Context.MODE_PRIVATE) .edit().clear().commit() ShadowBuild.setModel("Quest 3") @@ -67,4 +73,22 @@ class DriverMenusAutoTest { assertEquals(SessionPrefs.TP_UBWC_ON, menus.tpUbwcMode) assertFalse(menus.state().tpUbwcRestartRequired) } + + @Test fun changingUbwcBeforeTheFirstSessionDoesNotRequireRestart() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + val menus = DriverMenus(activity, Handler(Looper.getMainLooper())) + menus.refreshDrivers() + SessionPrefs.setTpUbwcMode(activity, SessionPrefs.TP_UBWC_ON) + menus.refreshDrivers() + assertFalse(menus.state().tpUbwcRestartRequired) + } + + @Test fun recreatingTheMenuKeepsTheActiveHintRestartWarning() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + TpUbwcHint.forThisDevice(activity) + SessionPrefs.setTpUbwcMode(activity, SessionPrefs.TP_UBWC_ON) + val menus = DriverMenus(activity, Handler(Looper.getMainLooper())) + menus.refreshDrivers() + assertTrue(menus.state().tpUbwcRestartRequired) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt index 205fc66e88..2315fada36 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt @@ -11,6 +11,7 @@ import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) @@ -18,6 +19,9 @@ class TpUbwcPrefsTest { private val context: Context get() = RuntimeEnvironment.getApplication() @Before fun reset() { + ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "resolved", false) + ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "cached", null) + ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "activeMode", null) context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() } From 16bedf36357e42f78c8e696374aeda76a1d7aa4a Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 23 Oct 2026 11:23:26 -0400 Subject: [PATCH 038/174] fix: keep the UBWC hint consistent after custom guest environment --- .../main/java/com/droiddeck/launcher/session/SessionService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 723b4d36db..86643fc15f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -696,7 +696,6 @@ class SessionService : Service() { val tuOverride = tuDebugOverride() val tuDriver = sysmemDriver(linuxDriverId) (tuOverride ?: "sysmem".takeIf { tuDriver || SessionPrefs.tuSysmem(this) })?.let { guest.add("TU_DEBUG=$it") } - com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice(this)?.let { guest.add("${com.droiddeck.launcher.gpu.TpUbwcHint.ENV}=$it") } if (SessionPrefs.zinkLazy(this)) { guest.add("ZINK_DESCRIPTORS=lazy") guest.add("ZINK_DEBUG=compact") @@ -726,6 +725,7 @@ class SessionService : Service() { val extra = extraEnv() + com.droiddeck.launcher.agent.AgentEnv.beginSession(this) if (extra.none { it.startsWith("TU_DEBUG=") }) guest.add("$GAME_TU_DEBUG=" + (tuOverride ?: if (tuDriver) "sysmem" else "")) extra.forEach { guest.add(it) } + com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice(this)?.let { guest.add("${com.droiddeck.launcher.gpu.TpUbwcHint.ENV}=$it") } val clientPinned = steamHere && SessionPrefs.clientCpusOverride(this) if (clientPinned) { guest.add("BL_CLIENT_CPUS=" + CpuCores.listOrAll(SessionPrefs.clientCpus(this))) From 293e84a64c038ca014a66a20d45966b78b1cd996 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Fri, 23 Oct 2026 13:57:38 -0400 Subject: [PATCH 039/174] feat: droiddeck-ntsync is the default Wine sync - New installs start on ntsync. - Existing installs move to ntsync once on the first start of this version, whatever sync they used before. A choice made after that is kept. - The ntsync switch is no longer labelled experimental or for testing, in every language. --- .../main/java/com/droiddeck/launcher/App.kt | 1 + .../launcher/session/SessionPrefs.kt | 13 ++++++++- app/src/main/res/values-ar/strings.xml | 4 +-- app/src/main/res/values-b+es+419/strings.xml | 4 +-- app/src/main/res/values-bg/strings.xml | 4 +-- app/src/main/res/values-cs/strings.xml | 4 +-- app/src/main/res/values-da/strings.xml | 4 +-- app/src/main/res/values-de/strings.xml | 4 +-- app/src/main/res/values-el/strings.xml | 4 +-- app/src/main/res/values-es/strings.xml | 4 +-- app/src/main/res/values-fi/strings.xml | 4 +-- app/src/main/res/values-fr/strings.xml | 4 +-- app/src/main/res/values-hi/strings.xml | 4 +-- app/src/main/res/values-hu/strings.xml | 4 +-- app/src/main/res/values-in/strings.xml | 4 +-- app/src/main/res/values-it/strings.xml | 4 +-- app/src/main/res/values-ja/strings.xml | 4 +-- app/src/main/res/values-ko/strings.xml | 4 +-- app/src/main/res/values-ms/strings.xml | 4 +-- app/src/main/res/values-nb/strings.xml | 4 +-- app/src/main/res/values-nl/strings.xml | 4 +-- app/src/main/res/values-pl/strings.xml | 4 +-- app/src/main/res/values-pt-rPT/strings.xml | 4 +-- app/src/main/res/values-pt/strings.xml | 4 +-- app/src/main/res/values-ro/strings.xml | 4 +-- app/src/main/res/values-ru/strings.xml | 4 +-- app/src/main/res/values-sv/strings.xml | 4 +-- app/src/main/res/values-th/strings.xml | 4 +-- app/src/main/res/values-tr/strings.xml | 4 +-- app/src/main/res/values-uk/strings.xml | 4 +-- app/src/main/res/values-vi/strings.xml | 4 +-- app/src/main/res/values-zh-rCN/strings.xml | 4 +-- app/src/main/res/values-zh-rHK/strings.xml | 4 +-- app/src/main/res/values-zh-rTW/strings.xml | 4 +-- app/src/main/res/values/strings.xml | 4 +-- .../launcher/session/SyncBackendTest.kt | 29 +++++++++++++++++-- 36 files changed, 106 insertions(+), 69 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 3fc4383772..aa26d5fca9 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -28,6 +28,7 @@ class App : Application() { if (process == "$packageName:vr_recovery" || process == "$packageName:rgb_diagnostic") return CrashHandler.install(this) com.droiddeck.launcher.session.QuestExperimental.initialize(this) + com.droiddeck.launcher.session.SessionPrefs.applyNtsyncDefault(this) com.droiddeck.launcher.session.SessionPrefs.settleGpuDriverMode(this) com.droiddeck.launcher.update.AppUpdates.init(this) 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 d9d2d8e1d3..4fbdd11803 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -376,7 +376,7 @@ object SessionPrefs { prefs(context).edit().putBoolean("noXalia", on).apply() } - fun fastSync(context: Context): Boolean = prefs(context).getBoolean("fastSync", false) + fun fastSync(context: Context): Boolean = prefs(context).getBoolean("fastSync", true) fun setFastSync(context: Context, on: Boolean) { prefs(context).edit().putBoolean("fastSync", on).apply() @@ -411,6 +411,17 @@ object SessionPrefs { .apply() } + fun applyNtsyncDefault(context: Context) { + val prefs = prefs(context) + if (prefs.getBoolean("ntsyncDefaultV1", false)) return + prefs.edit() + .putBoolean("fastSync", true) + .putBoolean("fsyncFirst", false) + .putBoolean("syncFallback", true) + .putBoolean("ntsyncDefaultV1", true) + .apply() + } + fun syncFallback(context: Context): Boolean = prefs(context).getBoolean("syncFallback", true) fun setSyncFallback(context: Context, on: Boolean) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 7001fa9167..5b0acda790 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -549,8 +549,8 @@ Turnip: التصيير عبر sysmem أسرع لعميل Steam؛ في الألعاب يختار برنامج التشغيل بين العرض المقسّم إلى مربعات والعرض في ذاكرة النظام لكل مرحلة. مطلوب على Adreno 710/720/722. تجاوز مساعد xalia في Steam - droiddeck-ntsync (تجريبي) - بديل في مساحة المستخدم لبرنامج تشغيل ntsync في Linux، للاختبار. أثناء تفعيله، يستخدمه Proton بدلًا من droiddeck-esync وdroiddeck-fsync. يعمل مع Proton Experimental ARM64 وGE-Proton وproton-cachyos. يُطبَّق في الجلسة التالية. + droiddeck-ntsync + بديل في مساحة المستخدم لبرنامج تشغيل ntsync في Linux. أثناء تفعيله، يستخدمه Proton بدلًا من droiddeck-esync وdroiddeck-fsync. يعمل مع Proton Experimental ARM64 وGE-Proton وproton-cachyos. يُطبَّق في الجلسة التالية. droiddeck-esync droiddeck-fsync أولًا يشغّل خاصية fsync المدمجة في Proton على ملفات Proton الأصلية، مع توفير futex_waitv في مساحة المستخدم، فلا يحتاج إلى حزمة ويستمر في العمل لحظة تحديث Steam لـ Proton. أثناء تفعيله، تستخدمه الألعاب قبل droiddeck-esync، باستثناء القليل الذي يبقيه Proton معطّلًا لـ fsync. يُطبَّق في الجلسة التالية. 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 16db21a9b9..4d1c38fb2a 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -536,8 +536,8 @@ Turnip: renderizado sysmem Más rápido para el cliente de Steam; en los juegos, el controlador elige entre renderizado por mosaicos o en memoria del sistema en cada pasada. Obligatorio en Adreno 710/720/722. Omitir el asistente xalia de Steam - droiddeck-ntsync (experimental) - Un sustituto en espacio de usuario del controlador ntsync de Linux, para pruebas. Mientras está activado, Proton lo usa en lugar de droiddeck-esync y droiddeck-fsync. Funciona con Proton Experimental ARM64, GE-Proton y proton-cachyos. Se aplica en la próxima sesión. + droiddeck-ntsync + Un sustituto en espacio de usuario del controlador ntsync de Linux. Mientras está activado, Proton lo usa en lugar de droiddeck-esync y droiddeck-fsync. Funciona con Proton Experimental ARM64, GE-Proton y proton-cachyos. Se aplica en la próxima sesión. droiddeck-esync droiddeck-fsync primero Usa el fsync propio de Proton con los archivos originales de Proton, con futex_waitv proporcionado en espacio de usuario, así que no necesita paquete y sigue funcionando en cuanto Steam actualiza Proton. Mientras está activado, los juegos lo usan antes que droiddeck-esync, salvo los pocos que Proton mantiene sin fsync. Se aplica en la próxima sesión. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 9dcc424a11..358318565f 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -541,8 +541,8 @@ Turnip: рендиране sysmem По-бързо за клиента на Steam; в игрите драйверът избира за всеки проход между рендериране на плочки и в системната памет. Задължително на Adreno 710/720/722. Пропускане на помощника xalia на Steam - droiddeck-ntsync (експериментално) - Заместител на потребителско ниво за драйвера ntsync на Linux, за тестване. Докато е включен, Proton го използва вместо droiddeck-esync и droiddeck-fsync. Работи с Proton Experimental ARM64, GE-Proton и proton-cachyos. Прилага се от следващата сесия. + droiddeck-ntsync + Заместител на потребителско ниво за драйвера ntsync на Linux. Докато е включен, Proton го използва вместо droiddeck-esync и droiddeck-fsync. Работи с Proton Experimental ARM64, GE-Proton и proton-cachyos. Прилага се от следващата сесия. droiddeck-esync droiddeck-fsync първо Стартира собствения fsync на Proton върху оригиналните файлове на Proton, с futex_waitv, подаден от потребителско ниво, затова не изисква пакет и продължава да работи веднага след актуализация на Proton от Steam. Докато е включен, игрите го използват преди droiddeck-esync, освен малкото, които Proton държи извън fsync. Прилага се от следващата сесия. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 97e6799605..938597a14a 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -545,8 +545,8 @@ Turnip: vykreslování sysmem Rychlejší pro klienta Steam; ve hrách ovladač pro každý průchod volí dlaždicové vykreslování, nebo vykreslování v systémové paměti. Vyžadováno na Adreno 710/720/722. Vynechat Steamova pomocníka xalia - droiddeck-ntsync (experimentální) - Uživatelská náhrada linuxového ovladače ntsync, pro testování. Když je zapnuto, Proton ho používá místo droiddeck-esync a droiddeck-fsync. Funguje s Proton Experimental ARM64, GE-Proton a proton-cachyos. Použije se od příští relace. + droiddeck-ntsync + Uživatelská náhrada linuxového ovladače ntsync. Když je zapnuto, Proton ho používá místo droiddeck-esync a droiddeck-fsync. Funguje s Proton Experimental ARM64, GE-Proton a proton-cachyos. Použije se od příští relace. droiddeck-esync droiddeck-fsync jako první Spouští vlastní fsync Protonu na původních souborech Protonu, s futex_waitv dodaným v uživatelském prostoru, takže nepotřebuje balíček a funguje i hned po aktualizaci Protonu Steamem. Když je zapnuto, hry ho používají před droiddeck-esync, kromě těch pár, které Proton u fsync nechává vypnuté. Použije se od příští relace. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 0c2bc230b3..4d0230790d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -541,8 +541,8 @@ Turnip: sysmem-rendering Hurtigere til Steam-klienten; i spil vælger driveren flise- eller systemhukommelses-rendering for hvert pass. Påkrævet på Adreno 710/720/722. Spring Steams xalia-hjælper over - droiddeck-ntsync (eksperimentel) - En stand-in til ntsync-driveren i Linux-kernen, i brugerrum, til test. Mens den er til, bruger Proton den i stedet for droiddeck-esync og droiddeck-fsync. Fungerer med Proton Experimental ARM64, GE-Proton og proton-cachyos. Gælder fra næste session. + droiddeck-ntsync + En stand-in til ntsync-driveren i Linux-kernen, i brugerrum. Mens den er til, bruger Proton den i stedet for droiddeck-esync og droiddeck-fsync. Fungerer med Proton Experimental ARM64, GE-Proton og proton-cachyos. Gælder fra næste session. droiddeck-esync droiddeck-fsync først Kører Protons egen fsync på de uændrede Proton-filer, med futex_waitv leveret i brugerrum, så det kræver ingen pack og fortsætter med at virke, lige så snart Steam opdaterer Proton. Mens den er til, bruger spil den før droiddeck-esync, undtagen de få, Proton holder uden for fsync. Gælder fra næste session. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c09e49dd7e..a25032d287 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -541,8 +541,8 @@ Turnip: Sysmem-Rendering Schneller für den Steam-Client; in Spielen wählt der Treiber pro Durchgang zwischen Kachel- und Systemspeicher-Rendering. Erforderlich bei Adreno 710/720/722. Steams xalia-Helfer überspringen - droiddeck-ntsync (experimentell) - Ein Userspace-Ersatz für den Linux-Treiber ntsync, zum Testen. Solange er aktiv ist, nutzt Proton ihn statt droiddeck-esync und droiddeck-fsync. Funktioniert mit Proton Experimental ARM64, GE-Proton und proton-cachyos. Gilt ab der nächsten Sitzung. + droiddeck-ntsync + Ein Userspace-Ersatz für den Linux-Treiber ntsync. Solange er aktiv ist, nutzt Proton ihn statt droiddeck-esync und droiddeck-fsync. Funktioniert mit Proton Experimental ARM64, GE-Proton und proton-cachyos. Gilt ab der nächsten Sitzung. droiddeck-esync droiddeck-fsync bevorzugen Führt Protons eigenes fsync mit den unveränderten Proton-Dateien aus, wobei futex_waitv im Userspace bereitgestellt wird. Es braucht daher kein Pack und funktioniert weiter, sobald Steam Proton aktualisiert. Solange es aktiv ist, nutzen Spiele es vor droiddeck-esync, außer den wenigen, die Proton von fsync fernhält. Gilt ab der nächsten Sitzung. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 181822f35e..03ab295a9f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -541,8 +541,8 @@ Turnip: απόδοση sysmem Ταχύτερο για το πρόγραμμα-πελάτη Steam· στα παιχνίδια ο οδηγός επιλέγει σε κάθε πέρασμα απόδοση με πλακίδια ή στη μνήμη συστήματος. Απαιτείται σε Adreno 710/720/722. Παράβλεψη του βοηθού xalia του Steam - droiddeck-ntsync (πειραματικό) - Ένα υποκατάστατο σε επίπεδο χρήστη για το πρόγραμμα οδήγησης ntsync του Linux, για δοκιμές. Όσο είναι ενεργό, το Proton το χρησιμοποιεί αντί για το droiddeck-esync και το droiddeck-fsync. Λειτουργεί με Proton Experimental ARM64, GE-Proton και proton-cachyos. Εφαρμόζεται στην επόμενη συνεδρία. + droiddeck-ntsync + Ένα υποκατάστατο σε επίπεδο χρήστη για το πρόγραμμα οδήγησης ntsync του Linux. Όσο είναι ενεργό, το Proton το χρησιμοποιεί αντί για το droiddeck-esync και το droiddeck-fsync. Λειτουργεί με Proton Experimental ARM64, GE-Proton και proton-cachyos. Εφαρμόζεται στην επόμενη συνεδρία. droiddeck-esync droiddeck-fsync πρώτα Εκτελεί το δικό του fsync του Proton στα απλά αρχεία Proton, με το futex_waitv παρεχόμενο σε επίπεδο χρήστη, οπότε δεν χρειάζεται πακέτο και συνεχίζει να λειτουργεί τη στιγμή που το Steam ενημερώνει το Proton. Όσο είναι ενεργό, τα παιχνίδια το χρησιμοποιούν πριν από το droiddeck-esync, εκτός από τα λίγα που το Proton κρατά εκτός fsync. Εφαρμόζεται στην επόμενη συνεδρία. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ec99ab7198..c8f94321e8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -545,8 +545,8 @@ Turnip: renderizado sysmem Más rápido para el cliente de Steam; en los juegos, el controlador elige entre renderizado por mosaicos o en memoria del sistema en cada pasada. Obligatorio en Adreno 710/720/722. Omitir el asistente xalia de Steam - droiddeck-ntsync (experimental) - Un sustituto en espacio de usuario del controlador ntsync de Linux, para pruebas. Mientras está activado, Proton lo usa en lugar de droiddeck-esync y droiddeck-fsync. Funciona con Proton Experimental ARM64, GE-Proton y proton-cachyos. Se aplica en la próxima sesión. + droiddeck-ntsync + Un sustituto en espacio de usuario del controlador ntsync de Linux. Mientras está activado, Proton lo usa en lugar de droiddeck-esync y droiddeck-fsync. Funciona con Proton Experimental ARM64, GE-Proton y proton-cachyos. Se aplica en la próxima sesión. droiddeck-esync droiddeck-fsync primero Usa el fsync propio de Proton con los archivos originales de Proton, con futex_waitv proporcionado en espacio de usuario, así que no necesita paquete y sigue funcionando en cuanto Steam actualiza Proton. Mientras está activado, los juegos lo usan antes que droiddeck-esync, salvo los pocos que Proton mantiene sin fsync. Se aplica en la próxima sesión. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index ac12cc7e89..31695f9a15 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -541,8 +541,8 @@ Turnip: sysmem-renderöinti Nopeampi Steam-asiakasohjelmalle; peleissä ajuri valitsee jokaiselle vaiheelle ruuduittaisen tai järjestelmämuistiin tehtävän renderöinnin. Pakollinen Adreno 710/720/722:lla. Ohita Steamin xalia-avustaja - droiddeck-ntsync (kokeellinen) - Käyttäjätilainen korvike Linuxin ntsync-ajurille, testausta varten. Kun se on päällä, Proton käyttää sitä droiddeck-esyncin ja droiddeck-fsyncin sijaan. Toimii Proton Experimental ARM64:n, GE-Protonin ja proton-cachyosin kanssa. Tulee voimaan seuraavassa istunnossa. + droiddeck-ntsync + Käyttäjätilainen korvike Linuxin ntsync-ajurille. Kun se on päällä, Proton käyttää sitä droiddeck-esyncin ja droiddeck-fsyncin sijaan. Toimii Proton Experimental ARM64:n, GE-Protonin ja proton-cachyosin kanssa. Tulee voimaan seuraavassa istunnossa. droiddeck-esync droiddeck-fsync etusijalle Käynnistää Protonin omaa fsynciä vakiotiedostoilla, futex_waitv tarjottuna käyttäjätilassa, niin se ei tarvitse pakettia ja toimii edelleen heti kun Steam päivittää Protonin. Kun se on päällä, pelit käyttävät sitä droiddeck-esyncin edellä, paitsi harvat, jotka Proton pitää pois fsyncistä. Tulee voimaan seuraavassa istunnossa. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 143d11449b..8410619a68 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -545,8 +545,8 @@ Turnip : rendu sysmem Le client Steam sera plus rapide ; en jeu, le pilote choisit à chaque passe entre rendu par tuiles et rendu en mémoire système. Requis pour Adreno 710/720/722. Ignorer l\'assistant xalia de Steam - droiddeck-ntsync (expérimental) - Un substitut en espace utilisateur du pilote Linux ntsync, pour les tests. Lorsqu\'il est activé, Proton l\'utilise à la place de droiddeck-esync et de droiddeck-fsync. Fonctionne avec Proton Experimental ARM64, GE-Proton et proton-cachyos. Prendra effet à la prochaine session. + droiddeck-ntsync + Un substitut en espace utilisateur du pilote Linux ntsync. Lorsqu\'il est activé, Proton l\'utilise à la place de droiddeck-esync et de droiddeck-fsync. Fonctionne avec Proton Experimental ARM64, GE-Proton et proton-cachyos. Prendra effet à la prochaine session. droiddeck-esync droiddeck-fsync en priorité Exécute le fsync propre à Proton sur les fichiers Proton d\'origine, avec futex_waitv fourni en espace utilisateur : aucun pack n\'est nécessaire et il continue de fonctionner dès que Steam met à jour Proton. Lorsqu\'il est activé, les jeux l\'utilisent avant droiddeck-esync, sauf les quelques-uns que Proton exclut de fsync. Prendra effet à la prochaine session. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 1135072324..5126c1d6de 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -541,8 +541,8 @@ Turnip: sysmem रेंडरिंग Steam क्लाइंट के लिए तेज़; गेम में ड्राइवर हर पास के लिए टाइल या सिस्टम मेमोरी रेंडरिंग चुनता है। Adreno 710/720/722 पर ज़रूरी। Steam के xalia हेल्पर को छोड़ें - droiddeck-ntsync (एक्सपेरिमेंटल) - जांच के लिए Linux ntsync ड्राइवर की यूज़रस्पेस जगह लेने वाली चीज़। चालू रहते हुए, Proton इसे droiddeck-esync और droiddeck-fsync के बदले इस्तेमाल करता है। यह Proton Experimental ARM64, GE-Proton और proton-cachyos के साथ काम करता है। अगले सेशन से लागू होता है। + droiddeck-ntsync + Linux ntsync ड्राइवर की यूज़रस्पेस जगह लेने वाली चीज़। चालू रहते हुए, Proton इसे droiddeck-esync और droiddeck-fsync के बदले इस्तेमाल करता है। यह Proton Experimental ARM64, GE-Proton और proton-cachyos के साथ काम करता है। अगले सेशन से लागू होता है। droiddeck-esync droiddeck-fsync पहले स्टॉक Proton फ़ाइलों पर Proton का अपना fsync चलाता है, futex_waitv यूज़रस्पेस में दिया जाता है, इसलिए इसे किसी पैक की ज़रूरत नहीं और Steam के Proton अपडेट करते ही यह काम करता रहता है। चालू रहते हुए, गेम इसे droiddeck-esync से पहले इस्तेमाल करते हैं, सिवाय उन कुछ के जिन्हें Proton fsync से दूर रखता है। अगले सेशन से लागू होता है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index a1638350ab..cbf3a71628 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -541,8 +541,8 @@ Turnip: sysmem renderelés Gyorsabb a Steam kliensnek; játékokban a meghajtó menetenként választ a csempés és a rendszermemóriás renderelés között. Adreno 710/720/722-n szükséges. A Steam xalia segítőjének kihagyása - droiddeck-ntsync (kísérleti) - A Linux ntsync illesztőprogram felhasználói szintű helyettesítője, teszteléshez. Amíg be van kapcsolva, a Proton ezt használja a droiddeck-esync és a droiddeck-fsync helyett. A Proton Experimental ARM64-gyel, a GE-Protonnal és a proton-cachyosszal működik. A következő munkamenettől érvényes. + droiddeck-ntsync + A Linux ntsync illesztőprogram felhasználói szintű helyettesítője. Amíg be van kapcsolva, a Proton ezt használja a droiddeck-esync és a droiddeck-fsync helyett. A Proton Experimental ARM64-gyel, a GE-Protonnal és a proton-cachyosszal működik. A következő munkamenettől érvényes. droiddeck-esync droiddeck-fsync előre A Proton saját fsyncjét futtatja az eredeti Proton-fájlokon, felhasználói szinten biztosított futex_waitv-vel, így nincs szükség csomagra, és azonnal működik, amint a Steam frissíti a Protont. Amíg be van kapcsolva, a játékok ezt használják a droiddeck-esync előtt, kivéve azt a néhányat, amelyet a Proton kizár az fsyncből. A következő munkamenettől érvényes. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 61bb207a00..444e88819e 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -539,8 +539,8 @@ Turnip: rendering sysmem Lebih cepat untuk klien Steam; di gim, driver memilih rendering ubin atau memori sistem untuk setiap pass. Diperlukan pada Adreno 710/720/722. Lewati bantuan xalia milik Steam - droiddeck-ntsync (eksperimental) - Pengganti userspace untuk driver ntsync Linux, untuk pengujian. Saat aktif, Proton menggunakannya sebagai pengganti droiddeck-esync dan droiddeck-fsync. Berfungsi dengan Proton Experimental ARM64, GE-Proton, dan proton-cachyos. Berlaku pada sesi berikutnya. + droiddeck-ntsync + Pengganti userspace untuk driver ntsync Linux. Saat aktif, Proton menggunakannya sebagai pengganti droiddeck-esync dan droiddeck-fsync. Berfungsi dengan Proton Experimental ARM64, GE-Proton, dan proton-cachyos. Berlaku pada sesi berikutnya. droiddeck-esync droiddeck-fsync lebih dulu Menjalankan fsync milik Proton sendiri pada file Proton standar, dengan futex_waitv yang disediakan di userspace, sehingga tidak memerlukan paket dan tetap berfungsi begitu Steam memperbarui Proton. Saat aktif, gim menggunakannya sebelum droiddeck-esync, kecuali beberapa gim yang oleh Proton dijaga tetap di luar fsync. Berlaku pada sesi berikutnya. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 0d8fd58828..abfe8b6f5c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -543,8 +543,8 @@ Turnip: rendering sysmem Più veloce per il client di Steam; nei giochi il driver sceglie per ogni passata tra rendering a tile e in memoria di sistema. Necessario su Adreno 710/720/722. Salta l\'assistente xalia di Steam - droiddeck-ntsync (sperimentale) - Un sostituto in userspace del driver ntsync di Linux, per i test. Quando è attivo, Proton lo usa al posto di droiddeck-esync e droiddeck-fsync. Funziona con Proton Experimental ARM64, GE-Proton e proton-cachyos. Si applica dalla prossima sessione. + droiddeck-ntsync + Un sostituto in userspace del driver ntsync di Linux. Quando è attivo, Proton lo usa al posto di droiddeck-esync e droiddeck-fsync. Funziona con Proton Experimental ARM64, GE-Proton e proton-cachyos. Si applica dalla prossima sessione. droiddeck-esync Prima droiddeck-fsync Esegue il fsync di Proton sui file Proton originali, con futex_waitv fornito in userspace, quindi non richiede pacchetti e continua a funzionare appena Steam aggiorna Proton. Quando è attivo, i giochi lo usano prima di droiddeck-esync, tranne i pochi che Proton esclude da fsync. Si applica dalla prossima sessione. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7b719791fd..4431538c7c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -541,8 +541,8 @@ Turnip:sysmemレンダリング Steamクライアントが高速になります。ゲームではドライバーがパスごとにタイルレンダリングとシステムメモリレンダリングを選びます。Adreno 710/720/722では必須です。 Steamのxalia補助をスキップ - droiddeck-ntsync(実験的) - Linuxのntsyncドライバーをユーザー空間で代替するテスト用機能です。オンの間、Protonはdroiddeck-esyncとdroiddeck-fsyncの代わりにこれを使用します。Proton Experimental ARM64、GE-Proton、proton-cachyosで動作します。次回のセッションで有効になります。 + droiddeck-ntsync + Linuxのntsyncドライバーをユーザー空間で代替する機能です。オンの間、Protonはdroiddeck-esyncとdroiddeck-fsyncの代わりにこれを使用します。Proton Experimental ARM64、GE-Proton、proton-cachyosで動作します。次回のセッションで有効になります。 droiddeck-esync droiddeck-fsyncを優先 futex_waitvをユーザー空間で提供し、標準のProtonファイルのままProton自身のfsyncを実行します。パックが不要なため、SteamがProtonを更新してもすぐに動作し続けます。オンの間、Protonがfsyncを使わない一部のゲームを除き、ゲームはdroiddeck-esyncよりこちらを優先します。次回のセッションで有効になります。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 0ea3c7b1be..c88fe44b3b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -541,8 +541,8 @@ Turnip: sysmem 렌더링 Steam 클라이언트가 빨라집니다. 게임에서는 드라이버가 패스마다 타일 렌더링과 시스템 메모리 렌더링 중 하나를 고릅니다. Adreno 710/720/722에 필수입니다. Steam의 xalia 도우미 건너뛰기 - droiddeck-ntsync(실험적) - 테스트용으로 Linux ntsync 드라이버를 사용자 공간에서 대신하는 기능입니다. 켜져 있으면 Proton이 droiddeck-esync와 droiddeck-fsync 대신 이 기능을 사용합니다. Proton Experimental ARM64, GE-Proton 및 proton-cachyos에서 작동합니다. 다음 세션에 적용됩니다. + droiddeck-ntsync + Linux ntsync 드라이버를 사용자 공간에서 대신하는 기능입니다. 켜져 있으면 Proton이 droiddeck-esync와 droiddeck-fsync 대신 이 기능을 사용합니다. Proton Experimental ARM64, GE-Proton 및 proton-cachyos에서 작동합니다. 다음 세션에 적용됩니다. droiddeck-esync droiddeck-fsync 우선 futex_waitv를 사용자 공간에서 제공하여 기본 Proton 파일로 Proton 자체의 fsync를 실행하므로, 팩이 필요 없고 Steam이 Proton을 업데이트해도 바로 작동합니다. 켜져 있으면 게임이 droiddeck-esync보다 이 기능을 우선 사용합니다. 단, Proton이 fsync를 끄는 일부 게임은 예외입니다. 다음 세션에 적용됩니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 2e3eb1205d..7b44da15ba 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -539,8 +539,8 @@ Turnip: rendering sysmem Lebih pantas untuk klien Steam; dalam permainan, pemacu memilih pemaparan jubin atau memori sistem bagi setiap laluan. Diperlukan pada Adreno 710/720/722. Langkau pembantu xalia Steam - droiddeck-ntsync (eksperimen) - Pengganti ruang pengguna untuk pemacu ntsync Linux, untuk pengujian. Semasa ia hidup, Proton menggunakannya sebagai ganti droiddeck-esync dan droiddeck-fsync. Berfungsi dengan Proton Experimental ARM64, GE-Proton dan proton-cachyos. Berkuat kuasa pada sesi seterusnya. + droiddeck-ntsync + Pengganti ruang pengguna untuk pemacu ntsync Linux. Semasa ia hidup, Proton menggunakannya sebagai ganti droiddeck-esync dan droiddeck-fsync. Berfungsi dengan Proton Experimental ARM64, GE-Proton dan proton-cachyos. Berkuat kuasa pada sesi seterusnya. droiddeck-esync droiddeck-fsync dahulu Menjalankan fsync Proton sendiri pada fail Proton standard, dengan futex_waitv dibekalkan dalam ruang pengguna, jadi ia tidak memerlukan pek dan terus berfungsi sebaik sahaja Steam mengemas kini Proton. Semasa ia hidup, permainan menggunakannya mendahului droiddeck-esync, kecuali beberapa Proton yang mematikan fsync. Berkuat kuasa pada sesi seterusnya. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index e0ee85176d..c702bd959b 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -541,8 +541,8 @@ Turnip: sysmem-rendering Raskere for Steam-klienten; i spill velger driveren flis- eller systemminnerendering for hvert pass. Påkrevd på Adreno 710/720/722. Hopp over Steams xalia-hjelper - droiddeck-ntsync (eksperimentell) - En erstatning i brukerrom for Linux-driveren ntsync, for testing. Mens dette er på, bruker Proton den i stedet for droiddeck-esync og droiddeck-fsync. Fungerer med Proton Experimental ARM64, GE-Proton og proton-cachyos. Gjelder fra neste sesjon. + droiddeck-ntsync + En erstatning i brukerrom for Linux-driveren ntsync. Mens dette er på, bruker Proton den i stedet for droiddeck-esync og droiddeck-fsync. Fungerer med Proton Experimental ARM64, GE-Proton og proton-cachyos. Gjelder fra neste sesjon. droiddeck-esync droiddeck-fsync først Kjører Protons egen fsync på de uendrede Proton-filene, med futex_waitv levert i brukerrom, så den trenger ingen pakke og fortsetter å fungere i det Steam oppdaterer Proton. Mens dette er på, bruker spill den foran droiddeck-esync, med unntak av de få Proton holder utenfor fsync. Gjelder fra neste sesjon. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 93b6ab06fc..a5fda08678 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -541,8 +541,8 @@ Turnip: sysmem-rendering Sneller voor de Steam-client; in games kiest het stuurprogramma per pass tussen tegel- en systeemgeheugenrendering. Vereist op Adreno 710/720/722. Sla de xalia-helper van Steam over - droiddeck-ntsync (experimenteel) - Een userspace-vervanger voor de ntsync-driver van Linux, voor tests. Terwijl dit aan staat, gebruikt Proton dit in plaats van droiddeck-esync en droiddeck-fsync. Werkt met Proton Experimental ARM64, GE-Proton en proton-cachyos. Geldt vanaf de volgende sessie. + droiddeck-ntsync + Een userspace-vervanger voor de ntsync-driver van Linux. Terwijl dit aan staat, gebruikt Proton dit in plaats van droiddeck-esync en droiddeck-fsync. Werkt met Proton Experimental ARM64, GE-Proton en proton-cachyos. Geldt vanaf de volgende sessie. droiddeck-esync droiddeck-fsync eerst Draait de eigen fsync van Proton op de standaard Proton-bestanden, met futex_waitv in userspace geleverd, zodat er geen pakket nodig is en dit blijft werken zodra Steam Proton bijwerkt. Terwijl dit aan staat, gebruiken games dit vóór droiddeck-esync, behalve de paar die Proton niet op fsync laat draaien. Geldt vanaf de volgende sessie. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 288e644bae..d13e2f120d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -545,8 +545,8 @@ Turnip: renderowanie sysmem Szybsze dla klienta Steam; w grach sterownik dla każdego przebiegu wybiera renderowanie kafelkowe lub w pamięci systemowej. Wymagane na Adreno 710/720/722. Pomijaj pomocnika xalia w Steam - droiddeck-ntsync (eksperymentalne) - Zastępnik sterownika Linux ntsync w przestrzeni użytkownika, do testów. Gdy jest włączony, Proton używa go zamiast droiddeck-esync i droiddeck-fsync. Zgodny z Proton Experimental ARM64, GE-Proton i proton-cachyos. Działa od następnej sesji. + droiddeck-ntsync + Zastępnik sterownika Linux ntsync w przestrzeni użytkownika. Gdy jest włączony, Proton używa go zamiast droiddeck-esync i droiddeck-fsync. Zgodny z Proton Experimental ARM64, GE-Proton i proton-cachyos. Działa od następnej sesji. droiddeck-esync Najpierw droiddeck-fsync Uruchamia własny fsync Proton na standardowych plikach Proton, z futex_waitv dostarczanym w przestrzeni użytkownika, więc nie wymaga pakietu i działa od razu po aktualizacji Proton przez Steam. Gdy jest włączony, gry używają go przed droiddeck-esync, z wyjątkiem nielicznych, którym Proton wyłącza fsync. Działa od następnej sesji. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 91e75d38fc..4d05644a03 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -543,8 +543,8 @@ Turnip: renderização em sysmem Mais rápido para o cliente Steam; nos jogos, o controlador escolhe em cada passagem entre renderização em mosaico ou na memória do sistema. Obrigatório no Adreno 710/720/722. Ignorar o assistente xalia do Steam - droiddeck-ntsync (experimental) - Um substituto em espaço de utilizador para o controlador ntsync do Linux, para testes. Enquanto estiver ativado, o Proton utiliza-o em vez do droiddeck-esync e do droiddeck-fsync. Funciona com o Proton Experimental ARM64, o GE-Proton e o proton-cachyos. Aplica-se na próxima sessão. + droiddeck-ntsync + Um substituto em espaço de utilizador para o controlador ntsync do Linux. Enquanto estiver ativado, o Proton utiliza-o em vez do droiddeck-esync e do droiddeck-fsync. Funciona com o Proton Experimental ARM64, o GE-Proton e o proton-cachyos. Aplica-se na próxima sessão. droiddeck-esync droiddeck-fsync primeiro Executa o fsync do próprio Proton sobre os ficheiros originais do Proton, com o futex_waitv fornecido em espaço de utilizador, por isso não precisa de pacote e continua a funcionar assim que o Steam atualiza o Proton. Enquanto estiver ativado, os jogos utilizam-no antes do droiddeck-esync, exceto os poucos que o Proton mantém fora do fsync. Aplica-se na próxima sessão. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 45bd06550c..802fa6ad9e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -543,8 +543,8 @@ Turnip: renderização sysmem Mais rápido para o cliente da Steam; nos jogos, o driver escolhe a cada passagem entre renderização em blocos ou na memória do sistema. Obrigatório nas Adreno 710/720/722. Pular o assistente xalia da Steam - droiddeck-ntsync (experimental) - Um substituto em espaço de usuário para o driver ntsync do Linux, para testes. Enquanto estiver ativado, o Proton o usa no lugar do droiddeck-esync e do droiddeck-fsync. Funciona com o Proton Experimental ARM64, o GE-Proton e o proton-cachyos. Vale a partir da próxima sessão. + droiddeck-ntsync + Um substituto em espaço de usuário para o driver ntsync do Linux. Enquanto estiver ativado, o Proton o usa no lugar do droiddeck-esync e do droiddeck-fsync. Funciona com o Proton Experimental ARM64, o GE-Proton e o proton-cachyos. Vale a partir da próxima sessão. droiddeck-esync droiddeck-fsync primeiro Roda o fsync do próprio Proton nos arquivos originais do Proton, com o futex_waitv fornecido em espaço de usuário, então não precisa de pacote e continua funcionando assim que a Steam atualiza o Proton. Enquanto estiver ativado, os jogos o usam antes do droiddeck-esync, exceto os poucos que o Proton mantém fora do fsync. Vale a partir da próxima sessão. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 4b434247a5..9ed2b820b1 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -543,8 +543,8 @@ Turnip: randare sysmem Mai rapidă pentru clientul Steam; în jocuri, driverul alege la fiecare trecere între randarea pe dale și cea în memoria sistemului. Necesară pe Adreno 710/720/722. Omite asistentul xalia al Steam - droiddeck-ntsync (experimental) - Un substitut la nivel de utilizator pentru driverul Linux ntsync, pentru testare. Cât timp este activ, Proton îl folosește în locul droiddeck-esync și droiddeck-fsync. Funcționează cu Proton Experimental ARM64, GE-Proton și proton-cachyos. Se aplică la sesiunea următoare. + droiddeck-ntsync + Un substitut la nivel de utilizator pentru driverul Linux ntsync. Cât timp este activ, Proton îl folosește în locul droiddeck-esync și droiddeck-fsync. Funcționează cu Proton Experimental ARM64, GE-Proton și proton-cachyos. Se aplică la sesiunea următoare. droiddeck-esync droiddeck-fsync primul Rulează propriul fsync al Proton pe fișierele Proton standard, cu futex_waitv furnizat la nivel de utilizator, deci nu are nevoie de pachet și continuă să funcționeze imediat ce Steam actualizează Proton. Cât timp este activ, jocurile îl folosesc înaintea droiddeck-esync, cu excepția celor puține pe care Proton le ține în afara fsync. Se aplică la sesiunea următoare. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 592685d837..ad24076cc5 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -547,8 +547,8 @@ Turnip: рендеринг sysmem Клиент Steam будет быстрее; в играх драйвер для каждого прохода выбирает тайловый рендеринг или рендеринг в системной памяти. Требуется для Adreno 710/720/722. Пропустить помощник xalia в Steam - droiddeck-ntsync (экспериментально) - Замена драйвера ntsync Linux в пространстве пользователя, для тестирования. Пока включено, Proton использует ее вместо droiddeck-esync и droiddeck-fsync. Работает с Proton Experimental ARM64, GE-Proton и proton-cachyos. Вступит в силу в следующей сессии. + droiddeck-ntsync + Замена драйвера ntsync Linux в пространстве пользователя. Пока включено, Proton использует ее вместо droiddeck-esync и droiddeck-fsync. Работает с Proton Experimental ARM64, GE-Proton и proton-cachyos. Вступит в силу в следующей сессии. droiddeck-esync droiddeck-fsync в приоритете Запускает собственный fsync Proton на стандартных файлах Proton, а futex_waitv предоставляется в пространстве пользователя: пакет не нужен, и все продолжает работать сразу после обновления Proton в Steam. Пока включено, игры используют его раньше droiddeck-esync, кроме тех немногих, для которых Proton отключает fsync. Вступит в силу в следующей сессии. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5f75e21777..ee40ac576c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -541,8 +541,8 @@ Turnip: sysmem-rendering Snabbare för Steam-klienten; i spel väljer drivrutinen kakel- eller systemminnesrendering för varje pass. Krävs på Adreno 710/720/722. Hoppa över Steams xalia-hjälp - droiddeck-ntsync (experimentell) - En ersättning i användarutrymmet för Linux ntsync-drivrutinen, för testning. Medan det är på använder Proton det i stället för droiddeck-esync och droiddeck-fsync. Fungerar med Proton Experimental ARM64, GE-Proton och proton-cachyos. Gäller från nästa session. + droiddeck-ntsync + En ersättning i användarutrymmet för Linux ntsync-drivrutinen. Medan det är på använder Proton det i stället för droiddeck-esync och droiddeck-fsync. Fungerar med Proton Experimental ARM64, GE-Proton och proton-cachyos. Gäller från nästa session. droiddeck-esync droiddeck-fsync först Kör Protons egen fsync på de ursprungliga Proton-filerna, med futex_waitv tillhandahållen i användarutrymmet, så det behöver inget paket och fortsätter fungera så snart Steam uppdaterar Proton. Medan det är på använder spel det före droiddeck-esync, förutom de få som Proton håller borta från fsync. Gäller från nästa session. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index d2c04317c6..dffe5fd7ae 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -539,8 +539,8 @@ Turnip: การเรนเดอร์ sysmem เร็วขึ้นสำหรับไคลเอนต์ Steam ในเกมไดรเวอร์จะเลือกการเรนเดอร์แบบไทล์หรือในหน่วยความจำระบบในแต่ละพาส จำเป็นสำหรับ Adreno 710/720/722 ข้ามตัวช่วย xalia ของ Steam - droiddeck-ntsync (ทดลอง) - ตัวแทนในระดับยูสเซอร์สเปซของไดรเวอร์ ntsync ของ Linux สำหรับการทดสอบ เมื่อเปิดใช้ Proton จะใช้สิ่งนี้แทน droiddeck-esync และ droiddeck-fsync ใช้ได้กับ Proton Experimental ARM64, GE-Proton และ proton-cachyos จะมีผลในเซสชันถัดไป + droiddeck-ntsync + ตัวแทนในระดับยูสเซอร์สเปซของไดรเวอร์ ntsync ของ Linux เมื่อเปิดใช้ Proton จะใช้สิ่งนี้แทน droiddeck-esync และ droiddeck-fsync ใช้ได้กับ Proton Experimental ARM64, GE-Proton และ proton-cachyos จะมีผลในเซสชันถัดไป droiddeck-esync droiddeck-fsync ก่อน รัน fsync ของ Proton เองบนไฟล์ Proton มาตรฐาน โดยมี futex_waitv ที่จัดเตรียมในระดับยูสเซอร์สเปซ จึงไม่ต้องใช้แพ็กและยังคงทำงานได้ทันทีที่ Steam อัปเดต Proton เมื่อเปิดใช้ เกมจะใช้สิ่งนี้ก่อน droiddeck-esync ยกเว้นบางส่วนที่ Proton ปิด fsync ไว้ จะมีผลในเซสชันถัดไป diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 24fc12e92d..bb71dab78e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -541,8 +541,8 @@ Turnip: sysmem işleme Steam istemcisi için daha hızlı; oyunlarda sürücü her geçişte döşeme tabanlı veya sistem belleğinde işlemeyi seçer. Adreno 710/720/722\'de gereklidir. Steam\'in xalia yardımcısını atla - droiddeck-ntsync (deneysel) - Linux ntsync sürücüsünün test amaçlı, kullanıcı alanında çalışan bir yedeği. Açıkken Proton, droiddeck-esync ve droiddeck-fsync yerine bunu kullanır. Proton Experimental ARM64, GE-Proton ve proton-cachyos ile çalışır. Sonraki oturumda uygulanır. + droiddeck-ntsync + Linux ntsync sürücüsünün kullanıcı alanında çalışan bir yedeği. Açıkken Proton, droiddeck-esync ve droiddeck-fsync yerine bunu kullanır. Proton Experimental ARM64, GE-Proton ve proton-cachyos ile çalışır. Sonraki oturumda uygulanır. droiddeck-esync Önce droiddeck-fsync Proton\'un kendi fsync\'ini standart Proton dosyalarıyla, futex_waitv kullanıcı alanında sağlanarak çalıştırır; bu yüzden paket gerektirmez ve Steam Proton\'u güncellediği anda da çalışmaya devam eder. Açıkken oyunlar, Proton\'un fsync dışında tuttuğu birkaç oyun hariç, bunu droiddeck-esync\'ten önce kullanır. Sonraki oturumda uygulanır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 0fe47636a7..a67b973c6a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -545,8 +545,8 @@ Turnip: рендеринг через sysmem Швидше для клієнта Steam; в іграх драйвер для кожного проходу вибирає тайловий рендеринг або рендеринг у системній пам’яті. Потрібно для Adreno 710/720/722. Пропускати помічник Steam xalia - droiddeck-ntsync (експериментально) - Програмна заміна драйвера ntsync ядра Linux у просторі користувача, для тестування. Поки це увімкнено, Proton використовує її замість droiddeck-esync і droiddeck-fsync. Працює з Proton Experimental ARM64, GE-Proton і proton-cachyos. Застосовується в наступному сеансі. + droiddeck-ntsync + Програмна заміна драйвера ntsync ядра Linux у просторі користувача. Поки це увімкнено, Proton використовує її замість droiddeck-esync і droiddeck-fsync. Працює з Proton Experimental ARM64, GE-Proton і proton-cachyos. Застосовується в наступному сеансі. droiddeck-esync droiddeck-fsync першим Запускає власний fsync Proton на стандартних файлах Proton, а futex_waitv надається в просторі користувача, тому не потрібен пакет і все працює відразу після оновлення Proton у Steam. Поки це увімкнено, ігри використовують його раніше за droiddeck-esync, окрім кількох, де Proton тримає fsync вимкненим. Застосовується в наступному сеансі. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c7e88e0653..73a93bf2f5 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -539,8 +539,8 @@ Turnip: render sysmem Nhanh hơn cho ứng dụng Steam; trong game, trình điều khiển chọn kết xuất theo ô hoặc trong bộ nhớ hệ thống cho từng lượt. Bắt buộc trên Adreno 710/720/722. Bỏ qua trình trợ giúp xalia của Steam - droiddeck-ntsync (thử nghiệm) - Một bản thay thế ở không gian người dùng cho driver ntsync của Linux, dùng để thử nghiệm. Khi đang bật, Proton dùng nó thay cho droiddeck-esync và droiddeck-fsync. Hoạt động với Proton Experimental ARM64, GE-Proton và proton-cachyos. Áp dụng từ phiên sau. + droiddeck-ntsync + Một bản thay thế ở không gian người dùng cho driver ntsync của Linux. Khi đang bật, Proton dùng nó thay cho droiddeck-esync và droiddeck-fsync. Hoạt động với Proton Experimental ARM64, GE-Proton và proton-cachyos. Áp dụng từ phiên sau. droiddeck-esync droiddeck-fsync trước Chạy fsync riêng của Proton trên các tệp Proton gốc, với futex_waitv được cung cấp ở không gian người dùng, nên không cần pack và vẫn hoạt động ngay khi Steam cập nhật Proton. Khi đang bật, game dùng nó trước droiddeck-esync, trừ một số ít Proton giữ fsync tắt. Áp dụng từ phiên sau. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 68d927ebb2..6d09ed2aed 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -541,8 +541,8 @@ Turnip:sysmem 渲染 Steam 客户端更快;游戏中驱动会为每个渲染通道选择分块渲染或系统内存渲染。Adreno 710/720/722 必需。 跳过 Steam 的 xalia 助手 - droiddeck-ntsync(实验性) - Linux ntsync 驱动的用户态替代品,供测试使用。开启时,Proton 使用它代替 droiddeck-esync 和 droiddeck-fsync。适用于 Proton Experimental ARM64、GE-Proton 和 proton-cachyos。将在下次会话生效。 + droiddeck-ntsync + Linux ntsync 驱动的用户态替代品。开启时,Proton 使用它代替 droiddeck-esync 和 droiddeck-fsync。适用于 Proton Experimental ARM64、GE-Proton 和 proton-cachyos。将在下次会话生效。 droiddeck-esync droiddeck-fsync 优先 在原始 Proton 文件上运行 Proton 自带的 fsync,由用户态提供 futex_waitv,因此无需任何包,且 Steam 更新 Proton 后立即继续可用。开启时,除 Proton 自身禁用 fsync 的少数游戏外,各游戏优先使用它而非 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 a39c7b101d..ce0f2693ca 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -541,8 +541,8 @@ Turnip:sysmem 渲染 Steam 用戶端會更快;遊戲中驅動程式會為每個渲染通道選擇分塊渲染或系統記憶體渲染。Adreno 710/720/722 必須開啟。 略過 Steam 的 xalia 輔助程式 - droiddeck-ntsync(實驗性) - 在用戶空間代替 Linux ntsync 驅動程式,供測試使用。開啟時,Proton 會使用它而非 droiddeck-esync 和 droiddeck-fsync。適用於 Proton Experimental ARM64、GE-Proton 和 proton-cachyos。下次會話生效。 + droiddeck-ntsync + 在用戶空間代替 Linux ntsync 驅動程式。開啟時,Proton 會使用它而非 droiddeck-esync 和 droiddeck-fsync。適用於 Proton Experimental ARM64、GE-Proton 和 proton-cachyos。下次會話生效。 droiddeck-esync 優先使用 droiddeck-fsync 在原裝 Proton 檔案上執行 Proton 本身的 fsync,並在用戶空間提供 futex_waitv,因此無需套件,Steam 更新 Proton 後亦能立即繼續運作。開啟時,遊戲會優先使用它而非 droiddeck-esync,Proton 刻意不用 fsync 的少數遊戲除外。下次會話生效。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d29f3cef46..a7d315ec18 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -541,8 +541,8 @@ Turnip:sysmem 渲染 Steam 用戶端會更快;遊戲中驅動程式會為每個算繪通道選擇分塊算繪或系統記憶體算繪。Adreno 710/720/722 必需。 跳過 Steam 的 xalia 輔助程式 - droiddeck-ntsync(實驗性) - 以使用者空間替代 Linux ntsync 驅動程式,供測試使用。開啟時,Proton 會使用它來取代 droiddeck-esync 和 droiddeck-fsync。適用於 Proton Experimental ARM64、GE-Proton 和 proton-cachyos。下次工作階段生效。 + droiddeck-ntsync + 以使用者空間替代 Linux ntsync 驅動程式。開啟時,Proton 會使用它來取代 droiddeck-esync 和 droiddeck-fsync。適用於 Proton Experimental ARM64、GE-Proton 和 proton-cachyos。下次工作階段生效。 droiddeck-esync 優先使用 droiddeck-fsync 在原版 Proton 檔案上執行 Proton 自己的 fsync,並在使用者空間提供 futex_waitv,因此不需要套件,Steam 更新 Proton 後也能立即繼續運作。開啟時,遊戲會優先使用它而非 droiddeck-esync,Proton 本身停用 fsync 的少數遊戲除外。下次工作階段生效。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c449a05be5..25c5c820b3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -554,8 +554,8 @@ Turnip: sysmem rendering Faster for the Steam client; in games the driver picks tile or system-memory rendering per pass. Required on Adreno 710/720/722. Skip Steam\'s xalia helper - droiddeck-ntsync (experimental) - A userspace stand-in for the Linux ntsync driver, for testing. While it is on, Proton uses it instead of droiddeck-esync and droiddeck-fsync. Works with Proton Experimental ARM64, GE-Proton and proton-cachyos. Applies next session. + droiddeck-ntsync + A userspace stand-in for the Linux ntsync driver. While it is on, Proton uses it instead of droiddeck-esync and droiddeck-fsync. Works with Proton Experimental ARM64, GE-Proton and proton-cachyos. Applies next session. droiddeck-esync droiddeck-fsync first Runs Proton\'s own fsync on the stock Proton files, with futex_waitv supplied in userspace, so it needs no pack and keeps working the moment Steam updates Proton. While it is on, games use it ahead of droiddeck-esync, except the few Proton keeps off fsync. Applies next session. diff --git a/app/src/test/java/com/droiddeck/launcher/session/SyncBackendTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SyncBackendTest.kt index 844931bbbb..85cf481e90 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SyncBackendTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SyncBackendTest.kt @@ -13,9 +13,33 @@ class SyncBackendTest { private val context: Context = RuntimeEnvironment.getApplication() @Test - fun aFreshInstallStartsOnEsync() { - assertEquals(SessionPrefs.SYNC_ESYNC, SessionPrefs.syncBackend(context)) + fun aFreshInstallStartsOnNtsync() { + assertEquals(SessionPrefs.SYNC_NTSYNC, SessionPrefs.syncBackend(context)) assertEquals(false, SessionPrefs.fsyncFirst(context)) + SessionPrefs.applyNtsyncDefault(context) + assertEquals(SessionPrefs.SYNC_NTSYNC, SessionPrefs.syncBackend(context)) + } + + @Test + fun anEarlierChoiceMovesToNtsyncOnce() { + for (earlier in listOf(SessionPrefs.SYNC_ESYNC, SessionPrefs.SYNC_FSYNC, SessionPrefs.SYNC_WINESERVER)) { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + SessionPrefs.setSyncBackend(context, earlier) + SessionPrefs.applyNtsyncDefault(context) + assertEquals(SessionPrefs.SYNC_NTSYNC, SessionPrefs.syncBackend(context)) + } + } + + @Test + fun aChoiceMadeAfterTheMoveIsKept() { + SessionPrefs.setSyncBackend(context, SessionPrefs.SYNC_ESYNC) + SessionPrefs.applyNtsyncDefault(context) + SessionPrefs.setSyncBackend(context, SessionPrefs.SYNC_ESYNC) + SessionPrefs.applyNtsyncDefault(context) + assertEquals(SessionPrefs.SYNC_ESYNC, SessionPrefs.syncBackend(context)) + SessionPrefs.setSyncBackend(context, SessionPrefs.SYNC_WINESERVER) + SessionPrefs.applyNtsyncDefault(context) + assertEquals(SessionPrefs.SYNC_WINESERVER, SessionPrefs.syncBackend(context)) } @Test @@ -34,6 +58,7 @@ class SyncBackendTest { @Test fun pickingATabTurnsSyncBackOn() { + SessionPrefs.setFastSync(context, false) SessionPrefs.setSyncFallback(context, false) SessionPrefs.setFsyncFirst(context, false) assertEquals(SessionPrefs.SYNC_WINESERVER, SessionPrefs.syncBackend(context)) From d111b2b3ddf52c93bd245e579897054368d4531d Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 13:59:04 -0400 Subject: [PATCH 040/174] ci: reuse preload snapshots verified against main builds --- .github/workflows/build.yml | 63 +++--- tools/components/README.md | 35 ++++ tools/components/build-arm64-preloads.sh | 23 +++ tools/components/preloads.lock.json | 125 ++++++++++++ tools/components/preloads.py | 248 +++++++++++++++++++++++ tools/release/runtime_inputs.py | 2 +- tools/tests/test_preload_snapshots.py | 146 +++++++++++++ 7 files changed, 617 insertions(+), 25 deletions(-) create mode 100644 tools/components/README.md create mode 100644 tools/components/build-arm64-preloads.sh create mode 100644 tools/components/preloads.lock.json create mode 100644 tools/components/preloads.py create mode 100644 tools/tests/test_preload_snapshots.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94dbf6baf8..5ea175cbfe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,15 @@ on: - 'LICENSE' - '.gitignore' workflow_dispatch: + inputs: + rebuild_preloads: + description: Rebuild preloads instead of reusing the approved binary snapshot + type: boolean + default: false permissions: contents: read + actions: read pull-requests: write concurrency: @@ -26,7 +32,7 @@ concurrency: cancel-in-progress: ${{ github.event_name == 'pull_request' }} env: - PRELOAD_CACHE_VERSION: v7 + PRELOAD_CACHE_VERSION: v8 jobs: xbox: @@ -257,34 +263,43 @@ jobs: app/src/main/assets/linuxfs !app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet !app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox - key: preloads-${{ env.PRELOAD_CACHE_VERSION }}-${{ hashFiles('app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/cpp/adrenotools/src/hook/kgsl.h', 'tools/quest/*', 'tools/linuxfs/preload/*.c', 'tools/linuxfs/build-x86-preloads.sh', 'tools/linuxfs/fex/*', 'tools/linuxfs/clipboard/*.c', 'tools/linuxfs/ssbs/*.c', 'tools/proot/fastpath/*.c', 'tools/linuxfs/overlay/usr/local/bin/*', 'tools/linuxfs/overlay/usr/bin/**', 'tools/linuxfs/desktop/*', 'tools/gamescope/release.env', 'tools/wlroots/release.env', 'tools/linuxfs/uruntime.env', 'tools/linuxfs/licenses/*', 'tools/mangoapp/*', 'tools/msitools/**', 'tools/linuxfs/debian-image.env', 'tools/pipewire/**', 'tools/ci/install-ubuntu-packages.sh', 'tools/vr/**') }} + !app/src/main/assets/linuxfs/i386/libblsession.so + !app/src/main/assets/linuxfs/i386/libfakeinput.so + !app/src/main/assets/linuxfs/i386/libfaultreport.so + !app/src/main/assets/linuxfs/libblaudit.so + !app/src/main/assets/linuxfs/libblfastpath.so + !app/src/main/assets/linuxfs/libblsession.so + !app/src/main/assets/linuxfs/libfakeinput.so + !app/src/main/assets/linuxfs/libssbs.so + !app/src/main/assets/linuxfs/usr/local/bin/droiddeck-clipboard + !app/src/main/assets/linuxfs/x86_64/libblsession.so + !app/src/main/assets/linuxfs/x86_64/libfakeinput.so + !app/src/main/assets/linuxfs/x86_64/libfaultreport.so + !app/src/main/assets/linuxfs/x86_64/libvulkan-thunk.so + !app/src/main/assets/linuxfs/x86_64/libwebkitinput.so + key: preloads-${{ env.PRELOAD_CACHE_VERSION }}-${{ hashFiles('app/src/main/cpp/adrenotools/src/hook/kgsl.h', 'tools/quest/*', 'tools/linuxfs/overlay/usr/local/bin/*', 'tools/linuxfs/overlay/usr/bin/**', 'tools/linuxfs/desktop/*', 'tools/gamescope/release.env', 'tools/wlroots/release.env', 'tools/linuxfs/uruntime.env', 'tools/linuxfs/licenses/*', 'tools/mangoapp/*', 'tools/msitools/**', 'tools/pipewire/**', 'tools/ci/install-ubuntu-packages.sh', 'tools/vr/**') }} - - name: Build libfakeinput.so and libblsession.so (glibc aarch64) + - name: Restore verified preload snapshots + id: component-preloads + env: + GH_TOKEN: ${{ github.token }} + FORCE_PRELOAD_REBUILD: ${{ inputs.rebuild_preloads || 'false' }} + COMPONENT_TRUSTED_BASE: ${{ needs.xbox.outputs.base-sha || github.sha }} + run: python3 tools/components/preloads.py restore + + - name: Build changed ARM64 preloads + if: steps.component-preloads.outputs.arm64 != 'true' + run: | + bash tools/ci/install-ubuntu-packages.sh gcc-aarch64-linux-gnu g++-aarch64-linux-gnu + bash tools/components/build-arm64-preloads.sh app/src/main/assets/linuxfs + + - name: Prepare remaining Linux runtime assets if: steps.preloads.outputs.cache-hit != 'true' run: | set -euo pipefail bash tools/ci/install-ubuntu-packages.sh gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libvulkan1 mesa-vulkan-drivers D=app/src/main/assets/linuxfs mkdir -p "$D" - aarch64-linux-gnu-g++ -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \ - -pthread -std=c++17 -static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL \ - -o "$D/libfakeinput.so" app/src/main/cpp/fakeinput_steam.cpp -ldl - aarch64-linux-gnu-strip --strip-unneeded "$D/libfakeinput.so" - aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ - -o "$D/libblsession.so" tools/linuxfs/preload/*.c -ldl - aarch64-linux-gnu-strip --strip-unneeded "$D/libblsession.so" - aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ - -o "$D/libblfastpath.so" tools/proot/fastpath/fastpath.c -ldl - aarch64-linux-gnu-strip --strip-unneeded "$D/libblfastpath.so" - aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -nostdlib -ffreestanding -fno-stack-protector \ - -fno-tree-loop-distribute-patterns -Wl,-z,defs -o "$D/libblaudit.so" tools/proot/fastpath/audit.c - aarch64-linux-gnu-strip --strip-unneeded "$D/libblaudit.so" - aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ - -o "$D/libssbs.so" tools/linuxfs/ssbs/ssbs_adapter.c -ldl - aarch64-linux-gnu-strip --strip-unneeded "$D/libssbs.so" - mkdir -p "$D/usr/local/bin" - aarch64-linux-gnu-gcc -O2 -Wall -Wextra -o "$D/usr/local/bin/droiddeck-clipboard" tools/linuxfs/clipboard/clipboard.c -ldl - aarch64-linux-gnu-strip --strip-unneeded "$D/usr/local/bin/droiddeck-clipboard" VK_INCLUDE=$(ls -d "${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}"/toolchains/llvm/prebuilt/*/sysroot/usr/include | head -1) \ tools/vr/build.sh --native "$D/usr/local/lib/droiddeck-vr" for script in tools/linuxfs/overlay/usr/local/bin/droiddeck-* tools/linuxfs/overlay/usr/local/bin/steam-compatibility; do @@ -366,7 +381,7 @@ jobs: ls -lR "$D" - name: Fetch the Debian image the preloads build in - if: steps.preloads.outputs.cache-hit != 'true' + if: steps.component-preloads.outputs.x86 != 'true' env: GH_TOKEN: ${{ github.token }} run: | @@ -389,7 +404,7 @@ jobs: docker image ls "$image" - name: Build the x86 preloads FEX guests load (glibc 2.31) - if: steps.preloads.outputs.cache-hit != 'true' + if: steps.component-preloads.outputs.x86 != 'true' run: | set -euo pipefail docker run --rm -v "$PWD:/src" -w /src public.ecr.aws/docker/library/debian:bullseye bash -c ' diff --git a/tools/components/README.md b/tools/components/README.md new file mode 100644 index 0000000000..646c099ccb --- /dev/null +++ b/tools/components/README.md @@ -0,0 +1,35 @@ +# Verified preload snapshots + +`preloads.lock.json` pins a small immutable preload archive. It records each +binary's hash, its producing main CI run, the original APK artifact identity and +digest, source/header hashes, the ARM64 build recipe and x86 compiler-image inputs. +It covers core ARM64 preloads and the x86 preload libraries. VR, Android native +libraries, Comet and Xbox keep their existing preparation paths. + +Every build compares current source inputs, including transitive quoted headers, +and build recipes with this manifest. Changed groups rebuild from source. A +missing release also selects a rebuild. Corrupt archives, unexpected files and +binary hash mismatches fail the build. Existing preload checks, runtime packaging +checks and all test jobs still run. + +The trust anchor is the manifest in the pinned main base. A new or changed PR +manifest is independently checked against a successful `push` build of main: +GitHub must confirm the run/source/workflow and original APK artifact digest, and +every claimed binary must match that APK. The claimed source inputs and recipe +must match that run's Git source. A PR cannot establish trust by changing both a +binary and its claimed checksum. This is approved-build reuse, not a claim of +bit-for-bit reproducible compilation or a signed SLSA attestation. + +To refresh after source or compiler changes: + +1. Let a main build compile and test the new inputs. +2. Run `python tools/components/preloads.py snapshot --run RUN_ID`. +3. Publish `app/build/component-snapshot/preloads.tar.gz` to + DroidDeck-Components as `preloads-`, without replacing an + existing release. Include the manifest and producing run in the release notes. +4. Review and commit the updated manifest. CI independently checks its origin. + +The workflow dispatch `rebuild_preloads` option forces source compilation even +when an approved snapshot matches. Use it when refreshing a compiler or system +header revision. Runner image updates do not silently replace an approved binary; +the producing run remains the record of its compiler environment. diff --git a/tools/components/build-arm64-preloads.sh b/tools/components/build-arm64-preloads.sh new file mode 100644 index 0000000000..a38a1edaaa --- /dev/null +++ b/tools/components/build-arm64-preloads.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -euo pipefail +D=${1:?output directory} +mkdir -p "$D" +aarch64-linux-gnu-g++ -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \ + -pthread -std=c++17 -static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL \ + -o "$D/libfakeinput.so" app/src/main/cpp/fakeinput_steam.cpp -ldl +aarch64-linux-gnu-strip --strip-unneeded "$D/libfakeinput.so" +aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ + -o "$D/libblsession.so" tools/linuxfs/preload/*.c -ldl +aarch64-linux-gnu-strip --strip-unneeded "$D/libblsession.so" +aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ + -o "$D/libblfastpath.so" tools/proot/fastpath/fastpath.c -ldl +aarch64-linux-gnu-strip --strip-unneeded "$D/libblfastpath.so" +aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -nostdlib -ffreestanding -fno-stack-protector \ + -fno-tree-loop-distribute-patterns -Wl,-z,defs -o "$D/libblaudit.so" tools/proot/fastpath/audit.c +aarch64-linux-gnu-strip --strip-unneeded "$D/libblaudit.so" +aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ + -o "$D/libssbs.so" tools/linuxfs/ssbs/ssbs_adapter.c -ldl +aarch64-linux-gnu-strip --strip-unneeded "$D/libssbs.so" +mkdir -p "$D/usr/local/bin" +aarch64-linux-gnu-gcc -O2 -Wall -Wextra -o "$D/usr/local/bin/droiddeck-clipboard" tools/linuxfs/clipboard/clipboard.c -ldl +aarch64-linux-gnu-strip --strip-unneeded "$D/usr/local/bin/droiddeck-clipboard" diff --git a/tools/components/preloads.lock.json b/tools/components/preloads.lock.json new file mode 100644 index 0000000000..4093912e32 --- /dev/null +++ b/tools/components/preloads.lock.json @@ -0,0 +1,125 @@ +{ + "archive_sha256": "cb6487a94f25a3068fd07958174eb5b5e14f709655ff4ef0a8cdbd99138513b2", + "arm64_recipe": "62c8b9cf001f1b04b52856bd74d353842a4be29960f033067f34c7d3a9a48681", + "groups": { + "arm64": { + "@runner": "84f825635599f81ed33f62c5fc4c73f66044d1468b060d65f83855eb9c8bfe77", + "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/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/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/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/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/ssbs/ssbs_adapter.c": "9e4e0fe637f7b8f91f12d8151f02e8d31bcb4294be2b2c62d3cd3ce76f200306", + "tools/proot/fastpath/audit.c": "bfe347a2ddaceef40a78d7d590e4e679724ee4c82f3f1f1e3c7017a18ad536d4", + "tools/proot/fastpath/fastpath.c": "4cd07b25ba14f6faa6bac5091ae323ded6b646dbb34b9e5a92ea6385e4d37cb5", + "tools/quest/kgsl_compat.c": "111afffda7a6df2469610f6c342ae086b1a97a559c586efc4a28015b86efd6bd", + "tools/quest/kgsl_compat.h": "2e9e0eb647530a35277954b7e61a22ee958067fe46056a608fb32f40f273f1bf" + }, + "x86": { + "@runner": "84f825635599f81ed33f62c5fc4c73f66044d1468b060d65f83855eb9c8bfe77", + "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", + "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/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/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/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/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" + }, + "outputs": { + "i386/libblsession.so": "5343cdb704217ddc81ee593e67d5987363dc7b5ac78bd4bd36000219e5063268", + "i386/libfakeinput.so": "188d88dfb13b6e2f2df948e7b8b4d9ec604770f55d1ea5b6b9e21ad56a74ce5e", + "i386/libfaultreport.so": "95f9ef60f04a13ee60cfbd4d2d2efb60a7063b722e646c78c9dc27162292877b", + "libblaudit.so": "6c6abe89baf5d7309babee0c3372a4b00c2b689e2a63de38c5e9a660626509b5", + "libblfastpath.so": "0e1f151b5c1c5ea9dd380ad58d09f8fe7ba3ae037d0991cb3eef6899e9d5ec83", + "libblsession.so": "29d4b5ea46dba941107e02c0ee544244b137a339cada43bff65c350f2ef2755a", + "libfakeinput.so": "5f6dc3aea05de2dc1fbe0bbfac2ce4d11e3d47f761c6b06c8badb15fe1904392", + "libssbs.so": "c288ed0da26c2481aff270d1cdafe1205061c4a300c2c46ae1b53c6e0c94f44b", + "usr/local/bin/droiddeck-clipboard": "ec50e8f67fdf76372927189b0fdb670f9b70fd3484f2fe3e833bc8f9fdc44205", + "x86_64/libblsession.so": "61d19f06aebab6a789f8c99f687af9903376bfc853e46b70c48a2ce5e497accc", + "x86_64/libfakeinput.so": "8663dd2086bf8ae53069a480dd9ae4619109d32f0947a29e2ce38f07a21ae2e6", + "x86_64/libfaultreport.so": "bb0dc9165d0d764473e552508650edd586df16d620fc5b16b8b1c5740a28ce22", + "x86_64/libvulkan-thunk.so": "74f01b652d7e8179561a096a552328b68da640cc4bad3981edd38e6afbf90243", + "x86_64/libwebkitinput.so": "9b07380a7b017397b9c56bb7bb1161e046b0c6a647fc413888904606b0def6d0" + }, + "toolchain": { + "arm64": "Ubuntu 24.04 GCC cross compiler; exact build commands pinned by arm64_recipe", + "x86": "Debian bullseye compiler image and recipe pinned by source inputs" + }, + "version": 1 +} diff --git a/tools/components/preloads.py b/tools/components/preloads.py new file mode 100644 index 0000000000..7da904080f --- /dev/null +++ b/tools/components/preloads.py @@ -0,0 +1,248 @@ +"""Reuse reviewed preload snapshots; changed snapshots must prove their main-build origin.""" +import argparse +import gzip +import hashlib +import io +import json +import os +import posixpath +import re +from pathlib import Path +import subprocess +import tarfile +import urllib.error +import urllib.request +from zipfile import ZipFile + +ROOT = Path(__file__).resolve().parents[2] +REPO = 'Droid-Deck/DroidDeck' +LOCK = 'tools/components/preloads.lock.json' +COMMON = ['app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/cpp/adrenotools/src/hook/kgsl.h', + 'app/src/main/cpp/venc/venc_proto.h', 'tools/linuxfs/preload', + 'tools/quest/kgsl_compat.c', 'tools/quest/kgsl_compat.h'] +INPUTS = { + 'arm64': COMMON + ['tools/proot/fastpath', 'tools/linuxfs/ssbs', 'tools/linuxfs/clipboard'], + 'x86': COMMON + ['tools/linuxfs/fex', 'tools/linuxfs/build-x86-preloads.sh', 'tools/linuxfs/debian-image.env'], +} +OUTPUTS = { + 'arm64': ['libfakeinput.so', 'libblsession.so', 'libblfastpath.so', 'libblaudit.so', 'libssbs.so', + 'usr/local/bin/droiddeck-clipboard'], + 'x86': [f'{arch}/{name}.so' for arch in ('x86_64', 'i386') + for name in ('libfakeinput', 'libblsession', 'libfaultreport')] + + ['x86_64/libwebkitinput.so', 'x86_64/libvulkan-thunk.so'], +} +FILES = set(sum(OUTPUTS.values(), [])) + + +def sha(data): + return hashlib.sha256(data).hexdigest() + + +def run(*args, root=ROOT): + return subprocess.check_output(args, cwd=root) + + +def api(path): + return json.loads(run('gh', 'api', 'repos/' + REPO + '/' + path)) + + +def source_files(group, root=ROOT, commit=None): + if commit: + paths = run('git', 'ls-tree', '-r', '--name-only', commit, '--', *INPUTS[group], root=root).decode().splitlines() + read = lambda path: run('git', 'show', f'{commit}:{path}', root=root) + else: + paths = run('git', 'ls-files', '--cached', '--others', '--exclude-standard', '--', *INPUTS[group], root=root).decode().splitlines() + read = lambda path: (root / path).read_bytes() + paths = [p for p in paths if not p.endswith('.md') and '__pycache__' not in p and not p.endswith('.pyc')] + if not paths: + raise ValueError('No preload inputs found') + result = {} + pending = list(paths) + while pending: + path = pending.pop() + if path in result: + continue + if path.startswith('../') or path.startswith('/'): + raise ValueError('Preload include escapes repository') + content = read(path).replace(b'\r\n', b'\n') + result[path] = sha(content) + for include in re.findall(rb'^\s*#\s*include\s*"([^"\n]+)"', content, re.M): + pending.append(posixpath.normpath(posixpath.join(posixpath.dirname(path), include.decode()))) + workflow = (run('git', 'show', f'{commit}:.github/workflows/build.yml', root=root).decode() if commit + else (root / '.github/workflows/build.yml').read_text()) + runner = re.search(r'(?ms)^ build:\n.*?^ runs-on: ([^\n]+)', workflow) + if runner is None: + raise ValueError('APK build runner policy is missing') + result['@runner'] = sha(runner[1].strip().encode()) + return dict(sorted(result.items())) + + +def recipe(root=ROOT, commit=None): + def read(path): + return (run('git', 'show', f'{commit}:{path}', root=root).decode() if commit + else (root / path).read_text()) + script = 'tools/components/build-arm64-preloads.sh' + if commit and run('git', 'ls-tree', commit, script, root=root) == b'': + workflow = read('.github/workflows/build.yml') + text = workflow[workflow.index(' aarch64-linux-gnu-g++ -shared'):] + text = text[:text.index(' VK_INCLUDE=')] + else: + text = read(script) + preamble = '#!/usr/bin/env bash\nset -euo pipefail\nD=${1:?output directory}\nmkdir -p "$D"\n' + if not text.startswith(preamble): + return sha(text.encode()) + text = text[len(preamble):] + return sha(' '.join(text.split()).encode()) + + +def artifact_bytes(origin, cache): + build = api(f"actions/runs/{origin['run']}") + if (build['event'] != 'push' or build['head_branch'] != 'main' or build['conclusion'] != 'success' + or build['head_sha'] != origin['commit'] or build['path'] != '.github/workflows/build.yml' + or build['repository']['full_name'] != REPO): + raise ValueError('Snapshot is not from a successful main APK build') + artifact = api(f"actions/artifacts/{origin['artifact']}") + if (artifact['name'] != 'droiddeck-apk' or artifact['workflow_run']['id'] != origin['run'] + or artifact['digest'] != 'sha256:' + origin['artifact_sha256']): + raise ValueError('Original APK artifact identity or digest mismatch') + cache.mkdir(parents=True, exist_ok=True) + path = cache / (origin['artifact_sha256'] + '.zip') + if not path.exists(): + path.write_bytes(run('gh', 'api', f"repos/{REPO}/actions/artifacts/{origin['artifact']}/zip")) + content = path.read_bytes() + if sha(content) != origin['artifact_sha256']: + raise ValueError('Original APK archive checksum mismatch') + with ZipFile(io.BytesIO(content)) as archive: + names = [name for name in archive.namelist() if name.endswith('.apk')] + if len(names) != 1: + raise ValueError('Expected one original APK') + with ZipFile(io.BytesIO(archive.read(names[0]))) as apk: + return {name: apk.read('assets/linuxfs/' + name) for name in FILES} + + +def validate_lock(data): + if data.get('version') != 1 or set(data['groups']) != set(INPUTS): + raise ValueError('Unsupported preload snapshot') + if set(data['outputs']) != FILES: + raise ValueError('Unexpected preload output set') + for digest in [data['archive_sha256'], *data['outputs'].values()]: + if len(digest) != 64 or any(c not in '0123456789abcdef' for c in digest): + raise ValueError('Invalid preload checksum') + + +def prove_origin(data, cache, root=ROOT): + content = artifact_bytes(data['origin'], cache) + if {name: sha(value) for name, value in content.items()} != data['outputs']: + raise ValueError('Snapshot binaries differ from the original main APK') + commit = data['origin']['commit'] + run('git', 'fetch', '--no-tags', 'origin', commit, root=root) + for group in INPUTS: + if source_files(group, root, commit) != data['groups'][group]: + raise ValueError('Snapshot inputs differ from the producing source') + if recipe(root, commit) != data['arm64_recipe']: + raise ValueError('Snapshot recipe differs from the producing source') + + +def unpack(content, data): + if sha(content) != data['archive_sha256']: + raise ValueError('Preload archive checksum mismatch') + result = {} + total = 0 + with tarfile.open(fileobj=io.BytesIO(content), mode='r:gz') as archive: + for entry in archive: + if entry.name not in FILES or entry.name in result or not entry.isfile() or entry.size > 32 * 1024 * 1024: + raise ValueError('Unsafe or unexpected preload archive entry') + total += entry.size + if total > 64 * 1024 * 1024: + raise ValueError('Preload archive exceeds expanded size limit') + value = archive.extractfile(entry).read() + if sha(value) != data['outputs'][entry.name]: + raise ValueError('Preload binary checksum mismatch') + result[entry.name] = value + if set(result) != FILES: + raise ValueError('Incomplete preload archive') + return result + + +def restore(root=ROOT): + data = json.loads((root / LOCK).read_text()) + validate_lock(data) + matching = {group: source_files(group, root) == data['groups'][group] for group in INPUTS} + matching['arm64'] &= recipe(root) == data['arm64_recipe'] + if os.environ.get('FORCE_PRELOAD_REBUILD') == 'true': + matching = dict.fromkeys(INPUTS, False) + if any(matching.values()): + base = os.environ.get('COMPONENT_TRUSTED_BASE') + approved = None + if base: + result = subprocess.run(['git', 'show', f'{base}:{LOCK}'], cwd=root, capture_output=True) + if result.returncode == 0: + approved = json.loads(result.stdout) + if approved != data: + prove_origin(data, root / 'app/build/component-downloads', root) + url = (f"https://github.com/Droid-Deck/DroidDeck-Components/releases/download/" + f"preloads-{data['archive_sha256']}/preloads.tar.gz") + try: + with urllib.request.urlopen(url, timeout=60) as response: + content = response.read(64 * 1024 * 1024) + except urllib.error.HTTPError as error: + if error.code != 404: + raise + print('Preload snapshot is unavailable; rebuilding from source.') + matching = dict.fromkeys(INPUTS, False) + else: + binaries = unpack(content, data) + for group, matches in matching.items(): + if matches: + for name in OUTPUTS[group]: + path = root / 'app/src/main/assets/linuxfs' / name + if not path.resolve().is_relative_to(root.resolve()) or path.is_symlink(): + raise ValueError('Preload output escapes repository or is a symlink') + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(binaries[name]) + path.chmod(0o755 if name.endswith('droiddeck-clipboard') else 0o644) + for group, matches in matching.items(): + print(f"{group}: {'verified snapshot reused' if matches else 'inputs changed or snapshot unavailable; rebuild required'}") + if os.environ.get('GITHUB_OUTPUT'): + with open(os.environ['GITHUB_OUTPUT'], 'a') as output: + output.write(f'{group}={str(matches).lower()}\n') + return matching + + +def snapshot(run_id, destination, root=ROOT): + build = api(f'actions/runs/{run_id}') + candidates = api(f'actions/runs/{run_id}/artifacts?per_page=100')['artifacts'] + artifact = next(a for a in candidates if a['name'] == 'droiddeck-apk') + origin = dict(run=run_id, commit=build['head_sha'], artifact=artifact['id'], + artifact_sha256=artifact['digest'].removeprefix('sha256:'), + url=build['html_url']) + content = artifact_bytes(origin, root / 'app/build/component-downloads') + run('git', 'fetch', '--no-tags', 'origin', origin['commit'], root=root) + data = dict(version=1, origin=origin, groups={g: source_files(g, root, origin['commit']) for g in INPUTS}, + arm64_recipe=recipe(root, origin['commit']), outputs={name: sha(value) for name, value in content.items()}, + toolchain=dict(arm64='Ubuntu 24.04 GCC cross compiler; exact build commands pinned by arm64_recipe', + x86='Debian bullseye compiler image and recipe pinned by source inputs')) + stream = io.BytesIO() + with gzip.GzipFile(fileobj=stream, mode='wb', mtime=0) as compressed: + with tarfile.open(fileobj=compressed, mode='w') as archive: + for name, value in sorted(content.items()): + entry = tarfile.TarInfo(name) + entry.size, entry.mode = len(value), 0o644 + archive.addfile(entry, io.BytesIO(value)) + destination.mkdir(parents=True, exist_ok=True) + (destination / 'preloads.tar.gz').write_bytes(stream.getvalue()) + data['archive_sha256'] = sha(stream.getvalue()) + (root / LOCK).write_text(json.dumps(data, indent=2, sort_keys=True) + '\n') + print('Snapshot SHA-256: ' + data['archive_sha256']) + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + parser.add_argument('operation', choices=['restore', 'snapshot']) + parser.add_argument('--run', type=int) + parser.add_argument('--out', type=Path, default=ROOT / 'app/build/component-snapshot') + args = parser.parse_args() + if args.operation == 'restore': + restore() + else: + snapshot(args.run, args.out) diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index a0ac10bfdd..d6cf46bc49 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -23,7 +23,7 @@ PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet'] SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/assets/pulseaudio.tzst', 'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', 'tools/gamescope/release.env', 'tools/droiddeck-esync/release.env', - 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/build_local.sh', + 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/components', 'tools/build_local.sh', 'tools/release/runtime_inputs.py', 'app/src/main/assets/desktop-removal', 'tools/quest', 'tools/vr/src', 'tools/vr/driver_droiddeck', 'tools/vr/layer', 'tools/vr/build.sh', 'app/src/main/cpp/waylandcomp/src/headpose_shm.h', diff --git a/tools/tests/test_preload_snapshots.py b/tools/tests/test_preload_snapshots.py new file mode 100644 index 0000000000..5a4cfb606c --- /dev/null +++ b/tools/tests/test_preload_snapshots.py @@ -0,0 +1,146 @@ +import copy +import importlib.util +import io +import json +import os +from pathlib import Path +import subprocess +import tarfile +import tempfile +import unittest +from unittest.mock import patch + +SPEC = importlib.util.spec_from_file_location('preload_snapshots', Path(__file__).resolve().parents[1] / 'components/preloads.py') +snapshots = importlib.util.module_from_spec(SPEC) +SPEC.loader.exec_module(snapshots) + + +def archive(files): + stream = io.BytesIO() + with tarfile.open(fileobj=stream, mode='w:gz') as tar: + for name, content in files.items(): + entry = tarfile.TarInfo(name) + entry.size = len(content) + tar.addfile(entry, io.BytesIO(content)) + return stream.getvalue() + + +class PreloadSnapshotTest(unittest.TestCase): + def setUp(self): + directory = tempfile.TemporaryDirectory() + self.addCleanup(directory.cleanup) + self.root = Path(directory.name) + # Real repository inputs exercise the transitive include walker and build recipe. + for group in snapshots.INPUTS: + for name in snapshots.source_files(group): + if name.startswith('@'): + continue + target = self.root / name + target.parent.mkdir(parents=True, exist_ok=True) + target.write_bytes((snapshots.ROOT / name).read_bytes()) + recipe = 'tools/components/build-arm64-preloads.sh' + (self.root / recipe).parent.mkdir(parents=True, exist_ok=True) + (self.root / recipe).write_text((snapshots.ROOT / recipe).read_text()) + (self.root / '.github/workflows').mkdir(parents=True) + (self.root / '.github/workflows/build.yml').write_text((snapshots.ROOT / '.github/workflows/build.yml').read_text()) + self.git('init', '-q') + self.git('config', 'core.autocrlf', 'false') + self.git('config', 'user.name', 'Test Developer') + self.git('config', 'user.email', 'test@example.test') + self.git('add', '.') + self.binaries = {name: ('verified-' + name).encode() for name in snapshots.FILES} + self.content = archive(self.binaries) + self.data = dict(version=1, origin=dict(run=123, commit='abc', artifact=456, artifact_sha256='0' * 64), + groups={g: snapshots.source_files(g, self.root) for g in snapshots.INPUTS}, + arm64_recipe=snapshots.recipe(self.root), archive_sha256=snapshots.sha(self.content), + outputs={name: snapshots.sha(value) for name, value in self.binaries.items()}) + (self.root / snapshots.LOCK).write_text(json.dumps(self.data)) + self.git('add', '.') + self.git('commit', '-qm', 'Approved baseline') + self.base = self.git('rev-parse', 'HEAD').strip() + + def git(self, *args): + return subprocess.check_output(['git', *args], cwd=self.root, text=True) + + def restore(self, base=None): + with patch.dict(os.environ, COMPONENT_TRUSTED_BASE=base or self.base, FORCE_PRELOAD_REBUILD='false'), \ + patch.object(snapshots.urllib.request, 'urlopen', return_value=io.BytesIO(self.content)) as fetch, \ + patch.object(snapshots, 'prove_origin') as prove: + result = snapshots.restore(self.root) + return result, fetch, prove + + def test_reviewed_unchanged_binaries_reused_and_written(self): + result, fetch, prove = self.restore() + self.assertEqual(result, dict(arm64=True, x86=True)) + prove.assert_not_called() + fetch.assert_called_once() + for name, value in self.binaries.items(): + self.assertEqual((self.root / 'app/src/main/assets/linuxfs' / name).read_bytes(), value) + + def test_changed_common_source_requires_both_rebuilds(self): + path = self.root / snapshots.COMMON[0] + path.write_text(path.read_text() + '\n// Changed source\n') + result, fetch, prove = self.restore() + self.assertEqual(result, dict(arm64=False, x86=False)) + fetch.assert_not_called() + prove.assert_not_called() + + def test_new_transitive_header_is_an_input(self): + source = self.root / snapshots.COMMON[0] + source.write_text(source.read_text() + '\n#include "new-header.h"\n') + header = source.with_name('new-header.h') + header.write_text('#define VALUE 1\n') + before = snapshots.source_files('arm64', self.root) + header.write_text('#define VALUE 2\n') + self.assertNotEqual(before, snapshots.source_files('arm64', self.root)) + + def test_changed_recipe_rebuilds_arm64_only(self): + script = self.root / 'tools/components/build-arm64-preloads.sh' + script.write_text(script.read_text().replace('-O2', '-O3')) + result, _, _ = self.restore() + self.assertEqual(result, dict(arm64=False, x86=True)) + + def test_new_manifest_requires_main_build_proof(self): + result, _, prove = self.restore('HEAD~1') + self.assertTrue(all(result.values())) + prove.assert_called_once() + + def test_forged_binary_hash_cannot_prove_main_origin(self): + data = copy.deepcopy(self.data) + data['outputs']['libblsession.so'] = 'f' * 64 + with patch.object(snapshots, 'artifact_bytes', return_value=self.binaries): + with self.assertRaisesRegex(ValueError, 'original main APK'): + snapshots.prove_origin(data, self.root / 'cache', self.root) + + def test_non_main_or_unsuccessful_run_cannot_prove_origin(self): + build = dict(event='pull_request', head_branch='main', conclusion='success', head_sha='abc', + path='.github/workflows/build.yml', repository=dict(full_name=snapshots.REPO)) + for field, value in [('event', 'pull_request'), ('head_branch', 'feature'), ('conclusion', 'failure')]: + candidate = dict(build, event='push') + candidate[field] = value + with self.subTest(field=field), patch.object(snapshots, 'api', return_value=candidate): + with self.assertRaisesRegex(ValueError, 'successful main'): + snapshots.artifact_bytes(self.data['origin'], self.root / 'cache') + + def test_corrupt_archive_is_rejected(self): + with self.assertRaisesRegex(ValueError, 'checksum'): + snapshots.unpack(self.content + b'tampered', self.data) + + def test_missing_duplicate_or_traversal_entries_are_rejected(self): + for files in ({}, {'../escaped': b'bad'}, {'libblsession.so': b'wrong'}): + content = archive(files) + data = dict(self.data, archive_sha256=snapshots.sha(content)) + with self.subTest(names=list(files)), self.assertRaises(ValueError): + snapshots.unpack(content, data) + + def test_missing_release_rebuilds_without_accepting_unverified_bytes(self): + error = snapshots.urllib.error.HTTPError('https://example.test', 404, 'missing', {}, None) + with patch.dict(os.environ, COMPONENT_TRUSTED_BASE=self.base), \ + patch.object(snapshots.urllib.request, 'urlopen', side_effect=error): + self.assertEqual(snapshots.restore(self.root), dict(arm64=False, x86=False)) + + def test_manual_rebuild_does_not_download_snapshot(self): + with patch.dict(os.environ, FORCE_PRELOAD_REBUILD='true'), \ + patch.object(snapshots.urllib.request, 'urlopen') as fetch: + self.assertEqual(snapshots.restore(self.root), dict(arm64=False, x86=False)) + fetch.assert_not_called() From d7bf0b274ff202edd3181dfa2d285cd667b8f2f4 Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 14:31:13 -0400 Subject: [PATCH 041/174] ci: consolidate verified component preparation --- .github/workflows/authorship.yml | 2 +- .github/workflows/build.yml | 718 ++++++------------ tools/ci/resolve-ndk.sh | 16 + tools/ci/toolchains.env | 1 + tools/components/README.md | 34 +- tools/components/preloads.lock.json | 2 +- tools/components/preloads.py | 70 +- tools/components/prepare.py | 167 ++++ tools/components/recipes.json | 225 ++++++ tools/components/recipes/arm64-preloads.sh | 3 + tools/components/recipes/audio.sh | 14 + tools/components/recipes/comet.sh | 5 + tools/components/recipes/debian-image.sh | 18 + tools/components/recipes/directaudio.sh | 3 + tools/components/recipes/esync.sh | 23 + tools/components/recipes/proot.sh | 4 + tools/components/recipes/pulseaudio-source.sh | 5 + tools/components/recipes/runtime.sh | 83 ++ tools/components/recipes/x86-preloads.sh | 17 + tools/components/recipes/xbox.sh | 4 + tools/release/announce-preview.sh | 20 + tools/release/describe-build.sh | 22 + tools/release/publish-ci.sh | 39 + tools/release/report-build.sh | 77 ++ tools/release/runtime_inputs.py | 2 +- tools/tests/test_ci_checks.py | 6 + tools/tests/test_ci_ndk.py | 27 + tools/tests/test_component_prepare.py | 106 +++ tools/tests/test_esync_packs.py | 10 +- tools/tests/test_preload_snapshots.py | 31 + tools/tests/test_xbox_build_source.py | 18 +- 31 files changed, 1269 insertions(+), 503 deletions(-) create mode 100644 tools/ci/resolve-ndk.sh create mode 100644 tools/ci/toolchains.env create mode 100644 tools/components/prepare.py create mode 100644 tools/components/recipes.json create mode 100644 tools/components/recipes/arm64-preloads.sh create mode 100644 tools/components/recipes/audio.sh create mode 100644 tools/components/recipes/comet.sh create mode 100644 tools/components/recipes/debian-image.sh create mode 100644 tools/components/recipes/directaudio.sh create mode 100644 tools/components/recipes/esync.sh create mode 100644 tools/components/recipes/proot.sh create mode 100644 tools/components/recipes/pulseaudio-source.sh create mode 100644 tools/components/recipes/runtime.sh create mode 100644 tools/components/recipes/x86-preloads.sh create mode 100644 tools/components/recipes/xbox.sh create mode 100644 tools/release/announce-preview.sh create mode 100644 tools/release/describe-build.sh create mode 100644 tools/release/publish-ci.sh create mode 100644 tools/release/report-build.sh create mode 100644 tools/tests/test_ci_ndk.py create mode 100644 tools/tests/test_component_prepare.py diff --git a/.github/workflows/authorship.yml b/.github/workflows/authorship.yml index 97c6637a8f..ebbcae644f 100644 --- a/.github/workflows/authorship.yml +++ b/.github/workflows/authorship.yml @@ -23,7 +23,7 @@ permissions: jobs: validate: - name: Build APK + name: Validate source and build result runs-on: ubuntu-24.04 timeout-minutes: 5 steps: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ea175cbfe..265b1faee6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,17 +31,14 @@ concurrency: group: build-${{ github.event.pull_request.number || github.run_id }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} -env: - PRELOAD_CACHE_VERSION: v8 - jobs: - xbox: - name: Xbox ARM64 backend + source: + name: Pin source tree if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} - runs-on: ubuntu-24.04-arm - timeout-minutes: 30 + runs-on: ubuntu-24.04 + timeout-minutes: 5 outputs: - base-sha: ${{ steps.merge.outputs.base-sha }} + base-sha: ${{ steps.merge.outputs.base-sha || steps.trusted.outputs.base-sha }} tree-sha: ${{ steps.source.outputs.tree-sha }} steps: - uses: actions/checkout@v4 @@ -59,9 +56,46 @@ jobs: git config user.name "ci" git config user.email "ci@users.noreply.github.com" git merge --no-ff --no-edit origin/main - - name: Record backend source tree + - name: Resolve trusted manifest base + id: trusted + if: github.event_name != 'pull_request' + run: | + set -euo pipefail + git fetch --no-tags origin main + echo "base-sha=$(git rev-parse origin/main)" >> "$GITHUB_OUTPUT" + - name: Record pinned source tree id: source run: echo "tree-sha=$(git rev-parse 'HEAD^{tree}')" >> "$GITHUB_OUTPUT" + + xbox: + name: Xbox ARM64 backend + needs: source + if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} + runs-on: ubuntu-24.04-arm + timeout-minutes: 30 + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + fetch-depth: 0 + persist-credentials: false + - name: Merge the pinned APK base + if: github.event_name == 'pull_request' + env: + BUILD_BASE_SHA: ${{ needs.source.outputs.base-sha }} + run: | + set -euo pipefail + git fetch --no-tags origin "$BUILD_BASE_SHA" + git config user.name "ci" + git config user.email "ci@users.noreply.github.com" + git merge --no-ff --no-edit FETCH_HEAD + - name: Verify pinned source tree + env: + SOURCE_TREE: ${{ needs.source.outputs.tree-sha }} + run: test "$(git rev-parse 'HEAD^{tree}')" = "$SOURCE_TREE" + - name: Plan component identities + id: plan + run: python3 tools/components/prepare.py plan - uses: actions/cache@v4 id: xbox-cache with: @@ -69,13 +103,10 @@ jobs: app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox app/build/xbox/xodus-droiddeck-source.tar.xz app/build/xbox/runtime/*-source.tar.xz - key: xbox-arm64-${{ hashFiles('tools/xbox/**') }} + key: xbox-v2-${{ steps.plan.outputs.xbox }} - name: Build Xbox backend if: steps.xbox-cache.outputs.cache-hit != 'true' - run: | - rustup toolchain install 1.99.0 --profile minimal - bash tools/ci/install-ubuntu-packages.sh build-essential pkg-config libssl-dev protobuf-compiler cmake xz-utils - bash tools/xbox/build.sh + run: python3 tools/components/prepare.py xbox - uses: actions/upload-artifact@v4 with: name: xbox-arm64 @@ -90,8 +121,157 @@ jobs: if-no-files-found: error retention-days: 14 + components: + name: Prepare verified components + needs: source + if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} + runs-on: ubuntu-24.04 + timeout-minutes: 40 + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + fetch-depth: 0 + persist-credentials: false + - name: Merge the pinned APK base + if: github.event_name == 'pull_request' + env: + BUILD_BASE_SHA: ${{ needs.source.outputs.base-sha }} + run: | + set -euo pipefail + git fetch --no-tags origin "$BUILD_BASE_SHA" + git config user.name "ci" + git config user.email "ci@users.noreply.github.com" + git merge --no-ff --no-edit FETCH_HEAD + - name: Verify pinned source tree + env: + SOURCE_TREE: ${{ needs.source.outputs.tree-sha }} + run: test "$(git rev-parse 'HEAD^{tree}')" = "$SOURCE_TREE" + - name: Resolve the pinned Android NDK + run: bash tools/ci/resolve-ndk.sh + + - name: Plan component identities + id: plan + run: python3 tools/components/prepare.py plan + - name: Cache remaining Linux runtime assets + id: preloads + uses: actions/cache@v4 + with: + path: | + app/src/main/assets/linuxfs + !app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet + !app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox + !app/src/main/assets/linuxfs/i386/libblsession.so + !app/src/main/assets/linuxfs/i386/libfakeinput.so + !app/src/main/assets/linuxfs/i386/libfaultreport.so + !app/src/main/assets/linuxfs/libblaudit.so + !app/src/main/assets/linuxfs/libblfastpath.so + !app/src/main/assets/linuxfs/libblsession.so + !app/src/main/assets/linuxfs/libfakeinput.so + !app/src/main/assets/linuxfs/libssbs.so + !app/src/main/assets/linuxfs/usr/local/bin/droiddeck-clipboard + !app/src/main/assets/linuxfs/x86_64/libblsession.so + !app/src/main/assets/linuxfs/x86_64/libfakeinput.so + !app/src/main/assets/linuxfs/x86_64/libfaultreport.so + !app/src/main/assets/linuxfs/x86_64/libvulkan-thunk.so + !app/src/main/assets/linuxfs/x86_64/libwebkitinput.so + key: runtime-v9-${{ steps.plan.outputs.runtime }} + + - name: Cache PulseAudio 13.0 source + id: pa-src + uses: actions/cache@v4 + with: + path: pa13 + key: pulseaudio-src-${{ steps.plan.outputs.pulseaudio-source }} + - name: Cache proot + id: proot + uses: actions/cache@v4 + with: + path: | + app/src/main/jniLibs/arm64-v8a/libproot.so + app/src/main/jniLibs/arm64-v8a/libproot-loader.so + key: proot-v2-${{ steps.plan.outputs.proot }} + - name: Cache GOG Galaxy companion + id: comet + uses: actions/cache@v4 + with: + path: app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet + key: comet-v2-${{ steps.plan.outputs.comet }} + + - name: Restore verified preload snapshots + id: component-preloads + env: + GH_TOKEN: ${{ github.token }} + FORCE_PRELOAD_REBUILD: ${{ inputs.rebuild_preloads || 'false' }} + COMPONENT_TRUSTED_BASE: ${{ needs.source.outputs.base-sha }} + run: python3 tools/components/prepare.py preload-snapshot + + - name: Prepare required Linux build tools once + env: + COMPONENTS_TO_BUILD: >- + ${{ steps.preloads.outputs.cache-hit != 'true' && 'runtime' || '' }} + ${{ steps.component-preloads.outputs.arm64 != 'true' && 'arm64-preloads' || '' }} + ${{ steps.comet.outputs.cache-hit != 'true' && 'comet' || '' }} + run: python3 tools/components/prepare.py tools + + - name: Build changed ARM64 preloads + if: steps.component-preloads.outputs.arm64 != 'true' + run: python3 tools/components/prepare.py arm64-preloads + + - name: Prepare remaining Linux runtime assets + if: steps.preloads.outputs.cache-hit != 'true' + run: python3 tools/components/prepare.py runtime + + - name: Fetch the Debian image the preloads build in + if: steps.component-preloads.outputs.x86 != 'true' + env: + GH_TOKEN: ${{ github.token }} + run: python3 tools/components/prepare.py debian-image + + - name: Build the x86 preloads FEX guests load (glibc 2.31) + if: steps.component-preloads.outputs.x86 != 'true' + run: python3 tools/components/prepare.py x86-preloads + + - name: Bundle the droiddeck-esync packs + run: python3 tools/components/prepare.py esync + + - name: Fetch PulseAudio 13.0 source + if: steps.pa-src.outputs.cache-hit != 'true' + run: python3 tools/components/prepare.py pulseaudio-source + + - name: Fetch DirectAudio (tools/directaudio/release.env) + run: python3 tools/components/prepare.py directaudio + + - name: Build the AAudio sink into the audio bundle + run: python3 tools/components/prepare.py audio + + - name: Build proot + if: steps.proot.outputs.cache-hit != 'true' + run: python3 tools/components/prepare.py proot + + - name: Check the preloads + run: | + set -euo pipefail + bash tools/linuxfs/check-preloads.sh app/src/main/assets/linuxfs + + - name: Build GOG Galaxy companion + if: steps.comet.outputs.cache-hit != 'true' + run: python3 tools/components/prepare.py comet + + - name: Prepare graphics driver variants + run: python3 tools/quest/build-driver.py "$ANDROID_HOME/ndk/$NDK_VERSION" + - name: Record and pack prepared components + run: python3 tools/components/prepare.py pack + - uses: actions/upload-artifact@v4 + with: + name: prepared-components + path: app/build/prepared-components.tar.gz + if-no-files-found: error + compression-level: 0 + retention-days: 14 + build: - needs: xbox + needs: [source, components, xbox] name: Compile APK and Android tests if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} runs-on: ubuntu-24.04 @@ -155,7 +335,7 @@ jobs: - name: Merge onto main, or say what conflicts if: github.event_name == 'pull_request' env: - BUILD_BASE_SHA: ${{ needs.xbox.outputs.base-sha }} + BUILD_BASE_SHA: ${{ needs.source.outputs.base-sha }} run: | set -uo pipefail git config user.name "ci" @@ -213,7 +393,7 @@ jobs: - name: Verify backend and APK source match env: - XBOX_SOURCE_TREE: ${{ needs.xbox.outputs.tree-sha }} + XBOX_SOURCE_TREE: ${{ needs.source.outputs.tree-sha }} run: test "$(git rev-parse 'HEAD^{tree}')" = "$XBOX_SOURCE_TREE" - uses: actions/setup-java@v4 @@ -225,11 +405,8 @@ jobs: with: cache-cleanup: on-success - - name: Resolve the runner's NDK - run: | - NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" - VERSION=$(sed -n 's/^Pkg.Revision *= *//p' "$NDK/source.properties") - echo "NDK_VERSION=$VERSION" >> "$GITHUB_ENV" + - name: Resolve the pinned Android NDK + run: bash tools/ci/resolve-ndk.sh - name: Set the APK build label id: build-label @@ -255,274 +432,6 @@ jobs: echo "DROIDDECK_PR_NUMBER=${PR_NUMBER:-0}" >> "$GITHUB_ENV" echo "Build: \`$label\`" >> "$GITHUB_STEP_SUMMARY" - - name: Cache the preloads - id: preloads - uses: actions/cache@v4 - with: - path: | - app/src/main/assets/linuxfs - !app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet - !app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox - !app/src/main/assets/linuxfs/i386/libblsession.so - !app/src/main/assets/linuxfs/i386/libfakeinput.so - !app/src/main/assets/linuxfs/i386/libfaultreport.so - !app/src/main/assets/linuxfs/libblaudit.so - !app/src/main/assets/linuxfs/libblfastpath.so - !app/src/main/assets/linuxfs/libblsession.so - !app/src/main/assets/linuxfs/libfakeinput.so - !app/src/main/assets/linuxfs/libssbs.so - !app/src/main/assets/linuxfs/usr/local/bin/droiddeck-clipboard - !app/src/main/assets/linuxfs/x86_64/libblsession.so - !app/src/main/assets/linuxfs/x86_64/libfakeinput.so - !app/src/main/assets/linuxfs/x86_64/libfaultreport.so - !app/src/main/assets/linuxfs/x86_64/libvulkan-thunk.so - !app/src/main/assets/linuxfs/x86_64/libwebkitinput.so - key: preloads-${{ env.PRELOAD_CACHE_VERSION }}-${{ hashFiles('app/src/main/cpp/adrenotools/src/hook/kgsl.h', 'tools/quest/*', 'tools/linuxfs/overlay/usr/local/bin/*', 'tools/linuxfs/overlay/usr/bin/**', 'tools/linuxfs/desktop/*', 'tools/gamescope/release.env', 'tools/wlroots/release.env', 'tools/linuxfs/uruntime.env', 'tools/linuxfs/licenses/*', 'tools/mangoapp/*', 'tools/msitools/**', 'tools/pipewire/**', 'tools/ci/install-ubuntu-packages.sh', 'tools/vr/**') }} - - - name: Restore verified preload snapshots - id: component-preloads - env: - GH_TOKEN: ${{ github.token }} - FORCE_PRELOAD_REBUILD: ${{ inputs.rebuild_preloads || 'false' }} - COMPONENT_TRUSTED_BASE: ${{ needs.xbox.outputs.base-sha || github.sha }} - run: python3 tools/components/preloads.py restore - - - name: Build changed ARM64 preloads - if: steps.component-preloads.outputs.arm64 != 'true' - run: | - bash tools/ci/install-ubuntu-packages.sh gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - bash tools/components/build-arm64-preloads.sh app/src/main/assets/linuxfs - - - name: Prepare remaining Linux runtime assets - if: steps.preloads.outputs.cache-hit != 'true' - run: | - set -euo pipefail - bash tools/ci/install-ubuntu-packages.sh gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libvulkan1 mesa-vulkan-drivers - D=app/src/main/assets/linuxfs - mkdir -p "$D" - VK_INCLUDE=$(ls -d "${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}"/toolchains/llvm/prebuilt/*/sysroot/usr/include | head -1) \ - tools/vr/build.sh --native "$D/usr/local/lib/droiddeck-vr" - for script in tools/linuxfs/overlay/usr/local/bin/droiddeck-* tools/linuxfs/overlay/usr/local/bin/steam-compatibility; do - install -Dm644 "$script" "$D/usr/local/bin/$(basename "$script")" - done - for f in tools/linuxfs/overlay/usr/bin/* tools/linuxfs/overlay/usr/bin/steamos-polkit-helpers/*; do - [ -f "$f" ] && install -Dm644 "$f" "$D/${f#tools/linuxfs/overlay/}" - done - if [ -f tools/gamescope/release.env ]; then - . tools/gamescope/release.env - curl -fsSL --retry 3 -o gamescope.tzst "https://github.com/${GAMESCOPE_REPO:-${GITHUB_REPOSITORY}}/releases/download/${GAMESCOPE_TAG}/gamescope.tzst" - echo "${GAMESCOPE_SHA256} gamescope.tzst" | sha256sum -c - - tar --use-compress-program=unzstd -xf gamescope.tzst -C "$D" - test -f "$D/usr/local/bin/gamescope" - rm gamescope.tzst - fi - . tools/linuxfs/uruntime.env - curl -fsSL --retry 3 -o uruntime "https://github.com/VHSgunzo/uruntime/releases/download/${URUNTIME_VERSION}/${URUNTIME_ASSET}" - echo "${URUNTIME_SHA256} uruntime" | sha256sum -c - - install -Dm644 uruntime "$D/usr/local/lib/droiddeck/uruntime" - install -Dm644 tools/linuxfs/licenses/uruntime-LICENSE "$D/usr/local/share/licenses/uruntime/LICENSE" - rm uruntime - M="$D/usr/local/lib/mangoapp" - mkdir -p "$M" mango-pkgs - grep -v '^#' tools/mangoapp/packages.txt | while read -r sum url; do - [ -n "$url" ] || continue - curl -fsSL --retry 3 -o mango-pkgs/pkg.tar.zst "$url" - echo "$sum mango-pkgs/pkg.tar.zst" | sha256sum -c - - tar --use-compress-program=unzstd -xf mango-pkgs/pkg.tar.zst -C mango-pkgs - rm mango-pkgs/pkg.tar.zst - done - install -m644 mango-pkgs/usr/bin/mangoapp "$M/mangoapp" - for so in libfmt.so.10 libspdlog.so.1.13 libglfw.so.3 libtraceevent.so.1; do - cp -L "mango-pkgs/usr/lib/$so" "$M/$so" - done - aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -Wl,-soname,libtracefs.so.1 \ - -o "$M/libtracefs.so.1" tools/mangoapp/libtracefs-shim.c - aarch64-linux-gnu-strip --strip-unneeded "$M/libtracefs.so.1" - install -Dm644 tools/mangoapp/mangoapp "$D/usr/local/bin/mangoapp" - rm -rf mango-pkgs - ls -l "$M" - mkdir -p pw-pkgs - grep -v '^#' tools/pipewire/packages.txt | while read -r sum url; do - [ -n "$url" ] || continue - curl -fsSL --retry 3 -o pw-pkgs/pkg.tar.zst "$url" - echo "$sum pw-pkgs/pkg.tar.zst" | sha256sum -c - - tar --use-compress-program=unzstd -xf pw-pkgs/pkg.tar.zst -C pw-pkgs - rm pw-pkgs/pkg.tar.zst - done - tools/pipewire/assemble.sh pw-pkgs "$D/usr/local/lib/droiddeck-pipewire.tzst" - rm -rf pw-pkgs - ls -l "$D/usr/local/lib/droiddeck-pipewire.tzst" - T="$D/usr/local/lib/droiddeck-msitools" - mkdir -p "$T" msi-pkgs - grep -v '^#' tools/msitools/packages.txt | while read -r sum url; do - [ -n "$url" ] || continue - curl -fsSL --retry 3 -o msi-pkgs/pkg.tar.xz "$url" - echo "$sum msi-pkgs/pkg.tar.xz" | sha256sum -c - - tar -xJf msi-pkgs/pkg.tar.xz -C msi-pkgs - rm msi-pkgs/pkg.tar.xz - done - install -m644 msi-pkgs/usr/bin/msiinfo "$T/msiinfo" - install -m644 msi-pkgs/usr/bin/cabextract "$T/cabextract" - install -m644 msi-pkgs/usr/lib/7zip/7z "$T/7z" - install -m644 msi-pkgs/usr/lib/7zip/7z.so "$T/7z.so" - for so in libmsi-1.0.so.0 libgsf-1.so.114 libgcab-1.0.so.0; do - cp -L "msi-pkgs/usr/lib/$so" "$T/$so" - done - for f in NOTICE GPL-2 GPL-3 LGPL-2.1 7zip-License 7zip-unRarLicense; do - install -Dm644 "tools/msitools/licenses/$f" "$D/usr/local/share/licenses/droiddeck-msitools/$f" - done - rm -rf msi-pkgs - ls -l "$T" - install -Dm644 tools/linuxfs/desktop/droiddeck-desktop "$D/usr/local/bin/droiddeck-desktop" - install -Dm644 tools/linuxfs/desktop/droiddeck-gpu "$D/usr/local/bin/droiddeck-gpu" - install -Dm644 tools/linuxfs/desktop/droiddeck-desktop-gpu "$D/usr/local/bin/droiddeck-desktop-gpu" - install -Dm644 tools/linuxfs/desktop/kwin_wayland_wrapper "$D/usr/local/bin/kwin_wayland_wrapper" - install -Dm644 tools/linuxfs/desktop/firefox-droiddeck.js "$D/usr/lib/firefox/defaults/pref/droiddeck.js" - ls -lR "$D" - - - name: Fetch the Debian image the preloads build in - if: steps.component-preloads.outputs.x86 != 'true' - env: - GH_TOKEN: ${{ github.token }} - run: | - set -euo pipefail - . tools/linuxfs/debian-image.env - image=public.ecr.aws/docker/library/debian:bullseye - if gh release download "$DEBIAN_IMAGE_TAG" -R "$GITHUB_REPOSITORY" -p "$DEBIAN_IMAGE_ASSET" -O /tmp/debian-image.tar.zst \ - && { [ -z "$DEBIAN_IMAGE_SHA256" ] || echo "$DEBIAN_IMAGE_SHA256 /tmp/debian-image.tar.zst" | sha256sum -c -; }; then - zstd -dc /tmp/debian-image.tar.zst | docker load - rm -f /tmp/debian-image.tar.zst - else - echo "::warning::the hosted Debian image could not be fetched; pulling from the registry instead" - for attempt in 1 2 3 4 5; do - docker pull "$image" && break - [ "$attempt" -lt 5 ] || { echo "::error::could not pull $image after $attempt attempts"; exit 1; } - echo "pull attempt $attempt failed (registry busy?); retrying in $((attempt * 30)) s" - sleep $((attempt * 30)) - done - fi - docker image ls "$image" - - - name: Build the x86 preloads FEX guests load (glibc 2.31) - if: steps.component-preloads.outputs.x86 != 'true' - run: | - set -euo pipefail - docker run --rm -v "$PWD:/src" -w /src public.ecr.aws/docker/library/debian:bullseye bash -c ' - set -euo pipefail - install_compilers() { - apt-get -o Acquire::Check-Valid-Until=false update -qq && - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends gcc g++ gcc-multilib g++-multilib binutils >/dev/null - } - printf "deb http://deb.debian.org/debian bullseye main\ndeb http://security.debian.org/debian-security bullseye-security main\n" > /etc/apt/sources.list - if ! install_compilers; then - printf "deb http://archive.debian.org/debian bullseye main\ndeb http://archive.debian.org/debian-security bullseye-security main\n" > /etc/apt/sources.list - install_compilers - fi - tools/linuxfs/build-x86-preloads.sh app/src/main/assets/linuxfs - ' - sudo chown -R "$(id -u):$(id -g)" app/src/main/assets/linuxfs - ls -l app/src/main/assets/linuxfs/x86_64 app/src/main/assets/linuxfs/i386 - - - name: Bundle the droiddeck-esync packs - run: | - set -euo pipefail - if [ -f tools/droiddeck-esync/release.env ]; then - . tools/droiddeck-esync/release.env - release_url="https://github.com/${SYNC_BUNDLE_REPO}/releases/download/${SYNC_BUNDLE_TAG}" - curl -fsSL --retry 3 -o sync-bundle.tzst "$release_url/$SYNC_BUNDLE_ASSET" - echo "$SYNC_BUNDLE_SHA256 sync-bundle.tzst" | sha256sum -c - - mkdir -p app/src/main/assets/droiddeck-esync - tar --use-compress-program=unzstd -xf sync-bundle.tzst -C app/src/main/assets/droiddeck-esync - rm sync-bundle.tzst - curl -fsSL --retry 3 -o sync-index.json "$release_url/index.json" - revoked=$(python3 -c 'import json, sys; print(" ".join(p["id"] for p in json.load(open(sys.argv[1]))["packs"] if p.get("revoked") is True))' sync-index.json) - for id in $revoked; do - if [ -e "app/src/main/assets/droiddeck-esync/packs/$id.tzst" ]; then - echo "::warning::$SYNC_BUNDLE_ASSET carries revoked pack $id; it is left out of the APK (point tools/droiddeck-esync/release.env at a newer bundle)" - rm -f "app/src/main/assets/droiddeck-esync/packs/$id.tzst" - fi - done - rm sync-index.json - test -f app/src/main/assets/droiddeck-esync/index.json - test -f app/src/main/assets/droiddeck-esync/index.json.sig - ls -lR app/src/main/assets/droiddeck-esync - fi - - - name: Cache PulseAudio 13.0 source - id: pa-src - uses: actions/cache@v4 - with: - path: pa13 - key: pulseaudio-src-13.0 - - name: Fetch PulseAudio 13.0 source - if: steps.pa-src.outputs.cache-hit != 'true' - run: | - set -euo pipefail - curl -fsSL -o pa.tar.gz https://github.com/pulseaudio/pulseaudio/archive/refs/tags/v13.0.tar.gz - mkdir -p pa13 && tar -xzf pa.tar.gz -C pa13 --strip-components=1 && rm pa.tar.gz - - name: Fetch DirectAudio (tools/directaudio/release.env) - run: tools/directaudio/fetch.sh "$PWD" "$PWD/sink-out" - - name: Build the AAudio sink into the audio bundle - run: | - set -euo pipefail - export NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" - tools/aaudio-sink/build.sh "$PWD/pa13" "$PWD/sink-out" - rm -rf pa-bundle && mkdir -p pa-bundle - tar --use-compress-program=unzstd -xf app/src/main/assets/pulseaudio.tzst -C pa-bundle - test ! -f pa-bundle/modules/arm64/module-aaudio-sink.so - install -m755 sink-out/module-aaudio-sink.so pa-bundle/modules/arm64/module-aaudio-sink.so - install -m755 sink-out/module-directaudio-native-sink.so pa-bundle/modules/arm64/module-directaudio-native-sink.so - (cd pa-bundle && tar --use-compress-program='zstd -19' -cf ../pulseaudio.tzst .) - mkdir -p app/build/prepared-assets - mv pulseaudio.tzst app/build/prepared-assets/pulseaudio.tzst - tar --use-compress-program=unzstd -tf app/build/prepared-assets/pulseaudio.tzst | grep -c '\.so$' - rm -rf pa-bundle sink-out - - name: Cache proot - id: proot - uses: actions/cache@v4 - with: - path: | - app/src/main/jniLibs/arm64-v8a/libproot.so - app/src/main/jniLibs/arm64-v8a/libproot-loader.so - key: proot-${{ env.NDK_VERSION }}-${{ hashFiles('tools/proot/**') }} - - name: Build proot - if: steps.proot.outputs.cache-hit != 'true' - run: | - set -euo pipefail - export NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" - tools/proot/build.sh app/src/main/jniLibs/arm64-v8a - - - name: Check the preloads - run: | - set -euo pipefail - bash tools/linuxfs/check-preloads.sh app/src/main/assets/linuxfs - - - name: Check Quest tracking IPC - run: | - set -euo pipefail - NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" - VK_INCLUDE=$(ls -d "$NDK"/toolchains/llvm/prebuilt/*/sysroot/usr/include | head -1) - mkdir -p build/vr/include - cp -R "$VK_INCLUDE/vulkan" build/vr/include/ - if [ -d "$VK_INCLUDE/vk_video" ]; then cp -R "$VK_INCLUDE/vk_video" build/vr/include/; fi - g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_tracking.cpp -o /tmp/test-xr-tracking - /tmp/test-xr-tracking - g++ -std=c++17 -Wall -Wextra -Werror tools/vr/tests/test_xr_touch.cpp -o /tmp/test-xr-touch - /tmp/test-xr-touch - g++ -std=c++17 -Wall -Wextra -Werror tools/vr/tests/test_pad_controller_config.cpp -o /tmp/test-pad-controller-config - /tmp/test-pad-controller-config - g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_vsync.cpp -o /tmp/test-xr-vsync - /tmp/test-xr-vsync - g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_frames.cpp -o /tmp/test-xr-frames - /tmp/test-xr-frames - cc -Itools/vr/third_party/wayland -c tools/vr/src/wayland_client_stub.c -o /tmp/test-wayland-stub.o - cc -Itools/vr/third_party/wayland -c app/src/main/cpp/waylandcomp/generated/xdg-shell-protocol.c -o /tmp/test-xdg-shell.o - g++ -std=c++17 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers -pthread -Ibuild/vr/include \ - -Itools/vr/third_party/wayland -Iapp/src/main/cpp/waylandcomp/generated \ - tools/vr/tests/test_presenter_shutdown.cpp tools/vr/src/presenter.cpp /tmp/test-wayland-stub.o /tmp/test-xdg-shell.o \ - -ldl -o /tmp/test-presenter-shutdown - timeout 10 /tmp/test-presenter-shutdown - - name: Rust toolchain for the store engines (aarch64-linux-android) id: rust run: | @@ -561,28 +470,20 @@ jobs: restore-keys: | cxx-${{ env.NDK_VERSION }}- + - uses: actions/download-artifact@v4 + with: + name: prepared-components + path: app/build + - name: Verify and unpack prepared components + env: + SOURCE_TREE: ${{ needs.source.outputs.tree-sha }} + run: python3 tools/components/prepare.py unpack --tree "$SOURCE_TREE" + - uses: actions/download-artifact@v4 with: name: xbox-arm64 path: app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox - - name: Cache GOG Galaxy companion - id: comet - uses: actions/cache@v4 - with: - path: app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet - key: comet-${{ runner.os }}-${{ runner.arch }}-rust1.90.0-${{ hashFiles('tools/comet/**') }} - - - name: Build GOG Galaxy companion - if: steps.comet.outputs.cache-hit != 'true' - run: | - if ! command -v aarch64-linux-gnu-gcc >/dev/null; then - bash tools/ci/install-ubuntu-packages.sh gcc-aarch64-linux-gnu - fi - rustup toolchain install 1.90.0 --profile minimal - rustup target add --toolchain 1.90.0 aarch64-unknown-linux-gnu - RUSTUP_TOOLCHAIN=1.90.0 bash tools/comet/build.sh - - name: Build the add-on packs run: bash tools/packs/build.sh app/build/packs @@ -593,7 +494,6 @@ jobs: SGDB_API_KEY: ${{ secrets.SGDB_API_KEY }} run: | set -o pipefail - python3 tools/quest/build-driver.py "$ANDROID_HOME/ndk/$NDK_VERSION" python3 tools/release/runtime_inputs.py record ./gradlew assembleRelease --console=plain -PndkVersion="$NDK_VERSION" 2>&1 | tee /tmp/build.log python3 tools/release/check_session_assets.py app/build/outputs/apk/release/app-release.apk @@ -701,87 +601,11 @@ jobs: TEST_DIAGNOSTICS_URL: ${{ steps.unit-test-diagnostics.outputs.artifact-url }} APK_OUTCOME: ${{ steps.apk-upload.outcome }} SAME_REPO: ${{ github.event.pull_request.head.repo.full_name == github.repository }} - run: | - set -uo pipefail - MARK="" - { - echo "$MARK" - echo "## Build of this pull request" - echo - [ -f /tmp/pr-merge.md ] && cat /tmp/pr-merge.md - echo - case "$BUILD_OUTCOME:$UNIT_TEST_OUTCOME:$APK_OUTCOME" in - success:success:success) - echo "### Build passed" - echo - echo "The \`droiddeck-apk\` artifact is [on this run]($RUN_URL), signed with the public test key." - echo - if [ "$SAME_REPO" = true ]; then - echo "After the parallel regression tests pass, a release-signed tester build that installs over Stable or Preview will be published and will appear in DroidDeck's **Test builds** list. Label the PR \`no-test-build\` to skip that." - else - echo "**Maintainer:** add the \`publish-test\` label to publish a release-signed tester build that installs over Stable or Preview and appears in DroidDeck's **Test builds** list. The label is removed automatically after publishing." - fi - echo - echo "Fallback: [open **PR Release Publish**]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/workflows/pr-release-publish.yml) on \`main\` and enter PR \`$PR\`." - ;; - success:success:*) - echo "### APK publication incomplete" - echo - echo "Compilation and unit tests passed, but APK publication did not complete. See [the run]($RUN_URL)." - ;; - success:failure:*) - echo "### ERROR: Unit tests failed" - echo - echo "The APK compiled, but unit tests failed. No installable artifact was published." - echo - if [ -n "$TEST_DIAGNOSTICS_URL" ]; then - echo "The [unit-test-results]($TEST_DIAGNOSTICS_URL) artifact contains the test log and any generated reports." - else - echo "The test diagnostics upload did not complete. See [the test log]($RUN_URL)." - fi - ;; - success:*) - echo "### Build incomplete" - echo - echo "The APK compiled, but unit tests did not complete successfully. See [the run]($RUN_URL)." - ;; - failure:*) - echo "### ERROR: Build failed" - echo - echo "The compiler's errors ([full log]($RUN_URL)):" - echo - echo '```' - { grep -E '^e: |^w: .*error|error:|CMake Error|fatal error|ninja: error|FAILED|What went wrong|Execution failed for task|Unresolved reference|Type mismatch|Unresolved' /tmp/build.log 2>/dev/null \ - | sed -e 's#file:///home/runner/work/[^/]*/[^/]*/##' -e 's#/home/runner/work/[^/]*/[^/]*/##' \ - | grep -v '^w: ' | awk '!seen[$0]++' | head -80; } || true - echo '```' - echo - echo "