emerald-hws 0.0.20__py3-none-any.whl → 0.0.22__py3-none-any.whl

emerald_hws/emeraldhws.py

@@ -110,13 +110,14 @@ class EmeraldHWS():
         if post_response_json.get("code") == 200:
             self.logger.debug("emeraldhws: Successfully logged into Emerald API")
             property_data = post_response_json.get("info", {}).get("property")
-            self.logger.debug(f"emeraldhws: API returned property data: {property_data}")
 
             with self._state_lock:
                 self.properties = property_data
 
             # Check if we got valid data
             if not isinstance(property_data, list) or len(property_data) == 0:
+                # Log the full response when properties are invalid to help diagnose the issue
+                self.logger.debug(f"emeraldhws: Poperties empty/invalid, full response: {post_response_json}")
                 raise Exception("No heat pumps found on account - API returned empty or invalid property list")
         else:
             raise Exception("Unable to fetch properties from Emerald API")
@@ -156,8 +157,21 @@ class EmeraldHWS():
             self.logger.info(f"emeraldhws: awsiot: Reconnecting MQTT connection (reason: {reason})")
 
             if self.mqttClient is not None:
-                self.mqttClient.stop()
-                self.mqttClient = None  # Clear the client so a new one can be created
+                # Clear connection event before stopping
+                self._connection_event.clear()
+
+                try:
+                    # Stop the client and wait for it to fully stop
+                    stop_future = self.mqttClient.stop()
+                    if stop_future:
+                        # Wait up to 10 seconds for clean shutdown
+                        stop_future.result(timeout=10)
+                    self.logger.debug("emeraldhws: awsiot: MQTT client stopped successfully")
+                except Exception as e:
+                    self.logger.warning(f"emeraldhws: awsiot: Error stopping MQTT client: {e}")
+                finally:
+                    # Always clear the client reference
+                    self.mqttClient = None
 
             self.connectMQTT()
             self.subscribeAllHWS()
@@ -305,6 +319,8 @@ class EmeraldHWS():
         """ Log message when stopped
         """
         self.logger.debug("emeraldhws: awsiot: stopped")
+        # Clear connection event when stopped
+        self._connection_event.clear()
         return
 
     def on_lifecycle_disconnection(self, lifecycle_disconnect_data: mqtt5.LifecycleDisconnectData):
@@ -327,6 +343,9 @@ class EmeraldHWS():
                 self.logger.debug(f"emeraldhws: awsiot: disconnect data: {lifecycle_disconnect_data.__dict__}")
 
         self.logger.info(f"emeraldhws: awsiot: disconnected - {reason}")
+
+        # Clear connection event when disconnected
+        self._connection_event.clear()
         return
 
     def on_lifecycle_attempting_connect(self, lifecycle_attempting_connect_data: mqtt5.LifecycleAttemptingConnectData):

{emerald_hws-0.0.20.dist-info → emerald_hws-0.0.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emerald_hws
-Version: 0.0.20
+Version: 0.0.22
 Summary: A package to manipulate and monitor Emerald Heat Pump Hot Water Systems
 Author-email: Ross Williamson <ross@inertia.net.nz>
 License-Expression: MIT

emerald_hws-0.0.22.dist-info/RECORD

@@ -0,0 +1,7 @@
+emerald_hws/__init__.py,sha256=uukjQ-kiPYKWvGT3jLL6kJA1DCNAxtw4HlLKqPSypXs,61
+emerald_hws/emeraldhws.py,sha256=DI3yaAoL_iNRqM480AuSKwVKa_nfbsvEVMdnrlW7OIA,28936
+emerald_hws/__assets__/SFSRootCAG2.pem,sha256=hw9W0AnYrrlbcWsOewAgIl1ULEsoO57Ylu35dCjWcS4,1424
+emerald_hws-0.0.22.dist-info/METADATA,sha256=aOWR41PKiop_mbtnkokueGiQuw46tFUB7nm84wnxvZk,2534
+emerald_hws-0.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+emerald_hws-0.0.22.dist-info/top_level.txt,sha256=ZCiUmnBkDr2n4QVkTet1s_AKiGJjuz3heuCR5w5ZqLY,12
+emerald_hws-0.0.22.dist-info/RECORD,,

emerald_hws-0.0.20.dist-info/RECORD

@@ -1,7 +0,0 @@
-emerald_hws/__init__.py,sha256=uukjQ-kiPYKWvGT3jLL6kJA1DCNAxtw4HlLKqPSypXs,61
-emerald_hws/emeraldhws.py,sha256=fVyZ_9uQp9RfHTaAI0ZlHIj37hIn2lHDNeXO0vysV4I,28008
-emerald_hws/__assets__/SFSRootCAG2.pem,sha256=hw9W0AnYrrlbcWsOewAgIl1ULEsoO57Ylu35dCjWcS4,1424
-emerald_hws-0.0.20.dist-info/METADATA,sha256=UE32BxNZQMJmdZ62Q-CXOOr0u76QMVoMoUQfpDWtvOE,2534
-emerald_hws-0.0.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-emerald_hws-0.0.20.dist-info/top_level.txt,sha256=ZCiUmnBkDr2n4QVkTet1s_AKiGJjuz3heuCR5w5ZqLY,12
-emerald_hws-0.0.20.dist-info/RECORD,,