williamp/localtuya-modded
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved stability and Fix local_key update to not be thwarted by retries

Browse Source
This commit is contained in:
rospogrigio
2023-01-24 17:03:19 +01:00
parent 613bde4d6a
commit 7a97fdfe97
1 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
custom_components/localtuya/common.py
View File

@@ -1,5 +1,6 @@
"""Code shared between all platforms.""" """Code shared between all platforms."""
import asyncio import asyncio
import json.decoder
import logging import logging
import time import time
from datetime import timedelta from datetime import timedelta
@@ -176,12 +177,13 @@ class TuyaDevice(pytuya.TuyaListener, pytuya.ContextualLogger):
def async_connect(self): def async_connect(self):
"""Connect to device if not already connected.""" """Connect to device if not already connected."""
# self.debug("async_connect: %d %r %r", self._is_closing, self._connect_task, self._interface)
if not self._is_closing and self._connect_task is None and not self._interface: if not self._is_closing and self._connect_task is None and not self._interface:
self._connect_task = asyncio.create_task(self._make_connection()) self._connect_task = asyncio.create_task(self._make_connection())
async def _make_connection(self): async def _make_connection(self):
"""Subscribe localtuya entity events.""" """Subscribe localtuya entity events."""
self.debug("Connecting to %s", self._dev_config_entry[CONF_HOST]) self.info("Trying to connect to %s...", self._dev_config_entry[CONF_HOST])
try: try:
self._interface = await pytuya.connect( self._interface = await pytuya.connect(
@@ -194,12 +196,13 @@ class TuyaDevice(pytuya.TuyaListener, pytuya.ContextualLogger):
) )
self._interface.add_dps_to_request(self.dps_to_request) self._interface.add_dps_to_request(self.dps_to_request)
except Exception: # pylint: disable=broad-except except Exception: # pylint: disable=broad-except
self.exception(f"Connect to {self._dev_config_entry[CONF_HOST]} failed") self.warning(f"Connect to {self._dev_config_entry[CONF_HOST]} failed attempting to connect")
if self._interface is not None: if self._interface is not None:
await self._interface.close() await self._interface.close()
self._interface = None self._interface = None
if self._interface is not None: if self._interface is not None:
try:
try: try:
self.debug("Retrieving initial state") self.debug("Retrieving initial state")
status = await self._interface.status() status = await self._interface.status()
@@ -210,7 +213,6 @@ class TuyaDevice(pytuya.TuyaListener, pytuya.ContextualLogger):
self.status_updated(status) self.status_updated(status)
except Exception as ex: # pylint: disable=broad-except except Exception as ex: # pylint: disable=broad-except
try:
if (self._default_reset_dpids is not None) and ( if (self._default_reset_dpids is not None) and (
len(self._default_reset_dpids) > 0 len(self._default_reset_dpids) > 0
): ):
@@ -228,21 +230,15 @@ class TuyaDevice(pytuya.TuyaListener, pytuya.ContextualLogger):
self._interface.start_heartbeat() self._interface.start_heartbeat()
self.status_updated(status) self.status_updated(status)
else:
except UnicodeDecodeError as e: # pylint: disable=broad-except self.error(
self.exception( f"Initial state update failed, giving up: %r", ex
f"Connect to {self._dev_config_entry[CONF_HOST]} failed: %s",
type(e),
) )
if self._interface is not None: # return
await self._interface.close() except (UnicodeDecodeError, json.decoder.JSONDecodeError) as ex:
self._interface = None
except Exception as e: # pylint: disable=broad-except
self.exception( self.exception(
f"Connect to {self._dev_config_entry[CONF_HOST]} failed" f"Initial state update failed, trying key update"
) )
if "json.decode" in str(type(e)):
await self.update_local_key() await self.update_local_key()
if self._interface is not None: if self._interface is not None:
@@ -278,6 +274,8 @@ class TuyaDevice(pytuya.TuyaListener, pytuya.ContextualLogger):
timedelta(seconds=self._dev_config_entry[CONF_SCAN_INTERVAL]), timedelta(seconds=self._dev_config_entry[CONF_SCAN_INTERVAL]),
) )
self.info(f"Successfully connected to {self._dev_config_entry[CONF_HOST]}")
self._connect_task = None self._connect_task = None
async def update_local_key(self): async def update_local_key(self):
@@ -310,7 +308,7 @@ class TuyaDevice(pytuya.TuyaListener, pytuya.ContextualLogger):
await self._interface.close() await self._interface.close()
if self._disconnect_task is not None: if self._disconnect_task is not None:
self._disconnect_task() self._disconnect_task()
self.debug( self.info(
"Closed connection with device %s.", "Closed connection with device %s.",
self._dev_config_entry[CONF_FRIENDLY_NAME], self._dev_config_entry[CONF_FRIENDLY_NAME],
) )
@@ -358,7 +356,11 @@ class TuyaDevice(pytuya.TuyaListener, pytuya.ContextualLogger):
self._unsub_interval() self._unsub_interval()
self._unsub_interval = None self._unsub_interval = None
self._interface = None self._interface = None
self.debug("Disconnected - waiting for discovery broadcast")
if self._connect_task is not None:
self._connect_task.cancel()
self._connect_task = None
self.warning("Disconnected - waiting for discovery broadcast")
class LocalTuyaEntity(RestoreEntity, pytuya.ContextualLogger): class LocalTuyaEntity(RestoreEntity, pytuya.ContextualLogger):