mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 14:25:08 +00:00
* refactor(web): drop validators nothing calls escape_html, validate_image_url, validate_font_awesome_class, validate_mime_type, validate_numeric_range, validate_string_length and sanitize_plugin_config had no callers outside their own tests. Only validate_file_upload (fonts upload) is imported by the web interface. dedup_unique_arrays is kept: its one caller in save_plugin_config was removed by the unrelated sync PR (#330), which looks accidental. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(api): remove the music-auth and of-the-day JSON routes POST /plugins/authenticate/spotify and /plugins/authenticate/ytm had no caller but their tests: the music plugin authenticates through its web_ui_actions (authenticate_spotify.py / authenticate_ytm.py) via /plugins/action. POST /plugins/of-the-day/json/upload and /json/delete looked the plugin up by the id ledmatrix-of-the-day (its manifest id is of-the-day), were reachable only from a file_type "json" upload field that no schema declares, and put the plugin directory on sys.path per request to import scripts.update_config. of-the-day manages its files through plugin-file-manager and its own web_ui_actions. The of-the-day branch of GET /plugins/config stays: it matches the real manifest id and still merges the on-disk category files into the form. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(api): read managers only from the blueprints api_v3/__init__.py and pages_v3.py declared module globals (plugin_store_manager, saved_repositories_manager, schema_manager, operation_queue, plugin_state_manager, operation_history, sync_manager, config_manager, plugin_manager) that nothing assigns: app.py sets the managers as attributes on the Blueprint objects, and every route reads them there. The one reader, backup restore's fallback to the module plugin_store_manager, could only ever fall back to None. _ensure_cache_manager() built a second CacheManager in the web process instead of using the one app.py puts on api_v3. The display routes now read api_v3.cache_manager, creating it on the blueprint only when nothing set it (the same None handling as the /cache routes). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * chore(web): drop run.sh and the unused log_config_change web_interface/run.sh was referenced only by web_interface/README.md; the service starts the UI through scripts/utils/start_web_conditionally.py and the README already documents `python3 web_interface/start.py`. log_config_change() in web_interface/logging_config.py was never called. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(web): delete unreferenced store_manager.js, diff_viewer.js, htmx-sse.js - js/plugins/store_manager.js (window.PluginStoreManager) and js/config/diff_viewer.js (window.ConfigDiffViewer) were loaded on every page but nothing reads either global. - htmx-sse.js (plus its CDN fallback) was loaded after HTMX, but no template or plugin page uses sse-connect / hx-ext="sse": the live streams run through LEDStreams in app-shell.js. js/plugins/state_manager.js stays: install_manager.js's updateAll() reads and refreshes window.PluginStateManager. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(web): remove app.js helpers nothing calls - hexToRgb, rgbToHex, validateForm, uploadFont and switchTab (whose 'switch-tab' event had no listener) have no caller in the templates, static JS or the plugin monorepo. - installPlugin: plugins_manager.js (loaded last) assigns window.installPlugin, and its own store cards are the only callers. - The showNotification fallback could never install: app-shell.js is deferred ahead of app.js and defines the same fallback at top level. - performanceMonitor only logged with ?debug=perf and read an unset this.measures; the marks it took on every load had no reader. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(web): drop app-shell.js refreshPlugin A top-level function in app-shell.js, so a window global, but nothing calls it (no inline handler, no window lookup, no string-built name). The other plugin actions in that block stay. updatePlugin is the live window.updatePlugin: plugins_manager.js only installs its own copy when none exists. uninstallPlugin/pollUninstallOperation, updateAllPlugins, executePluginAction and toggleNestedSection are replaced by later deferred scripts, but a click that lands while those scripts are still downloading reaches the app-shell copies, so removing them is not a pure no-op. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(web): remove definitions plugins_manager.js always overrides All of these are replaced before anything can call them, checked against the load order in base.html and the live window.* values: - openOnDemandModal/requestOnDemandStop stubs: the IIFE later in the same script assigns the real functions synchronously. - updatePlugin and uninstallPlugin stubs (`window.X || stub`): app-shell.js already defined both, so the fallback never installed. Same for the later updatePlugin override, gated on the live function containing '[UPDATE]', which app-shell.js's never does. - The first addArrayObjectItem/removeArrayObjectItem: reassigned by the top-level copies after the IIFE. - The first `function formatDate` in the IIFE: a later declaration of the same name in the same scope wins. - deleteUploadedImage, getCurrentImages, showUploadProgress, formatFileSize and getScheduleSummary: character-for-character copies of js/widgets/file-upload.js, which stays the owner. - `typeof X === 'undefined'` fallbacks and `typeof X !== 'undefined'` re-exports after the IIFE: always false, or a self-assignment. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(web): render the shell directly and delete index.html index.html extended base.html with {% block content %}, but base.html defines no blocks, so none of index.html ever rendered: rendering both with jinja2 gives byte-identical output. index() still loaded the config, read config.json and config_secrets.json raw and json.dumps'd them on every page load for variables base.html never reads, and flashed errors that base.html never shows. It now renders base.html with no context. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(web): stop htmx-config.js replacing console.error and console.warn It swapped both globals for filters that dropped any error mentioning insertBefore / "Cannot read properties of null" when "htmx" appeared in the message or stack, and a list of Permissions-Policy warnings. That hid real errors from every script on the page, and made every logged error and warning report htmx-config.js as its source. The beforeSwap target validation above it, which prevents the insertBefore errors in the first place, stays. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * chore(web): quiet the widget load announcements and debug logs About 30 lines hit the console on every page load: one "... widget registered" per widget file, one "[WidgetRegistry] Registered widget: X" per registration, plus the registry, base widget and plugin loader announcing themselves. The load-time announcements are removed; the per-call ones (registry register, plugin widget loads, "Render called") now go through the page's debugLog switch (localStorage.pluginDebug), guarded because the widgets also load in node tests without it. fonts.html and wifi.html debug logging goes through debugLog as well. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(api): drop the removed music-auth and of-the-day JSON routes Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
92 lines
4.1 KiB
Python
92 lines
4.1 KiB
Python
"""Regression test: POST /display/on-demand/start restarting a running
|
|
service must not import a name that does not exist.
|
|
|
|
display.py has `import web_interface.blueprints.api_v3 as _pkg` and reads
|
|
mutable, test-patched attributes back through it (`_pkg.time.time()`,
|
|
`_pkg._get_starlark_plugin()`, ...) rather than binding them by value, per
|
|
the package's own docstring. One spot went further and wrote a genuine
|
|
`import` *statement* against that alias --
|
|
|
|
import _pkg.time as time_module
|
|
|
|
-- but `_pkg` is a local name bound by `import ... as _pkg` in this module,
|
|
not a real top-level package, so `import _pkg.time` is not something Python
|
|
can resolve; it raises ModuleNotFoundError. That line only runs when the
|
|
display service is already running and the caller also asked to (re)start
|
|
it, so this endpoint failed on exactly the restart path -- the one where a
|
|
cache write recording the new on-demand request had already happened.
|
|
|
|
The route wraps its body in `except Exception`, so the failure reached the
|
|
caller as a handled 500 with a generic message, not an unhandled crash --
|
|
but a 500 all the same on a request that should have restarted the service
|
|
and reported success.
|
|
"""
|
|
|
|
import sys
|
|
from pathlib import Path
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
|
|
sys.path.insert(0, str(Path(__file__).parent.parent))
|
|
|
|
from test._api_v3_test_helpers import api_v3_client, api_v3_module # noqa: F401,E402
|
|
|
|
URL = "/api/v3/display/on-demand/start"
|
|
|
|
|
|
@pytest.fixture
|
|
def restart_path(api_v3_module):
|
|
"""Force the `service_was_running and start_service` branch.
|
|
|
|
plugin_manager and config_manager are set to None so the route takes
|
|
the simplest path to that branch rather than tripping over unrelated
|
|
MagicMock plumbing. The cache is the blueprint's cache_manager, which
|
|
api_v3_module already set to a MagicMock. _get_display_service_status,
|
|
_stop_display_service and _ensure_display_service_running are bound by
|
|
value in display.py (see its own docstring), so they are patched on
|
|
that submodule rather than on the package.
|
|
"""
|
|
api_v3_module.api_v3.plugin_manager = None
|
|
api_v3_module.api_v3.config_manager = None
|
|
|
|
with patch("web_interface.blueprints.api_v3.display._get_display_service_status") as get_status, \
|
|
patch("web_interface.blueprints.api_v3.display._stop_display_service") as stop_service, \
|
|
patch("web_interface.blueprints.api_v3.display._ensure_display_service_running") as ensure_running:
|
|
# Active before the request: service_was_running becomes True.
|
|
get_status.return_value = {"active": True}
|
|
ensure_running.return_value = {"active": True}
|
|
yield {
|
|
"get_status": get_status,
|
|
"stop_service": stop_service,
|
|
"ensure_running": ensure_running,
|
|
}
|
|
|
|
|
|
class TestRestartingARunningService:
|
|
def test_it_does_not_500(self, api_v3_client, restart_path):
|
|
response = api_v3_client.post(
|
|
URL, json={"plugin_id": "weather", "start_service": True})
|
|
body = response.get_json()
|
|
assert response.status_code == 200, body
|
|
assert body["status"] == "success", body
|
|
|
|
def test_the_service_is_actually_stopped_and_restarted(
|
|
self, api_v3_client, restart_path):
|
|
api_v3_client.post(
|
|
URL, json={"plugin_id": "weather", "start_service": True})
|
|
restart_path["stop_service"].assert_called_once()
|
|
restart_path["ensure_running"].assert_called_once()
|
|
|
|
def test_a_service_that_was_not_running_is_not_stopped_first(
|
|
self, api_v3_client, restart_path):
|
|
# The buggy import sits inside `if service_was_running and
|
|
# start_service`, so it only ever fired on the restart path --
|
|
# this is the other side of that branch, unaffected either way,
|
|
# kept here so the branch condition itself stays covered.
|
|
restart_path["get_status"].return_value = {"active": False}
|
|
response = api_v3_client.post(
|
|
URL, json={"plugin_id": "weather", "start_service": True})
|
|
assert response.status_code == 200, response.get_json()
|
|
restart_path["stop_service"].assert_not_called()
|