discstation 0.1.42 → 0.1.43

package/README.md

@@ -175,7 +175,11 @@ self-signed cert. On startup the host prints the LAN URL to open
   — and picking one starts it directly, no separate confirm step. Also has
   EJECT/CLOSE toggle, a live disc-status readout, and full playback
   transport. Greys out and auto-collapses the instant a physical remote is
-  detected, so the two never fight for control.
+  detected, so the two never fight for control — including mid-burn/rip/play:
+  plugging the remote in hands it control without interrupting whatever's
+  running, and its screen picks up the current status instead of starting
+  over; unplugging it hands control back to the on-screen remote within a
+  second or two.
 
 ## Mobile App
 
@@ -184,7 +188,8 @@ has the same on-screen remote as the web UI, rendered inline in the main
 screen rather than a popup — same "REMOTE" tag toggle, opens automatically
 with no ESP32 attached, mode buttons filtered to what the disc actually
 supports, and picking one starts it directly. Same auto-collapse behavior
-when a physical ESP32 shows up, same underlying `/remote/button` protocol.
+when a physical ESP32 shows up — mid-operation and without interruption, same
+as the web UI — and the same underlying `/remote/button` protocol.
 
 ## Disc Support
 

package/arduino/firmware/firmware.json

@@ -1 +1 @@
-{"version":"0.1.42","size":1260592,"md5":"fc62c97a1f9e0bedc579426771789964"}
+{"version":"0.1.43","size":1260592,"md5":"575faf0891e354ecd451d8454228a18e"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discstation",
-  "version": "0.1.42",
+  "version": "0.1.43",
   "description": "DiscStation optical-media appliance host — one cross-OS installer",
   "bin": {
     "discstation-setup": "scripts/setup.mjs",

package/src/discstation.py

@@ -530,6 +530,14 @@ class _WebHandler(http.server.BaseHTTPRequestHandler):
             return
         if _active_ser is not None and _active_ser.hw is None:
             _active_ser.virtual.push_line(cmd)
+            # One-click burn: chain START right behind SELECT:BURN* in the SAME
+            # request, atomically - station_loop's SELECT handler clears any
+            # stale buffered input the instant it reads the SELECT line, and a
+            # START sent as a second, separate HTTP call can land in that exact
+            # gap and get wiped (intermittent, timing-dependent "burn never
+            # starts" bug). Queuing both lines from one call removes the gap.
+            if cmd.upper().startswith("SELECT:BURN"):
+                _active_ser.virtual.push_line("START")
             self._respond(200, 'OK')
         else:
             self._respond(409, 'A hardware remote is attached')
@@ -645,7 +653,7 @@ class _WebHandler(http.server.BaseHTTPRequestHandler):
     def _serve_sw(self):
         sw = '''self.addEventListener('install', e => {
   self.skipWaiting();
-  caches.open('discstation-v18').then(c => c.addAll(['/','/static/style.css?v=18','/static/app.js?v=18']));
+  caches.open('discstation-v20').then(c => c.addAll(['/','/static/style.css?v=20','/static/app.js?v=20']));
 });
 self.addEventListener('activate', e => e.waitUntil(clients.claim()));
 self.addEventListener('fetch', e => {
@@ -654,7 +662,7 @@ self.addEventListener('fetch', e => {
   if (path === '/' || path.startsWith('/static/')) {
     e.respondWith(fetch(e.request).then(r => {
       const copy = r.clone();
-      caches.open('discstation-v18').then(c => c.put(e.request, copy));
+      caches.open('discstation-v20').then(c => c.put(e.request, copy));
       return r;
     }).catch(() => caches.match(e.request)));
   } else {
@@ -845,6 +853,20 @@ def wait_for_web_url(ser):
     url = f"{protocol}://{ip}:{_web_port}"
     safe_send(ser, f"IP:{url}")
     print(f"URL displayed: {url}")
+    # The one-click remote buttons queue START right behind SELECT:BURN* (see
+    # _handle_remote_button) - when files were uploaded BEFORE the mode was
+    # picked (the normal one-click order), that START can already be sitting
+    # in the buffer by the time this runs. Check the queue before touching the
+    # serial line at all: the loop below reads and discards one line per pass
+    # looking for CANCEL/HOME, and would otherwise eat that START and throw it
+    # away, leaving the burn waiting forever for a START that already came.
+    try:
+        got = _burn_url_queue.get_nowait()
+    except Empty:
+        got = None
+    if got:
+        safe_send(ser, "STATUS:Got URL, starting...")
+        return got
     while True:
         line = read_serial_line(ser, timeout=0.5)
         if line and line.strip().upper() in ("CANCEL", "HOME"):

package/src/static/app.js

@@ -51,11 +51,16 @@
   function setProgress(phase, percent, active = true) {
     const panel = $("global-progress");
     const fill = $("progress-fill");
-    panel.hidden = !active && percent < 0;
+    // Clamp here, the one place this renders - a browser's own upload
+    // "progress" event isn't guaranteed to stop exactly at loaded===total
+    // (seen reading past 100%), and this is the single choke point every
+    // caller (upload, burn/rip progress, SSE) goes through either way.
+    const shown = percent >= 0 ? Math.min(100, Math.max(0, Math.round(percent))) : -1;
+    panel.hidden = !active && shown < 0;
     $("progress-phase").textContent = (phase || "READY").toUpperCase();
-    $("progress-value").textContent = percent >= 0 ? `${percent}%` : "...";
-    fill.style.width = percent >= 0 ? `${Math.min(100, percent)}%` : "34%";
-    fill.classList.toggle("indeterminate", percent < 0);
+    $("progress-value").textContent = shown >= 0 ? `${shown}%` : "...";
+    fill.style.width = shown >= 0 ? `${shown}%` : "34%";
+    fill.classList.toggle("indeterminate", shown < 0);
   }
 
   async function pollStatus() {
@@ -154,16 +159,11 @@
     const button = event.target.closest("[data-cmd]");
     if (!button || button.disabled) return;
     const cmd = button.dataset.cmd;
+    // One-click burn: the server queues START right behind SELECT:BURN* in the
+    // same request now (was two separate POSTs from here, which raced against
+    // the server clearing stale input the instant it read SELECT and could
+    // silently drop the START - see _handle_remote_button in discstation.py).
     await sendRemoteCmd(cmd);
-    // On real hardware START is a long-press of the encoder on the burn-ready
-    // review screen, not its own button - a one-click "BURN AUDIO"/"BURN
-    // DATA"/"BURN" here is the whole point of the web remote, so chase the
-    // mode select straight through to starting the burn instead of leaving
-    // the user stuck with nothing left to press. (The backend queues this
-    // harmlessly if files/URL aren't in yet - it's only consumed once the
-    // burn's actually at its own "waiting for start" step, and gets flushed
-    // if a different mode gets selected first so it can't fire the wrong burn.)
-    if (cmd.startsWith("SELECT:BURN")) await sendRemoteCmd("START");
   });
   let volumeTimer;
   $("remote-volume").addEventListener("input", (event) => {

package/src/static/index.html

@@ -144,7 +144,7 @@
     </footer>
   </div>
   <div id="install-slot"></div>
-  <script>if ("serviceWorker" in navigator) navigator.serviceWorker.register("/sw.js?v=18").catch(() => {});</script>
-  <script src="/static/app.js?v=18" defer></script>
+  <script>if ("serviceWorker" in navigator) navigator.serviceWorker.register("/sw.js?v=20").catch(() => {});</script>
+  <script src="/static/app.js?v=20" defer></script>
 </body>
 </html>