mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-16 11:59:13 +00:00
* feat(ipc)!: remove the cache-key mailboxes (control socket stage 5) The control socket is now the only way the web interface sends the display a command. The display stops reading display_on_demand_request and plugin_error_clear_request, and the web interface stops writing them. - Display: no mailbox poll (MailboxWatch, the 1 s / 0.25 s cadence, _consume_on_demand_request, the deprecation log) and no persisted display_on_demand_processed_id guard; the error publisher reads no clear request. CacheManager.file_signature and MailboxWatch are removed. - A write to either retired key is dropped by CacheManager.save_cache and logged once per writer, naming the plugin from the call stack (or the request's plugin_id), with the API to move to. - Web: on-demand start with no display listening starts the service (when start_service) and sends the request again once the socket answers (45 s, 10 s for a running service without a socket yet); every other failure is a 503 (400 for invalid_args). Stop answers 503 when no display listens, unless stop_service. errors/clear answers 503 with a reason-specific message instead of writing a request; clear_pending is always false. src.ipc.client.should_fall_back is replaced by display_not_listening. - Kept: display_current_state, display_on_demand_state, plugin_runtime_snapshot and the heartbeat (read whenever the socket cannot answer), and display_on_demand_config (the display's resume record). Tests: mailbox-only tests removed (test_on_demand_mailbox.py, the mailbox cadence, file_signature and MailboxWatch tests); tests that injected requests through the mailbox now use the socket queue or a plugin's in-process request. The run-loop harness sends on-demand requests over its fake control socket, so four golden traces change: on-demand starts and stops land at the request instant instead of the next 0.25 s mailbox look (one frame fewer on the screen they end), and in vegas.json within one frame instead of 263 ms, which shifts the later 1 s-throttled WiFi-notice check by under a second. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: the on-demand routes' other callers ack over the socket, not the mailbox test_api_v3_bool_coercion, test_api_v3_lazy_plugin_discovery and test_web_api's stop test checked the mailbox write; they now get an ack from a mocked control socket. The stop route touches no manager any more, so it leaves the removed-catch-all sample. A request that was sent is never 'not listening' (pins the sent check the mutation run let through). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(web): a start that waits for the display answers 202 and is delivered in the background The start route held a request open for up to 45 s while a cold-started display loaded its plugins; the MQTT bridge (15 s timeout) and browsers reported a failure for a request that was then delivered. Now, when no display is listening, the route starts the service if asked and answers 202 with status "starting" at once. A single worker in the web process (web_interface/on_demand_dispatch.py) sends the request until the display acknowledges it or the wait runs out (45 s cold start, 10 s for a running service without a socket yet). A newer start supersedes the pending one; a stop cancels it (and succeeds, with cancelled_request_id, even with no display listening). The outcome is reported by /display/on-demand/status (source "web": starting, or error with start-timeout or the socket's reason, until the display publishes something newer) and by /display/current-status as on_demand_pending. Callers: the web UI's on-demand modal and "Preview on display" treat "starting" as taken (an info toast); the MQTT bridge already treats any non-error 2xx as success (now pinned by a test). Tests: the dispatcher (ack, retry then ack, start-timeout, other failures, superseded, an in-flight ack for a superseded start, stop while pending, a per-start wait, outcome lifetime); the routes (202, status routes while pending and after a timeout, a later display state replacing the failure, stop while pending, a new start superseding); a JS suite for app.js. Mutation check: 20 mutants on the worker, the routes and app.js, 20 killed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(web): a cancelled on-demand start never reaches the display after its replacement CI caught a race in test_a_new_start_supersedes_the_pending_one: the dispatcher's worker could read the old start, the route cancel it and send the new one, and the worker's send of the old one land after it. cancel() now waits out a send already in flight (the worker holds a send lock while it reads the pending start and sends it), so whatever the caller sends next lands after it. Pinned by test_a_cancel_waits_for_a_send_in_flight, which fails without the wait. The Linux-only TestRealSocket test for a display that went away now expects the 202 and the start-timeout that follows, as the route answers since the background dispatcher. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(web): a delivered on-demand start reads as starting until the display acts on it On ledpi (three cold starts) the display acknowledged the start as its socket opened, then took ~5 s to act on it while Vegas built its first strip; the status routes meanwhile showed the display's own idle state, so a UI polling every 700 ms flashed idle. The display's on-demand state now names the request it answers (request_id). A delivered start keeps reading as status "starting" with delivered: true, in /display/on-demand/status and as on_demand_pending in /display/current-status, until the display publishes state for that request id (a display without the field: any state newer than the delivery), for at most DELIVERED_SHOWN_SECONDS (30 s). The display's startup state, which can be published after the acknowledgement, names no request and does not end it. Tests: stays starting against the startup idle state (no id, an older id); the matching active state and the matching error take over; an older display's newer state takes over; the 30 s cap; the display's state names its request. Mutation check: 11 mutants, 11 killed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(display): on_demand_request_id has a class default for controllers built without __init__ _on_demand_state now publishes it, and test_state_stream_readers builds controllers with __new__. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: the case-spelling on-demand test patches _send_on_demand now the mailbox is gone Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * docs: blank line before 3.8.7 heading --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
171 lines
6.5 KiB
Python
171 lines
6.5 KiB
Python
"""A control socket command wakes the run loop (control socket stage 2).
|
|
|
|
Stage 1's socket was no faster than the file mailbox: a queued command
|
|
waited for the same polls the mailbox does -- the 1 s frame sleep of a static
|
|
screen, the 0.25 s dwell tick, and Vegas's interrupt check every 10 frames
|
|
(about 0.4 s at the 24 fps a Pi 4 manages). Now the render thread waits on
|
|
the socket's queue instead of sleeping, and Vegas checks the queue every
|
|
frame, so a command is applied:
|
|
|
|
* at once on a static screen and in a dwell (here: at the instant it is
|
|
queued, on the fake clock);
|
|
* at the next frame in Vegas (8 ms here, at 125 fps).
|
|
|
|
Each test runs the real run() loop on the fake clock of
|
|
test/_run_loop_harness.py. The latencies are the fake clock's, so they are
|
|
exact. (The file mailbox these were once compared with is gone: stage 5.)
|
|
"""
|
|
|
|
import os
|
|
|
|
import pytest
|
|
|
|
os.environ.setdefault("EMULATOR", "true")
|
|
|
|
from src.ipc.contract import Command, ErrorCode # noqa: E402
|
|
from test._run_loop_harness import FakePlugin, RunLoopHarness # noqa: E402
|
|
|
|
POSTED = 10.3
|
|
|
|
|
|
def _event_time(trace, kind):
|
|
return next(e[0] for e in trace["events"] if e[1] == kind)
|
|
|
|
|
|
def _on_demand_latency(tmp_path, build, horizon=40):
|
|
h = RunLoopHarness(tmp_path, horizon=horizon)
|
|
build(h)
|
|
h.control_socket().post(POSTED, Command.ON_DEMAND_START, {"plugin_id": "weather"})
|
|
trace = h.run()
|
|
return round(_event_time(trace, "on-demand-start") - POSTED, 3), trace
|
|
|
|
|
|
def _static(h):
|
|
h.add_plugin(FakePlugin("clock", ["clock"], duration=30))
|
|
h.add_plugin(FakePlugin("weather", ["weather"], duration=30))
|
|
|
|
|
|
def _dwell(h):
|
|
# Content on the first frame only: the 1 s loop ends at t=1 and the rest
|
|
# of the 30 s is made up in the dwell sleep (_sleep_with_plugin_updates).
|
|
h.add_plugin(FakePlugin("clock", ["clock"], duration=30, first_frame_only=True))
|
|
h.add_plugin(FakePlugin("weather", ["weather"], duration=30))
|
|
|
|
|
|
def _vegas(h):
|
|
_static(h)
|
|
h.enable_vegas(cycle=30)
|
|
|
|
|
|
@pytest.mark.parametrize("build", [_static, _dwell, _vegas],
|
|
ids=["static-screen", "dwell", "vegas"])
|
|
def test_a_socket_command_lands_at_once(tmp_path, build):
|
|
# Before stage 2 these waited for the next 1 s frame, the next 0.25 s
|
|
# dwell tick, or the next 10-frame Vegas check.
|
|
socket_latency, trace = _on_demand_latency(tmp_path, build)
|
|
if build is _vegas:
|
|
# One 8 ms frame: Vegas checks the queue every frame now.
|
|
assert socket_latency <= 0.008
|
|
else:
|
|
assert socket_latency == 0.0
|
|
# And the requested plugin is what the panel shows next, from then on.
|
|
row = next(r for r in trace["screens"] if r[1] == "weather")
|
|
assert row[0] == pytest.approx(POSTED + socket_latency, abs=0.001)
|
|
|
|
|
|
def test_a_brightness_lands_at_once_without_ending_the_screen(tmp_path):
|
|
h = RunLoopHarness(tmp_path, horizon=40)
|
|
_static(h)
|
|
command = h.control_socket().post(POSTED, Command.BRIGHTNESS_SET, {"brightness": 40})
|
|
trace = h.run()
|
|
|
|
assert [e for e in trace["events"] if e[1] == "brightness"] == [[POSTED, "brightness", 40]]
|
|
# The clock screen runs its full 30 s and the next starts on time.
|
|
assert trace["screens"][0][:4] == [0.0, "clock", 30.0, "duration"]
|
|
assert trace["screens"][1][:2] == [30.0, "weather"]
|
|
assert command.outcome.done and command.outcome.result["panel_brightness"] == 40
|
|
|
|
|
|
def test_the_static_frame_cadence_is_unchanged_by_a_command(tmp_path):
|
|
"""The wait resumes after a command that does not end the screen, so the
|
|
plugin is still drawn once a second, not once more at the command."""
|
|
h = RunLoopHarness(tmp_path, horizon=31)
|
|
_static(h)
|
|
quiet = h.run()
|
|
|
|
(tmp_path / "b").mkdir()
|
|
h2 = RunLoopHarness(tmp_path / "b", horizon=31)
|
|
_static(h2)
|
|
h2.control_socket().post(POSTED, Command.BRIGHTNESS_SET, {"brightness": 40})
|
|
busy = h2.run()
|
|
assert busy["screens"][0] == quiet["screens"][0]
|
|
|
|
|
|
def _with_reloadable(h, version="2.0.0", loads=True):
|
|
new = FakePlugin("clock", ["clock"], duration=30)
|
|
|
|
def reload_plugin(plugin_id):
|
|
h.log("reload", plugin_id)
|
|
if not loads:
|
|
return False
|
|
new._h = h
|
|
h.pm.plugins[plugin_id] = new
|
|
h.pm.plugin_manifests[plugin_id] = {"version": version, "display_modes": ["clock"]}
|
|
return True
|
|
|
|
h.pm.reload_plugin = reload_plugin
|
|
return new
|
|
|
|
|
|
def test_a_plugin_reload_ends_the_screen_and_reloads_before_the_next(tmp_path):
|
|
h = RunLoopHarness(tmp_path, horizon=70)
|
|
_static(h)
|
|
new = _with_reloadable(h)
|
|
command = h.control_socket().post(POSTED, Command.PLUGIN_RELOAD, {"plugin_id": "clock"})
|
|
trace = h.run()
|
|
|
|
# Reloaded the moment it was asked for: the clock screen ends then, and
|
|
# the rotation moves on.
|
|
assert _event_time(trace, "reload") == POSTED
|
|
assert trace["screens"][0][:3] == [0.0, "clock", POSTED]
|
|
assert trace["screens"][1][:2] == [POSTED, "weather"]
|
|
assert command.outcome.result == {"plugin_id": "clock", "reloaded": True,
|
|
"version": "2.0.0", "modes": ["clock"]}
|
|
# The next clock screen is drawn by the reloaded instance.
|
|
assert h.controller.plugin_modes["clock"] is new
|
|
assert trace["screens"][2][1] == "clock"
|
|
|
|
|
|
def test_a_plugin_reload_during_vegas_yields_at_the_next_frame(tmp_path):
|
|
h = RunLoopHarness(tmp_path, horizon=70)
|
|
_vegas(h)
|
|
_with_reloadable(h)
|
|
command = h.control_socket().post(POSTED, Command.PLUGIN_RELOAD, {"plugin_id": "clock"})
|
|
trace = h.run()
|
|
|
|
assert 0 <= _event_time(trace, "reload") - POSTED <= 0.008
|
|
assert command.outcome.result["reloaded"] is True
|
|
# The ticker resumes after the reload; no rotation screen in between.
|
|
after = [r for r in trace["screens"] if r[0] > POSTED]
|
|
assert after and after[0][1] == "<vegas>"
|
|
|
|
|
|
def test_a_plugin_that_does_not_load_again_is_reported(tmp_path):
|
|
h = RunLoopHarness(tmp_path, horizon=40)
|
|
_static(h)
|
|
_with_reloadable(h, loads=False)
|
|
command = h.control_socket().post(POSTED, Command.PLUGIN_RELOAD, {"plugin_id": "clock"})
|
|
h.run()
|
|
assert command.outcome.error_code == ErrorCode.FAILED
|
|
assert "clock" not in h.controller.available_modes
|
|
|
|
|
|
def test_reloading_a_plugin_that_is_not_running(tmp_path):
|
|
h = RunLoopHarness(tmp_path, horizon=40)
|
|
_static(h)
|
|
command = h.control_socket().post(POSTED, Command.PLUGIN_RELOAD, {"plugin_id": "nope"})
|
|
trace = h.run()
|
|
assert command.outcome.error_code == ErrorCode.NOT_LOADED
|
|
# It still cost the clock screen nothing but its end: rotation goes on.
|
|
assert [r[1] for r in trace["screens"][:2]] == ["clock", "weather"]
|