Restore last command value only if possible #6

Fixing Support for H-WASHER 500

pyhon/api.py

@@ -55,11 +55,13 @@ class HonConnection:
                     appliances = (await resp.json())["payload"]["appliances"]
                     for appliance in appliances:
                         device = HonDevice(self, appliance)
+                        if device.mac_address is None:
+                            continue
                         await asyncio.gather(*[
                             device.load_attributes(),
                             device.load_commands(),
                             device.load_statistics()])
-                    self._devices.append(device)
+                        self._devices.append(device)
                 except json.JSONDecodeError:
                     _LOGGER.error("No JSON Data after GET: %s", await resp.text())
                     return False
@@ -70,7 +72,7 @@ class HonConnection:
             "applianceType": device.appliance_type,
             "code": device.appliance["code"],
             "applianceModelId": device.appliance_model_id,
-            "firmwareId": "41",
+            "firmwareId": device.appliance["eepromId"],
             "macAddress": device.mac_address,
             "fwVersion": device.appliance["fwVersion"],
             "os": const.OS,
@@ -84,6 +86,14 @@ class HonConnection:
                 return {}
             return result
 
+    async def command_history(self, device: HonDevice):
+        url = f"{const.API_URL}/commands/v1/appliance/{device.mac_address}/history"
+        async with self._session.get(url, headers=await self._headers) as response:
+            result = await response.json()
+            if not result or not result.get("payload"):
+                return {}
+            return result["payload"]["history"]
+
     async def load_attributes(self, device: HonDevice, loop=False):
         params = {
             "macAddress": device.mac_address,
@@ -92,9 +102,10 @@ class HonConnection:
         }
         url = f"{const.API_URL}/commands/v1/context"
         async with self._session.get(url, params=params, headers=await self._headers) as response:
-            if response.status >= 400 and not loop:
+            if response.status == 403 and not loop:
                 _LOGGER.error("%s - Error %s - %s", url, response.status, await response.text())
-                await self.setup()
+                self._request_headers.pop("cognito-token", None)
+                self._request_headers.pop("id-token", None)
                 return await self.load_attributes(device, loop=True)
             return (await response.json()).get("payload", {})
 
@@ -129,7 +140,7 @@ class HonConnection:
             },
             "ancillaryParameters": ancillary_parameters,
             "parameters": parameters,
-            "applianceType": device.appliance_type_name
+            "applianceType": device.appliance_type
         }
         url = f"{const.API_URL}/commands/v1/send"
         async with self._session.post(url, headers=await self._headers, json=data) as resp:

pyhon/appliances/wm.py

@@ -6,4 +6,5 @@ class Appliance:
         if self._data["attributes"]["lastConnEvent"]["category"] == "DISCONNECTED":
             self._data["attributes"]["parameters"]["machMode"] = "0"
         self._data["active"] = bool(self._data.get("activity"))
+        self._data["pause"] = self._data["attributes"]["parameters"]["machMode"] == "3"
         return self._data

pyhon/commands.py

@@ -2,12 +2,12 @@ from pyhon.parameter import HonParameterFixed, HonParameterEnum, HonParameterRan
 
 
 class HonCommand:
-    def __init__(self, name, attributes, connector, device, multi=None, category=""):
+    def __init__(self, name, attributes, connector, device, multi=None, program=""):
         self._connector = connector
         self._device = device
         self._name = name
         self._multi = multi or {}
-        self._category = category
+        self._program = program
         self._description = attributes.get("description", "")
         self._parameters = self._create_parameters(attributes.get("parameters", {}))
         self._ancillary_parameters = self._create_parameters(attributes.get("ancillaryParameters", {}))
@@ -38,7 +38,7 @@ class HonCommand:
         return {key: parameter.value for key, parameter in self._ancillary_parameters.items()}
 
     async def send(self):
-        parameters = {name: parameter.value for name, parameter in self._parameters}
+        parameters = {name: parameter.value for name, parameter in self._parameters.items()}
         return await self._connector.send_command(self._device, self._name, parameters, self.ancillary_parameters)
 
     def get_programs(self):
@@ -67,5 +67,5 @@ class HonCommand:
     @property
     def settings(self):
         """Parameters with typology enum and range"""
-        return {s: self._parameters[s] for s in self.setting_keys}
+        return {s: self._parameters.get(s) for s in self.setting_keys if self._parameters.get(s) is not None}
 

pyhon/const.py

@@ -3,7 +3,7 @@ API_URL = "https://api-iot.he.services"
 APP = "hon"
 # All seen id's (different accounts, different devices) are the same, so I guess this hash is static
 CLIENT_ID = "3MVG9QDx8IX8nP5T2Ha8ofvlmjLZl5L_gvfbT9.HJvpHGKoAS_dcMN8LYpTSYeVFCraUnV.2Ag1Ki7m4znVO6"
-APP_VERSION = "1.51.9"
+APP_VERSION = "1.53.7"
 OS_VERSION = 31
 OS = "android"
 DEVICE_MODEL = "exynos9820"

pyhon/device.py

@@ -1,11 +1,14 @@
 import importlib
+from contextlib import suppress
 
 from pyhon.commands import HonCommand
+from pyhon.parameter import HonParameterFixed
 
 
 class HonDevice:
     def __init__(self, connector, appliance):
-        appliance["attributes"] = {v["parName"]: v["parValue"] for v in appliance["attributes"]}
+        if attributes := appliance.get("attributes"):
+            appliance["attributes"] = {v["parName"]: v["parValue"] for v in attributes}
         self._appliance = appliance
         self._connector = connector
         self._appliance_model = {}
@@ -23,7 +26,7 @@ class HonDevice:
         if "." in item:
             result = self.data
             for key in item.split("."):
-                if all([k in "0123456789" for k in key]):
+                if all([k in "0123456789" for k in key]) and type(result) is list:
                     result = result[int(key)]
                 else:
                     result = result[key]
@@ -31,15 +34,16 @@ class HonDevice:
         else:
             if item in self.data:
                 return self.data[item]
-            return self.attributes["parameters"].get(item, self.appliance[item])
+            if item in self.attributes["parameters"]:
+                return self.attributes["parameters"].get(item)
+            return self.appliance[item]
 
     def get(self, item, default=None):
         try:
             return self[item]
-        except KeyError | IndexError:
+        except (KeyError, IndexError):
             return default
 
-
     @property
     def appliance_model_id(self):
         return self._appliance.get("applianceModelId")
@@ -80,6 +84,21 @@ class HonDevice:
     def appliance(self):
         return self._appliance
 
+    async def _recover_last_command_states(self, commands):
+        command_history = await self._connector.command_history(self)
+        for name, command in commands.items():
+            last = next((index for (index, d) in enumerate(command_history) if d.get("command", {}).get("commandName") == name), None)
+            if last is None:
+                continue
+            parameters = command_history[last].get("command", {}).get("parameters", {})
+            if command._multi and parameters.get("program"):
+                command.set_program(parameters.pop("program").split(".")[-1].lower())
+                command = self.commands[name]
+            for key, data in command.settings.items():
+                if not isinstance(data, HonParameterFixed) and parameters.get(key) is not None:
+                    with suppress(ValueError):
+                        data.value = parameters.get(key)
+
     async def load_commands(self):
         raw = await self._connector.load_commands(self)
         self._appliance_model = raw.pop("applianceModel")
@@ -91,11 +110,13 @@ class HonDevice:
                 commands[command] = HonCommand(command, attr, self._connector, self)
             elif "parameters" in attr[list(attr)[0]]:
                 multi = {}
-                for category, attr2 in attr.items():
+                for program, attr2 in attr.items():
-                    cmd = HonCommand(command, attr2, self._connector, self, multi=multi, category=category)
+                    program = program.split(".")[-1].lower()
-                    multi[category] = cmd
+                    cmd = HonCommand(command, attr2, self._connector, self, multi=multi, program=program)
+                    multi[program] = cmd
                     commands[command] = cmd
         self._commands = commands
+        await self._recover_last_command_states(commands)
 
     @property
     def settings(self):
@@ -127,7 +148,7 @@ class HonDevice:
     @property
     def data(self):
         result = {"attributes": self.attributes, "appliance": self.appliance, "statistics": self.statistics,
-                  "commands": self.parameters}
+                  **self.parameters}
         if self._extra:
             return result | self._extra.Appliance(result).get()
         return result

pyhon/parameter.py

@@ -30,7 +30,7 @@ class HonParameter:
 class HonParameterFixed(HonParameter):
     def __init__(self, key, attributes):
         super().__init__(key, attributes)
-        self._value = attributes["fixedValue"]
+        self._value = attributes.get("fixedValue", None)
 
     def __repr__(self):
         return f"{self.__class__} (<{self.key}> fixed)"
@@ -75,6 +75,7 @@ class HonParameterRange(HonParameter):
 
     @value.setter
     def value(self, value):
+        value = int(value)
         if self._min <= value <= self._max and not value % self._step:
             self._value = value
         else:
@@ -93,7 +94,7 @@ class HonParameterEnum(HonParameter):
 
     @property
     def values(self):
-        return [str(value) for value in self._values]
+        return sorted([str(value) for value in self._values])
 
     @property
     def value(self):
@@ -111,7 +112,7 @@ class HonParameterProgram(HonParameterEnum):
     def __init__(self, key, command):
         super().__init__(key, {})
         self._command = command
-        self._value = command._category
+        self._value = command._program
         self._values = command._multi
         self._typology = "enum"
 

setup.py

@@ -7,7 +7,7 @@ with open("README.md", "r") as f:
 
 setup(
     name="pyhOn",
-    version="0.3.1",
+    version="0.3.8",
     author="Andre Basche",
     description="Control hOn devices with python",
     long_description=long_description,