mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 06:15:09 +00:00
ChuckandClaude Opus 5.5
d18e4d3c9d
* fix(plugins): drop a plugin's package modules when it unloads A plugin that keeps helpers in a package (providers/feed.py, imported as `from providers.feed import ...`) leaves dotted entries in sys.modules. PluginLoader only tracked bare names: `providers` was namespaced and dropped on unload, `providers.feed` stayed. A reload after a store update imported a fresh `providers`, then got the old `feed` back from the module cache, so the new manager.py ran against the old helpers until the display restarted. A load that failed part-way left them behind the same way. Elections (providers/), flights (enrichment/) and olympics (data/, renderers/) ship packages. The loader now records the dotted modules whose file (or, for a namespace package, every __path__ entry) lies inside the plugin directory. They keep their names while the plugin runs, as before, and unregister_plugin_modules() drops them, only while sys.modules still holds that plugin's module. The failed-load cleanup in load_module() drops them too. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(plugins): remove a symlinked dev plugin as a link PluginStoreManager._safe_remove_directory, behind uninstall and behind discarding the set-aside copy after an install or update, handed a symlinked dev plugin (scripts/dev/dev_plugin_setup.sh) to shutil.rmtree, which refuses a symlink. The chmod fallback then walked through the link and set every directory and file in the linked checkout to 0700, and the sudo stage refused the resolved path as outside the plugins directory. The removal failed, the link stayed, and the developer's checkout lost its group/other permissions. A dangling link read as already removed, because exists() follows it, and was left behind. A symlink is now unlinked before any other stage runs, and before the exists() check. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(plugins): load a dev plugin linked in under a different name contained_plugin_dir(), the containment check before a plugin's dependencies are installed, resolved the plugin directory and looked for the resolved folder's name among the plugins directory's entries. A dev plugin symlinked in under its id by a name its checkout does not share -- `dev_plugin_setup.sh link-github foo <url>` clones ledmatrix-foo, the repository naming convention, and links it as plugins/foo -- has no such entry, so install_dependencies() returned False and the load failed with "Dependency installation failed", even with no requirements.txt. When the path sits directly in the plugins directory, the entry it names (the link) is looked up first; anything else is resolved and matched by name as before. The answer is still always rebuilt from a name os.scandir() returned for the plugins directory, so a path outside it is still refused. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(plugins): release a plugin whose update() raises a BaseException On the async update worker, the wrapped update() finished its bookkeeping (_finish: release the plugin lock, drop the pending slot, state back to ENABLED) only for an Exception. asyncio.CancelledError and SystemExit derive from BaseException, so one raised from update() skipped _finish: the plugin kept its lock and stayed RUNNING for the life of the process, never rescheduled, with every display() skipped as busy. PluginExecutor caught only Exception as well, so its thread died with the call never marked complete and an immediate failure was logged and recorded as a timeout. _target_update now runs _finish for any BaseException and re-raises it, and the executor's thread stores it like any other exception, so it is reported as the operation's failure (PluginError) on both the async and the synchronous path. _finish and _record_update_failure take a BaseException. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(config): notify config subscribers outside the service lock ConfigService._load_config ran every subscriber while holding _lock. The display's per-plugin subscriber calls PluginManager.apply_config_change, which waits up to PLUGIN_LOCK_TIMEOUT (5 s) for a plugin busy in update(). A save that enables or disables a plugin also flags a reconcile, which the render thread runs: its get_config(), and the unsubscribe() of a plugin it disables, both take _lock, so the panel froze behind every slow callback, up to 5 s per busy plugin. The config is now swapped under _lock and the subscribers are called after it is released, from a copy of the subscriber lists. A separate _notify_lock is held across a whole reload (read, swap, notify), so one reload's notifications still finish before the next one's start. Each callback is checked against the live lists just before it runs, and unsubscribe() waits only for a call of that same callback already in progress (unless it is that callback's own thread), so a callback it removed is not running and will not run once it returns, as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
91 lines
2.9 KiB
Python
91 lines
2.9 KiB
Python
"""Removing a dev plugin linked into the plugins directory removes the link.
|
|
|
|
``scripts/dev/dev_plugin_setup.sh`` symlinks a checkout into the plugins
|
|
directory. ``PluginStoreManager._safe_remove_directory`` -- behind uninstall,
|
|
and behind discarding the set-aside copy after an install or update -- handed
|
|
the link to ``shutil.rmtree``, which refuses a symlink. Its fallback then
|
|
walked through the link and chmodded every directory and file of the linked
|
|
checkout to 0700, and the sudo stage refused a path outside the plugins
|
|
directory. So the uninstall failed, the link stayed, and the developer's
|
|
checkout lost its group/other permissions and gained execute bits.
|
|
|
|
Skipped where this process cannot create a symlink (Windows without the
|
|
privilege).
|
|
"""
|
|
|
|
import json
|
|
import os
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
|
|
from src.plugin_system.store_manager import PluginStoreManager
|
|
|
|
PLUGIN_ID = "linked-demo"
|
|
|
|
|
|
def _symlink_or_skip(target, link):
|
|
try:
|
|
os.symlink(target, link, target_is_directory=True)
|
|
except (OSError, NotImplementedError) as e:
|
|
pytest.skip(f"cannot create a symlink here: {e}")
|
|
|
|
|
|
@pytest.fixture
|
|
def linked(tmp_path):
|
|
checkout = tmp_path / "dev-plugins" / PLUGIN_ID
|
|
checkout.mkdir(parents=True)
|
|
(checkout / "manifest.json").write_text(
|
|
json.dumps({"id": PLUGIN_ID, "name": "Linked", "class_name": "P",
|
|
"display_modes": ["linked"], "version": "1.0.0"}),
|
|
encoding="utf-8")
|
|
(checkout / "manager.py").write_text("X = 1\n", encoding="utf-8")
|
|
plugins_dir = tmp_path / "plugins"
|
|
plugins_dir.mkdir()
|
|
link = plugins_dir / PLUGIN_ID
|
|
_symlink_or_skip(checkout, link)
|
|
store = PluginStoreManager(plugins_dir=str(plugins_dir))
|
|
store.logger = MagicMock()
|
|
return store, link, checkout
|
|
|
|
|
|
def test_removing_a_linked_plugin_removes_only_the_link(linked):
|
|
store, link, checkout = linked
|
|
|
|
assert store._safe_remove_directory(link) is True
|
|
|
|
assert not os.path.lexists(link)
|
|
assert (checkout / "manager.py").read_text(encoding="utf-8") == "X = 1\n"
|
|
|
|
|
|
@pytest.mark.skipif(os.name != "posix", reason="POSIX permission bits")
|
|
def test_removing_a_linked_plugin_leaves_the_checkouts_permissions(linked):
|
|
store, link, checkout = linked
|
|
os.chmod(checkout, 0o755)
|
|
os.chmod(checkout / "manager.py", 0o644)
|
|
|
|
store._safe_remove_directory(link)
|
|
|
|
assert checkout.stat().st_mode & 0o777 == 0o755
|
|
assert (checkout / "manager.py").stat().st_mode & 0o777 == 0o644
|
|
|
|
|
|
def test_uninstalling_a_linked_plugin_removes_the_link(linked):
|
|
store, link, checkout = linked
|
|
|
|
assert store.uninstall_plugin(PLUGIN_ID) is True
|
|
|
|
assert not os.path.lexists(link)
|
|
assert (checkout / "manifest.json").exists()
|
|
|
|
|
|
def test_a_dangling_link_is_removed_too(linked):
|
|
store, link, checkout = linked
|
|
for child in checkout.iterdir():
|
|
child.unlink()
|
|
checkout.rmdir()
|
|
|
|
assert store._safe_remove_directory(link) is True
|
|
|
|
assert not os.path.lexists(link)
|