diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 2547858c9..1c470199d 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1038,9 +1038,23 @@ class FrontEndActivity : ComponentActivity() { onSteamUrl = { url -> if (!com.droiddeck.launcher.session.SteamSessionUrl.isSupported(url)) { android.widget.Toast.makeText(this, R.string.steam_navigation_failed, android.widget.Toast.LENGTH_LONG).show() - } else if (!SessionState.running) startSession( - Intent(this, SessionActivity::class.java).putExtra(SessionService.EXTRA_STEAM_URL, url), steamSession = true, - ) else if (SessionState.mode != SessionService.MODE_STEAM) { + } else if (!SessionState.running) { + if (!startSession(Intent(this, SessionActivity::class.java), steamSession = true)) { + android.widget.Toast.makeText(this, R.string.steam_navigation_failed, android.widget.Toast.LENGTH_LONG).show() + } else { + val context = applicationContext + Thread({ + val opened = runCatching { + com.droiddeck.launcher.agent.AgentGuest.awaitAndOpenSteamUrl(context, url) + }.isSuccess + if (!opened) ui.post { + if (!isDestroyed) android.widget.Toast.makeText( + this, R.string.steam_navigation_failed, android.widget.Toast.LENGTH_LONG, + ).show() + } + }, "steam-navigation-start").start() + } + } else if (SessionState.mode != SessionService.MODE_STEAM) { android.widget.Toast.makeText(this, R.string.steam_navigation_switch_mode, android.widget.Toast.LENGTH_LONG).show() } else if (SessionState.stopRequested) { android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show() diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt index 46d799455..bb5d999b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt @@ -11,6 +11,7 @@ import android.os.FileObserver import android.util.Log import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.SessionEvents +import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.session.SteamSessionUrl import org.json.JSONObject @@ -97,15 +98,32 @@ object AgentGuest { fun focus(context: Context): JSONObject? = if (SessionState.running) readJson(File(dir(context), "focus.json")) else null - fun openSteamUrl(context: Context, url: String): JSONObject { + fun openSteamUrl(context: Context, url: String, timeoutMs: Long = STEAM_URL_TIMEOUT_MS): JSONObject { require(SteamSessionUrl.isSupported(url)) { "Unsupported Steam navigation URL" } - val result = call(context, JSONObject().put("kind", "steam-url").put("url", url), 8_000, trusted = true) + val result = call(context, JSONObject().put("kind", "steam-url").put("url", url) + .put("timeout", (timeoutMs - 1_000).coerceAtLeast(1_000) / 1_000.0), timeoutMs, trusted = true) check(SteamSessionUrl.wasOpened(result.optBoolean("ok"), result.optBoolean("launched"))) { "Steam did not accept the navigation request" } return result } + fun awaitAndOpenSteamUrl(context: Context, url: String, timeoutMs: Long = STEAM_START_URL_TIMEOUT_MS): JSONObject { + require(SteamSessionUrl.isSupported(url)) { "Unsupported Steam navigation URL" } + val deadline = android.os.SystemClock.elapsedRealtime() + timeoutMs + while (android.os.SystemClock.elapsedRealtime() < deadline) { + check(SessionState.running && SessionState.mode == SessionService.MODE_STEAM && !SessionState.stopRequested) { + "The Steam session ended before its UI became ready" + } + if (hello(context) != null) { + val remaining = deadline - android.os.SystemClock.elapsedRealtime() + return openSteamUrl(context, url, minOf(STEAM_URL_TIMEOUT_MS, remaining)) + } + Thread.sleep(POLL_MS) + } + throw AgentException("AGENT_UNAVAILABLE", "The Steam guest agent did not become ready") + } + fun selectedSteamAppId(context: Context): Long? { val result = call(context, JSONObject().put("kind", "steam-selection"), 6_000) if (!result.optBoolean("ok") || result.isNull("appId")) return null @@ -204,4 +222,7 @@ object AgentGuest { } catch (e: Exception) { null } + + private const val STEAM_URL_TIMEOUT_MS = 125_000L + private const val STEAM_START_URL_TIMEOUT_MS = 180_000L } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent index 87e660a6e..a16f2ab10 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent @@ -1032,6 +1032,28 @@ def request_timeout(req, default): return timeout +def wait_for_steam_ui(agent_dir, timeout=120): + """Wait for Steam's initialized shared app store before sending a navigation URL.""" + timeout = request_timeout({"timeout": timeout}, 120) + deadline = time.monotonic() + timeout + expression = "Boolean(globalThis.appStore?.m_bIsInitialized)" + while True: + remaining = deadline - time.monotonic() + if remaining <= 0: + raise AgentError("STEAM_UI_TIMEOUT", "Steam's UI router did not become ready") + try: + result = cdp_eval(agent_dir, expression, await_promise=False, + timeout=min(5, max(0.25, remaining))) + if result.get("value") is True: + return + except OSError: + pass + except AgentError as error: + if error.code not in ("NO_DEVTOOLS", "DEVTOOLS_UNREACHABLE", "NO_TARGET", "TIMEOUT"): + raise + time.sleep(min(0.25, max(0, deadline - time.monotonic()))) + + def handle(agent_dir, req): kind = req.get("kind") if kind == "ping": @@ -1055,6 +1077,7 @@ def handle(agent_dir, req): if not isinstance(url, str) or not re.fullmatch( r"steam://(?:open/downloads|uninstall/[1-9][0-9]{0,9})", url): raise AgentError("INVALID_REQUEST", "Steam navigation URL is not supported") + wait_for_steam_ui(agent_dir, req.get("timeout", 120)) try: subprocess.Popen(["steam", url], stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, start_new_session=True) diff --git a/tools/tests/test_droiddeck_agent.py b/tools/tests/test_droiddeck_agent.py index 9865c00b4..e02e956c7 100644 --- a/tools/tests/test_droiddeck_agent.py +++ b/tools/tests/test_droiddeck_agent.py @@ -197,13 +197,30 @@ class AgentTest(unittest.TestCase): self.assertEqual("UNAVAILABLE", answer["error"]["code"]) def test_steam_url_uses_client_argv_for_supported_navigation(self): - with patch.object(agent.subprocess, "Popen") as popen: + with patch.object(agent, "wait_for_steam_ui") as ready, patch.object(agent.subprocess, "Popen") as popen: answer = self.ask({"kind": "steam-url", "url": "steam://open/downloads"}) self.assertTrue(answer["ok"]) self.assertTrue(answer["launched"]) + ready.assert_called_once_with(self.dir, 120) self.assertEqual(["steam", "steam://open/downloads"], popen.call_args.args[0]) self.assertTrue(popen.call_args.kwargs["start_new_session"]) + def test_steam_url_waits_for_initialized_ui_router(self): + with patch.object(agent, "cdp_eval", side_effect=[OSError("DevTools restarted"), + {"value": False}, {"value": True}]) as evaluate, \ + patch.object(agent.time, "sleep"): + agent.wait_for_steam_ui(self.dir, timeout=2) + self.assertEqual(3, evaluate.call_count) + self.assertIn("appStore", evaluate.call_args.args[1]) + + def test_steam_url_is_not_forwarded_when_ui_readiness_times_out(self): + with patch.object(agent, "wait_for_steam_ui", side_effect=agent.AgentError("STEAM_UI_TIMEOUT", "not ready")), \ + patch.object(agent.subprocess, "Popen") as popen: + answer = self.ask({"kind": "steam-url", "url": "steam://open/downloads"}) + self.assertFalse(answer["ok"]) + self.assertEqual("STEAM_UI_TIMEOUT", answer["error"]["code"]) + popen.assert_not_called() + def test_steam_url_rejects_untrusted_routes_and_argument_injection(self): for url in ("steam://open/settings", "steam://nav/library", "steam://open/downloads\n--exec", "https://example.com"): with self.subTest(url=url), patch.object(agent.subprocess, "Popen") as popen: