Merge branch 'sibowler-fix_semaphore_release_error' into stability_fixes

custom_components/localtuya/common.py

@@ -196,7 +196,9 @@ class TuyaDevice(pytuya.TuyaListener, pytuya.ContextualLogger):
             )
             self._interface.add_dps_to_request(self.dps_to_request)
         except Exception:  # pylint: disable=broad-except
-            self.warning(f"Connect to {self._dev_config_entry[CONF_HOST]} failed attempting to connect")
+            self.warning(
+                f"Connect to {self._dev_config_entry[CONF_HOST]} failed attempting to connect"
+            )
             if self._interface is not None:
                 await self._interface.close()
                 self._interface = None
@@ -231,14 +233,10 @@ class TuyaDevice(pytuya.TuyaListener, pytuya.ContextualLogger):
                         self._interface.start_heartbeat()
                         self.status_updated(status)
                     else:
-                        self.error(
-                            f"Initial state update failed, giving up: %r", ex
-                        )
+                        self.error(f"Initial state update failed, giving up: %r", ex)
                         # return
             except (UnicodeDecodeError, json.decoder.JSONDecodeError) as ex:
-                self.exception(
-                    f"Initial state update failed, trying key update"
-                )
+                self.exception(f"Initial state update failed, trying key update")
                 await self.update_local_key()
 
                 if self._interface is not None:

custom_components/localtuya/pytuya/__init__.py

@@ -449,7 +449,9 @@ class MessageDispatcher(ContextualLogger):
         try:
             await asyncio.wait_for(self.listeners[seqno].acquire(), timeout=timeout)
         except asyncio.TimeoutError:
-            self.warning("Command %d timed out waiting for sequence number %d", cmd, seqno)
+            self.warning(
+                "Command %d timed out waiting for sequence number %d", cmd, seqno
+            )
             del self.listeners[seqno]
             raise
 
@@ -479,8 +481,11 @@ class MessageDispatcher(ContextualLogger):
         if msg.seqno in self.listeners:
             # self.debug("Dispatching sequence number %d", msg.seqno)
             sem = self.listeners[msg.seqno]
-            self.listeners[msg.seqno] = msg
-            sem.release()
+            if isinstance(sem, asyncio.Semaphore):
+                self.listeners[msg.seqno] = msg
+                sem.release()
+            else:
+                self.debug("Got additional message without request - skipping: %s", sem)
         elif msg.cmd == HEART_BEAT:
             self.debug("Got heartbeat response")
             if self.HEARTBEAT_SEQNO in self.listeners: