show boot progress

Author: Emeteil

robot_orchestrator/boot/fsm.py

@@ -35,6 +35,11 @@ class BootResult:
     services_ready: dict[str, bool]
 
 
+@dataclass
+class BootProgress:
+    step: str = "starting"
+
+
 class BootSequence:
     def __init__(
         self,
@@ -49,6 +54,7 @@ def __init__(
         scan_qr: Callable[[], SecretsPayload | None] | None = None,
         recovery_committing_handlers: dict | None = None,
         wifi_manager=None,
+        progress: "BootProgress | None" = None,
     ):
         self.settings = settings
         self.paths = paths
@@ -61,6 +67,7 @@ def __init__(
         self.scan_qr = scan_qr
         self.recovery_committing_handlers = recovery_committing_handlers
         self.wifi_manager = wifi_manager
+        self.progress = progress or BootProgress()
 
     def prepare_early_services(self) -> list[str]:
         placeholder_mode = ModeDecision(production=False, reasons=[], capabilities={})
@@ -86,22 +93,28 @@ async def run(self) -> BootResult:
         facts = BootFacts()
         facts.gpio_forced = self._read_gpio()
 
+        self.progress.step = "checking_secrets"
         await self._maybe_scan_qr(facts)
 
+        self.progress.step = "probing_hardware"
         camera_device = resolve_camera_device(self.settings.hardware.camera, self.hal.camera_probe)
         await asyncio.to_thread(self._probe_hardware, facts, camera_device)
 
+        self.progress.step = "updating_repos"
         await asyncio.to_thread(self._update_repos, facts)
+        self.progress.step = "flashing_firmware"
         await asyncio.to_thread(self._run_firmware_targets, facts)
 
         mode = decide_mode(facts)
 
+        self.progress.step = "starting_services"
         mcu_port = resolve_mcu_port(self.settings.hardware.mcu, self.hal.usb_inventory)
         self._prepare_services(mode, camera_device, mcu_port)
 
         main_services = [s for s in self.settings.services if s.phase != "early"]
         order = topological_order(main_services)
         services_ready = await self.supervisor.start_ordered(order, mode.capabilities)
+        self.progress.step = "done"
 
         with self.db.transaction() as conn:
             store.update_boot_history(
@@ -132,6 +145,7 @@ async def _maybe_scan_qr(self, facts: BootFacts) -> None:
         required = self.settings.secrets.required
         missing = secrets_store.missing_required_secrets(self.paths, required)
         if missing and self.scan_qr is not None:
+            self.progress.step = "waiting_for_qr"
             payload = await asyncio.to_thread(self.scan_qr)
             if payload is not None:
                 ingest_payload(self.paths, self.journal, payload)

robot_orchestrator/cli.py

@@ -13,7 +13,7 @@
 
 from robot_orchestrator import log as logmod
 from robot_orchestrator.boot.decision import capability
-from robot_orchestrator.boot.fsm import BootSequence
+from robot_orchestrator.boot.fsm import BootProgress, BootSequence
 from robot_orchestrator.boot.hardware import resolve_camera_device, resolve_mcu_port
 from robot_orchestrator.config import Settings, load_settings
 from robot_orchestrator.firmware.github_artifacts import GithubArtifactClient
@@ -271,17 +271,20 @@ async def _run_orchestrator(settings: Settings, paths: Paths, args: argparse.Nam
     }
 
     stop_event = asyncio.Event()
+    boot_progress = BootProgress()
     context = AdminContext(
         settings=settings, paths=paths, db=db, journal=journal,
         repo_managers=repo_managers, firmware_workflows=firmware_workflows,
         supervisor=supervisor, scan_qr=scan_qr, wifi_manager=wifi_manager,
         self_update_manager=self_update_manager, request_restart=stop_event.set,
+        boot_progress=boot_progress,
     )
 
     sequence = BootSequence(
         settings, paths, db, journal, hal,
         repo_managers, firmware_workflows, supervisor,
         scan_qr=scan_qr, recovery_committing_handlers=recovery_handlers, wifi_manager=wifi_manager,
+        progress=boot_progress,
     )
 
     notifier = SdNotifier()

robot_orchestrator/web/app.py

@@ -77,7 +77,8 @@ def boot_page(request: Request):
     def boot_state(request: Request):
         require_loopback(request)
         if context is None or context.boot_result is None:
-            return {"state": "booting"}
+            step = context.boot_progress.step if context and context.boot_progress else "starting"
+            return {"state": "booting", "step": step}
         boot = context.boot_result
         return {
             "state": "running",

robot_orchestrator/web/context.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Callable
 
-from robot_orchestrator.boot.fsm import BootResult
+from robot_orchestrator.boot.fsm import BootProgress, BootResult
 from robot_orchestrator.config import Settings
 from robot_orchestrator.firmware.workflow import FirmwareWorkflow
 from robot_orchestrator.paths import Paths
@@ -25,3 +25,4 @@ class AdminContext:
     self_update_manager: object | None = None
     request_restart: Callable[[], None] | None = None
     boot_result: BootResult | None = None
+    boot_progress: BootProgress | None = None

robot_orchestrator/web/static/boot/index.html

@@ -55,9 +55,20 @@ <h1>robot-orchestrator</h1>
   const qrHint = document.getElementById("qr-hint");
   banner.innerHTML = "";
 
+  const STEP_LABELS = {
+    starting: "Загрузка…",
+    checking_secrets: "Проверка секретов…",
+    waiting_for_qr: "Ожидание QR-кода",
+    probing_hardware: "Проверка оборудования…",
+    updating_repos: "Обновление репозиториев…",
+    flashing_firmware: "Прошивка микроконтроллера…",
+    starting_services: "Запуск сервисов…",
+    done: "Загрузка…",
+  };
+
   if (data.state === "booting" || data.state === "unknown") {
     banner.className = "banner booting";
-    banner.textContent = "Загрузка…";
+    banner.textContent = STEP_LABELS[data.step] || "Загрузка…";
   } else if (data.production) {
     banner.className = "banner prod";
     banner.textContent = "PROD";
@@ -76,7 +87,8 @@ <h1>robot-orchestrator</h1>
     }
   }
 
-  const showQr = data.reasons && data.reasons.some((r) => r.startsWith("secrets_missing"));
+  const showQr = data.step === "waiting_for_qr" ||
+    (data.reasons && data.reasons.some((r) => r.startsWith("secrets_missing")));
   qrHint.style.display = showQr ? "block" : "none";
   if (showQr) {
     qr.style.display = "block";