discstation 0.1.35 → 0.1.38

package/README.md

@@ -46,8 +46,7 @@ remote can talk to the host over Wi-Fi instead of a USB cable.
 |------|-------------|
 | **Burn Video DVD** | YouTube URL or local file → ffmpeg 2-pass → DVD-Video disc |
 | **Burn Data DVD** | Any files/folders → ISO/Joliet data disc (no quality loss) |
-| **Burn MPG** | Re-burn a previously converted movie.mpg |
-| **Play** | Playback via mpv (DVD-Video, Audio CD, VCD, SVCD) — the OLED remote shows a live spectrum visualizer of the actual audio (Linux only for now; see `docs/PLATFORM_SUPPORT.md`) |
+| **Play** | Playback via mpv (DVD-Video, Audio CD, VCD, SVCD) — the OLED remote shows a live spectrum visualizer of the actual audio (Linux only for now; see `docs/PLATFORM_SUPPORT.md`); while a track plays the OLED keeps the track/volume screen (or the visualizer) up — the spinning-disc screensaver only appears on the home/standby screens or after playback has been paused for 15 s |
 | **Rip** | Audio CD → FLAC (MusicBrainz); DVD-Video → VIDEO_TS mirror or HandBrake MKV (TMDb naming) |
 
 ## Project Structure
@@ -63,6 +62,7 @@ remote can talk to the host over Wi-Fi instead of a USB cable.
 ├── mobile/                   # Expo (React Native) companion app
 ├── arduino/DiscStation/     # ESP32 DevKit remote firmware
 ├── scripts/setup.mjs         # `discstation-setup` — cross-OS installer dispatch
+├── scripts/check.sh          # static checks + smoke test (run before committing)
 ├── docs/                     # Platform support notes
 ├── install.sh / install-macos.sh / install-windows.ps1
 ├── requirements.txt / requirements-optional.txt
@@ -94,7 +94,9 @@ dock/taskbar icon on macOS, Linux, and Windows.
 **Updating:** `npm install -g discstation` alone now redeploys and restarts
 the already-running service automatically (a `postinstall` hook copies the
 updated files over and restarts it) — no need to re-run `discstation-setup`
-after every update. `discstation-setup` itself is still what performs the
+after every update. Note this deploys whatever version is *published*, so installing an
+older published release over a newer git checkout rolls the running service
+back to it until you publish (or re-copy `src/`) again. `discstation-setup` itself is still what performs the
 first install (system packages, venv, cert, service registration).
 
 Support by OS:
@@ -154,10 +156,11 @@ self-signed cert. On startup the host prints the LAN URL to open
 ## Mobile App
 
 The `mobile/` Expo app (enter the host's LAN address in its settings screen)
-has the same on-screen remote as the web UI — mode buttons, EJECT/CLOSE,
-disc status, and playback transport, tapped from the "REMOTE" tag next to
-the wordmark. Same auto-collapse behavior when a physical ESP32 shows up,
-same underlying `/remote/button` protocol.
+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.
 
 ## Disc Support
 

package/arduino/DiscStation/DiscStation.ino

@@ -33,7 +33,6 @@
 #define LONG_PRESS_MS    1000
 #define ENC_CLICK_GUARD_MS 200  // ignore new SW presses this soon after a rotation tick (rotation vibration can bounce SW low)
 #define DONE_RESET_MS    30000
-#define STANDBY_BLANK_MS 60000
 #define IDLE_BLANK_MS    15000   // no input this long on HOME/STANDBY -> spinning-disc screensaver
                                  // (this power bank's no-load auto-shutoff trips at ~30s idle; keep this
                                  // well under that so the screensaver's current draw beats it there)
@@ -222,6 +221,8 @@ String discLine = "Disc: none";
 String line1 = "Status: READY";
 String line2 = "";
 String line3 = "";
+bool trayOpen = false;        // host says the tray is open (eject wait / STANDBY:Tray open) - EJECT button then closes it
+bool waitingIsTray = false;   // the WAITING screen is the eject "close tray" wait, not the pre-burn confirm
 String waitingLine1 = "";
 String waitingLine2 = "";
 int progressPercent = -1;
@@ -272,6 +273,7 @@ uint8_t vuLevel[VU_BARS];
 bool visualizerActive = false;
 unsigned long lastVuAt = 0;
 unsigned long vuSuppressUntil = 0;   // bars withheld (text screen shown instead) until millis() reaches this
+bool playPaused = false;   // last PLAY_STATUS was PAUSED - the only PLAY state the idle screensaver may take over
 bool vuSeenReal = false;   // has this PLAY session ever gotten a VU: frame with a nonzero bar -
                            // a session-level fact (macOS: never; Linux: within the first frame or
                            // two), decided once and left alone. Deliberately separate from
@@ -456,7 +458,7 @@ void drawWaiting() {
   printUpper(waitingLine2);
 
   display.setCursor(2, 49);
-  display.print("SHORT // GO");
+  display.print(waitingIsTray ? "EJECT BTN // CLOSE" : "SHORT // GO");
 
   display.display();
 }
@@ -774,6 +776,7 @@ void parseMessage(String msg) {
   Out.println(msg);
 
   if (msg.startsWith("HOME:")) {
+    trayOpen = false;
     drawHome();
 
   } else if (msg.startsWith("DISC:")) {
@@ -802,6 +805,7 @@ void parseMessage(String msg) {
     if (uiState == UI_HOME) drawHome();
 
   } else if (msg.startsWith("STANDBY:")) {
+    trayOpen = msg.substring(8) == "Tray open";
     drawStandby();
 
   } else if (msg.startsWith("TITLE:")) {
@@ -827,6 +831,9 @@ void parseMessage(String msg) {
     lastVuAt = 0;                  // fresh session - unknown yet whether the host even sends VU: at all
     visualizerActive = false;
     vuSeenReal = false;            // unknown yet whether this session ever gets a real (nonzero) frame
+    playPaused = false;
+    displayBlank = false;          // a fresh session must never inherit a running screensaver
+    lastInputTime = millis();
     Out.print("POT:");             // push the last-used volume so playback starts at it
     Out.println(playVolume);
     drawPlay();
@@ -838,6 +845,9 @@ void parseMessage(String msg) {
   } else if (msg.startsWith("PLAY_STATUS:")) {
     line1 = msg.substring(12);
     if (line1.length() > 20) line1 = line1.substring(0, 20);
+    playPaused = (line1 == "PAUSED");
+    if (playPaused) lastInputTime = millis();   // idle timer starts from the pause
+    else displayBlank = false;                  // resumed (even from the web remote) - drop the screensaver
     if (line1 == "PLAYING" || line1 == "PAUSED" || (audioPlayMode && line1.startsWith("TRACK "))) {
       playStatusTemp = false;
     } else {
@@ -849,8 +859,13 @@ void parseMessage(String msg) {
   } else if (msg.startsWith("WAITING:")) {
     returnToHomeAt = 0;
     String rest = msg.substring(8);
+    waitingIsTray = rest.indexOf("close tray") >= 0;
+    if (waitingIsTray) trayOpen = true;
     int slash = rest.indexOf('/');
-    if (slash >= 0) {
+    if (waitingIsTray) {
+      waitingLine1 = "TRAY OPEN";
+      waitingLine2 = "";
+    } else if (slash >= 0) {
       waitingLine1 = "Data: " + rest.substring(0, slash);
       waitingLine1.trim();
       waitingLine2 = "Disc: " + rest.substring(slash + 1);
@@ -983,14 +998,6 @@ void handleSelectPress(bool longPress) {
       drawStatus();
     }
 
-  } else if (uiState == UI_STANDBY) {
-    Out.println("EJECT");
-    line1 = "Ejecting...";
-    line2 = "";
-    line3 = "";
-    returnToHomeAt = millis() + 5000;
-    drawStatus();
-
   } else if (uiState == UI_STATUS && line1 == "Ejecting...") {
     // Manual escape if stuck on eject screen with no app response
     drawStandby();
@@ -1005,7 +1012,7 @@ void handleSelectPress(bool longPress) {
     if (longPress) {
       Out.println("CANCEL");
       drawHome();
-    } else {
+    } else if (!waitingIsTray) {   // tray close moved to the EJECT button
       Out.println("CONFIRM");
       line1 = "Confirmed!";
       line2 = "";
@@ -1138,7 +1145,15 @@ void handleEncoderCCW() {
 void handleEjectButton() {
   if (wakeDisplay()) { lastInputTime = millis(); return; }
   lastInputTime = millis();
-  if (uiState == UI_HOME || uiState == UI_STANDBY || uiState == UI_DISCONNECTED || uiState == UI_PLAY) {
+  if (trayOpen && (uiState == UI_STANDBY || uiState == UI_HOME || (uiState == UI_WAITING && waitingIsTray))) {
+    Out.println("CONFIRM");            // host closes the tray
+    trayOpen = false;
+    line1 = "Closing tray...";
+    line2 = "";
+    line3 = "";
+    returnToHomeAt = millis() + 5000;
+    drawStatus();
+  } else if (uiState == UI_HOME || uiState == UI_STANDBY || uiState == UI_DISCONNECTED || uiState == UI_PLAY) {
     Out.println("EJECT");
     line1 = "Ejecting...";
     line2 = "";
@@ -1353,24 +1368,13 @@ void loop() {
     if (uiState == UI_PLAY && !displayBlank) drawPlay();
   }
 
-  // --- Idle disc screensaver (HOME + STANDBY + PLAY) ---
-  // PLAY is included because a static "PLAYING" screen is just as low-current
-  // as HOME/STANDBY were - the power bank doesn't care what's on screen, only
-  // that the draw stays static this long.
-  //
-  // In PLAY specifically, if this session has never gotten a single REAL
-  // (nonzero) VU: frame (!vuSeenReal - the host/platform doesn't support the
-  // visualizer, e.g. macOS today), don't make the user wait out the full
-  // generic idle timer for an animation - drop into the spinning-disc
-  // screensaver as soon as the text-hold window (vuSuppressUntil) expires.
-  // vuSeenReal (not lastVuAt, which now updates on every frame including
-  // all-zero ones) is deliberately a session-level, decided-once fact, so
-  // this can't re-trigger mid-playback and flicker against the bars.
-  bool playSkippingToScreensaver = (uiState == UI_PLAY) && !vuSeenReal &&
-      (long)(millis() - vuSuppressUntil) >= 0;
+  // --- Idle disc screensaver (HOME + STANDBY, or PLAY while paused) ---
+  // Never while a track is actually playing - the track/volume status (or
+  // visualizer) owns the screen then. A static screen is what the power bank
+  // needs to see stay drawing, so the saver covers every idle/paused state.
   if (displayOk && !displayBlank &&
-      (uiState == UI_HOME || uiState == UI_STANDBY || uiState == UI_PLAY) &&
-      ((long)(millis() - lastInputTime) >= IDLE_BLANK_MS || playSkippingToScreensaver)) {
+      (uiState == UI_HOME || uiState == UI_STANDBY || (uiState == UI_PLAY && playPaused)) &&
+      (long)(millis() - lastInputTime) >= IDLE_BLANK_MS) {
     displayBlank = true;
     saverStep = 0;
     lastSaverFrame = 0;

package/discstation.env.example

@@ -20,7 +20,7 @@ DISC_DL_OUTPUT_LIMIT_BYTES=8000000000
 # ~/.local/share/discstation/tmdb.key
 # DISCSTATION_TMDB_API_KEY=
 # YTDLP_COOKIES_FROM_BROWSER=firefox
-# YTDLP_COOKIES=/home/phuju/.config/discstation/youtube-cookies.txt
+# YTDLP_COOKIES=~/.config/discstation/youtube-cookies.txt
 # YTDLP_USER_AGENT=Mozilla/5.0 ...
 # YTDLP_PO_TOKEN=web_embedded.gvs+TOKEN
 # YTDLP_EXTRACTOR_ARGS=youtube:player_client=web_embedded

package/docs/PLATFORM_SUPPORT.md

@@ -27,37 +27,19 @@ Set `DISC_DEVICE` if automatic drive detection fails. The one known limitation
 is **audio-CD *burning*** — `cdrdao` is the only option and often cannot claim
 the drive on recent macOS; DiscStation reports this clearly instead of hanging.
 
-### ESP32 remote: OLED spectrum visualizer — not currently working on macOS
-
-**Confirmed broken, not just a setup step.** The visualizer's macOS capture
-path (`ffmpeg -f avfoundation` reading the BlackHole loopback device) was
-built and the BlackHole/Multi-Output-Device routing was set up and verified
-correct on real hardware — but `ffmpeg`'s capture consistently returns
-silence (valid-looking output, zero errors, every sample exactly `0`) even
-with the native macOS Sound input level meter confirmed showing real,
-moving signal on BlackHole at the same moment. That combination — real
-signal present at the OS/driver level, silently zeroed once it reaches an
-app's capture buffer — is macOS's system-audio-capture privacy protection
-muting an untrusted capturer, not a permission checkbox that was missed:
-Microphone and Screen & System Audio Recording were both granted to
-`ffmpeg` with no change.
-
-The legitimate modern API for this (CoreAudio's Process Tap,
-`AudioHardwareCreateProcessTap`, macOS 14.2+) requires a properly
-code-signed app bundle requesting a specific entitlement, with its own
-dedicated system consent dialog — a bare ad-hoc-signed Homebrew CLI binary
-like `ffmpeg` structurally cannot satisfy that, regardless of which Privacy
-& Security toggles are flipped. Making the visualizer work on macOS would
-mean building a small signed helper app around that API — a real, separate
-project, not started.
-
-**Everything else works normally** — audio-CD/DVD/video playback, ripping,
-burning, and the web UI are all unaffected. PLAY just always shows the
-normal text status screen on macOS instead of ever switching to bars.
-
-If BlackHole is already installed from an earlier attempt at this, it's
-harmless to leave in place — it just won't do anything useful for
-DiscStation until/unless the above gets built.
+### ESP32 remote: OLED spectrum visualizer — Linux only
+
+The bars need a way to tap the audio being played. On Linux that's PulseAudio's
+monitor source (`parec`). macOS has no equivalent a plain CLI tool can use: a
+capture through a loopback driver (BlackHole + `ffmpeg -f avfoundation`) was
+built and verified end to end on real hardware, and returns pure silence
+(every sample `0`, no errors) even while the native Sound input meter shows
+signal — macOS's system-audio-capture privacy protection mutes untrusted
+capturers, and no Privacy & Security toggle changes that. The supported route
+is CoreAudio's Process Tap (`AudioHardwareCreateProcessTap`, macOS 14.2+),
+which needs a code-signed app bundle with its own consent dialog — a separate
+project, not started, so the capture code was removed. PLAY just shows the
+normal text status screen on macOS; everything else is unaffected.
 
 ### Troubleshooting playback ("mpv not found" / play fails to start)
 

package/install-macos.sh

@@ -28,7 +28,7 @@ if ! command -v brew >/dev/null 2>&1; then
 fi
 
 brew install python ffmpeg cdrdao dvdauthor node yt-dlp xorriso mpv libdiscid handbrake \
-  libdvdcss dvdbackup libcdio-paranoia blackhole-2ch
+  libdvdcss dvdbackup libcdio-paranoia
 mkdir -p "$APP_DIR" "$VENV_DIR" "$CONFIG_DIR"
 cp -R "$ROOT_DIR/src/." "$APP_DIR/"
 python3 -m venv "$VENV_DIR"
@@ -40,12 +40,9 @@ else
 fi
 # Optional metadata deps — best effort. python-libdiscid (a C extension) is
 # Linux-only in requirements-optional.txt; on macOS install the pure-Python
-# bits and let brew's libdiscid cover disc IDs via the CLI tools. numpy is
-# for the OLED spectrum visualizer (needs the blackhole-2ch brew package
-# above too, plus a one-time Multi-Output Device setup - see
-# docs/PLATFORM_SUPPORT.md).
+# bits and let brew's libdiscid cover disc IDs via the CLI tools.
 if [[ -f "$ROOT_DIR/requirements-optional.txt" ]]; then
-  "$VENV_DIR/bin/python" -m pip install musicbrainzngs tmdbsimple numpy \
+  "$VENV_DIR/bin/python" -m pip install musicbrainzngs tmdbsimple \
     || printf 'Optional metadata deps skipped (host still works).\n'
 fi
 

package/install.sh

@@ -14,7 +14,8 @@ fi
 if command -v apt-get >/dev/null 2>&1; then
   sudo apt-get update
   sudo apt-get install -y \
-    cdrdao dvdauthor ffmpeg genisoimage growisofs handbrake-cli lsdvd mpv \
+    cdrdao dvdauthor dvdbackup eject ffmpeg genisoimage growisofs handbrake-cli \
+    lsdvd mpv sg3-utils \
     nodejs openssl python3 python3-pip python3-serial python3-mutagen \
     python3-requests python3-pyudev python3-libdiscid python3-musicbrainzngs \
     python3-numpy pulseaudio-utils libdiscid0 python3-venv wodim
@@ -51,6 +52,10 @@ if [[ ! -f "$CONFIG_DIR/server.crt" || ! -f "$CONFIG_DIR/server.key" ]]; then
 fi
 
 sudo usermod -aG dialout,cdrom "$USER" || true
+# Don't let the kernel re-close an ejected tray whenever some process (a desktop
+# volume monitor, a disc probe) opens the drive.
+echo 'dev.cdrom.autoclose = 0' | sudo tee /etc/sysctl.d/90-discstation.conf >/dev/null \
+  && sudo sysctl -q -w dev.cdrom.autoclose=0 || true
 mkdir -p "$HOME/.config/systemd/user"
 cp "$ROOT_DIR/systemd/discstation.service" "$HOME/.config/systemd/user/discstation.service"
 systemctl --user daemon-reload

package/package.json

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

package/requirements-optional.txt

@@ -13,10 +13,8 @@ python-libdiscid>=2.0 ; sys_platform == "linux"
 musicbrainzngs>=0.7.1
 tmdbsimple>=2.9
 
-# OLED spectrum visualizer during playback. Linux needs `parec`/`pactl`
-# (pulseaudio-utils apt package) - prefer python3-numpy via apt there, pip
-# installs are blocked on a system Python. macOS needs the BlackHole
-# loopback driver (brew install blackhole-2ch, see docs/PLATFORM_SUPPORT.md
-# for the one-time Multi-Output Device setup); numpy installs fine via pip
-# there since install-macos.sh's venv isn't externally-managed.
-numpy>=1.24 ; sys_platform == "linux" or sys_platform == "darwin"
+# OLED spectrum visualizer during playback (Linux only). Needs `parec`/`pactl`
+# (pulseaudio-utils apt package) - prefer python3-numpy via apt, pip installs
+# are blocked on a system Python. macOS can't capture system audio from a CLI
+# tool - see docs/PLATFORM_SUPPORT.md.
+numpy>=1.24 ; sys_platform == "linux"

package/scripts/check.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+# Static sanity checks for every language in the repo. Run before committing.
+set -euo pipefail
+cd "$(dirname "$0")/.."
+
+python3 -m py_compile src/*.py
+for f in install.sh install-macos.sh scripts/*.sh; do bash -n "$f"; done
+for f in scripts/*.mjs scripts/lib/*.mjs src/static/app.js; do node --check "$f"; done
+(cd mobile && ./node_modules/.bin/tsc --noEmit --noUnusedLocals)
+
+# Import the host and exercise the pure status/menu logic with canned input.
+(cd src && python3 - <<'EOF'
+import discstation as d
+d._record_web_status("PLAY_MODE:AUDIO_CD")
+assert d._status_snapshot()["playing"] is True
+d._record_web_status("PROGRESS:42%")
+assert d._status_snapshot()["progress"] == 42
+d._record_web_status("DONE:ok")
+assert d._status_snapshot()["playing"] is False
+
+# Burn-flow helpers: history recording for every exit path, START/SPEED/MODE/CANCEL.
+import json, pathlib, tempfile
+d.HISTORY_FILE = pathlib.Path(tempfile.mkdtemp()) / "h.jsonl"
+with d._burn_history({"title": "t"}):
+    pass
+try:
+    with d._burn_history({"title": "t"}):
+        raise RuntimeError("boom")
+except RuntimeError:
+    pass
+with d._burn_history({"title": "t"}, swallow_cancel=True) as h:
+    raise d.CancelError("x")
+assert h.cancelled
+rows = [json.loads(l) for l in open(d.HISTORY_FILE)]
+assert [r["success"] for r in rows] == [True, False, False] and rows[1]["error"] == "boom"
+ser = d.VirtualSerial()
+for line in ("SPEED:6x", "START"):
+    ser.push_line(line)
+assert d._wait_for_start(ser, "audio burn") == (None, "6x")
+for line in ("MODE:BEST", "START"):
+    ser.push_line(line)
+assert d._wait_for_start(ser, mode="AUTO") == ("BEST", None)
+ser.push_line("CANCEL")
+assert d._wait_for_start(ser, "x") is None
+
+# Subprocess-output iterators (shared reader thread) + cancel handling.
+import subprocess, sys
+def spawn(code):
+    return subprocess.Popen([sys.executable, "-c", code], stdout=subprocess.PIPE, text=True)
+assert list(d.discstation_burn.iter_proc_or_cancel(spawn("print('a');print('b')"), ser)) == ["a", "b"]
+assert [e for e in d.iter_process_events(spawn("print('x')"), idle_seconds=0.2, ser=ser) if e] == ["x"]
+ser.push_line("CANCEL")
+try:
+    list(d.iter_process_events(spawn("import time;time.sleep(30)"), idle_seconds=0.2, ser=ser))
+    raise SystemExit("cancel not raised")
+except d.CancelError:
+    pass
+print("smoke ok")
+EOF
+)
+echo "all checks passed"