discstation 0.1.20 → 0.1.22

package/README.md

@@ -1,12 +1,18 @@
 # DiscStation
 
 DiscStation is a physical-media appliance for DVD-Video, data DVDs, audio CDs,
-playback, ripping, phone uploads, and ESP32 remote control.
+playback, ripping, phone uploads, and ESP32 remote control. The ESP32 remote
+is optional — with none attached, the built-in web UI becomes a full
+on-screen remote instead, so `npm install -g discstation` alone is enough to
+use every mode.
 
 ## Hardware
 
 - **Brain:** Raspberry Pi 4/5 (or any Linux box)
-- **Remote:** ESP32-C6 with SSD1306 OLED, rotary encoder, and buttons
+- **Remote (optional):** ESP32-C6 with SSD1306 OLED, rotary encoder, and
+  buttons — or none at all; the web UI's on-screen remote covers the same
+  controls when no ESP32 is detected, and steps aside (greyed out,
+  auto-collapsing) the moment one is plugged in
 - **Drive:** ATAPI DVD writer (e.g. iHAS124) over USB
 
 ## Features
@@ -58,7 +64,15 @@ get a standalone app window with a dock/taskbar icon on macOS, Linux, and
 Windows.
 
 `discstation-setup --help` lists the forwarded env vars. From a git clone,
-`npm run setup` does the same thing. Support by OS:
+`npm run setup` does the same thing.
+
+**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
+first install (system packages, venv, cert, service registration).
+
+Support by OS:
 
 | OS | What runs | Optical support |
 |----|-----------|-----------------|
@@ -95,11 +109,19 @@ mode but not full VIDEO_TS mirror or audio-CD ripping yet. See
 
 ## Web Interface
 
-Built-in web server on port 8080 (HTTPS with self-signed cert):
+Built-in web server on port 8080 (HTTPS with self-signed cert) and a plain
+HTTP mirror on 8081 for the mobile app / any browser that balks at the
+self-signed cert. On startup the host prints the LAN URL to open
+(`>>> Open http://<ip>:8081 ... <<<`).
 
 - Upload files from any device on the LAN for data DVD burning
 - Submit YouTube URLs for video DVD burning
 - Dark theme, mobile-responsive, PWA (installable on phone)
+- **On-screen remote** — click the "REMOTE" tag next to the DiscStation
+  wordmark to reveal a full control surface (mode buttons, EJECT/CLOSE
+  toggle, live disc-status readout, playback transport). Fully functional
+  with no ESP32 attached; greys out and auto-collapses the instant a
+  physical remote is detected, so the two never fight for control.
 
 ## Disc Support
 

package/arduino/c6/DiscStation_C6.ino

@@ -510,7 +510,13 @@ void parseMessage(String msg) {
     line1 = msg.substring(7);
     line2 = "";
     line3 = "";
-    progressPercent = -1;
+    // Don't reset progressPercent here - a STATUS: label change (e.g.
+    // "Copying files..." -> "Converting...") is often immediately
+    // followed by a fresh PROGRESS: for the same ongoing operation.
+    // Wiping it every time flipped the bar to the indeterminate dots
+    // and back on every single label update, flickering between the
+    // two. DONE:/CANCELLED:/ERROR:/NO_DISC: still reset it below - those
+    // really are the end of an operation.
     drawStatus();
 
   } else if (msg.startsWith("PROGRESS:")) {

package/arduino/v1/DiscStation.ino

@@ -535,7 +535,10 @@ void parseMessage(String msg) {
     line1 = msg.substring(7);
     line2 = "";
     line3 = "";
-    progressPercent = -1;
+    // Don't reset progressPercent here - see arduino/c6/DiscStation_C6.ino's
+    // matching comment: STATUS: label changes mid-operation are usually
+    // immediately followed by a fresh PROGRESS:, so wiping it every time
+    // flickered the bar to the indeterminate dots and back.
     drawStatus();
 
   } else if (msg.startsWith("PROGRESS:")) {

package/install-windows.ps1

@@ -64,13 +64,32 @@ if ($winget -and -not $IsWin7) {
         catch { Write-Host "  yt-dlp fetch skipped" }
     }
     if (-not (Have "ffmpeg")) { Get-Zip "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip" $tools | Out-Null }
-    if (-not (Have "mpv")) { Get-Zip "https://sourceforge.net/projects/mpv-player-windows/files/latest/download" $tools | Out-Null }
+    if (-not (Have "mpv")) {
+        # The SourceForge "latest" mpv build is a .7z (Expand-Archive can't
+        # open it); mpv's own first-party CI release ships plain .zip builds.
+        try {
+            $mpvRelease = Invoke-RestMethod "https://api.github.com/repos/mpv-player/mpv/releases/tags/git-release" -UseBasicParsing -TimeoutSec 25
+            $mpvAsset = $mpvRelease.assets | Where-Object { $_.name -match "x86_64-w64-mingw32\.zip$" } | Select-Object -First 1
+            if ($mpvAsset) { Get-Zip $mpvAsset.browser_download_url (Join-Path $tools "mpv") | Out-Null }
+        } catch { Write-Host "  mpv fetch skipped" }
+    }
+    if (-not (Have "HandBrakeCLI")) {
+        try {
+            $hbRelease = Invoke-RestMethod "https://api.github.com/repos/HandBrake/HandBrake/releases/latest" -UseBasicParsing -TimeoutSec 25
+            $hbAsset = $hbRelease.assets | Where-Object { $_.name -match "^HandBrakeCLI-.*-win-x86_64\.zip$" } | Select-Object -First 1
+            if ($hbAsset) { Get-Zip $hbAsset.browser_download_url (Join-Path $tools "handbrake") | Out-Null }
+        } catch { Write-Host "  HandBrakeCLI fetch skipped" }
+    }
+    # dvdauthor + spumux (DVD-Video authoring/subtitles) have no winget package;
+    # this VideoHelp-hosted plain .zip (no rar/unrar needed) is the only
+    # reliable direct-download source found.
+    if (-not (Have "dvdauthor")) { Get-Zip "https://download.videohelp.com/gfd/edcounter.php?file=download/dvdauthor_winbin.zip" (Join-Path $tools "dvdauthor") | Out-Null }
     if (Test-Path $tools) {
         $env:Path = $env:Path + ";" + $tools + ";" +
             ((Get-ChildItem $tools -Recurse -Filter "ffmpeg.exe" -ErrorAction SilentlyContinue | Select-Object -First 1).DirectoryName)
     }
     Write-Host "xorriso and HandBrakeCLI have no simple direct-download URL - install manually if you need"
-    Write-Host "video-DVD authoring / DVD ripping (see the plan's Windows setup notes)."
+    Write-Host "video-DVD ISO packaging / DVD ripping (see the plan's Windows setup notes)."
 } else {
     Write-Host "winget unavailable (Windows 7). ISO + data + audio burn work via IMAPI2."
     Write-Host "For rip/play/video-DVD install manually: xorriso, HandBrakeCLI 1.5.1, ffmpeg, mpv, yt-dlp."
@@ -126,14 +145,18 @@ try {
         $action    = New-ScheduledTaskAction -Execute $pyw -Argument "`"$target`"" -WorkingDirectory $App
         $trigger   = New-ScheduledTaskTrigger -AtLogOn -User $env:USERNAME
         $set       = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -RestartCount 3 -RestartInterval (New-TimeSpan -Minutes 1)
-        # S4U: runs headlessly for this user without needing an active interactive
-        # desktop session (Interactive logon type only fires while one exists, so
-        # e.g. Start-ScheduledTask over SSH/no console session would silently no-op).
+        # Interactive: attaches to the logged-in desktop session, same
+        # lifecycle as `systemctl --user`/launchd LaunchAgents on the other
+        # two platforms - required so PLAY's mpv window actually renders
+        # somewhere visible (S4U runs headlessly with no session to render
+        # into, which silently made every mpv window invisible). Trade-off,
+        # same one Linux/macOS already accept: won't start until someone is
+        # logged into the desktop.
         # RunLevel Limited (standard, non-elevated): nothing here needs admin -
         # IMAPI2 burning, WMI reads, and binding ports >1024 all work as a normal
         # user, and elevation is what put "Administrator" on the flashing console
         # windows this used to spawn.
-        $principal = New-ScheduledTaskPrincipal -UserId $env:USERNAME -LogonType S4U -RunLevel Limited
+        $principal = New-ScheduledTaskPrincipal -UserId $env:USERNAME -LogonType Interactive -RunLevel Limited
         Register-ScheduledTask -TaskName "DiscStation" -Action $action -Trigger $trigger -Settings $set -Principal $principal -Force | Out-Null
         Start-ScheduledTask -TaskName "DiscStation"
     } else {

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "discstation",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "DiscStation optical-media appliance host — one cross-OS installer",
   "bin": {
     "discstation-setup": "scripts/setup.mjs",
     "discstation": "scripts/open.mjs"
   },
   "scripts": {
-    "setup": "node scripts/setup.mjs"
+    "setup": "node scripts/setup.mjs",
+    "postinstall": "node scripts/postinstall.mjs"
   },
   "engines": {
     "node": ">=16"

package/scripts/postinstall.mjs

@@ -0,0 +1,82 @@
+#!/usr/bin/env node
+// Runs automatically after `npm install -g discstation` (fresh install or an
+// update). Closes the class of bug where `npm install -g` updates the
+// package but an already-running background service (systemd/launchd/a
+// Windows Scheduled Task) keeps serving the old code because nobody
+// remembered to separately re-run `discstation-setup` afterward.
+//
+// Deliberately lightweight: only copies files + restarts the service if one
+// is *already* installed. Never touches brew/apt/winget or does a first
+// install - that stays an explicit, visible `discstation-setup` run, since
+// it needs heavier system-package work a silent postinstall shouldn't do.
+import { existsSync, cpSync } from 'node:fs';
+import { homedir, platform } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { spawnSync } from 'node:child_process';
+
+const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '..');
+
+// Never auto-run inside a dev checkout of this repo itself.
+if (existsSync(join(ROOT, '.git'))) process.exit(0);
+// Only for a real global install - a project merely depending on this
+// package shouldn't have a background service silently touched.
+if (!process.env.npm_config_global) process.exit(0);
+
+function configDir() {
+  if (process.env.DISCSTATION_CONFIG_DIR) return process.env.DISCSTATION_CONFIG_DIR;
+  const p = platform();
+  if (p === 'win32') return join(process.env.APPDATA || homedir(), 'DiscStation');
+  if (p === 'darwin') return join(homedir(), 'Library', 'Application Support', 'DiscStation');
+  return join(homedir(), '.local', 'share', 'discstation');
+}
+
+const appDir = process.env.DISCSTATION_APP_DIR || join(configDir(), 'app');
+
+function alreadyInstalled() {
+  const p = platform();
+  if (p === 'darwin') {
+    return existsSync(join(homedir(), 'Library', 'LaunchAgents', 'com.discstation.agent.plist'));
+  }
+  if (p === 'win32') {
+    const r = spawnSync('schtasks', ['/Query', '/TN', 'DiscStation'], { stdio: 'ignore' });
+    return r.status === 0;
+  }
+  return existsSync(join(homedir(), '.config', 'systemd', 'user', 'discstation.service'));
+}
+
+function restartService() {
+  const p = platform();
+  try {
+    if (p === 'darwin') {
+      spawnSync('launchctl', ['kickstart', '-k', `gui/${process.getuid()}/com.discstation.agent`], { stdio: 'ignore' });
+    } else if (p === 'win32') {
+      spawnSync(
+        'powershell.exe',
+        [
+          '-NoProfile',
+          '-Command',
+          'Stop-ScheduledTask -TaskName DiscStation -ErrorAction SilentlyContinue; Start-ScheduledTask -TaskName DiscStation',
+        ],
+        { stdio: 'ignore' }
+      );
+    } else {
+      spawnSync('systemctl', ['--user', 'restart', 'discstation.service'], { stdio: 'ignore' });
+    }
+  } catch {
+    /* best-effort - a failed restart here shouldn't fail the npm install */
+  }
+}
+
+if (!existsSync(appDir) || !alreadyInstalled()) {
+  console.log('\ndiscstation: first install detected - run `discstation-setup` to finish setting up the host.\n');
+  process.exit(0);
+}
+
+try {
+  cpSync(join(ROOT, 'src'), appDir, { recursive: true, force: true });
+  restartService();
+  console.log('\ndiscstation: redeployed the updated host and restarted the service.\n');
+} catch (e) {
+  console.log(`\ndiscstation: could not auto-redeploy (${e.message}). Run \`discstation-setup\` manually.\n`);
+}