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>
165 lines
6.7 KiB
Python
165 lines
6.7 KiB
Python
"""Tests that api_v3 routes find installed plugins before anything else has.
|
|
|
|
The web process discovers plugins lazily (web_interface/app.py): nothing scans
|
|
the plugins directory at startup, and plugin_manifests stays empty until some
|
|
endpoint calls discover_plugins(). Routes that consulted plugin_manifests
|
|
without discovering therefore misbehaved for as long as nothing else had run.
|
|
Measured on a rig after restarting ledmatrix-web:
|
|
|
|
POST /api/v3/display/on-demand/start {"plugin_id": "ledmatrix-stocks"}
|
|
-> 404 "Plugin ledmatrix-stocks not found", for over three minutes,
|
|
until GET /api/v3/plugins/installed happened to discover plugins.
|
|
|
|
The browser UI loads the plugin list first, so people rarely saw it; API-only
|
|
callers (the Home Assistant MQTT bridge, scripts) saw it after every restart.
|
|
/plugins/toggle answered the same 404, and /config/main was worse: an
|
|
undiscovered plugin section skipped secret separation and wrote its API key
|
|
into config.json in plain text.
|
|
|
|
A real PluginManager over a temporary plugins directory, so "empty until
|
|
discovered" is the real behaviour rather than a mock's.
|
|
"""
|
|
|
|
import json
|
|
import sys
|
|
from pathlib import Path
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
sys.path.insert(0, str(Path(__file__).parent.parent))
|
|
|
|
from src.config_manager import ConfigManager # noqa: E402
|
|
from src.plugin_system.plugin_manager import PluginManager # noqa: E402
|
|
from src.plugin_system.schema_manager import SchemaManager # noqa: E402
|
|
from test._api_v3_test_helpers import api_v3_client, api_v3_module # noqa: F401,E402
|
|
|
|
PLUGIN_ID = 'ledmatrix-stocks'
|
|
MODE = 'stocks'
|
|
|
|
|
|
def _install(plugins_dir, plugin_id, modes, schema=None):
|
|
plugin_dir = plugins_dir / plugin_id
|
|
plugin_dir.mkdir(parents=True)
|
|
(plugin_dir / 'manifest.json').write_text(json.dumps({
|
|
'id': plugin_id, 'name': plugin_id, 'version': '1.0.0',
|
|
'entry_point': 'manager.py', 'class_name': 'Plugin',
|
|
'display_modes': modes,
|
|
}))
|
|
(plugin_dir / 'manager.py').write_text('')
|
|
if schema is not None:
|
|
(plugin_dir / 'config_schema.json').write_text(json.dumps(schema))
|
|
|
|
|
|
@pytest.fixture
|
|
def plugins_dir(tmp_path):
|
|
path = tmp_path / 'plugin-repos'
|
|
path.mkdir()
|
|
_install(path, PLUGIN_ID, [MODE], schema={
|
|
'type': 'object',
|
|
'properties': {
|
|
'enabled': {'type': 'boolean'},
|
|
'symbols': {'type': 'string'},
|
|
'api_key': {'type': 'string', 'x-secret': True},
|
|
},
|
|
})
|
|
return path
|
|
|
|
|
|
@pytest.fixture
|
|
def fresh_web_process(api_v3_module, plugins_dir):
|
|
"""The web process right after a restart: nothing discovered yet."""
|
|
manager = PluginManager(plugins_dir=str(plugins_dir))
|
|
assert not manager.plugin_manifests
|
|
api_v3_module.api_v3.plugin_manager = manager
|
|
return manager
|
|
|
|
|
|
@pytest.fixture
|
|
def display_service(api_v3_module):
|
|
"""Keep on-demand start away from systemctl and the real cache."""
|
|
cache = api_v3_module.api_v3.cache_manager = MagicMock()
|
|
with patch('web_interface.blueprints.api_v3.display._get_display_service_status') as status:
|
|
status.return_value = {'active': True}
|
|
yield cache
|
|
|
|
|
|
def _start(client, **body):
|
|
body.setdefault('start_service', False)
|
|
return client.post('/api/v3/display/on-demand/start', json=body)
|
|
|
|
|
|
class TestOnDemandStart:
|
|
def test_by_plugin_id(self, api_v3_client, fresh_web_process, display_service):
|
|
response = _start(api_v3_client, plugin_id=PLUGIN_ID)
|
|
|
|
assert response.status_code == 200, response.get_json()
|
|
request = display_service.set.call_args.args[1]
|
|
assert (request['plugin_id'], request['mode']) == (PLUGIN_ID, MODE)
|
|
|
|
def test_by_mode_alone(self, api_v3_client, fresh_web_process, display_service):
|
|
response = _start(api_v3_client, mode=MODE)
|
|
|
|
assert response.status_code == 200, response.get_json()
|
|
assert display_service.set.call_args.args[1]['plugin_id'] == PLUGIN_ID
|
|
|
|
def test_a_plugin_installed_since_the_last_scan(
|
|
self, api_v3_client, fresh_web_process, plugins_dir, display_service):
|
|
fresh_web_process.discover_plugins()
|
|
_install(plugins_dir, 'ledmatrix-weather', ['weather'])
|
|
|
|
assert _start(api_v3_client, plugin_id='ledmatrix-weather').status_code == 200
|
|
assert _start(api_v3_client, mode=MODE).status_code == 200
|
|
|
|
def test_a_mode_installed_since_the_last_scan(
|
|
self, api_v3_client, fresh_web_process, plugins_dir, display_service):
|
|
fresh_web_process.discover_plugins()
|
|
_install(plugins_dir, 'ledmatrix-weather', ['weather'])
|
|
|
|
response = _start(api_v3_client, mode='weather')
|
|
|
|
assert response.status_code == 200, response.get_json()
|
|
|
|
def test_an_unknown_plugin_is_still_not_found(
|
|
self, api_v3_client, fresh_web_process, display_service):
|
|
assert _start(api_v3_client, plugin_id='no-such-plugin').status_code == 404
|
|
assert _start(api_v3_client, mode='no-such-mode').status_code == 404
|
|
display_service.set.assert_not_called()
|
|
|
|
|
|
def test_toggle_finds_the_plugin(api_v3_client, api_v3_module, fresh_web_process):
|
|
config_manager = api_v3_module.api_v3.config_manager
|
|
config_manager.load_config.return_value = {PLUGIN_ID: {'enabled': False}}
|
|
config_manager.save_config_atomic.return_value = MagicMock(
|
|
status=MagicMock(value='success'))
|
|
|
|
response = api_v3_client.post('/api/v3/plugins/toggle',
|
|
json={'plugin_id': PLUGIN_ID, 'enabled': True})
|
|
|
|
assert response.status_code == 200, response.get_json()
|
|
saved = config_manager.save_config_atomic.call_args.args[0]
|
|
assert saved[PLUGIN_ID]['enabled'] is True
|
|
|
|
|
|
def test_main_config_save_keeps_a_plugin_secret_out_of_config_json(
|
|
api_v3_client, api_v3_module, fresh_web_process, plugins_dir, tmp_path):
|
|
# /config/main validates a plugin section like POST /plugins/config does,
|
|
# so it needs a real schema manager rather than the helper's mock.
|
|
api_v3_module.api_v3.schema_manager = SchemaManager(plugins_dir=plugins_dir)
|
|
config_file = tmp_path / 'config.json'
|
|
config_file.write_text('{}')
|
|
secrets_file = tmp_path / 'config_secrets.json'
|
|
config_manager = ConfigManager(config_path=str(config_file),
|
|
secrets_path=str(secrets_file))
|
|
config_manager.template_path = str(tmp_path / 'no-template.json')
|
|
api_v3_module.api_v3.config_manager = config_manager
|
|
|
|
response = api_v3_client.post('/api/v3/config/main', json={
|
|
PLUGIN_ID: {'symbols': 'AAPL', 'api_key': 's3cret-key'},
|
|
})
|
|
|
|
assert response.status_code == 200, response.get_json()
|
|
assert 's3cret' not in config_file.read_text()
|
|
assert json.loads(secrets_file.read_text())[PLUGIN_ID]['api_key'] == 's3cret-key'
|
|
assert json.loads(config_file.read_text())[PLUGIN_ID]['symbols'] == 'AAPL'
|