Develop

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## v1.0.13
+
+- Fix reconnect process
+- Fix threadsafe warning log messages
+- Fix color more error log messages
+
+## v1.0.13b2
+
+- Remove typo of args in AWS client message handling
+
+## v1.0.13b1
+
+- Remove typo of args in AWS client message handling
+
+## v1.0.13b0
+
+- Add threadsafe handling for set status
+- Add safe block for AWS client termination process
+- Fix color mode warning on startup
+
 ## v1.0.12
 
 - Fix light support modes warning
@@ -292,7 +312,7 @@ ERROR (MainThread) [custom_components.mydolphin_plus.managers.config_manager] In
 ## v0.0.8
 
 - Add a list of relevant states that also determine if a robot is not actively cleaning
-- Added MyDolpin Plus to the standard HACS repo
+- Added MyDolphin Plus to the standard HACS repo
 
 ## v0.0.7
 

custom_components/mydolphin_plus/common/consts.py

@@ -403,4 +403,5 @@
     API_RESPONSE_DATA_SECRET_ACCESS_KEY,
     DYNAMIC_CONTENT_SERIAL_NUMBER,
     CONF_USERNAME,
+    CONF_PASSWORD,
 ]

custom_components/mydolphin_plus/light.py

@@ -53,7 +53,8 @@ def __init__(
     ):
         super().__init__(entity_description, coordinator)
 
-        self._attr_supported_color_modes = set(ColorMode.ONOFF)
+        self._attr_supported_color_modes = {ColorMode.ONOFF}
+        self._attr_color_mode = ColorMode.ONOFF
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         await self.async_execute_device_action(ACTION_ENTITY_TURN_ON)

custom_components/mydolphin_plus/managers/aws_client.py

@@ -14,7 +14,7 @@
 
 from homeassistant.const import CONF_MODE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.dispatcher import dispatcher_send
 
 from ..common.clean_modes import CleanModes
 from ..common.connection_callbacks import ConnectionCallbacks
@@ -148,14 +148,27 @@ def data(self) -> dict:
         return self._data
 
     async def terminate(self):
-        def _on_terminate_future_completed(future):
-            disconnect_future.result()
+        try:
 
-            self._awsiot_client = None
+            def _on_terminate_future_completed(future):
+                future.result()
+
+                self._awsiot_client = None
 
-        if self._awsiot_client is not None:
-            disconnect_future = self._awsiot_client.disconnect()
-            disconnect_future.add_done_callback(_on_terminate_future_completed)
+            if self._awsiot_client is not None:
+                disconnect_future = self._awsiot_client.disconnect()
+                disconnect_future.add_done_callback(_on_terminate_future_completed)
+
+        except Exception as ex:
+            exc_type, exc_obj, tb = sys.exc_info()
+            line_number = tb.tb_lineno
+
+            _LOGGER.warning(
+                "Failed to gracefully shutdown AWS IOT Client, setting it to None, "
+                f"Error: {ex}, Line: {line_number}"
+            )
+
+            self._awsiot_client = None
 
         self._set_status(ConnectivityStatus.Disconnected)
         _LOGGER.debug("AWS Client is disconnected")
@@ -642,4 +655,4 @@ def _async_dispatcher_send(self, signal: str, *args: Any) -> None:
             self._local_async_dispatcher_send(signal, *args)
 
         else:
-            async_dispatcher_send(self._hass, signal, *args)
+            dispatcher_send(self._hass, signal, *args)

custom_components/mydolphin_plus/managers/flow_manager.py

@@ -45,7 +45,7 @@ def __init__(
 
     async def async_step(self, user_input: dict | None = None):
         """Manage the domain options."""
-        _LOGGER.info(f"Config flow started, Step: {self._flow_id}, Input: {user_input}")
+        _LOGGER.info(f"Config flow started, Step: {self._flow_id}")
 
         form_errors = None
 
@@ -57,8 +57,6 @@ async def async_step(self, user_input: dict | None = None):
                 user_input = {key: self._entry.data[key] for key in self._entry.data}
                 user_input[CONF_TITLE] = self._entry.title
 
-                _LOGGER.info(user_input)
-
                 await PasswordManager.decrypt(
                     self._hass, user_input, self._entry.entry_id
                 )

custom_components/mydolphin_plus/managers/rest_api.py

@@ -13,7 +13,7 @@
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
-from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.dispatcher import dispatcher_send
 
 from ..common.connectivity_status import ConnectivityStatus
 from ..common.consts import (
@@ -509,4 +509,4 @@ def _async_dispatcher_send(self, signal: str, *args: Any) -> None:
             self._local_async_dispatcher_send(signal, *args)
 
         else:
-            async_dispatcher_send(self._hass, signal, *args)
+            dispatcher_send(self._hass, signal, *args)

custom_components/mydolphin_plus/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "cloud_push",
   "issue_tracker": "https://github.com/sh00t2kill/dolphin-robot/issues",
   "requirements": ["awsiotsdk"],
-  "version": "1.0.12"
+  "version": "1.0.13"
 }

requirements.txt

@@ -1,10 +1,12 @@
 pre-commit
 homeassistant~=2024.2.0
 aiohttp~=3.9.3
-cryptography~=42.0.2
+cryptography~=42.0.4
 voluptuous~=0.13.1
 
 python-slugify
 
 awsiotsdk~=1.21.0
 awscrt~=0.20.2
+
+awsiot~=0.1.3