discstation 0.1.23 → 0.1.26

package/src/discstation_burn.py

@@ -192,6 +192,9 @@ BAUD   = 115200
 
 def check_cancel(ser):
     try:
+        if line_reader is not None:
+            line = line_reader(ser, 0)
+            return bool(line) and line in ("CANCEL", "PLAY_STOP")
         if ser and ser.in_waiting:
             line = ser.readline().decode(errors="ignore").strip()
             note_serial_activity()
@@ -517,6 +520,12 @@ def detect_disc_type(device):
 # pipeline emits also updates the web/SSE status in real time.
 status_sink = None
 
+# discstation.py sets this to its buffered read_serial_line so check_cancel
+# reads the same way station_loop does (partial lines get buffered and
+# reassembled). A bare ser.readline() here can slice a "CANCEL\n" in half
+# on a mid-transmission read and then never match it.
+line_reader = None
+
 
 def send(ser, msg):
     global _serial_write_failed

package/src/discstation_host.py

@@ -8,9 +8,11 @@ import os
 import platform
 import re
 import shutil
+import socket
 import subprocess
 import sys
 import threading
+import time
 from pathlib import Path
 
 from serial.tools import list_ports
@@ -67,6 +69,77 @@ def serial_port():
     return _stable_serial_path(sorted(preferred)[0])
 
 
+_REMOTE_MDNS_TYPE = "_discstation._tcp.local."
+_REMOTE_DEFAULT_HOST = "discstation.local"
+_remote_cache = {"at": 0.0, "value": None}
+
+
+def remote_host():
+    """Address of the Wi-Fi appliance remote, or None.
+
+    `DISC_REMOTE_HOST` unset / `auto` (default) -> mDNS browse for the
+        firmware's `_discstation._tcp` advert, falling back to resolving
+        `discstation.local` via the OS resolver. Result cached ~60s so the
+        reconnect loop / hot-swap poll don't hammer mDNS.
+    `DISC_REMOTE_HOST=<ip|host>`  -> that address, verbatim, instantly.
+    `DISC_REMOTE_HOST=off` / `none` / `0`  -> None (never look; USB / web only).
+
+    Only consulted by main() when no USB serial is present. Best-effort -
+    main() tries to connect and falls back on failure."""
+    setting = (os.environ.get("DISC_REMOTE_HOST") or "").strip().lower()
+    if setting in ("off", "none", "no", "false", "0", "disabled"):
+        return None
+    if setting and setting != "auto":
+        return (os.environ.get("DISC_REMOTE_HOST") or "").strip()
+
+    if time.time() - _remote_cache["at"] < 60:
+        return _remote_cache["value"]
+
+    value = _discover_remote()
+    _remote_cache["at"] = time.time()
+    _remote_cache["value"] = value
+    return value
+
+
+def _discover_remote():
+    try:
+        from zeroconf import Zeroconf, ServiceBrowser
+    except ImportError:
+        Zeroconf = None
+    if Zeroconf is not None:
+        found = {}
+
+        class _Listener:
+            def add_service(self, zc, type_, name):
+                info = zc.get_service_info(type_, name, timeout=1500)
+                if info:
+                    for addr in info.parsed_addresses():
+                        if "." in addr:  # IPv4
+                            found["addr"] = addr
+                            return
+
+            update_service = add_service
+
+            def remove_service(self, *a):
+                pass
+
+        zc = Zeroconf()
+        try:
+            ServiceBrowser(zc, _REMOTE_MDNS_TYPE, _Listener())
+            deadline = time.time() + 2.5
+            while time.time() < deadline and "addr" not in found:
+                time.sleep(0.1)
+        finally:
+            zc.close()
+        if found.get("addr"):
+            return found["addr"]
+
+    try:
+        return socket.gethostbyname(_REMOTE_DEFAULT_HOST)
+    except OSError:
+        return None
+
+
 def _stable_serial_path(device):
     """Map a volatile /dev/ttyUSBN to its stable /dev/serial/by-id/ symlink so a
     USB re-enumeration (ttyUSB1 -> ttyUSB0) doesn't strand the reconnect loop."""