rustuya-local 0.1.0.dev7__tar.gz → 0.1.0.dev10__tar.gz

{rustuya_local-0.1.0.dev7 → rustuya_local-0.1.0.dev10}/CHANGELOG.md

@@ -3,11 +3,38 @@
 All notable changes to this project are documented in this file. A release's GitHub Release notes are its section
 here (the release workflow reads it, and refuses to publish a version without one).
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). Versions are `0.0.x` until the first
-stable release.
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). The current development series uses
+`0.1.0.devN`; the earlier `0.0.x` releases remain below as history.
 
 ## [Unreleased]
 
+## [0.1.0.dev10] — 2026-10-18
+
+### Changed
+- Wait for live bridge acknowledgements and the panel's registry refresh instead of sleeping after device commands.
+- Verify embedded bridge startup through a live MQTT config publication, supervise its native async task, and
+  retain ownership when shutdown times out.
+- Wait for producer presence with an event and an explicit timeout instead of repeated short sleeps.
+- Use manager state-change notifications for wizard progress and cloud-fetch completion; remove status polling.
+- Use manager registry readiness instead of patching its private methods; require rustuya-manager 0.2.3.
+- Create session directories with a regular loop instead of a discarded list comprehension.
+- Wait for daemon readiness events in the subprocess test, allowing both startup timeout stages to finish.
+
+## [0.1.0.dev8] — 2026-10-13
+
+### Fixed
+- Always stop the embedded bridge during Home Assistant unload, including service-stop failure or cancellation.
+- Close MQTT callback tasks, ignore queued dispatch after shutdown, retrieve asynchronous handler errors and stop
+  the paho thread outside the event loop, including when a connection attempt fails.
+- Preserve concurrent partial Home Assistant settings/options saves by locking reads, merges and restart together.
+- Reject unsafe pack ownership paths, malformed hashes and bounds; preserve host settings and symlink targets.
+
+### Documentation
+- Separate current status, architecture and outstanding work from the historical redesign record.
+- Document the 2026-10-13 code review, verification results and remaining reliability issues.
+- Correct daemon setup, test prerequisites and saved cover settings precedence.
+- Translate all Korean Markdown documents into English, including archived design and roadmap history.
+
 ## [0.1.0.dev7] — 2026-10-12
 
 ### Changed

{rustuya_local-0.1.0.dev7 → rustuya_local-0.1.0.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rustuya-local
-Version: 0.1.0.dev7
+Version: 0.1.0.dev10
 Summary: Local Tuya control: rustuya-bridge -> tuya-interpreter -> IL (ildevice). HA-independent core.
 Project-URL: Homepage, https://github.com/3735943886/rustuya-local
 Project-URL: Repository, https://github.com/3735943886/rustuya-local
@@ -14,7 +14,7 @@ Requires-Dist: tuya-interpreter>=0.1.0a2
 Provides-Extra: fullstack
 Requires-Dist: tuyamock; extra == 'fullstack'
 Provides-Extra: manager
-Requires-Dist: rustuya-manager[web]>=0.2.2; extra == 'manager'
+Requires-Dist: rustuya-manager[web]>=0.2.3; extra == 'manager'
 Provides-Extra: test
 Requires-Dist: httpx2; extra == 'test'
 Requires-Dist: ildevice-homeassistant; extra == 'test'
@@ -46,11 +46,29 @@ rustuya-bridge ──MQTT──► rustuya-local ──MQTT (il/…)──► il
 
 ## Daemon
 
+```bash
+uv venv --python 3.13
+uv pip install -e .
+.venv/bin/rustuya-local run --config config.json
 ```
-uv venv && uv pip install -e .
-rustuya-local run --config config.json
+
+Create `config.json` beside the device file before running:
+
+```json
+{
+  "bridge": {"host": "localhost", "port": 1883, "root": "rustuya"},
+  "il": {"host": "localhost", "port": 1883, "prefix": "il", "source": "tuya"},
+  "devices": "tuyadevices.json",
+  "custom_converters": "custom_converters",
+  "pack": true,
+  "watch_interval": 5,
+  "options": {"allow_hazardous": false, "expose_unused": false}
+}
 ```
 
+The package requires Python 3.13 or newer. Device and converter paths are relative to the configuration file.
+`watch_interval: 0` disables polling; use a positive interval to apply file edits and downloaded rules while running.
+
 `config.json` (see `src/rustuya_local/config.py`): the bridge and IL brokers, the IL prefix, the device list, a
 `custom_converters` directory, and options for the Hub (`allow_hazardous`, `expose_unused`, `overrides`).
 The device list is the `tuyadevices.json` that [rustuya-manager](https://github.com/3735943886/rustuya-manager) keeps (its QR-login wizard writes
@@ -134,7 +152,9 @@ device settings are enabled, unless an override selects another source. A settin
 the setting is saved as the device's block in `zz_settings.json` in the converters directory and applied at once, so it
 survives a restart and can be edited there too. Without a converters directory (a daemon with no
 `custom_converters`) the switches are not offered; `"options": {"device_settings": false}` turns them off.
-A block with the same `cover` keys in your own file or the builtin rules sets a model's starting point; the saved settings win.
+A block with the same `cover` keys in your own file or the builtin rules sets a model's starting point.
+User files, including `zz_settings.json`, are applied in filename order; a later file can override saved settings.
+The daemon's inline `options.overrides` is applied after file layers.
 Older `cover.infer_motion` and `converters.cover_motion` blocks are upgraded on loading to `cover.state_source`
 (`inferred`, or `none` for `infer_motion: false`) and `cover.settle`; see [migration notes](docs/MIGRATING.md).
 
@@ -172,15 +192,22 @@ rustuya-local release (bump the patch version and tag; the manager's catalog fol
 
 ## Tests
 
-```
-.venv/bin/python -m pytest
+```bash
+uv venv --python 3.14
+uv pip install -e ../ildevice-homeassistant -e ".[test,test-ha,fullstack,manager]"
+.venv/bin/python -m pytest -q
+ruff check src tests custom_components scripts
 ```
 
-Everything here needs the sibling repos and, for the last two groups, `mosquitto`, `pyrustuya-bridge` and `tuyamock`
-(`pip install -e ".[test,fullstack]"`); those are skipped when missing. Parity with Home Assistant core's fixtures lives in
-`tuya-interpreter/tests/chain`, the wire and topic vectors in `ildevice/vectors`.
+The complete suite uses Python 3.14 because the consumer and Home Assistant test dependencies require it.
+Install `mosquitto` for broker tests and Node.js for panel JavaScript tests. The command above installs the consumer
+from a sibling checkout and other dependencies from the package index; CI follows the same approach.
+Missing base or test dependencies can fail collection; optional broker, emulator and fixture tests skip when their
+prerequisites are unavailable. The full-stack device comparison uses `../tuya-interpreter/tests/golden`; IL wire and
+topic vectors use `../ildevice/vectors` (or the `ILDEVICE` environment variable). Keep those checkouts for these checks.
 
-- `tests/unit/`: the configuration.
+- `tests/unit/`: configuration validation, host lifecycle, IL vectors, rule loading, settings persistence,
+  pack ownership, converter APIs, panel JavaScript and release packaging.
 - `tests/e2e/test_service.py`: the service on in-memory brokers (overrides directory, a failed start).
 - `tests/e2e/test_chain_*.py`, `test_daemon.py`: the runner with ildevice-homeassistant's consumer model on the other side, in one process
   and over a real broker; the daemon as a subprocess.
@@ -190,8 +217,14 @@ Everything here needs the sibling repos and, for the last two groups, `mosquitto
   (`tuyamock`) around the daemon: state, commands, rejections, a device dropping off and returning, a daemon restart, and a
   differential check that 38 real device shapes come out of the whole chain exactly as `tuya-interpreter` computes them.
 
-## Status
+## Documentation
 
-Planning, progress and open decisions: `docs/REDESIGN.md`.
+- [Current status](docs/STATUS.md): version, document index and verification boundaries.
+- [Architecture](docs/ARCHITECTURE.md): current components, lifecycle and rule precedence.
+- [Migration](docs/MIGRATING.md): upgrading old converters and rustuya-homeassistant installations.
+- [Code review](docs/REVIEW.md): findings and local verification from 2026-10-13.
+- [Roadmap](docs/ROADMAP.md): outstanding work and real-device checks.
+- [Design history](docs/REDESIGN.md): the September redesign record; historical APIs and versions.
+- [Changelog](CHANGELOG.md): changes grouped by release.
 
-Licence: `LICENSE` (MIT).
+Licence: [MIT](LICENSE).

{rustuya_local-0.1.0.dev7 → rustuya_local-0.1.0.dev10}/README.md

@@ -20,11 +20,29 @@ rustuya-bridge ──MQTT──► rustuya-local ──MQTT (il/…)──► il
 
 ## Daemon
 
+```bash
+uv venv --python 3.13
+uv pip install -e .
+.venv/bin/rustuya-local run --config config.json
 ```
-uv venv && uv pip install -e .
-rustuya-local run --config config.json
+
+Create `config.json` beside the device file before running:
+
+```json
+{
+  "bridge": {"host": "localhost", "port": 1883, "root": "rustuya"},
+  "il": {"host": "localhost", "port": 1883, "prefix": "il", "source": "tuya"},
+  "devices": "tuyadevices.json",
+  "custom_converters": "custom_converters",
+  "pack": true,
+  "watch_interval": 5,
+  "options": {"allow_hazardous": false, "expose_unused": false}
+}
 ```
 
+The package requires Python 3.13 or newer. Device and converter paths are relative to the configuration file.
+`watch_interval: 0` disables polling; use a positive interval to apply file edits and downloaded rules while running.
+
 `config.json` (see `src/rustuya_local/config.py`): the bridge and IL brokers, the IL prefix, the device list, a
 `custom_converters` directory, and options for the Hub (`allow_hazardous`, `expose_unused`, `overrides`).
 The device list is the `tuyadevices.json` that [rustuya-manager](https://github.com/3735943886/rustuya-manager) keeps (its QR-login wizard writes
@@ -108,7 +126,9 @@ device settings are enabled, unless an override selects another source. A settin
 the setting is saved as the device's block in `zz_settings.json` in the converters directory and applied at once, so it
 survives a restart and can be edited there too. Without a converters directory (a daemon with no
 `custom_converters`) the switches are not offered; `"options": {"device_settings": false}` turns them off.
-A block with the same `cover` keys in your own file or the builtin rules sets a model's starting point; the saved settings win.
+A block with the same `cover` keys in your own file or the builtin rules sets a model's starting point.
+User files, including `zz_settings.json`, are applied in filename order; a later file can override saved settings.
+The daemon's inline `options.overrides` is applied after file layers.
 Older `cover.infer_motion` and `converters.cover_motion` blocks are upgraded on loading to `cover.state_source`
 (`inferred`, or `none` for `infer_motion: false`) and `cover.settle`; see [migration notes](docs/MIGRATING.md).
 
@@ -146,15 +166,22 @@ rustuya-local release (bump the patch version and tag; the manager's catalog fol
 
 ## Tests
 
-```
-.venv/bin/python -m pytest
+```bash
+uv venv --python 3.14
+uv pip install -e ../ildevice-homeassistant -e ".[test,test-ha,fullstack,manager]"
+.venv/bin/python -m pytest -q
+ruff check src tests custom_components scripts
 ```
 
-Everything here needs the sibling repos and, for the last two groups, `mosquitto`, `pyrustuya-bridge` and `tuyamock`
-(`pip install -e ".[test,fullstack]"`); those are skipped when missing. Parity with Home Assistant core's fixtures lives in
-`tuya-interpreter/tests/chain`, the wire and topic vectors in `ildevice/vectors`.
+The complete suite uses Python 3.14 because the consumer and Home Assistant test dependencies require it.
+Install `mosquitto` for broker tests and Node.js for panel JavaScript tests. The command above installs the consumer
+from a sibling checkout and other dependencies from the package index; CI follows the same approach.
+Missing base or test dependencies can fail collection; optional broker, emulator and fixture tests skip when their
+prerequisites are unavailable. The full-stack device comparison uses `../tuya-interpreter/tests/golden`; IL wire and
+topic vectors use `../ildevice/vectors` (or the `ILDEVICE` environment variable). Keep those checkouts for these checks.
 
-- `tests/unit/`: the configuration.
+- `tests/unit/`: configuration validation, host lifecycle, IL vectors, rule loading, settings persistence,
+  pack ownership, converter APIs, panel JavaScript and release packaging.
 - `tests/e2e/test_service.py`: the service on in-memory brokers (overrides directory, a failed start).
 - `tests/e2e/test_chain_*.py`, `test_daemon.py`: the runner with ildevice-homeassistant's consumer model on the other side, in one process
   and over a real broker; the daemon as a subprocess.
@@ -164,8 +191,14 @@ Everything here needs the sibling repos and, for the last two groups, `mosquitto
   (`tuyamock`) around the daemon: state, commands, rejections, a device dropping off and returning, a daemon restart, and a
   differential check that 38 real device shapes come out of the whole chain exactly as `tuya-interpreter` computes them.
 
-## Status
+## Documentation
 
-Planning, progress and open decisions: `docs/REDESIGN.md`.
+- [Current status](docs/STATUS.md): version, document index and verification boundaries.
+- [Architecture](docs/ARCHITECTURE.md): current components, lifecycle and rule precedence.
+- [Migration](docs/MIGRATING.md): upgrading old converters and rustuya-homeassistant installations.
+- [Code review](docs/REVIEW.md): findings and local verification from 2026-10-13.
+- [Roadmap](docs/ROADMAP.md): outstanding work and real-device checks.
+- [Design history](docs/REDESIGN.md): the September redesign record; historical APIs and versions.
+- [Changelog](CHANGELOG.md): changes grouped by release.
 
-Licence: `LICENSE` (MIT).
+Licence: [MIT](LICENSE).

{rustuya_local-0.1.0.dev7 → rustuya_local-0.1.0.dev10}/custom_components/rustuya/__init__.py

@@ -252,13 +252,19 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     # setup that follows puts it back anyway; only disabling the entry (or deleting it, below) removes it
     if entry.disabled_by is not None:
         panel.async_remove(hass)
-    runtime: RuntimeData = hass.data[DOMAIN].pop(entry.entry_id)
+    runtime: RuntimeData = hass.data[DOMAIN][entry.entry_id]
     restarting = getattr(runtime, "restarting", False) and entry.disabled_by is None
-    await runtime.service.stop(offline=not restarting)
+    try:
+        await runtime.service.stop(offline=not restarting)
+    finally:
+        try:
+            if runtime.embedded_bridge:
+                await runtime.embedded_bridge.stop()
+        finally:
+            # A stopped service cannot be reused, even when draining its commands failed.
+            hass.data[DOMAIN].pop(entry.entry_id, None)
     if restarting:
         hass.data[RESUME] = True
-    if runtime.embedded_bridge:
-        await runtime.embedded_bridge.stop()
     return True
 
 

rustuya_local-0.1.0.dev10/custom_components/rustuya/bridge_supervisor.py

@@ -0,0 +1,104 @@
+"""Own the embedded bridge's native async task and verify its MQTT startup signal."""
+
+from __future__ import annotations
+
+import asyncio
+import json
+import logging
+import secrets
+from urllib.parse import urlsplit
+
+_LOGGER = logging.getLogger(__name__)
+START_TIMEOUT = 15.0
+STOP_TIMEOUT = 10.0
+
+
+class EmbeddedBridge:
+    def __init__(self, broker: str, root: str, state_file: str, log_level: str = "warn",
+                 username: str | None = None, password: str | None = None) -> None:
+        self.broker = broker
+        self.root = root
+        self.state_file = state_file
+        self.log_level = log_level
+        self.username = username
+        self.password = password
+        self._server = None
+        self._task: asyncio.Future | None = None
+        self._stopping = False
+
+    async def start(self) -> None:
+        import pyrustuyabridge as pb
+
+        from rustuya_local.host.mqtt import MqttTransport
+
+        if self._task is not None:
+            raise RuntimeError("the embedded bridge has already been started")
+        address = urlsplit(self.broker)
+        observer = MqttTransport(address.hostname, address.port or 1883,
+                                 client_id=f"rustuya-startup-{secrets.token_hex(8)}",
+                                 username=self.username, password=self.password,
+                                 tls=address.scheme == "mqtts")
+        ready = asyncio.Event()
+
+        def on_config(message) -> None:
+            # A retained config may belong to an earlier, dead bridge instance.
+            if message.retain or not message.payload:
+                return
+            try:
+                config = json.loads(message.payload)
+            except (ValueError, UnicodeDecodeError):
+                return
+            if isinstance(config, dict) and config:
+                ready.set()
+
+        waiter = None
+        try:
+            async with asyncio.timeout(START_TIMEOUT):
+                await observer.connect()
+                await observer.subscribe(f"{self.root}/bridge/config", on_config)
+                kwargs = {"mqtt_broker": self.broker, "mqtt_root_topic": self.root, "mqtt_retain": True,
+                          "state_file": self.state_file, "no_signals": True, "log_level": self.log_level}
+                if self.username:
+                    kwargs["mqtt_username"] = self.username
+                if self.password:
+                    kwargs["mqtt_password"] = self.password
+                self._server = pb.PyBridgeServer(**kwargs)
+                self._stopping = False
+                self._task = asyncio.ensure_future(self._server.start_async())
+                self._task.add_done_callback(self._exited)
+                waiter = asyncio.create_task(ready.wait())
+                await asyncio.wait((waiter, self._task), return_when=asyncio.FIRST_COMPLETED)
+                if self._task.done():
+                    await self._task  # preserve the native startup exception
+                    raise RuntimeError("the embedded bridge exited during startup")
+        except BaseException:
+            await self.stop()
+            raise
+        finally:
+            if waiter is not None:
+                waiter.cancel()
+                await asyncio.gather(waiter, return_exceptions=True)
+            try:
+                await observer.close()
+            except BaseException:
+                # Startup has not returned ownership to the caller yet.
+                await self.stop()
+                raise
+
+    def _exited(self, task: asyncio.Future) -> None:
+        if task.cancelled():
+            return
+        error = task.exception()
+        if not self._stopping:
+            _LOGGER.error("the embedded bridge stopped unexpectedly: %s", error or "server exited")
+
+    async def stop(self) -> None:
+        if self._task is None:
+            return
+        self._stopping = True
+        self._server.stop()
+        # Shield the native task: a timed-out shutdown must retain ownership so
+        # another stop can still wait for cleanup, rather than losing the server.
+        await asyncio.wait_for(asyncio.shield(asyncio.gather(self._task, return_exceptions=True)), STOP_TIMEOUT)
+        self._task = None
+        self._server = None

{rustuya_local-0.1.0.dev7 → rustuya_local-0.1.0.dev10}/custom_components/rustuya/config_flow.py

@@ -54,8 +54,6 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 PROBE_TIMEOUT = 5.0      # seconds each for the broker to accept us and the bridge's retained config to arrive
-TICK = 0.1               # seconds between looks at the login's state while its progress shows
-TICKS = 50               # looks before the progress step is redrawn anyway
 
 
 def _qr_schema(qr_url: str) -> vol.Schema:
@@ -164,7 +162,7 @@ class _ManagerSteps:
             return self.async_show_progress_done(next_step_id="cloud_wizard_scan")
         return self.async_show_progress(step_id="cloud_wizard_progress", progress_action="cloud_wizard_working",
                                         description_placeholders={"message": session.message},
-                                        progress_task=self.hass.async_create_task(self._async_wizard_tick()))
+                                        progress_task=self.hass.async_create_task(self._async_wait_wizard_state()))
 
     async def async_step_cloud_wizard_scan(self, user_input: dict[str, Any] | None = None) -> FlowResult:
         """`async_show_progress` only takes plain description text -- no selector, so a QR needs an actual form
@@ -176,18 +174,14 @@ class _ManagerSteps:
         return self.async_show_form(step_id="cloud_wizard_scan",
                                     data_schema=_qr_schema(self._manager.wizard.session.qr_url))
 
-    async def _async_wizard_tick(self) -> None:
-        """`async_show_progress` needs a task to await; the wizard already runs in the background
-        (`WizardManager._run`), so this just waits for its state to change (or a short cap) so the
-        frontend's re-poll of `cloud_wizard_progress` promptly redraws instead of only on its own timer."""
+    async def _async_wait_wizard_state(self) -> None:
+        """Wake HA progress when the manager reports a wizard state change."""
         from rustuya_manager.wizard import WizardState
 
-        session = self._manager.wizard.session
-        start_state = session.state
-        for _ in range(TICKS):
-            if session.state != start_state or session.state in (WizardState.DONE, WizardState.ERROR):
-                return
-            await asyncio.sleep(TICK)
+        wizard = self._manager.wizard
+        state = wizard.session.state
+        if state not in (WizardState.DONE, WizardState.ERROR):
+            await wizard.wait_state_change(state)
 
     def _sync_form(self, step_id: str, diff: Any, error: str | None = None) -> FlowResult:
         self._sync_shown = True

{rustuya_local-0.1.0.dev7 → rustuya_local-0.1.0.dev10}/custom_components/rustuya/manager_session.py

@@ -68,9 +68,7 @@ async def open_manager(*, broker: str, root: str, devices_path: str, username: s
         # `sync()`'s diff is only meaningful once the bridge's device list has arrived; without this every cloud
         # device looks "missing" (an empty bridge side), which is how a whole device list ended up offered for
         # registration.
-        from .manager_registry import ready_registry
-
-        await ready_registry(manager, WAIT)
+        await manager.wait_ready(bootstrap_timeout=WAIT, bridge_timeout=WAIT)
     except BaseException:
         await close_manager(manager)
         raise
@@ -103,7 +101,12 @@ async def open_for_entry(hass: Any, data: dict[str, Any], *, run_bridge: bool =
         dirs.append(os.path.dirname(state_file))
         bridge = {"bridge_state": state_file,
                   "bridge_log_level": data.get(CONF_BRIDGE_LOG_LEVEL, DEFAULT_BRIDGE_LOG_LEVEL)}
-    await hass.async_add_executor_job(lambda: [os.makedirs(d, exist_ok=True) for d in dirs if d])
+    def ensure_directories() -> None:
+        for directory in dirs:
+            if directory:
+                os.makedirs(directory, exist_ok=True)
+
+    await hass.async_add_executor_job(ensure_directories)
     username, password = broker.credentials(data)
     return await open_manager(broker=broker.url(data), root=data[CONF_BRIDGE_ROOT],
                               devices_path=data[CONF_DEVICES_PATH], username=username, password=password, **bridge)

{rustuya_local-0.1.0.dev7 → rustuya_local-0.1.0.dev10}/custom_components/rustuya/manifest.json

@@ -11,10 +11,10 @@
   "requirements": [
     "tuya-interpreter>=0.1.0a2",
     "paho-mqtt>=2.0",
-    "rustuya-manager>=0.2.2",
+    "rustuya-manager>=0.2.3",
     "pyrustuyabridge>=0.4",
-    "rustuya-local>=0.1.0.dev7"
+    "rustuya-local>=0.1.0.dev10"
   ],
   "single_config_entry": true,
-  "version": "0.1.0.dev7"
+  "version": "0.1.0.dev10"
 }