Fix node state and values (#69)

Author: marcelveldt

zwave_js_server/model/node.py

@@ -99,7 +99,7 @@ def status(self) -> int:
     @property
     def ready(self) -> Optional[bool]:
         """Return the ready."""
-        return self.data.get("ready")  # TODO: I can't find ready in the docs.
+        return self.data.get("ready")
 
     @property
     def device_class(self) -> DeviceClass:
@@ -314,6 +314,13 @@ def handle_interview_failed(self, event: Event) -> None:
 
     def handle_ready(self, event: Event) -> None:
         """Process a node ready event."""
+        # the event contains a full dump of the node
+        self.data.update(event.data["nodeState"])
+        # update/add values
+        for value_state in event.data["nodeState"]["values"]:
+            value_id = get_value_id(self, value_state)
+            value = self.values.get(value_id, Value(self, value_state))
+            value.update(value_state)
 
     def handle_value_added(self, event: Event) -> None:
         """Process a node value added event."""
@@ -324,27 +331,20 @@ def handle_value_updated(self, event: Event) -> None:
         """Process a node value updated event."""
         value = self.values.get(get_value_id(self, event.data["args"]))
         if value is None:
-            # TODO decide how to handle value updated for unknown values
-            print()
-            print(
-                "Value updated for unknown value",
-                get_value_id(self, event.data["args"]),
-            )
-            print("Available value IDs", ", ".join(self.values))
-            print()
-            value = Value(self, event.data["args"])
-            self.values[value.value_id] = value
+            # received update for unknown value
+            # should not happen but just in case, treat like added value
+            self.handle_value_added(event)
         else:
             value.receive_event(event)
-        event.data["value"] = value
+            event.data["value"] = value
 
     def handle_value_removed(self, event: Event) -> None:
         """Process a node value removed event."""
         event.data["value"] = self.values.pop(get_value_id(self, event.data["args"]))
 
     def handle_value_notification(self, event: Event) -> None:
         """Process a node value notification event."""
-        event.data["notification"] = ValueNotification.from_event(event)
+        event.data["notification"] = ValueNotification(self, event.data["args"])
 
     def handle_metadata_updated(self, event: Event) -> None:
         """Process a node metadata updated event."""

zwave_js_server/model/value.py

@@ -1,5 +1,4 @@
 """Provide a model for the Z-Wave JS value."""
-from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Dict, Optional, TypedDict, Union
 
 from ..event import Event
@@ -178,36 +177,17 @@ def receive_event(self, event: Event) -> None:
         self.data.update(event.data["args"])
         self._value = event.data["args"].get("newValue")
 
+    def update(self, data: ValueDataType) -> None:
+        """Update data."""
+        self.data.update(data)
+        self._value = data.get("value")
+
 
-@dataclass
-class ValueNotification:
+class ValueNotification(Value):
     """
     Model for a Value Nofification message.
 
     https://zwave-js.github.io/node-zwave-js/#/api/node?id=quotvalue-notificationquot
     """
 
-    command_class_name: str
-    command_class: int
-    endpoint: int
-    property: str
-    value: Any
-    property_name: str
-    metadata: Optional[ValueMetadata] = None
-
-    @classmethod
-    def from_event(cls, event: Event) -> "ValueNotification":
-        """Parse event message into ValueNotification."""
-        return cls(
-            command_class_name=event.data["args"]["commandClassName"],
-            command_class=event.data["args"]["commandClass"],
-            endpoint=event.data["args"]["endpoint"],
-            property=event.data["args"]["property"],
-            value=event.data["args"].get("value"),
-            property_name=event.data["args"]["propertyName"],
-            metadata=ValueMetadata(
-                event.data["args"]["metadata"]
-                if "metadata" in event.data["args"]
-                else None
-            ),
-        )
+    # format is the same as a Value message, subclassed for easier identifying and future use