feat: password-protect diagnostics, fix stale toast and autocomplete timing

eupn · eupn · commit 7dd8f90cc7d0 · 2026-07-23T01:46:07.000+04:00
- Move the donation wall behind the diagnostics page instead of the
  public Main page; reachable via a new "Donation Wall" button there.
- Gate diagnostics access behind an optional diagnostics_password
  config value, entered on a new password page before the 5-tap
  gesture reaches Diagnostics. Unset (default) keeps today's
  no-password behavior.
- Recompute username autocomplete on focus, not just on keystrokes, so
  tapping a field with leftover partial text shows its suggestion
  immediately.
- Reset last-added-amount when starting a fresh InsertMoney/InsertCoins
  session — it lives on MainWindow and outlives those page instances,
  so a bill/coin toast that hadn't auto-hidden yet could replay at the
  start of the next donation.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ nix-shell
 cargo run
 ```
 
-The app starts fullscreen. Tap the logo **5 times** to open the diagnostics panel.
+The app starts fullscreen. Tap the logo **5 times** to open the diagnostics panel (password-protected if `diagnostics_password` is set — see below).
 
 ---
 
@@ -22,6 +22,7 @@ Create `.config/dramma.toml` next to the binary (or in the working directory you
 
 ```toml
 token = "your-bearer-token" # For Bot donates
+diagnostics_password = "your-password" # Optional — gates the diagnostics panel (and donation wall) if set
 
 # Optional overrides (these are the defaults):
 home_assistant_url    = "https://ha.hackem.cc/web-dramma/0?BrowserID=dramma"
diff --git a/src/config.rs b/src/config.rs
@@ -27,6 +27,7 @@ pub struct GameEntry {
 #[serde(default)]
 pub struct Config {
     pub token: Option<String>,
+    pub diagnostics_password: Option<String>,
     pub home_assistant_url: String,
     pub hass_api_port: u16,
     pub cashcode_serial_port: String,
@@ -42,6 +43,7 @@ impl Default for Config {
     fn default() -> Self {
         Self {
             token: None,
+            diagnostics_password: None,
             home_assistant_url: "https://ha.hackem.cc/web-dramma/0?BrowserID=dramma".to_string(),
             hass_api_port: 8321,
             cashcode_serial_port:
diff --git a/src/main.rs b/src/main.rs
@@ -55,6 +55,14 @@ pub fn main() {
     // Enable fullscreen mode for kiosk deployment
     main_window.window().set_fullscreen(true);
 
+    main_window.set_diagnostics_password(
+        config
+            .diagnostics_password
+            .clone()
+            .unwrap_or_default()
+            .into(),
+    );
+
     virtual_keyboard::init(&main_window);
     autocomplete_handler::init(&main_window);
     let cashcode_tx = bill_acceptor::init(&main_window, &config);
diff --git a/ui/autocomplete_line_edit.slint b/ui/autocomplete_line_edit.slint
@@ -66,9 +66,20 @@ export component AutocompleteLineEdit inherits Rectangle {
         }
     }
 
+    // Recompute the suggestion for whatever text is already in the field —
+    // otherwise re-focusing a field left with partial text shows no
+    // suggestion until the user types another character.
+    function refresh-suggestion() {
+        root.current-suggestion = AutocompleteHandler.find-suggestion(root.text, root.suggestions);
+        root.is-valid = AutocompleteHandler.is-valid-input(root.text, root.suggestions);
+    }
+
     // Reset cursor visibility when focus changes
     changed has-focus => {
         root.cursor-visible = true;
+        if (root.has-focus) {
+            root.refresh-suggestion();
+        }
         AutocompleteHandler.return-key-active = root.has-focus && root.current-suggestion != "";
     }
     // React to autocomplete trigger from virtual keyboard
@@ -154,8 +165,7 @@ export component AutocompleteLineEdit inherits Rectangle {
         text <=> root.text;
 
         edited(value) => {
-            root.current-suggestion = AutocompleteHandler.find-suggestion(value, root.suggestions);
-            root.is-valid = AutocompleteHandler.is-valid-input(value, root.suggestions);
+            root.refresh-suggestion();
             root.edited(value);
         }
 
diff --git a/ui/main_window.slint b/ui/main_window.slint
@@ -8,6 +8,7 @@ import { InsertMoney } from "pages/insert_money.slint";
 import { InsertCoins } from "pages/insert_coins.slint";
 import { HomeAssistant } from "pages/home_assistant.slint";
 import { Diagnostics, LogEntry } from "pages/diagnostics.slint";
+import { DiagnosticsAuth } from "pages/diagnostics_auth.slint";
 import { Logs, DonationLogItem } from "pages/logs.slint";
 
 export { VirtualKeyboardHandler, KeyModel, AutocompleteHandler }
@@ -18,6 +19,7 @@ enum Page {
     InsertMoney,
     InsertCoins,
     HomeAssistant,
+    DiagnosticsAuth,
     Diagnostics,
     Logs,
     Top,
@@ -48,6 +50,9 @@ export component MainWindow inherits Window {
     in-out property <int> last-added-amount: 0;
 
     // diagnostics
+    /// Password required to enter Diagnostics, set once from Rust config at
+    /// startup. Empty string means no password is configured — gate skipped.
+    in-out property <string> diagnostics-password: "";
     in-out property <[LogEntry]> diag-logs: [];
     in-out property <LogEntry> diag-bill-status: { level: 0, text: "Initializing..." };
     in-out property <LogEntry> diag-coin-status: { level: 0, text: "Initializing..." };
@@ -127,16 +132,13 @@ export component MainWindow inherits Window {
 
             play-clicked => {
                 root.session-amount = 0;
+                root.last-added-amount = 0;
                 root.start-accepting-money();
                 root.current-page = Page.InsertCoins;
             }
 
-            logs-clicked => {
-                root.current-page = Page.Logs;
-            }
-
             secret-tapped => {
-                root.current-page = Page.Diagnostics;
+                root.current-page = root.diagnostics-password == "" ? Page.Diagnostics : Page.DiagnosticsAuth;
             }
         }
         if current-page == Page.Donate: Donate {
@@ -164,6 +166,7 @@ export component MainWindow inherits Window {
                 root.session-fund-id = fund-id;
                 root.session-fund-name = self.selected-fund-index >= 0 ? self.fund-items[self.selected-fund-index] : "";
                 root.session-amount = 0;  // reset session amount
+                root.last-added-amount = 0;  // clear any stale toast from a previous session
                 root.start-accepting-money();  // enable bill acceptor
                 root.current-page = Page.InsertMoney;
                 root.enter-insert-money();  // start inactivity timer
@@ -234,6 +237,15 @@ export component MainWindow inherits Window {
                 root.current-page = Page.Main;
             }
         }
+        if current-page == Page.DiagnosticsAuth: DiagnosticsAuth {
+            expected-password: root.diagnostics-password;
+            back-clicked => {
+                root.current-page = Page.Main;
+            }
+            unlocked => {
+                root.current-page = Page.Diagnostics;
+            }
+        }
         if current-page == Page.Diagnostics: Diagnostics {
             log-lines: root.diag-logs;
             bill-status: root.diag-bill-status;
@@ -256,14 +268,17 @@ export component MainWindow inherits Window {
             check-backend => {
                 root.diag-check-backend();
             }
+            open-logs => {
+                root.current-page = Page.Logs;
+            }
         }
         if current-page == Page.Logs: Logs {
             entries: root.donation-logs;
             fetch-logs => {
                 root.fetch-logs();
             }
             back-clicked => {
-                root.current-page = Page.Main;
+                root.current-page = Page.Diagnostics;
             }
         }
 
diff --git a/ui/pages/diagnostics.slint b/ui/pages/diagnostics.slint
@@ -12,6 +12,7 @@ export component Diagnostics inherits Rectangle {
     callback reenumerate-coins();
     callback play-sound();
     callback check-backend();
+    callback open-logs();
 
     in-out property <[LogEntry]> log-lines: [];
     in property <LogEntry> bill-status: { level: 0, text: "Initializing..." };
@@ -141,6 +142,18 @@ export component Diagnostics inherits Rectangle {
                     root.play-sound();
                 }
             }
+
+            Button {
+                text: "Donation Wall";
+                width: 200px;
+                enabled: !root.guard;
+                clicked => {
+                    inactivity-timer.running = false;
+                    inactivity-timer.running = true;
+                    root.seconds-left = 120;
+                    root.open-logs();
+                }
+            }
         }
 
         // ── Status panel + camera preview ────────────────────────────────
@@ -178,10 +191,9 @@ export component Diagnostics inherits Rectangle {
                             height: 10px;
                             border-radius: 5px;
                             y: (parent.height - self.height) / 2;
-                            background: root.bill-status.level == 1 ? #4caf50 :
-                                        root.bill-status.level == 2 ? #ff8c00 :
-                                        root.bill-status.level == 3 ? #f44336 : #808080;
+                            background: root.bill-status.level == 1 ? #4caf50 : root.bill-status.level == 2 ? #ff8c00 : root.bill-status.level == 3 ? #f44336 : #808080;
                         }
+
                         Text {
                             text: root.bill-status.text;
                             font-size: 13px;
@@ -204,15 +216,15 @@ export component Diagnostics inherits Rectangle {
                             width: 130px;
                             vertical-alignment: center;
                         }
+
                         Rectangle {
                             width: 10px;
                             height: 10px;
                             border-radius: 5px;
                             y: (parent.height - self.height) / 2;
-                            background: root.coin-status.level == 1 ? #4caf50 :
-                                        root.coin-status.level == 2 ? #ff8c00 :
-                                        root.coin-status.level == 3 ? #f44336 : #808080;
+                            background: root.coin-status.level == 1 ? #4caf50 : root.coin-status.level == 2 ? #ff8c00 : root.coin-status.level == 3 ? #f44336 : #808080;
                         }
+
                         Text {
                             text: root.coin-status.text;
                             font-size: 13px;
@@ -235,15 +247,15 @@ export component Diagnostics inherits Rectangle {
                             width: 130px;
                             vertical-alignment: center;
                         }
+
                         Rectangle {
                             width: 10px;
                             height: 10px;
                             border-radius: 5px;
                             y: (parent.height - self.height) / 2;
-                            background: root.backend-status.level == 1 ? #4caf50 :
-                                        root.backend-status.level == 2 ? #ff8c00 :
-                                        root.backend-status.level == 3 ? #f44336 : #808080;
+                            background: root.backend-status.level == 1 ? #4caf50 : root.backend-status.level == 2 ? #ff8c00 : root.backend-status.level == 3 ? #f44336 : #808080;
                         }
+
                         Text {
                             text: root.backend-status.text;
                             font-size: 13px;
@@ -252,6 +264,7 @@ export component Diagnostics inherits Rectangle {
                             horizontal-stretch: 1;
                             overflow: elide;
                         }
+
                         Button {
                             text: "Check";
                             width: 80px;
diff --git a/ui/pages/diagnostics_auth.slint b/ui/pages/diagnostics_auth.slint
@@ -0,0 +1,97 @@
+import { Button, LineEdit, Palette } from "std-widgets.slint";
+import { VirtualKeyboardHandler, VirtualKeyboard } from "../virtual_keyboard.slint";
+
+export component DiagnosticsAuth inherits Rectangle {
+    callback back-clicked();
+    callback unlocked();
+    in property <string> expected-password: "";
+
+    property <bool> wrong: false;
+
+    init => {
+        VirtualKeyboardHandler.open = true;
+        password-input.focus();
+    }
+
+    function try-unlock() {
+        if password-input.text == root.expected-password {
+            VirtualKeyboardHandler.open = false;
+            root.wrong = false;
+            password-input.text = "";
+            root.unlocked();
+        } else {
+            root.wrong = true;
+            password-input.text = "";
+        }
+    }
+
+    background: Palette.background;
+
+    VerticalLayout {
+        alignment: center;
+        spacing: 20px;
+        padding: 32px;
+
+        Text {
+            text: "🔒 Diagnostics";
+            font-size: 28px;
+            font-weight: 700;
+            color: Palette.foreground;
+            horizontal-alignment: center;
+        }
+
+        Text {
+            text: root.wrong ? "Wrong password, try again" : "Enter password to continue";
+            font-size: 16px;
+            color: root.wrong ? #e53935 : Palette.foreground;
+            opacity: root.wrong ? 1.0 : 0.6;
+            horizontal-alignment: center;
+        }
+
+        HorizontalLayout {
+            alignment: center;
+
+            password-input := LineEdit {
+                width: 320px;
+                height: 60px;
+                font-size: 22px;
+                input-type: password;
+                horizontal-alignment: center;
+                accepted => {
+                    root.try-unlock();
+                }
+            }
+        }
+
+        HorizontalLayout {
+            alignment: center;
+            spacing: 16px;
+
+            Button {
+                text: "← Back";
+                width: 140px;
+                height: 56px;
+                clicked => {
+                    VirtualKeyboardHandler.open = false;
+                    password-input.text = "";
+                    root.wrong = false;
+                    root.back-clicked();
+                }
+            }
+
+            Button {
+                text: "Unlock";
+                primary: true;
+                width: 140px;
+                height: 56px;
+                clicked => {
+                    root.try-unlock();
+                }
+            }
+        }
+    }
+
+    keyboard := VirtualKeyboard {
+        y: VirtualKeyboardHandler.open ? parent.height - self.height : parent.height;
+    }
+}
diff --git a/ui/pages/main.slint b/ui/pages/main.slint
