emerald-hws 0.0.21__tar.gz → 0.0.23__tar.gz

{emerald_hws-0.0.21 → emerald_hws-0.0.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emerald_hws
-Version: 0.0.21
+Version: 0.0.23
 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.21 → emerald_hws-0.0.23}/src/emerald_hws/emeraldhws.py

@@ -109,13 +109,24 @@ 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")
+            info = post_response_json.get("info", {})
+
+            # Retrieve both property and shared_property arrays
+            property_data = info.get("property", [])
+            shared_property_data = info.get("shared_property", [])
+
+            # Combine both arrays into a single list
+            combined_properties = []
+            if isinstance(property_data, list):
+                combined_properties.extend(property_data)
+            if isinstance(shared_property_data, list):
+                combined_properties.extend(shared_property_data)
 
             with self._state_lock:
-                self.properties = property_data
+                self.properties = combined_properties
 
             # Check if we got valid data
-            if not isinstance(property_data, list) or len(property_data) == 0:
+            if len(combined_properties) == 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")
@@ -157,8 +168,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()
@@ -306,6 +330,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):
@@ -328,6 +354,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.21 → emerald_hws-0.0.23}/src/emerald_hws.egg-info/PKG-INFO

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