Compare commits

...

3 Commits

Author SHA1 Message Date
4a5045f126 Merge branch 'fix/login-fail-loudly'
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 21:14:41 +09:00
9cfc41b384 fix(config): give cron-started Steam the desktop session env
Steam has no autostart on nik-gpu, so after a reboot the first cron run
starts it, and every game Steam launches inherits that environment.
cron sets neither XDG_RUNTIME_DIR nor DBUS_SESSION_BUS_ADDRESS, so the
Pulse socket never got mounted into the Proton container. Persona 3
Reload then fell back to ALSA and crashed on launch in xaudio2_9.

Set both in config.ENV, which launch_game() passes down to Steam.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 21:11:43 +09:00
8bd76b88f8 fix(login): fail the run when login can't reach home
login.run() only printed a warning and returned when it gave up, so the
game window still existed, _run_sequence kept going, every later task
aborted at its own first click-verify, and the run exited 0. Cron then
logged and Discord-alerted "finished OK" for runs that did nothing --
18 of them between 2026-10-26 and 2026-10-29 while the client itself
was hanging at its "Initialize Catalog" startup screen.

Now login kills the stuck game and raises RuntimeError, so the run exits
non-zero and ba_cron_run.sh logs FAILED and sends the error alert.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-29 14:50:56 +09:00
2 changed files with 29 additions and 2 deletions

View File

@ -3,7 +3,21 @@ import os
DISPLAY = ":0"
XAUTHORITY = "/run/user/1000/gdm/Xauthority"
ENV = {**os.environ, "DISPLAY": DISPLAY, "XAUTHORITY": XAUTHORITY}
# Steam has no autostart here, so after a reboot it's the first cron run that
# starts it, and every game Steam launches inherits that environment. cron
# sets neither of these. Real incident (2026-11-06): without XDG_RUNTIME_DIR,
# the Pulse socket never got mounted into the Proton container, so Persona 3
# Reload fell back to ALSA and crashed on launch in xaudio2_9 until Steam was
# restarted from the desktop.
XDG_RUNTIME_DIR = "/run/user/1000"
DBUS_SESSION_BUS_ADDRESS = f"unix:path={XDG_RUNTIME_DIR}/bus"
ENV = {
**os.environ,
"DISPLAY": DISPLAY,
"XAUTHORITY": XAUTHORITY,
"XDG_RUNTIME_DIR": XDG_RUNTIME_DIR,
"DBUS_SESSION_BUS_ADDRESS": DBUS_SESSION_BUS_ADDRESS,
}
WINDOW_NAME = "BlueArchive"

View File

@ -553,4 +553,17 @@ def run(driver, config):
if attempt < config.LOGIN_MAX_RELAUNCHES:
_recover(driver, config)
print(f"[login] warning: could not reach home after {config.LOGIN_MAX_RELAUNCHES} attempts -- manual check needed")
# Raise rather than print-and-return (real incident, 2026-10-29): the
# game window still exists here, so _run_sequence's own window_exists()
# check never fired -- every later task then failed its own first
# click-verify step and aborted safely, the run exited 0, and
# ba_cron_run.sh logged and Discord-alerted "finished OK" for runs that
# did nothing at all (18 of them over 10/26-10/29). Raising makes the
# run exit non-zero, so cron logs FAILED and sends the error alert. The
# game is killed first: it's stuck somewhere short of home, and this
# abort skips the exit_game task that would otherwise have closed it.
driver.kill_game()
raise RuntimeError(
f"[login] could not reach home after {config.LOGIN_MAX_RELAUNCHES} attempts -- "
"aborting the rest of this run (check nik-gpu manually)"
)