Refactor message passing

Author: brefra

plugwise/nodes/__init__.py

@@ -172,7 +172,7 @@ def ping(self, callback=None, sensor=True):
                 callback,
             )
 
-    def on_message(self, message):
+    def message_for_node(self, message):
         """Process received message."""
         assert isinstance(message, NodeResponse)
         if message.mac == self.mac:
@@ -193,7 +193,8 @@ def on_message(self, message):
             elif isinstance(message, NodeJoinAckResponse):
                 self.set_available(True, True)
             else:
-                self._on_message(message)
+                self.process_messages_at_circles(message)
+                self.process_messages_at_sed(message)
                 self.set_available(True)
         else:
             _LOGGER.debug(
@@ -202,7 +203,12 @@ def on_message(self, message):
                 self.get_mac(),
             )
 
-    def _on_message(self, message):
+    def message_for_circle(self, message):
+        """Pass messages to PlugwiseCircle class"""
+        pass
+
+    def message_for_sed(self, message):
+        """Pass messages to NodeSED class"""
         pass
 
     def subscribe_callback(self, callback, sensor) -> bool:

plugwise/nodes/circle.py

@@ -121,7 +121,7 @@ def update_power_usage(self, callback=None):
             if not self.last_log_collected:
                 self.request_power_buffer()
 
-    def _on_message(self, message):
+    def message_for_circle(self, message):
         """
         Process received message
         """
@@ -157,10 +157,8 @@ def _on_message(self, message):
         else:
             self._circle_plus_message(message)
 
-    def _circle_plus_message(self, message):
-        pass
-
-    def _process_scan_response(self, message):
+    def message_for_circle_plus(self, message):
+        """Pass messages to PlugwiseCirclePlus class"""
         pass
 
     def get_relay_state(self) -> bool:

plugwise/nodes/circle_plus.py

@@ -28,7 +28,7 @@ def __init__(self, mac, address, message_sender):
         self._realtime_clock_offset = None
         self.get_real_time_clock(self.sync_realtime_clock)
 
-    def _circle_plus_message(self, message):
+    def message_for_circle_plus(self, message):
         """
         Process received message
         """

plugwise/nodes/scan.py

@@ -48,7 +48,7 @@ def get_motion(self) -> bool:
         """Return motion state"""
         return self._motion_state
 
-    def _on_SED_message(self, message):
+    def message_for_scan(self, message):
         """
         Process received message
         """

plugwise/nodes/sed.py

@@ -48,7 +48,7 @@ def is_sed(self) -> bool:
         """Return if True if node SED (battery powered)"""
         return True
 
-    def _on_message(self, message):
+    def process_messages_at_sed(self, message):
         """
         Process received message
         """
@@ -58,11 +58,24 @@ def _on_message(self, message):
             if message.ack_id == SLEEP_SET:
                 self.maintenance_interval = self._new_maintenance_interval
             else:
-                self._on_SED_message(message)
+                self.message_for_scan(message)
+                self.message_for_switch(message)
+                self.message_for_sense(message)
         else:
-            self._on_SED_message(message)
+            self.message_for_scan(message)
+            self.message_for_switch(message)
+            self.message_for_sense(message)
 
-    def _on_SED_message(self, message):
+    def message_for_scan(self, message):
+        """Pass messages to PlugwiseScan class"""
+        pass
+
+    def message_for_switch(self, message):
+        """Pass messages to PlugwiseSwitch class"""
+        pass
+
+    def message_for_sense(self, message):
+        """Pass messages to PlugwiseSense class"""
         pass
 
     def _process_awake_response(self, message):

plugwise/nodes/switch.py

@@ -20,7 +20,7 @@ def get_switch_state(self):
         """Return state of switch"""
         return self._switch_state
 
-    def _on_SED_message(self, message):
+    def message_for_switch(self, message):
         """
         Process received message
         """

plugwise/stick.py

@@ -509,7 +509,7 @@ def _pass_message_to_node(self, message, mac, discover=True):
         Returns True if message has passed onto existing known node
         """
         if self._plugwise_nodes.get(mac):
-            self._plugwise_nodes[mac].on_message(message)
+            self._plugwise_nodes[mac].message_for_node(message)
             return True
         if discover:
             _LOGGER.info(