Release v2.0.0

.codespellrc

@@ -0,0 +1,6 @@
+[codespell]
+# Ref: https://github.com/codespell-project/codespell#using-a-config-file
+skip = .git,.codespellrc,translations,resources.py
+check-hidden = true
+# ignore-regex = 
+ignore-words-list = hass,aline,laF,visibile

.github/workflows/codespell.yml

@@ -0,0 +1,23 @@
+# Codespell configuration is within .codespellrc
+---
+name: Codespell
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+permissions:
+  contents: read
+
+jobs:
+  codespell:
+    name: Check for spelling errors
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Codespell
+        uses: codespell-project/actions-codespell@v2

.gitignore

@@ -3,4 +3,5 @@
 *.pyproj.user
 *.sln
 /env
-*.zip
+*.zip
+.idea

CONTRIBUTING.md

@@ -1,2 +1,2 @@
 ## Contributing
-To submit your changes please fork this repository and open a pull request. 
+To submit your changes please fork this repository and open a pull request to dev branch. 

README.md

@@ -1,4 +1,4 @@
-[![Version](https://img.shields.io/github/manifest-json/v/Tasshack/dreame-vacuum/master?filename=custom_components%2Fdreame_vacuum%2Fmanifest.json&color=slateblue&label=Version&style=for-the-badge)](https://github.com/Tasshack/dreame-vacuum/releases)
+[![Version](https://img.shields.io/github/manifest-json/v/Tasshack/dreame-vacuum/dev?filename=custom_components%2Fdreame_vacuum%2Fmanifest.json&color=slateblue&label=Version&style=for-the-badge)](https://github.com/Tasshack/dreame-vacuum/releases)
 ![Downloads](https://img.shields.io/github/downloads/Tasshack/dreame-vacuum/total?label=Downloads&style=for-the-badge)
 ![Stars](https://img.shields.io/github/stars/Tasshack/dreame-vacuum?label=Stars&color=darkgoldenrod&style=for-the-badge)
 [![HACS](https://img.shields.io/badge/HACS-Default-orange.svg?logo=HomeAssistantCommunityStore&logoColor=white&style=for-the-badge)](https://github.com/hacs/integration)
@@ -18,110 +18,127 @@ Complete app replacement with Home Assistant for Dreame robot vacuums.
 
 ## Features
 
-- [Auto generated device entities](https://github.com/Tasshack/dreame-vacuum/blob/master/docs/entities.md)
-- [Live and multi floor map support](https://github.com/Tasshack/dreame-vacuum/blob/master/docs/map.md)
-- [Customized room cleaning entities](https://github.com/Tasshack/dreame-vacuum/blob/master/docs/room_entities.md)
-- [Services for device and map with examples](https://github.com/Tasshack/dreame-vacuum/blob/master/docs/services.md)
-- [Persistent notifications and error reporting](https://github.com/Tasshack/dreame-vacuum/blob/master/docs/notifications.md)
-- [Events for automations](https://github.com/Tasshack/dreame-vacuum/blob/master/docs/events.md)
-- [Valetudo map card support](#with-valetudo-map-card)
-
-## Supported Devices
-- **Dreame**
-  - `dreame.vacuum.p2008` *(F9)*
-  - `dreame.vacuum.p2009` *(D9)*
-  - `dreame.vacuum.p2259` *(D9 Max)*
-  - `dreame.vacuum.p2187` *(D9 Pro)*
-  - `dreame.vacuum.r2205` *(D10 Plus)*
-  - `dreame.vacuum.p2029` *(L10 Pro)*
-  - `dreame.vacuum.p2028a` *(L10 Plus)*
-  - `dreame.vacuum.r2228o` *(L10s Ultra)*
-  - `dreame.vacuum.r2215o` *(L10s Pro)*
-  - `dreame.vacuum.r2216o` *(L10s Pro)*
-  - `dreame.vacuum.p2028` *(Z10 Pro)*
-  - `dreame.vacuum.p2027` *(W10)*
-  - `dreame.vacuum.r2104` *(W10 Pro)*
-  - `dreame.vacuum.r2251o` *(W10s)*
-  - `dreame.vacuum.r2232a` *(W10s Pro)*
-  - `dreame.vacuum.r2228` *(S10)*
-  - `dreame.vacuum.r2211o` *(S10+)*
-  - `dreame.vacuum.r2233` *(S10 Pro)*
-  - `dreame.vacuum.r2247` *(S10 Pro Plus)*
-  - `dreame.vacuum.r2246` *(S10 Plus)*
-  - `dreame.vacuum.r2215` *(X10)*
-  - `dreame.vacuum.r2235` *(X10 Ultra)*
-- **Mijia**
-  - `dreame.vacuum.p2036` *(Trouver LDS Finder)*
-  - `dreame.vacuum.p2150o` *(Vacuum-Mop)*
-  - `dreame.vacuum.p2150a` *(Vacuum-Mop 2 Ultra)*
-  - `dreame.vacuum.p2150b` *(Vacuum-Mop 2 Ultra Set)*
-  - `dreame.vacuum.p2114o` *(Self-Cleaning Robot Vacuum-Mop)* 
-  - `dreame.vacuum.p2149o` *(Self-Cleaning Robot Vacuum-Mop Pro)*
-  - `dreame.vacuum.r2254` *(1S)*
-  - `dreame.vacuum.r2209` *(X10)*
-  - `dreame.vacuum.p2114a` *(X10+)*
-  - `dreame.vacuum.p2041` *(1T)*
-  - `dreame.vacuum.p2140a` *(2C)*
-  - `dreame.vacuum.p2140` *(2C)*
-  - `dreame.vacuum.p2140q` *(Mi Robot Vacuum-Mop 2)*
-  - `dreame.vacuum.p2140p` *(Mi Robot Vacuum-Mop 2)*
-  - `dreame.vacuum.p2140o` *(Mi Robot Vacuum-Mop 2)*
-  - `dreame.vacuum.p2148o` *(Mi Robot Vacuum Mop Ultra Slim)*
-  - `dreame.vacuum.p2041o` *(Mi Robot Vacuum-Mop 2 Pro+)*
-- **MOVA** 
-  - `dreame.vacuum.p2157` *(L600)*
-  - `dreame.vacuum.p2156o` *(MOVA Z500)*
+- [Supported devices](https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/supported_devices.md)
+- [Auto generated device entities](https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/entities.md)
+- [Live and multi floor map support](https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/map.md)
+- [Map obstacle photos](https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/map.md#obstacle-photos)
+- [Cleaning and cruising history maps](https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/map.md#cleaning-and-cruising-history-maps)
+- [Cloud and local map backup/recovery](https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/map.md#backup-and-recovery)
+- [Saved WiFi coverage maps](https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/map.md#wifi-map)
+- [Customized room cleaning entities](https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/room_entities.md)
+- [Services for device and map with examples](https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/services.md)
+- [Persistent notifications and error reporting](https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/notifications.md)
+- [Events for automations](https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/events.md)
+- Dreamehome account support
+- Movahome account support
+
 
 ## Installation
 
-### Manually
+#### Manually
 
-```sh
-wget -O - https://raw.githubusercontent.com/Tasshack/dreame-vacuum/master/install | bash -
+```bash
+wget -O - https://raw.githubusercontent.com/Tasshack/dreame-vacuum/dev/install | bash -
 ```
 
 
-### Via [HACS](https://hacs.xyz/)
+#### Via [HACS](https://hacs.xyz/)
 <a href="https://my.home-assistant.io/redirect/hacs_repository/?owner=Tasshack&repository=dreame-vacuum&category=integration" target="_blank"><img src="https://my.home-assistant.io/badges/hacs_repository.svg" alt="Open your Home Assistant instance and open a repository inside the Home Assistant Community Store." /></a>
 
+
 ## Configuration
+
 <a href="https://my.home-assistant.io/redirect/config_flow_start/?domain=dreame_vacuum" target="_blank"><img src="https://my.home-assistant.io/badges/config_flow_start.svg" alt="Open your Home Assistant instance and start setting up a new integration." /></a>
 - Select configuration type:
 
-    <img src="https://raw.githubusercontent.com/Tasshack/dreame-vacuum/master/docs/media/config_flow.png" width="550px">
-
-    <a href="https://github.com/Tasshack/dreame-vacuum/blob/master/docs/map.md" target="_blank">About map feature</a>
+     - **Mi Home Account**: TODO
+     - **Dreamehome Account**: TODO
+     - **Local**: TODO
 
 - Enter required credentials according to the selected configuration type. 
-  > Please make sure that the devices are at same subnet for both configuration types. <a href="https://python-miio.readthedocs.io/en/latest/troubleshooting.html#discover-devices-across-subnets" target="_blank">python-miio article about this issue.</a>
+  > Please make sure that the devices are at same subnet for `Mi Home account` and `Local` configuration types. <a href="https://python-miio.readthedocs.io/en/latest/troubleshooting.html#discover-devices-across-subnets" target="_blank">python-miio article about this issue.</a>
 - Set your device name and integration settings:
 
-    <img src="https://raw.githubusercontent.com/Tasshack/dreame-vacuum/master/docs/media/config_flow_settings.png" width="350px">
+    TODO
 
-    <a href="https://github.com/Tasshack/dreame-vacuum/blob/master/docs/notifications.md" target="_blank">About notifications feature</a><br><a href="https://github.com/Tasshack/dreame-vacuum/blob/master/docs/map.md#color-schemes" target="_blank">About map color schemes</a>
+    <a href="https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/notifications.md" target="_blank">About notifications feature</a><br><a href="https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/map.md#color-schemes" target="_blank">About map color schemes</a>
 - Navigate to device page for disabling or enabling entities that you want to use.
 
-    <a href="https://github.com/Tasshack/dreame-vacuum/blob/master/docs/entities.md" target="_blank">About entities</a>
-
-## How to Use
+    <a href="https://github.com/Tasshack/dreame-vacuum/blob/dev/docs/entities.md" target="_blank">About entities</a>
+
 
+## How To Use
 Integration is compatible with all available Lovelace vacuum cards but if you want to use zone cleaning feature you can prefer the Xiaomi Vacuum Card.
 
-#### With [Xiaomi Vacuum Map Card](https://github.com/PiotrMachowski/lovelace-xiaomi-vacuum-map-card)
+#### With Dreame Vacuum Card
+
+*Work in progress... <a href="https://github.com/Tasshack/dreame-vacuum/issues/466" target="_blank">#466</a>*
+
 
+#### With [Xiaomi Vacuum Map Card](https://github.com/PiotrMachowski/lovelace-xiaomi-vacuum-map-card)
+ > Template for room and zone cleaning.
+<a href="https://my.home-assistant.io/redirect/developer_template/" target="_blank"><img src="https://my.home-assistant.io/badges/developer_template.svg" alt="Open your Home Assistant instance and show your template developer tools." /></a>
 ```yaml
+{# ----------------- PROVIDE YOUR OWN ENTITY IDS HERE ----------------- #}
+{% set camera_entity = "camera." %}
+{% set vacuum_entity = "vacuum." %}
+{# ------------------- DO NOT CHANGE ANYTHING BELOW ------------------- #}
+{% set attributes = states[camera_entity].attributes %}
+
 type: custom:xiaomi-vacuum-map-card
-entity: # Your vacuum entity
+vacuum_platform: default
+entity: {{ vacuum_entity }}
 map_source:
-  camera: # Map Entity
+  camera: {{ camera_entity }}
 calibration_source:
   camera: true
-vacuum_platform: Tasshack/dreame-vacuum
+map_modes:
+  - template: vacuum_clean_zone
+    max_selections: 10
+    repeats_type: EXTERNAL
+    max_repeats: 3
+    service_call_schema:
+      service: dreame_vacuum.vacuum_clean_zone
+      service_data:
+        entity_id: '[[entity_id]]'
+        zone: '[[selection]]'
+        repeats: '[[repeats]]'
+  - template: vacuum_clean_segment
+    repeats_type: EXTERNAL
+    max_repeats: 3
+    service_call_schema:
+      service: dreame_vacuum.vacuum_clean_segment
+      service_data:
+        entity_id: '[[entity_id]]'
+        segments: '[[selection]]'
+        repeats: '[[repeats]]'
+    predefined_selections:
+{%- for room_id in attributes.rooms | default([]) %}
+{%- set room = attributes.rooms[room_id] %}
+      - id: {{room_id}}
+        outline:
+          - - {{room["x0"]}}
+            - {{room["y0"]}}
+          - - {{room["x0"]}}
+            - {{room["y1"]}}
+          - - {{room["x1"]}}
+            - {{room["y1"]}}
+          - - {{room["x1"]}}
+            - {{room["y0"]}}
+{%- endfor %}
+  - name: Clean Spot
+    icon: mdi:map-marker-plus
+    max_repeats: 3
+    selection_type: MANUAL_POINT
+    repeats_type: EXTERNAL
+    service_call_schema:
+      service: dreame_vacuum.vacuum_clean_spot
+      service_data:
+        entity_id: '[[entity_id]]'
+        points: '[[selection]]'
+        repeats: '[[repeats]]'
 ```
 
-> Open card editor, click "Generate rooms config" button, check (adjust if needed) your config using yaml editor and save changes.
-<img src="https://user-images.githubusercontent.com/6118709/189792603-c5ad2089-7405-4d1b-850d-77af8f170618.png">
-
 #### With [Vacuum Card](https://github.com/denysdovhan/vacuum-card)
 
 ```yaml
@@ -145,7 +162,7 @@ stats:
       subtitle: Sensors
   cleaning:
     - attribute: cleaned_area
-      unit: m²
+      unit: m2
       subtitle: Cleaned area
     - attribute: cleaning_time
       unit: min
@@ -245,35 +262,33 @@ attributes:
 
 ```
 
-#### With Dreame Vacuum Card
-
-*Coming Soon*
-
 ## To Do
 
-- Cleaning history map support
-- Map recovery support
+- Integrated custom lovelace map card
+- Shortcut editing
 - Schedule editing
-- AI Obstacle image support
-- Custom lovelace card for map editing
+- Furniture editing
+- DnD editing
+- Live camera streaming
+- Backend translations
 
 
 ## Contributing
-Integrations is currently only available on English language and if want you use it on our language it would be very helpful to you to translate files on *translations* folder and share with us.
-
-To submit your changes please fork this repository and open a pull request. 
+To submit your changes please fork `dev` branch of this repository and open a pull request. 
 
 ## Thanks To
 
  - [xiaomi_vacuum](https://github.com/pooyashahidi/xiaomi_vacuum) by [@pooyashahidi](https://github.com/pooyashahidi)
  - [Xiaomi MIoT for Home Assistant](https://github.com/ha0y/xiaomi_miot_raw) by [@ha0y](https://github.com/ha0y)
  - [Xiaomi Cloud Map Extractor](https://github.com/PiotrMachowski/Home-Assistant-custom-components-Xiaomi-Cloud-Map-Extractor) by [@PiotrMachowski](https://github.com/PiotrMachowski)
-
+ - Dreame cloud authentication by [@kuudori](https://github.com/kuudori)
+ - Mova cloud help by [@r1si](https://github.com/r1si)
+
 
 ## Do not forget to support the project!
 
 <a href="https://ko-fi.com/tasshack"><img width="300" src="https://raw.githubusercontent.com/Tasshack/dreame-vacuum/refs/heads/dev/.github/icons/kofi.png"/></a>
 
 <a href="https://paypal.me/tasshackK"><img width="300" src="https://raw.githubusercontent.com/Tasshack/dreame-vacuum/refs/heads/dev/.github/icons/paypal.png"></a>
 
-<a href="https://github.com/sponsors/Tasshack"><img width="300" src="https://raw.githubusercontent.com/Tasshack/dreame-vacuum/refs/heads/dev/.github/icons/github.png"></a>
+<a href="https://github.com/sponsors/Tasshack"><img width="300" src="https://raw.githubusercontent.com/Tasshack/dreame-vacuum/refs/heads/dev/.github/icons/github.png"></a>

custom_components/dreame_vacuum/__init__.py

@@ -1,11 +1,13 @@
 """The Dreame Vacuum component."""
+
 from __future__ import annotations
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from .const import DOMAIN
-from .coordinator import DreameVacuumDataUpdateCoordinator
+from homeassistant.components.frontend import DATA_EXTRA_MODULE_URL
 import warnings
+from pathlib import Path
+from .const import DOMAIN
 
 # Suppress python-miio FutureWarning on Python 3.13
 warnings.filterwarnings(
@@ -17,6 +19,8 @@
 # Suppress RuntimeWarning overflow encountered in scalar add
 warnings.filterwarnings("ignore", category=RuntimeWarning)
 
+from .coordinator import DreameVacuumDataUpdateCoordinator
+
 PLATFORMS = (
     Platform.VACUUM,
     Platform.SENSOR,
@@ -26,6 +30,7 @@
     Platform.NUMBER,
     Platform.SELECT,
     Platform.CAMERA,
+    Platform.TIME,
 )
 
 
@@ -36,20 +41,32 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
 
-    entry.async_on_unload(entry.add_update_listener(update_listener))
+    # Register frontend
+    # frontend_js = f"/{DOMAIN}/frontend.js"
+    # if DATA_EXTRA_MODULE_URL not in hass.data:
+    #    hass.data[DATA_EXTRA_MODULE_URL] = set()
+    # if frontend_js not in (
+    #    hass.data[DATA_EXTRA_MODULE_URL].urls
+    #    if hasattr(hass.data[DATA_EXTRA_MODULE_URL], "urls")
+    #    else hass.data[DATA_EXTRA_MODULE_URL]
+    # ):
+    #    hass.data[DATA_EXTRA_MODULE_URL].add(frontend_js)
+    #    hass.http.register_static_path(frontend_js, str(Path(Path(__file__).parent / "frontend.js")), True)
 
     # Set up all platforms for this device/entry.
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    entry.async_on_unload(entry.add_update_listener(update_listener))
     return True
 
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload Dreame Vacuum config entry."""
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
         coordinator: DreameVacuumDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
-        coordinator.device.listen(None)
-        coordinator.device.disconnect()
-        del coordinator.device
+        coordinator._device.listen(None)
+        coordinator._device.disconnect()
+        del coordinator._device
         coordinator._device = None
         del hass.data[DOMAIN][entry.entry_id]