rustuya-local 0.1.0.dev6__tar.gz → 0.1.0.dev8__tar.gz

{rustuya_local-0.1.0.dev6 → rustuya_local-0.1.0.dev8}/.github/workflows/_test.yml

@@ -3,7 +3,7 @@ name: Test (reusable)
 # Single source of truth for rustuya-local's pre-merge / pre-publish checks. Called from ci.yml
 # on push/PR and as a gate from release.yml, so a commit that fails these can't reach PyPI.
 #
-# il-ha is not on PyPI yet, so check out ildevice-homeassistant and explicitly
+# ildevice-homeassistant is not on PyPI yet, so check out ildevice-homeassistant and explicitly
 # install that checkout together with rustuya-local's test extras.
 # Other package dependencies are installed from PyPI.
 
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # il-ha (the test/fullstack sibling dep) requires Python>=3.14; rustuya-local's own
+        # ildevice-homeassistant (the test/fullstack sibling dep) requires Python>=3.14; rustuya-local's own
         # requires-python floor (3.13, in pyproject.toml) stays lower since only the test extras
         # need 3.14, not the base package.
         python-version: ["3.14"]
@@ -31,7 +31,7 @@ jobs:
         with:
           path: rustuya-local
 
-      # The repository publishes its Python package under the name il-ha.
+      # Install the integration checkout as the test consumer package.
       - name: Check out ildevice-homeassistant
         uses: actions/checkout@v7
         with:
@@ -91,7 +91,7 @@ jobs:
         run: pytest -q
 
   package:
-    # The test job uses an il-ha checkout; this one checks what a user gets: the wheel in a fresh
+    # The test job uses an ildevice-homeassistant checkout; this one checks what a user gets: the wheel in a fresh
     # environment, every dependency from PyPI, importing and starting the CLI.
     name: installs from PyPI alone
     runs-on: ubuntu-latest

{rustuya_local-0.1.0.dev6 → rustuya_local-0.1.0.dev8}/CHANGELOG.md

@@ -3,11 +3,32 @@
 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.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
+- Use ildevice-homeassistant consistently in documentation, UI text and code comments.
+- Require tuya-interpreter 0.1.0a2 in the package and the Home Assistant integration.
+
 ## [0.1.0.dev6] — 2026-10-12
 
 ### Changed

{rustuya_local-0.1.0.dev6 → rustuya_local-0.1.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rustuya-local
-Version: 0.1.0.dev6
+Version: 0.1.0.dev8
 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
@@ -10,14 +10,14 @@ License-File: LICENSE
 Requires-Python: >=3.13
 Requires-Dist: paho-mqtt>=2.0
 Requires-Dist: pyrustuyabridge>=0.4
-Requires-Dist: tuya-interpreter>=0.1.0a1
+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'
 Provides-Extra: test
 Requires-Dist: httpx2; extra == 'test'
-Requires-Dist: il-ha; extra == 'test'
+Requires-Dist: ildevice-homeassistant; extra == 'test'
 Requires-Dist: pytest; extra == 'test'
 Requires-Dist: pytest-asyncio; extra == 'test'
 Provides-Extra: test-ha
@@ -32,7 +32,7 @@ Local control of Tuya devices through [rustuya-bridge](https://github.com/373594
 ([ildevice](https://github.com/3735943886/ildevice)) devices, and in Home Assistant. It replaces rustuya-homeassistant.
 
 ```
-rustuya-bridge ──MQTT──► rustuya-local ──MQTT (il/…)──► il-ha (Home Assistant integration), or any IL consumer
+rustuya-bridge ──MQTT──► rustuya-local ──MQTT (il/…)──► ildevice-homeassistant (Home Assistant integration), or any IL consumer
  raw LAN dps             Service:
                          BridgeClient + rustuya_local.host.Hub
 ```
@@ -42,15 +42,33 @@ rustuya-bridge ──MQTT──► rustuya-local ──MQTT (il/…)──► il
 - **rustuya-local** is one `Service` (`src/rustuya_local/service.py`) and three thin shells that run it:
   the `rustuya-local run` daemon, the `custom_components/rustuya` Home Assistant integration, and a rustuya-manager
   plugin. Its `host` package owns the runner, transports and file watchers. It only produces IL and knows nothing of Home Assistant entities.
-- **[il-ha](https://github.com/3735943886/ildevice-homeassistant)** turns IL descriptors into Home Assistant entities.
+- **[ildevice-homeassistant](https://github.com/3735943886/ildevice-homeassistant)** turns IL descriptors into Home Assistant entities.
 
 ## 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
@@ -75,7 +93,7 @@ MQTT and in-process transport tests exercise the same adapter and the bidirectio
 
 Coming from rustuya-homeassistant: [docs/MIGRATING.md](docs/MIGRATING.md).
 
-Install il-ha, and run one IL producer per bridge: the daemon, the integration below, or the manager plugin. A second
+Install ildevice-homeassistant, and run one IL producer per bridge: the daemon, the integration below, or the manager plugin. A second
 one with the same IL prefix and source refuses to start while the first runs (every device would show twice): the
 daemon exits, the integration is retried by Home Assistant, the plugin's tab shows it and retries. To move from one to
 another, stop the old one first.
@@ -87,7 +105,7 @@ bridge mode, the broker and the IL prefix (it checks an external bridge answers
 is not on the default one), then offers to fetch the devices from Tuya Cloud (a saved login is reused; a QR login
 only when there is none), which closing its window skips (it is in *Configure* later, and in the panel); the rest
 starts at its defaults and is changed in the panel's *Settings*. Deleting the integration takes its devices out of IL
-(so il-ha removes them); with the embedded bridge it also clears that bridge's retained topics and its state file.
+(so ildevice-homeassistant removes them); with the embedded bridge it also clears that bridge's retained topics and its state file.
 The device list and Tuya login it kept under `.storage/rustuya/` are deleted; a device file you pointed elsewhere, and
 everything on an external bridge, are left as they are.
 
@@ -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,17 +192,24 @@ 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 il-ha's consumer model on the other side, in one process
+- `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.
 - `tests/e2e/test_manager_plugin.py`: the plugin under rustuya-manager's real plugin host (skipped without it).
 - `tests/ha/`: the integration (config flow, setup).
@@ -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.dev6 → rustuya_local-0.1.0.dev8}/README.md

@@ -6,7 +6,7 @@ Local control of Tuya devices through [rustuya-bridge](https://github.com/373594
 ([ildevice](https://github.com/3735943886/ildevice)) devices, and in Home Assistant. It replaces rustuya-homeassistant.
 
 ```
-rustuya-bridge ──MQTT──► rustuya-local ──MQTT (il/…)──► il-ha (Home Assistant integration), or any IL consumer
+rustuya-bridge ──MQTT──► rustuya-local ──MQTT (il/…)──► ildevice-homeassistant (Home Assistant integration), or any IL consumer
  raw LAN dps             Service:
                          BridgeClient + rustuya_local.host.Hub
 ```
@@ -16,15 +16,33 @@ rustuya-bridge ──MQTT──► rustuya-local ──MQTT (il/…)──► il
 - **rustuya-local** is one `Service` (`src/rustuya_local/service.py`) and three thin shells that run it:
   the `rustuya-local run` daemon, the `custom_components/rustuya` Home Assistant integration, and a rustuya-manager
   plugin. Its `host` package owns the runner, transports and file watchers. It only produces IL and knows nothing of Home Assistant entities.
-- **[il-ha](https://github.com/3735943886/ildevice-homeassistant)** turns IL descriptors into Home Assistant entities.
+- **[ildevice-homeassistant](https://github.com/3735943886/ildevice-homeassistant)** turns IL descriptors into Home Assistant entities.
 
 ## 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
@@ -49,7 +67,7 @@ MQTT and in-process transport tests exercise the same adapter and the bidirectio
 
 Coming from rustuya-homeassistant: [docs/MIGRATING.md](docs/MIGRATING.md).
 
-Install il-ha, and run one IL producer per bridge: the daemon, the integration below, or the manager plugin. A second
+Install ildevice-homeassistant, and run one IL producer per bridge: the daemon, the integration below, or the manager plugin. A second
 one with the same IL prefix and source refuses to start while the first runs (every device would show twice): the
 daemon exits, the integration is retried by Home Assistant, the plugin's tab shows it and retries. To move from one to
 another, stop the old one first.
@@ -61,7 +79,7 @@ bridge mode, the broker and the IL prefix (it checks an external bridge answers
 is not on the default one), then offers to fetch the devices from Tuya Cloud (a saved login is reused; a QR login
 only when there is none), which closing its window skips (it is in *Configure* later, and in the panel); the rest
 starts at its defaults and is changed in the panel's *Settings*. Deleting the integration takes its devices out of IL
-(so il-ha removes them); with the embedded bridge it also clears that bridge's retained topics and its state file.
+(so ildevice-homeassistant removes them); with the embedded bridge it also clears that bridge's retained topics and its state file.
 The device list and Tuya login it kept under `.storage/rustuya/` are deleted; a device file you pointed elsewhere, and
 everything on an external bridge, are left as they are.
 
@@ -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,17 +166,24 @@ 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 il-ha's consumer model on the other side, in one process
+- `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.
 - `tests/e2e/test_manager_plugin.py`: the plugin under rustuya-manager's real plugin host (skipped without it).
 - `tests/ha/`: the integration (config flow, setup).
@@ -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.dev6 → rustuya_local-0.1.0.dev8}/custom_components/rustuya/__init__.py

@@ -1,7 +1,7 @@
 """Rustuya as a Home Assistant integration: runs the same `rustuya_local.service.Service` the standalone
 `rustuya-local` daemon does, tied to this config entry, with an optional embedded rustuya-bridge (`pyrustuyabridge`)
-and user overrides from `<config>/rustuya_converters`. It creates no entities and does not depend on il-ha: it is only an IL
-*producer* — install il-ha (or any IL consumer) separately to turn its devices into entities.
+and user overrides from `<config>/rustuya_converters`. It creates no entities and does not depend on ildevice-homeassistant: it is only an IL
+*producer* — install ildevice-homeassistant (or any IL consumer) separately to turn its devices into entities.
 """
 
 from __future__ import annotations
@@ -105,7 +105,7 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
 
 def _tuya_id(hass: HomeAssistant, service: Any, device_id: str) -> str:
     """`device_id` as the Tuya device id: as given when the service drives it, else a Home Assistant device's. An IL
-    consumer registers a device with the IL id (the Tuya id) among its identifiers — il-ha as `("ildevice", id)`, under
+    consumer registers a device with the IL id (the Tuya id) among its identifiers — ildevice-homeassistant as `("ildevice", id)`, under
     whatever platform name it runs as — so any identifier value the service drives is taken, when there is exactly one.
     Unresolved, it is returned as given (and refused as an unknown device)."""
     from homeassistant.helpers import device_registry as dr
@@ -252,19 +252,25 @@ 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
 
 
 async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Deleted, not just unloaded (which only says `offline`, keeping everything for the next start). Clears what this
-    entry leaves behind: its IL devices (retained descriptors and values, so il-ha and other IL consumers drop them),
+    entry leaves behind: its IL devices (retained descriptors and values, so ildevice-homeassistant and other IL consumers drop them),
     with the embedded bridge also that bridge's retained topics and its state file, and the files it kept in its own
     storage directory (the device list and the Tuya login). A path the user pointed elsewhere is left alone, as is
     everything on an external bridge. A broker that cannot be reached only leaves the retained topics behind; the

{rustuya_local-0.1.0.dev6 → rustuya_local-0.1.0.dev8}/custom_components/rustuya/manifest.json

@@ -9,12 +9,12 @@
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/3735943886/rustuya-local/issues",
   "requirements": [
-    "tuya-interpreter>=0.1.0a1",
+    "tuya-interpreter>=0.1.0a2",
     "paho-mqtt>=2.0",
     "rustuya-manager>=0.2.2",
     "pyrustuyabridge>=0.4",
-    "rustuya-local>=0.1.0.dev6"
+    "rustuya-local>=0.1.0.dev8"
   ],
   "single_config_entry": true,
-  "version": "0.1.0.dev6"
+  "version": "0.1.0.dev8"
 }

{rustuya_local-0.1.0.dev6 → rustuya_local-0.1.0.dev8}/custom_components/rustuya/panel.py

@@ -221,11 +221,12 @@ class OptionsView(_View):
                 or not all(isinstance(v, bool) for v in body.values())):
             return self.json_message(f"the options are {sorted(DEFAULT_OPTIONS)}, each true or false",
                                      HTTPStatus.BAD_REQUEST)
-        options = {**entry.options, **body}
-        if options == dict(entry.options):
-            return self.json({"restarting": False})
-        await _restart(request.app["hass"], entry, options=options)        # answered once it has restarted
-        return self.json({"restarting": True})
+        async with _settings_lock(request.app["hass"]):
+            options = {**entry.options, **body}
+            if options == dict(entry.options):
+                return self.json({"restarting": False})
+            await _restart(request.app["hass"], entry, options=options)        # answered once it has restarted
+            return self.json({"restarting": True})
 
 
 def settings_of(data: Any) -> dict[str, Any]:
@@ -275,24 +276,30 @@ class SettingsView(_View):
     @_entry_view
     async def put(self, request: web.Request, entry: Any, runtime: Any) -> web.Response:
         hass = request.app["hass"]
-        try:
-            new = validate_settings(hass, entry.data, await request.json())
-        except ValueError as e:
-            return self.json_message(str(e), HTTPStatus.BAD_REQUEST)
-        old = dict(entry.data)
-        if new == settings_of(old):
-            return self.json({"restarting": False})
-        external = old.get(CONF_BRIDGE_MODE) != BRIDGE_EMBEDDED
-        if external and new[CONF_BRIDGE_ROOT] != old[CONF_BRIDGE_ROOT]:
-            from .config_flow import _probe_bridge
-
-            error = await _probe_bridge(hass, {**old, **new})
-            if error is not None:
-                return self.json_message(
-                    f"no rustuya-bridge answers on {new[CONF_BRIDGE_ROOT]}" if error == "bridge_not_found"
-                    else "cannot connect to the broker", HTTPStatus.BAD_REQUEST)
-        await _apply(hass, entry, old, {**old, **new})                       # answered once it has restarted
-        return self.json({"restarting": True})
+        body = await _json_body(request)
+        async with _settings_lock(hass):
+            try:
+                new = validate_settings(hass, entry.data, body)
+            except ValueError as e:
+                return self.json_message(str(e), HTTPStatus.BAD_REQUEST)
+            old = dict(entry.data)
+            if new == settings_of(old):
+                return self.json({"restarting": False})
+            external = old.get(CONF_BRIDGE_MODE) != BRIDGE_EMBEDDED
+            if external and new[CONF_BRIDGE_ROOT] != old[CONF_BRIDGE_ROOT]:
+                from .config_flow import _probe_bridge
+
+                error = await _probe_bridge(hass, {**old, **new})
+                if error is not None:
+                    return self.json_message(
+                        f"no rustuya-bridge answers on {new[CONF_BRIDGE_ROOT]}" if error == "bridge_not_found"
+                        else "cannot connect to the broker", HTTPStatus.BAD_REQUEST)
+            await _apply(hass, entry, old, {**old, **new})                       # answered once it has restarted
+            return self.json({"restarting": True})
+
+
+def _settings_lock(hass: HomeAssistant) -> asyncio.Lock:
+    return hass.data.setdefault(f"{DOMAIN}_settings_lock", asyncio.Lock())
 
 
 async def _apply(hass: HomeAssistant, entry: Any, old: dict[str, Any], data: dict[str, Any]) -> None:
@@ -318,34 +325,33 @@ async def _restart(hass: HomeAssistant, entry: Any, *, data: dict[str, Any] | No
     """Stop the entry, run `between`, store the new data / options, start it again — all awaited, so the panel's save
     answers once the restart is over (the page then reloads onto the restarted entry, not onto one about to go).
     Stopped, the entry has no update listener, so storing does not start a second reload. An options-only restart
-    keeps the IL presence online across it (`mark_restart`); new data may move the broker or the IL topics."""
-    lock = hass.data.setdefault(f"{DOMAIN}_settings_lock", asyncio.Lock())
-    async with lock:
-        old_data, old_options = dict(entry.data), dict(entry.options)
-        if data is None:
-            from . import mark_restart
-
-            mark_restart(hass, entry)
-        if not await hass.config_entries.async_unload(entry.entry_id):
-            raise RestartFailed("Could not stop the integration; settings were not changed")
+    keeps the IL presence online across it (`mark_restart`); new data may move the broker or the IL topics.
+    The request handler holds `_settings_lock` from reading the current entry through this restart."""
+    old_data, old_options = dict(entry.data), dict(entry.options)
+    if data is None:
+        from . import mark_restart
+
+        mark_restart(hass, entry)
+    if not await hass.config_entries.async_unload(entry.entry_id):
+        raise RestartFailed("Could not stop the integration; settings were not changed")
+    try:
+        if between is not None:
+            await between()
+        changes = {k: v for k, v in (("data", data), ("options", options)) if v is not None}
+        hass.config_entries.async_update_entry(entry, **changes)
+        if not await hass.config_entries.async_setup(entry.entry_id):
+            raise RestartFailed("The integration could not start with these settings")
+    except Exception as e:
+        # Failed setup leaves SETUP_ERROR/SETUP_RETRY, which cannot be set up
+        # directly. Unload also cancels any scheduled retry with the bad data.
+        await hass.config_entries.async_unload(entry.entry_id)
+        hass.config_entries.async_update_entry(entry, data=old_data, options=old_options)
         try:
-            if between is not None:
-                await between()
-            changes = {k: v for k, v in (("data", data), ("options", options)) if v is not None}
-            hass.config_entries.async_update_entry(entry, **changes)
-            if not await hass.config_entries.async_setup(entry.entry_id):
-                raise RestartFailed("The integration could not start with these settings")
-        except Exception as e:
-            # Failed setup leaves SETUP_ERROR/SETUP_RETRY, which cannot be set up
-            # directly. Unload also cancels any scheduled retry with the bad data.
-            await hass.config_entries.async_unload(entry.entry_id)
-            hass.config_entries.async_update_entry(entry, data=old_data, options=old_options)
-            try:
-                restored = await hass.config_entries.async_setup(entry.entry_id)
-            except Exception:  # noqa: BLE001 -- keep the recovery API usable even if rollback startup fails
-                restored = False
-            suffix = "Previous settings restored" if restored else "Previous settings restored, but startup still fails"
-            raise RestartFailed(f"{e}. {suffix}; settings remain editable") from e
+            restored = await hass.config_entries.async_setup(entry.entry_id)
+        except Exception:  # noqa: BLE001 -- keep the recovery API usable even if rollback startup fails
+            restored = False
+        suffix = "Previous settings restored" if restored else "Previous settings restored, but startup still fails"
+        raise RestartFailed(f"{e}. {suffix}; settings remain editable") from e
 
 
 class PackView(_View):

{rustuya_local-0.1.0.dev6 → rustuya_local-0.1.0.dev8}/custom_components/rustuya/strings.json

@@ -19,7 +19,7 @@
           "il_prefix": "IL topic prefix"
         },
         "data_description": {
-          "il_prefix": "Where the devices are published for il-ha (or any IL consumer); il-ha reads il by default."
+          "il_prefix": "Where the devices are published for ildevice-homeassistant (or any IL consumer); ildevice-homeassistant reads il by default."
         }
       },
       "embedded": {
@@ -33,7 +33,7 @@
           "il_prefix": "IL topic prefix"
         },
         "data_description": {
-          "il_prefix": "Where the devices are published for il-ha (or any IL consumer); il-ha reads il by default."
+          "il_prefix": "Where the devices are published for ildevice-homeassistant (or any IL consumer); ildevice-homeassistant reads il by default."
         }
       },
       "onboard": {
@@ -152,7 +152,7 @@
       "fields": {
         "device_id": {
           "name": "Device ID",
-          "description": "The Tuya device ID (as in the device list), or the Home Assistant device an IL consumer such as il-ha made of it."
+          "description": "The Tuya device ID (as in the device list), or the Home Assistant device an IL consumer such as ildevice-homeassistant made of it."
         },
         "dp": {
           "name": "DP",

{rustuya_local-0.1.0.dev6 → rustuya_local-0.1.0.dev8}/custom_components/rustuya/translations/en.json

@@ -19,7 +19,7 @@
           "il_prefix": "IL topic prefix"
         },
         "data_description": {
-          "il_prefix": "Where the devices are published for il-ha (or any IL consumer); il-ha reads il by default."
+          "il_prefix": "Where the devices are published for ildevice-homeassistant (or any IL consumer); ildevice-homeassistant reads il by default."
         }
       },
       "embedded": {
@@ -33,7 +33,7 @@
           "il_prefix": "IL topic prefix"
         },
         "data_description": {
-          "il_prefix": "Where the devices are published for il-ha (or any IL consumer); il-ha reads il by default."
+          "il_prefix": "Where the devices are published for ildevice-homeassistant (or any IL consumer); ildevice-homeassistant reads il by default."
         }
       },
       "onboard": {
@@ -152,7 +152,7 @@
       "fields": {
         "device_id": {
           "name": "Device ID",
-          "description": "The Tuya device ID (as in the device list), or the Home Assistant device an IL consumer such as il-ha made of it."
+          "description": "The Tuya device ID (as in the device list), or the Home Assistant device an IL consumer such as ildevice-homeassistant made of it."
         },
         "dp": {
           "name": "DP",

{rustuya_local-0.1.0.dev6 → rustuya_local-0.1.0.dev8}/custom_components/rustuya/translations/ko.json

@@ -19,7 +19,7 @@
           "il_prefix": "IL 토픽 prefix"
         },
         "data_description": {
-          "il_prefix": "il-ha(또는 다른 IL 소비자)가 읽을 기기를 게시하는 곳입니다. il-ha는 기본으로 il을 읽습니다."
+          "il_prefix": "ildevice-homeassistant(또는 다른 IL 소비자)가 읽을 기기를 게시하는 곳입니다. ildevice-homeassistant는 기본으로 il을 읽습니다."
         }
       },
       "embedded": {
@@ -33,7 +33,7 @@
           "il_prefix": "IL 토픽 prefix"
         },
         "data_description": {
-          "il_prefix": "il-ha(또는 다른 IL 소비자)가 읽을 기기를 게시하는 곳입니다. il-ha는 기본으로 il을 읽습니다."
+          "il_prefix": "ildevice-homeassistant(또는 다른 IL 소비자)가 읽을 기기를 게시하는 곳입니다. ildevice-homeassistant는 기본으로 il을 읽습니다."
         }
       },
       "onboard": {
@@ -152,7 +152,7 @@
       "fields": {
         "device_id": {
           "name": "기기 ID",
-          "description": "Tuya 기기 ID (기기 목록의 것), 또는 il-ha 같은 IL consumer가 만든 Home Assistant 기기 ID."
+          "description": "Tuya 기기 ID (기기 목록의 것), 또는 ildevice-homeassistant 같은 IL consumer가 만든 Home Assistant 기기 ID."
         },
         "dp": {
           "name": "DP",