Cache device class data

test/fixtures/climate_radio_thermostat_ct100_plus_state.json

@@ -10,7 +10,7 @@
     "generic": { "key": 2, "label": "Thermostat" },
     "specific": { "key": 3, "label": "Thermostat General V2" },
     "mandatorySupportedCCs": [],
-    "mandatoryControlCCs": []
+    "mandatoryControlledCCs": []
   },
   "isListening": true,
   "isFrequentListening": false,

test/fixtures/cover_qubino_shutter_state.json

@@ -10,7 +10,7 @@
     "generic": { "key": 2, "label": "Multilevel Switch" },
     "specific": { "key": 3, "label": "Motor Control Class C" },
     "mandatorySupportedCCs": [],
-    "mandatoryControlCCs": []
+    "mandatoryControlledCCs": []
   },
   "isListening": true,
   "isFrequentListening": false,

test/fixtures/idl_101_lock_state.json

@@ -6,9 +6,9 @@
   "status": 4,
   "ready": true,
   "deviceClass": {
-    "basic": "Routing Slave",
-    "generic": "Entry Control",
-    "specific": "Secure Keypad Door Lock",
+    "basic": { "key": 4, "label": "Routing Slave" },
+    "generic": { "key": 2, "label": "Entry Control" },
+    "specific": { "key": 3, "label": "Secure Keypad Door Lock" },
     "mandatorySupportedCCs": [
       "Basic",
       "Door Lock",
@@ -17,7 +17,7 @@
       "Security",
       "Version"
     ],
-    "mandatoryControlCCs": []
+    "mandatoryControlledCCs": []
   },
   "isListening": false,
   "isFrequentListening": true,

test/fixtures/lock_schlage_be469_state.json

@@ -8,7 +8,7 @@
     "generic": { "key": 2, "label": "Entry Control" },
     "specific": { "key": 3, "label": "Secure Keypad Door Lock" },
     "mandatorySupportedCCs": [],
-    "mandatoryControlCCs": []
+    "mandatoryControlledCCs": []
   },
   "isListening": false,
   "isFrequentListening": true,

test/fixtures/unparseable_json_string_value_state.json

@@ -8,7 +8,7 @@
     "generic": { "key": 2, "label": "Entry Control" },
     "specific": { "key": 3, "label": "Secure Keypad Door Lock" },
     "mandatorySupportedCCs": [],
-    "mandatoryControlCCs": []
+    "mandatoryControlledCCs": []
   },
   "isListening": false,
   "isFrequentListening": true,

zwave_js_server/model/device_class.py

@@ -40,29 +40,33 @@ class DeviceClass:
 
     def __init__(self, data: DeviceClassDataType) -> None:
         """Initialize."""
-        self.data = data
+        self._basic = DeviceClassItem(**data["basic"])
+        self._generic = DeviceClassItem(**data["generic"])
+        self._specific = DeviceClassItem(**data["specific"])
+        self._mandatory_supported_ccs: list[int] = data["mandatorySupportedCCs"]
+        self._mandatory_controlled_ccs: list[int] = data["mandatoryControlledCCs"]
 
     @property
     def basic(self) -> DeviceClassItem:
         """Return basic DeviceClass."""
-        return DeviceClassItem(**self.data["basic"])
+        return self._basic
 
     @property
     def generic(self) -> DeviceClassItem:
         """Return generic DeviceClass."""
-        return DeviceClassItem(**self.data["generic"])
+        return self._generic
 
     @property
     def specific(self) -> DeviceClassItem:
         """Return specific DeviceClass."""
-        return DeviceClassItem(**self.data["specific"])
+        return self._specific
 
     @property
     def mandatory_supported_ccs(self) -> list[int]:
         """Return list of mandatory Supported CC id's."""
-        return self.data["mandatorySupportedCCs"]
+        return self._mandatory_supported_ccs
 
     @property
     def mandatory_controlled_ccs(self) -> list[int]:
         """Return list of mandatory Controlled CC id's."""
-        return self.data["mandatoryControlledCCs"]
+        return self._mandatory_controlled_ccs

zwave_js_server/model/endpoint.py

@@ -57,6 +57,7 @@ def __init__(
         self.node = node
         self.data: EndpointDataType = data
         self.values: dict[str, ConfigurationValue | Value] = {}
+        self._device_class: None | DeviceClass = None
         self.update(data, values)
 
     def __repr__(self) -> str:
@@ -90,9 +91,7 @@ def index(self) -> int:
     @property
     def device_class(self) -> DeviceClass | None:
         """Return the device_class."""
-        if (device_class := self.data.get("deviceClass")) is None:
-            return None
-        return DeviceClass(device_class)
+        return self._device_class
 
     @property
     def installer_icon(self) -> int | None:
@@ -119,6 +118,10 @@ def update(
     ) -> None:
         """Update the endpoint data."""
         self.data = data
+        if (device_class := self.data.get("deviceClass")) is None:
+            self._device_class = None
+        else:
+            self._device_class = DeviceClass(device_class)
 
         # Remove stale values
         self.values = {

zwave_js_server/model/node/__init__.py

@@ -115,6 +115,7 @@ def __init__(self, client: Client, data: NodeDataType) -> None:
             client, data.get("statistics", DEFAULT_NODE_STATISTICS)
         )
         self._firmware_update_progress: NodeFirmwareUpdateProgress | None = None
+        self._device_class: None | DeviceClass = None
         self.values: dict[str, ConfigurationValue | Value] = {}
         self.endpoints: dict[int, Endpoint] = {}
         self.status_event = asyncio.Event()
@@ -149,9 +150,7 @@ def index(self) -> int:
     @property
     def device_class(self) -> DeviceClass | None:
         """Return the device_class."""
-        if (device_class := self.data.get("deviceClass")) is None:
-            return None
-        return DeviceClass(device_class)
+        return self._device_class
 
     @property
     def installer_icon(self) -> int | None:
@@ -377,6 +376,11 @@ def update(self, data: NodeDataType) -> None:
         """Update the internal state data."""
         self.data = copy.deepcopy(data)
         self._device_config = DeviceConfig(self.data.get("deviceConfig", {}))
+        if (device_class := self.data.get("deviceClass")) is None:
+            self._device_class = None
+        else:
+            self._device_class = DeviceClass(device_class)
+
         self._statistics = NodeStatistics(
             self.client, self.data.get("statistics", DEFAULT_NODE_STATISTICS)
         )