diff --git a/tools/deploy_fast.py b/tools/deploy_fast.py index 6130cd27d..259dc89cb 100644 --- a/tools/deploy_fast.py +++ b/tools/deploy_fast.py @@ -199,7 +199,37 @@ def pwsh(): raise Refused('PowerShell 7 (pwsh) is required for the local signer') +def signing_env(): + """The .signing.env build_local.sh uses: the override, else the checkout's own, else the main checkout's.""" + common = Path(git('rev-parse', '--path-format=absolute', '--git-common-dir').decode().strip()) + for candidate in (os.environ.get('DROIDDECK_SIGNING_ENV'), ROOT / '.signing.env', common.parent / '.signing.env'): + if candidate and Path(candidate).is_file(): + return Path(candidate).resolve() + return None + + +def version_key(path): + return [int(part) if part.isdigit() else -1 for part in path.parent.name.replace('-', '.').split('.')] + + +def sign_with_env(env_file, unsigned, signed): + complete = [path for path in (sdk_root() / 'build-tools').glob('*/aapt') + if all((path.parent / tool).is_file() for tool in ('zipalign', 'apksigner'))] + build_tools = sorted(complete, key=version_key, reverse=True) + if not build_tools: + raise Refused('no build-tools with aapt, zipalign and apksigner under ' + str(sdk_root() / 'build-tools')) + # BUILD_TOOLS is assigned after the env file is sourced so the file cannot replace the chosen SDK. + script = 'set -a; cd "$(dirname "$1")"; . "$1"; set +a; BUILD_TOOLS="$5" exec "$2" "$3" standard "$4"' + result = subprocess.run(['bash', '-c', script, 'sign', str(env_file), str(ROOT / 'tools/release/sign-apk.sh'), + str(unsigned), str(signed), str(build_tools[0].parent.resolve())], + capture_output=True, text=True) + if result.returncode or not signed.is_file(): + raise Refused('Signing failed:\n' + (result.stdout + result.stderr).strip()) + + def sign(unsigned, signed): + if not SIGNER.is_file() and (env_file := signing_env()): + return sign_with_env(env_file, unsigned, signed) # Microsoft Store Python virtualizes AppData for child processes too and hides the signer; use a python.org install. def quoted(value): return "'" + str(value).replace("'", "''") + "'" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index ee24ff582..93ca33883 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -23,15 +23,20 @@ BRIGHTNESS_JS = r""" if (window.__droiddeckBrightness) return "present"; const display = SteamClient.System?.Display; if (!display?.RegisterForBrightnessChanges || !display?.SetBrightness) return "unavailable"; - const self = { expected: null, updating: true, revision: 0 }; + const self = { expected: null, updating: true, revision: 0, localAt: -Infinity }; + // A held stick steps Steam faster than Android's readback returns; those stale readbacks would snap the slider back. + const HOLD_MS = 750; + // Returns "held" while a readback is being ignored, so the caller retries it after the hold. self.set = value => { - if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 1) return; - if (!self.updating && self.expected !== null && Math.abs(value - self.expected) < 0.0001) return; + if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 1) return true; + if (performance.now() - self.localAt < HOLD_MS) return "held"; + if (!self.updating && self.expected !== null && Math.abs(value - self.expected) < 0.0001) return true; self.expected = value; self.updating = true; const revision = ++self.revision; setTimeout(() => { if (self.revision === revision) self.updating = false; }, 500); display.SetBrightness(value); + return true; }; self.subscription = display.RegisterForBrightnessChanges(state => { const value = state?.flBrightness; @@ -39,6 +44,7 @@ BRIGHTNESS_JS = r""" if (Math.abs(value - self.expected) < 0.0001) { self.updating = false; return; } if (self.updating) { self.updating = false; return; } self.expected = value; + self.localAt = performance.now(); if (typeof window.__BINDING__ === "function") window.__BINDING__(String(value)); }); window.__droiddeckBrightness = self; @@ -764,9 +770,10 @@ class Helper: if not self.controls_installed: return if state != self.controls_state: - if self.page.evaluate("!!window.__droiddeckBrightness && (window.__droiddeckBrightness.set(%s), true)" % json.dumps(value)) is True: + applied = self.page.evaluate("window.__droiddeckBrightness ? window.__droiddeckBrightness.set(%s) : false" % json.dumps(value)) + if applied is True: self.controls_state = state - else: + elif applied != "held": self.controls_installed = False self.controls_state = None except (OSError, ValueError, TypeError): diff --git a/tools/tests/test_deploy_fast.py b/tools/tests/test_deploy_fast.py index fd1a66b9e..98f7f10ab 100644 --- a/tools/tests/test_deploy_fast.py +++ b/tools/tests/test_deploy_fast.py @@ -193,7 +193,8 @@ class SignTest(unittest.TestCase): seen.append(command) return mock.Mock(returncode=1, stdout='', stderr='') - with mock.patch.object(deploy_fast, 'pwsh', return_value='pwsh'): + with mock.patch.object(deploy_fast, 'pwsh', return_value='pwsh'), \ + mock.patch.object(deploy_fast, 'signing_env', return_value=None): with mock.patch.object(deploy_fast, 'SIGNER', Path("C:/O'Brien/sign.ps1")): with mock.patch.object(deploy_fast.subprocess, 'run', side_effect=run): with self.assertRaises(deploy_fast.Refused): @@ -204,6 +205,74 @@ class SignTest(unittest.TestCase): self.assertNotIn("a'b", script.replace("a''b", '')) self.assertNotIn("O'Brien", script.replace("O''Brien", '')) + def test_signing_env_prefers_the_override_then_the_checkout_then_the_main_checkout(self): + with tempfile.TemporaryDirectory() as directory: + base = Path(directory) + (base / 'main').mkdir() + (base / 'checkout').mkdir() + base = base.resolve() + override, local, shared = base / 'override.env', base / 'checkout/.signing.env', base / 'main/.signing.env' + common = (str(base / 'main/.git') + '\n').encode() + with mock.patch.object(deploy_fast, 'ROOT', base / 'checkout'), \ + mock.patch.object(deploy_fast, 'git', return_value=common), \ + mock.patch.dict(deploy_fast.os.environ, {'DROIDDECK_SIGNING_ENV': str(override)}): + self.assertIsNone(deploy_fast.signing_env()) + shared.write_text('x') + self.assertEqual(deploy_fast.signing_env(), shared) + local.write_text('x') + self.assertEqual(deploy_fast.signing_env(), local) + override.write_text('x') + self.assertEqual(deploy_fast.signing_env(), override) + + def test_the_env_signer_is_used_when_the_windows_signer_is_missing(self): + with tempfile.TemporaryDirectory() as directory: + base = Path(directory) + (base / 'build-tools/35.0.0').mkdir(parents=True) + for tool in ('aapt', 'zipalign', 'apksigner'): + (base / 'build-tools/35.0.0' / tool).write_text('') + signed = base / 'out.apk' + + def run(command, **options): + signed.write_text('apk') + return mock.Mock(returncode=0, stdout='', stderr='') + + with mock.patch.object(deploy_fast, 'SIGNER', base / 'missing.ps1'), \ + mock.patch.object(deploy_fast, 'signing_env', return_value=base / '.signing.env'), \ + mock.patch.object(deploy_fast, 'sdk_root', return_value=base), \ + mock.patch.object(deploy_fast.subprocess, 'run', side_effect=run) as run_: + deploy_fast.sign(base / 'in.apk', signed) + self.assertEqual(run_.call_args[0][0][-4:], [str(deploy_fast.ROOT / 'tools/release/sign-apk.sh'), str(base / 'in.apk'), str(signed), str((base / 'build-tools/35.0.0').resolve())]) + failed = mock.Mock(returncode=1, stdout='', stderr='boom') + signed.unlink() + with mock.patch.object(deploy_fast, 'SIGNER', base / 'missing.ps1'), \ + mock.patch.object(deploy_fast, 'signing_env', return_value=base / '.signing.env'), \ + mock.patch.object(deploy_fast, 'sdk_root', return_value=base), \ + mock.patch.object(deploy_fast.subprocess, 'run', return_value=failed): + with self.assertRaises(deploy_fast.Refused): + deploy_fast.sign(base / 'in.apk', signed) + + def test_the_newest_build_tools_win_numerically_and_the_env_file_cannot_replace_them(self): + with tempfile.TemporaryDirectory() as directory: + base = Path(directory).resolve() + for version in ('9.0.0', '35.0.0', '100.0.0'): + (base / 'build-tools' / version).mkdir(parents=True) + for tool in ('aapt', 'zipalign', 'apksigner'): + (base / 'build-tools' / version / tool).write_text('') + (base / 'build-tools/200.0.0').mkdir() + (base / 'build-tools/200.0.0/aapt').write_text('') + root = base / 'checkout' + (root / 'tools/release').mkdir(parents=True) + fake = root / 'tools/release/sign-apk.sh' + fake.write_text('#!/bin/bash\necho "$BUILD_TOOLS" > "$3"\n') + fake.chmod(0o755) + env_file = base / 'keys/.signing.env' + env_file.parent.mkdir() + env_file.write_text('BUILD_TOOLS=/wrong\n') + signed = base / 'out.apk' + with mock.patch.object(deploy_fast, 'ROOT', root), mock.patch.object(deploy_fast, 'sdk_root', return_value=base): + deploy_fast.sign_with_env(env_file, base / 'in.apk', signed) + self.assertEqual(signed.read_text().strip(), str(base / 'build-tools/100.0.0')) + if __name__ == '__main__': unittest.main() diff --git a/tools/tests/test_device_controls.py b/tools/tests/test_device_controls.py index 736d62acb..6b3f56d5c 100644 --- a/tools/tests/test_device_controls.py +++ b/tools/tests/test_device_controls.py @@ -54,6 +54,8 @@ const assert = require('assert'); globalThis.window = globalThis; const requests = [], callbacks = []; const timers = []; +let now = 0; +Object.defineProperty(globalThis, 'performance', { value: { now: () => now }, configurable: true }); globalThis.setTimeout = callback => timers.push(callback); let current = 1; window.droiddeckBrightnessChanged = value => requests.push(Number(value)); @@ -69,16 +71,19 @@ const script = require('fs').readFileSync(process.argv[2], 'utf8'); assert.strictEqual(eval(script), 'installed'); assert.strictEqual(eval(script), 'present'); const bridge = window.__droiddeckBrightness; +now = 10000; bridge.set(0.5); bridge.set(0.5); assert.deepStrictEqual(requests, []); callbacks.forEach(cb => cb({ flBrightness: 0.8 })); assert.deepStrictEqual(requests, [0.8]); +now += 1000; bridge.set(0.7992126); assert.deepStrictEqual(requests, [0.8]); for (const value of [NaN, Infinity, -1, 2, '0.5']) callbacks.forEach(cb => cb({ flBrightness: value })); assert.deepStrictEqual(requests, [0.8]); assert.strictEqual(callbacks.length, 1); +now += 1000; SteamClient.System.Display.SetBrightness = value => callbacks.forEach(cb => cb({ flBrightness: value + 0.1 })); bridge.set(0.3); assert.deepStrictEqual(requests, [0.8]); @@ -89,6 +94,17 @@ bridge.set(0.65); timers.forEach(callback => callback()); callbacks.forEach(cb => cb({ flBrightness: 0.7 })); assert.deepStrictEqual(requests, [0.8, 0.6, 0.7]); +// A held stick: Android's lagging readbacks must not pull Steam back while it keeps stepping. +let applied = []; +SteamClient.System.Display.SetBrightness = value => applied.push(value); +for (const value of [0.71, 0.72, 0.73]) { now += 50; callbacks.forEach(cb => cb({ flBrightness: value })); } +assert.strictEqual(bridge.set(0.71), 'held'); +now += 100; +assert.strictEqual(bridge.set(0.72), 'held'); +assert.deepStrictEqual(applied, []); +now += 800; +assert.strictEqual(bridge.set(0.3), true); +assert.deepStrictEqual(applied, [0.3]); """ with tempfile.TemporaryDirectory() as directory: script = Path(directory) / "bridge.js" @@ -128,6 +144,27 @@ assert.deepStrictEqual(requests, [0.8, 0.6, 0.7]); finally: globals_["CONTROLS_DIR"] = previous + def test_a_readback_held_by_the_bridge_is_retried_instead_of_cached(self): + with tempfile.TemporaryDirectory() as directory: + globals_ = LIVE["Helper"].sync_controls.__globals__ + previous = globals_["CONTROLS_DIR"] + try: + globals_["CONTROLS_DIR"] = directory + Path(directory, "state.json").write_text(json.dumps({"brightness": 0.5, "revision": 1})) + results = ["held", "held", True] + helper = LIVE["Helper"]("/steam", 0) + helper.controls_installed = True + helper.page = type("Page", (), {"evaluate": lambda self, expression: results.pop(0)})() + helper.sync_controls() + helper.sync_controls() + self.assertTrue(helper.controls_installed) + self.assertIsNone(helper.controls_state) + helper.sync_controls() + self.assertEqual(helper.controls_state["revision"], 1) + self.assertEqual(results, []) + finally: + globals_["CONTROLS_DIR"] = previous + def test_display_bridge_retries_binding_and_install_before_caching_state(self): with tempfile.TemporaryDirectory() as directory: globals_ = LIVE["Helper"].sync_controls.__globals__