mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 14:25:08 +00:00
* feat(starlark,on-demand): the third-party fixes worth taking, plus an MQTT bridge Analysis of ant456/ledmatrix-fixes-repo, a third-party collection of patches and services built while running this project on Starlark apps under MQTT control. Its patches are whole-file copies taken against an older tree, so applying them as written would revert #523's frame pacing, #534's display() bool returns and the GitHub token masking in plugins_manager.js. Three of its claimed fixes are already in main, and its api_v3 Starlark routes are #535's. What follows is the rest -- verified against current code, and reimplemented where the patch's approach did not hold up. **On-demand display.** `pinned` reached the controller from the API, was stored on it and republished in the status payload, but never narrowed the rotation -- a pinned request still cycled every mode its plugin owns. Right for a sports plugin, whose modes are views of one subject; wrong for a plugin whose modes are unrelated, which is every Starlark app. Now honoured, and it survives a restart. Restarting while on-demand was active loaded *only* the on-demand plugin, so normal rotation had nothing to return to for the life of the process -- and a restart mid-session is routine, since that is how an update is applied. The panel came back cycling one plugin's modes with no way out but clearing the cache by hand. Every enabled plugin loads now; on-demand still resumes on its saved mode. Stop requests are exempt from the duplicate guards on purpose, so that a second click stops a mode a race left running -- which means consuming the mailbox is the only thing that ends one. It was never consumed, so the same stop was re-read and re-processed on every poll, forever. Both paths now share one compare-before-delete helper. **Starlark rendering.** `extract_schema` parsed the source with a regex, which can only see option lists written out literally: an app whose dropdown is filled from a live API call inside `get_schema()` came back empty, and the config form offered nothing to pick. Now runs `pixlet schema`, which executes the app, and falls back to the parser when Pixlet is absent, too old for the subcommand, or the app fails to run. The third-party patch replaced the parser outright and hardcoded /usr/local/bin/pixlet; this keeps the fallback and the binary search. A `|` in a config value was dropped by a shell-metacharacter filter, though the command is a list with no shell involved -- and apps do use it as a separator inside one value. The key went missing silently and the app rendered its own "not configured" screen with nothing to say why. And a 0-byte render was reported as success: Pixlet exits 0 and writes nothing when an app has no content, which read downstream as a working app drawing a black panel. **Starlark display.** `display()` ignored the mode it was called with, so a specific app could not be addressed. It now accepts `display_mode` -- which is the whole mechanism, since the controller inspects the signature before passing it. Found while there: `_select_next_app` ran only while `current_app` was unset, so with several apps installed the first was picked once and shown forever while the rest were rendered on schedule and never displayed. And `enable_scrolling` was missing, so multi-frame apps were called once per rotation slot and never advanced past frame one. **GET /api/v3/display/modes.** Every mode that can be requested on-demand, with the plugin that owns it. Nothing exposed this, so anything driving the display from outside the web UI read each plugin's manifest.json off disk and reimplemented PluginManager's fallbacks. It also triggers discovery, which is otherwise lazy and normally happens because a person opened the dashboard. **integrations/mqtt_bridge.** Home Assistant control over MQTT Discovery: a mode select, a stop button, power, brightness. Rewritten against the API rather than the filesystem, so it needs no read access to config.json and cannot drift from the web UI. paho-mqtt 2.x VERSION2, TLS, an availability topic that is also the last will, and secrets from the environment. **Two opt-in extras.** A DNS single-request unit, for glibc's parallel A/AAAA lookup stalling ~5s per name on routers that answer only the A query -- which makes any plugin calling an external API slow and Starlark apps, which have a render timeout, fail outright. And a Pixlet config editor: a script you run and Ctrl+C rather than the third-party version's always-on unauthenticated Flask service, since it stops the display for the length of a session. Neither is installed by default. Long Starlark app names now wrap instead of overflowing their card. 115 new tests across 5 files. Also unblocked test_starlark_display_contract.py, which was silently skipping wherever fcntl is absent. Whole suite: no new failures against main. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(mqtt_bridge): the five issues Codacy flagged on this branch All in the new bridge, all real: * requests floor was 2.31.0, which carries CVE-2024-35195, CVE-2024-47081 and CVE-2026-25645. Raised to >=2.33.0,<3.0.0, which is what the project's own requirements.txt already pins. * `import time` was never used. * `"mqtt_password": None` in DEFAULTS read as a hardcoded credential. It is the "no password configured" default; marked nosec B105, the convention used elsewhere in the repo. Also dropped an unused `build_app` from the display-modes test imports. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix: the review findings on this PR Nine of CodeRabbit's ten, plus the CodeQL alert. The tenth is wrong and is answered below. **One bad config section blanked the whole mode list.** `/display/modes` read `full_config.get(plugin_id, {}).get('enabled')`, so a non-dict under a plugin id -- a shape DisplayController already guards, so it happens -- raised AttributeError mid-loop and answered 500 with no modes at all. Every MQTT bridge entity is built from that list. Now skipped with a warning. **The DNS scripts reported success they had not earned.** Three separate paths: `resolvconf -u` failing was swallowed by `|| true`; the systemd-resolved branch exited 0 without applying anything, so the oneshot unit recorded success while the workaround was inactive; and the installer's `|| echo` turned a failed start into "installation complete." with exit 0. All three now fail loudly. `single-request` is a glibc resolv.conf option with no resolved.conf equivalent, so on those hosts the honest answer is that it cannot be applied. A NetworkManager-generated resolv.conf is regenerated on connection changes, not only at boot, and the unit is oneshot with RemainAfterExit -- so the option can vanish mid-boot with nothing to put it back. Now detected and stated plainly rather than implied to be permanent. **`Before=` does not order a manual restart.** It only orders units already in the same transaction, so `systemctl restart ledmatrix` could bypass the fix. install_dns_fix.sh now writes a ledmatrix.service drop-in with Wants= and After=. Wants=, not Requires=: a DNS workaround failing should not stop the display. **The Pixlet editor's `--lan` is gone.** `pixlet serve` has no authentication, and a printed warning is not access control. Loopback only, with the SSH port-forward in the header where the flag used to be documented -- SSH does the authenticating and nothing is left listening. **The MQTT example config now defaults to TLS** on 8883. The installer copies it verbatim, and without TLS the broker password and every command cross the network in cleartext. A plaintext broker is still supported and documented, and the bridge warns once at startup when a password is configured without TLS. **Not taken: "the upstream Pixlet CLI has no `schema` subcommand."** Upstream tidbyt/pixlet has none, but `scripts/download_pixlet.sh` installs `tronbyt/pixlet`, whose `cmd/schema.go` is `schema [PATH]` -> JSON on stdout, built on `runtime.NewAppletFromPath`, so it does execute `get_schema()`. That is exactly what extract_schema_via_pixlet calls. A binary without the subcommand exits non-zero and falls back to the source parser, which is already covered by a test. **CodeQL stack-trace exposure: not taken either.** I removed `details` first and that broke test_web_error_detail.py::test_no_api_v3_handler_discards_its_exception, which enforces `describe_exception` across all ~75 handlers -- written because a device with failing storage answered "see logs for details" from the log viewer itself. describe_exception redacts credentials; the trade-off is the project's and is already made. Restored, with the reasoning in a comment. 11 new tests. Whole suite: no new failures against main, 4127 passed. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
206 lines
7.7 KiB
Python
206 lines
7.7 KiB
Python
"""starlark-apps: display() must report what actually reached the panel.
|
|
|
|
The display controller skips a mode only on a boolean False. Returning True
|
|
after the frame update failed told it the mode had rendered, so it held a dead
|
|
frame for the whole display_duration instead of rotating on -- the same class
|
|
of defect as a display() that returns None.
|
|
"""
|
|
|
|
import sys
|
|
import types
|
|
from pathlib import Path
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
|
|
PLUGIN_DIR = Path(__file__).resolve().parent.parent / "plugin-repos" / "starlark-apps"
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def manager_module():
|
|
if not PLUGIN_DIR.exists():
|
|
pytest.skip("starlark-apps plugin is not checked out")
|
|
sys.path.insert(0, str(PLUGIN_DIR))
|
|
# fcntl is POSIX-only and the manager imports it at module scope for
|
|
# manifest locking. None of the display paths under test touch it, so a
|
|
# stub is what keeps these assertions running on a developer's machine
|
|
# rather than skipping everywhere but the Pi and CI.
|
|
injected_fcntl = "fcntl" not in sys.modules
|
|
if injected_fcntl:
|
|
stub = types.ModuleType("fcntl")
|
|
stub.LOCK_EX = 2
|
|
stub.LOCK_UN = 8
|
|
stub.flock = lambda *a, **kw: None
|
|
sys.modules["fcntl"] = stub
|
|
try:
|
|
import importlib
|
|
spec = importlib.util.spec_from_file_location(
|
|
"starlark_manager_under_test", PLUGIN_DIR / "manager.py")
|
|
module = importlib.util.module_from_spec(spec)
|
|
spec.loader.exec_module(module)
|
|
return module
|
|
except Exception as e: # noqa: BLE001 - optional deps (Pillow, pixlet) may be absent
|
|
pytest.skip(f"starlark-apps manager is not importable here: {e}")
|
|
finally:
|
|
sys.path.remove(str(PLUGIN_DIR))
|
|
if injected_fcntl:
|
|
sys.modules.pop("fcntl", None)
|
|
|
|
|
|
def _plugin(manager_module):
|
|
"""A manager with __init__ bypassed -- only display paths are under test."""
|
|
cls = manager_module.StarlarkAppsPlugin
|
|
inst = cls.__new__(cls)
|
|
inst.logger = MagicMock()
|
|
inst.display_manager = MagicMock()
|
|
inst.current_app = None
|
|
return inst
|
|
|
|
|
|
class _App:
|
|
def __init__(self, frames):
|
|
self.frames = frames
|
|
self.current_frame_index = 0
|
|
self.last_frame_time = 0.0
|
|
self.app_id = "app"
|
|
|
|
|
|
class TestDisplayFramePropagates:
|
|
def test_a_failed_update_returns_false(self, manager_module):
|
|
p = _plugin(manager_module)
|
|
p.current_app = _App([("frame", 100)])
|
|
p.display_manager.update_display.side_effect = RuntimeError("panel gone")
|
|
|
|
assert p._display_frame() is False
|
|
|
|
def test_a_good_update_returns_true(self, manager_module):
|
|
p = _plugin(manager_module)
|
|
p.current_app = _App([("frame", 100)])
|
|
|
|
assert p._display_frame() is True
|
|
|
|
def test_no_frames_returns_false(self, manager_module):
|
|
p = _plugin(manager_module)
|
|
p.current_app = _App([])
|
|
|
|
assert p._display_frame() is False
|
|
|
|
def test_display_reports_the_frame_failure(self, manager_module):
|
|
p = _plugin(manager_module)
|
|
p.current_app = _App([("frame", 100)])
|
|
p.display_manager.update_display.side_effect = RuntimeError("panel gone")
|
|
|
|
result = p.display()
|
|
|
|
assert result is False, "display() claimed success over a failed frame update"
|
|
assert isinstance(result, bool), "the controller only skips on a real bool"
|
|
|
|
|
|
class _SelectableApp(_App):
|
|
"""An app that display() can pick, render and show."""
|
|
|
|
def __init__(self, app_id, enabled=True):
|
|
super().__init__(frames=[("frame", 100)])
|
|
self.app_id = app_id
|
|
self._enabled = enabled
|
|
|
|
def is_enabled(self):
|
|
return self._enabled
|
|
|
|
|
|
def _plugin_with_apps(manager_module, *app_ids):
|
|
p = _plugin(manager_module)
|
|
p.apps = {app_id: _SelectableApp(app_id) for app_id in app_ids}
|
|
p._display_frame = lambda: True
|
|
return p
|
|
|
|
|
|
class TestDisplayModeSelectsTheApp:
|
|
"""The controller passes the mode it is rotating to; the plugin must use it.
|
|
|
|
It inspects display()'s signature to decide whether to pass display_mode at
|
|
all, so the parameter is the whole mechanism -- without it there is no way
|
|
to address one specific app, including from an on-demand request pinned to
|
|
one.
|
|
"""
|
|
|
|
def test_display_accepts_display_mode(self, manager_module):
|
|
import inspect
|
|
params = inspect.signature(manager_module.StarlarkAppsPlugin.display).parameters
|
|
assert "display_mode" in params, \
|
|
"the controller only passes display_mode to plugins whose signature accepts it"
|
|
|
|
def test_a_named_app_is_the_one_shown(self, manager_module):
|
|
p = _plugin_with_apps(manager_module, "aquarium", "printer", "nowplaying")
|
|
assert p.display(display_mode="printer") is True
|
|
assert p.current_app.app_id == "printer"
|
|
|
|
def test_a_named_app_wins_over_the_one_already_showing(self, manager_module):
|
|
p = _plugin_with_apps(manager_module, "aquarium", "printer")
|
|
p.display(display_mode="aquarium")
|
|
p.display(display_mode="printer")
|
|
assert p.current_app.app_id == "printer"
|
|
|
|
def test_an_unknown_mode_falls_back_to_rotation(self, manager_module):
|
|
"""The plugin id arrives here when no per-app modes are exposed."""
|
|
p = _plugin_with_apps(manager_module, "aquarium")
|
|
assert p.display(display_mode="starlark-apps") is True
|
|
assert p.current_app.app_id == "aquarium"
|
|
|
|
def test_force_clear_does_not_override_a_named_app(self, manager_module):
|
|
p = _plugin_with_apps(manager_module, "aquarium", "printer")
|
|
p.display(display_mode="printer", force_clear=True)
|
|
assert p.current_app.app_id == "printer"
|
|
|
|
|
|
class TestInstalledAppsTakeTurns:
|
|
"""Every installed app gets shown, not just whichever was picked first.
|
|
|
|
_select_next_app ran only while current_app was unset, so the first enabled
|
|
app was chosen once and displayed forever; the rest were rendered on
|
|
schedule and never reached the panel.
|
|
"""
|
|
|
|
def test_each_entry_to_the_mode_advances(self, manager_module):
|
|
p = _plugin_with_apps(manager_module, "a", "b", "c")
|
|
seen = []
|
|
for _ in range(3):
|
|
p.display(force_clear=True) # force_clear = "you are up"
|
|
seen.append(p.current_app.app_id)
|
|
assert seen == ["a", "b", "c"]
|
|
|
|
def test_the_rotation_wraps(self, manager_module):
|
|
p = _plugin_with_apps(manager_module, "a", "b")
|
|
seen = []
|
|
for _ in range(4):
|
|
p.display(force_clear=True)
|
|
seen.append(p.current_app.app_id)
|
|
assert seen == ["a", "b", "a", "b"]
|
|
|
|
def test_frames_within_one_slot_do_not_advance_the_app(self, manager_module):
|
|
"""Only entry to the mode rotates -- the high-FPS loop must not."""
|
|
p = _plugin_with_apps(manager_module, "a", "b", "c")
|
|
p.display(force_clear=True)
|
|
for _ in range(20):
|
|
p.display(force_clear=False)
|
|
assert p.current_app.app_id == "a"
|
|
|
|
def test_a_disabled_app_is_skipped(self, manager_module):
|
|
p = _plugin_with_apps(manager_module, "a", "b")
|
|
p.apps["a"]._enabled = False
|
|
p.display(force_clear=True)
|
|
assert p.current_app.app_id == "b"
|
|
|
|
def test_no_enabled_apps_reports_nothing_displayed(self, manager_module):
|
|
p = _plugin_with_apps(manager_module, "a")
|
|
p.apps["a"]._enabled = False
|
|
assert p.display(force_clear=True) is False
|
|
|
|
|
|
class TestAnimationsRunAtFrameRate:
|
|
def test_the_plugin_asks_for_the_high_fps_loop(self, manager_module):
|
|
"""The controller reads this attribute; a multi-frame app is otherwise
|
|
called once per rotation slot and never advances past frame one."""
|
|
plugin = manager_module.StarlarkAppsPlugin
|
|
assert getattr(plugin, "enable_scrolling", False) is True
|