From c7cd2b55af4d2e6677e3808385abcc8392568b13 Mon Sep 17 00:00:00 2001 From: Zeratullo Date: Wed, 18 Nov 2026 06:23:00 +0100 Subject: [PATCH] fix(xbox): hand Xodus a launch folder the Linux guest can see (#2751) * fix(xbox): log and show why an Xbox launch could not be prepared * fix(xbox): hand Xodus a launch folder the Linux guest can see --------- Co-authored-by: Zeratullo <8460122+Zeratullo@users.noreply.github.com> --- .../droiddeck/launcher/stores/StoreLaunchRequests.kt | 6 +++++- .../droiddeck/launcher/stores/xbox/XboxLaunchViews.kt | 3 ++- .../launcher/stores/xbox/XboxLaunchViewsTest.kt | 11 +++++++++++ tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt index c4af9891d0..af4ea74964 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt @@ -58,7 +58,11 @@ object StoreLaunchRequests { } "xbox-renew" -> JSONObject().put("ok", com.droiddeck.launcher.stores.xbox.XboxRuntime.renew(app, request.optString("id"), request.optString("lease"))) "xbox-prepare" -> runCatching { com.droiddeck.launcher.stores.xbox.XboxRuntime.prepare(app, request.getString("id")) } - .getOrElse { JSONObject().put("ok", false).put("reason", "Xbox account service is unavailable. Sign in again and retry.") } + .getOrElse { + StoresState.logLine("Xbox: launch prepare failed (${it.javaClass.simpleName}: ${it.message})") + val reason = (it as? IllegalStateException)?.message ?: "Xbox account service is unavailable. Sign in again and retry." + JSONObject().put("ok", false).put("reason", reason) + } "ea-prepare" -> runCatching { lastLaunched = Store.EA to request.optString("id"); com.droiddeck.launcher.stores.ea.EaLaunch.prepare(app, request) } .getOrElse { JSONObject().put("ok", false).put("reason", "error-" + it.javaClass.simpleName) } "ea-exited" -> { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViews.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViews.kt index 9316ab27ef..c18bb9bb2e 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViews.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViews.kt @@ -18,7 +18,8 @@ internal class XboxLaunchViews { parent.listFiles()?.filter { it.name.startsWith("launch-") }?.forEach(::remove) recovered.add(parent.path) } - return Files.createTempDirectory(parent.toPath(), "launch-").toFile() + // The guest binds the files directory by the path Android reports, not its canonical one. + return File(files, "xbox-runtime/views/" + Files.createTempDirectory(parent.toPath(), "launch-").fileName) } companion object { diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViewsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViewsTest.kt index f14d294c01..145cb45e66 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViewsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViewsTest.kt @@ -50,4 +50,15 @@ class XboxLaunchViewsTest { assertEquals("preserve", evidence.readText()) } finally { root.deleteRecursively() } } + + @Test fun viewsKeepTheFilesPathTheGuestBinds() { + val root = Files.createTempDirectory("xbox-view-alias").toFile() + try { + val real = root.resolve("data/data/app/files").apply { mkdirs() } + val alias = root.resolve("user0").also { Files.createSymbolicLink(it.toPath(), real.parentFile!!.toPath()) }.resolve("files") + val view = XboxLaunchViews().create(alias) + assertEquals(alias.resolve("xbox-runtime/views").path, view.parentFile!!.path) + assertTrue(real.resolve("xbox-runtime/views").resolve(view.name).isDirectory) + } finally { root.deleteRecursively() } + } } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index 2b97aa3c9e..f15e0b694a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -390,7 +390,7 @@ def launch(command, env): raise RuntimeError('No Xbox account channel; start the game from DroidDeck') reply = store['ask'](Path(launch_dir) / 'stores', {'op': 'xbox-prepare', 'id': sidecar['id']}, timeout=190) if not reply or not reply.get('ok'): - raise RuntimeError('Xbox account service is unavailable; sign in again and retry') + raise RuntimeError((reply or {}).get('reason') or 'Xbox account service is unavailable; sign in again and retry') stopped = threading.Event() close = lambda: None try: