Fix node availabillity

Author: brefra

plugwise/controller.py

@@ -114,7 +114,9 @@ def resend(self, seq_id):
                 _mac = self.expected_responses[seq_id][0].mac.decode(UTF8_DECODE)
             _request = self.expected_responses[seq_id][0].__class__.__name__
 
-            if self.expected_responses[seq_id][2] <= MESSAGE_RETRY:
+            if self.expected_responses[seq_id][2] == -1:
+                _LOGGER.debug("Drop single %s to %s ", _request, _mac)
+            elif self.expected_responses[seq_id][2] <= MESSAGE_RETRY:
                 if (
                     isinstance(self.expected_responses[seq_id][0], NodeInfoRequest)
                     and not self.discovery_finished
@@ -142,35 +144,25 @@ def resend(self, seq_id):
                         self.expected_responses[seq_id][2] + 1,
                     )
             else:
-                if self.expected_responses[seq_id][2] + 1 == MESSAGE_RETRY:
-                    _LOGGER.warning(
-                        "Drop %s to %s because max retries %s reached",
-                        _request,
+                _LOGGER.warning(
+                    "Drop %s to %s because max retries %s reached",
+                    _request,
+                    _mac,
+                    str(MESSAGE_RETRY + 1),
+                )
+                # Report node as unavailable for missing NodePingRequest
+                if isinstance(self.expected_responses[seq_id][0], NodePingRequest):
+                    self.node_state(_mac, False)
+                else:
+                    _LOGGER.debug(
+                        "Do a single ping request to %s to validate if node is reachable",
                         _mac,
-                        str(MESSAGE_RETRY + 1),
                     )
-                    # Report node as unavailable for missing NodePingRequest
-                    if isinstance(self.expected_responses[seq_id][0], NodePingRequest):
-                        self.node_state(_mac, False)
-                    else:
-                        _LOGGER.debug(
-                            "Do a ping request to %s to validate if node is reachable",
-                            _mac,
-                        )
-                        self.send(NodePingRequest(_mac))
-                else:
-                    if isinstance(self.expected_responses[seq_id][0], NodePingRequest):
-                        _LOGGER.info(
-                            "Drop single %s to %s ",
-                            _request,
-                            _mac,
-                        )
-                    else:
-                        _LOGGER.warning(
-                            "Drop single %s to %s ",
-                            _request,
-                            _mac,
-                        )
+                    self.send(
+                        NodePingRequest(self.expected_responses[seq_id][0].mac),
+                        None,
+                        MESSAGE_RETRY + 1,
+                    )
             del self.expected_responses[seq_id]
 
     def _send_message_loop(self):

plugwise/nodes/sed.py

@@ -7,7 +7,6 @@
 import logging
 
 from ..constants import (
-    MESSAGE_RETRY,
     SED_AWAKE_BUTTON,
     SED_AWAKE_FIRST,
     SED_AWAKE_MAINTENANCE,
@@ -94,7 +93,7 @@ def _process_awake_response(self, message):
                     request_message.__class__.__name__,
                     self.get_mac(),
                 )
-                self.message_sender(request_message, callback, MESSAGE_RETRY)
+                self.message_sender(request_message, callback, -1)
             self._SED_requests = {}
         else:
             if message.awake_type.value == SED_AWAKE_STATE:

plugwise/stick.py

@@ -607,17 +607,14 @@ def _update_loop(self):
             while self._run_update_thread:
                 for mac in self._plugwise_nodes:
                     if self._plugwise_nodes[mac]:
+                        # Do ping request for all nodes if listener is registered for sensor
+                        self._plugwise_nodes[mac].ping(None, True)
+                        # Check availability state of SED's
                         if self._plugwise_nodes[mac].is_sed():
-                            # Check availability state of SED's
                             self._check_availability_of_seds(mac)
-                        else:
-                            # Do ping request for all non SED's
-                            self._plugwise_nodes[mac].ping(None, True)
-
-                        if self._plugwise_nodes[mac].measure_power():
-                            # Request current power usage
+                        # Request current power usage for all nodes supporting power measurement
+                        if self._plugwise_nodes[mac].measures_power():
                             self._plugwise_nodes[mac].update_power_usage()
-
                             # Sync internal clock of power measure nodes once a day
                             if datetime.now().day != day_of_month:
                                 day_of_month = datetime.now().day
@@ -629,7 +626,7 @@ def _update_loop(self):
                         self.msg_controller.send(
                             NodePingRequest(bytes(mac, UTF8_DECODE)),
                             None,
-                            MESSAGE_RETRY + 1,
+                            -1,
                         )
                     _discover_counter = 0
                 else: