Merge pull request #29 from addshore/updatedLogin

Update for new hOn login

pyhon/appliance.py

@@ -43,6 +43,10 @@ class HonAppliance:
         self._additional_data: Dict[str, Any] = {}
         self._last_update: Optional[datetime] = None
         self._default_setting = HonParameter("", {}, "")
+        self._connection = (
+            not self._attributes.get("lastConnEvent", {}).get("category", "")
+            == "DISCONNECTED"
+        )
 
         try:
             self._extra: Optional[ApplianceBase] = importlib.import_module(
@@ -90,6 +94,14 @@ class HonAppliance:
             return f"{attribute}{zone}{self._zone}"
         return attribute
 
+    @property
+    def connection(self) -> bool:
+        return self._connection
+
+    @connection.setter
+    def connection(self, connection: bool) -> None:
+        self._connection = connection
+
     @property
     def appliance_model_id(self) -> str:
         return str(self._info.get("applianceModelId", ""))

pyhon/appliances/dw.py

@@ -7,7 +7,7 @@ from pyhon.appliances.base import ApplianceBase
 class Appliance(ApplianceBase):
     def attributes(self, data: Dict[str, Any]) -> Dict[str, Any]:
         data = super().attributes(data)
-        if data.get("lastConnEvent", {}).get("category", "") == "DISCONNECTED":
+        if not self.parent.connection:
             data["parameters"]["machMode"].value = "0"
         data["active"] = bool(data.get("activity"))
         return data

pyhon/appliances/ov.py

@@ -6,7 +6,7 @@ from pyhon.appliances.base import ApplianceBase
 class Appliance(ApplianceBase):
     def attributes(self, data: Dict[str, Any]) -> Dict[str, Any]:
         data = super().attributes(data)
-        if data.get("lastConnEvent", {}).get("category", "") == "DISCONNECTED":
+        if not self.parent.connection:
             data["parameters"]["temp"].value = 0
             data["parameters"]["onOffStatus"].value = 0
             data["parameters"]["remoteCtrValid"].value = 0

pyhon/appliances/td.py

@@ -8,7 +8,7 @@ from pyhon.parameter.fixed import HonParameterFixed
 class Appliance(ApplianceBase):
     def attributes(self, data: Dict[str, Any]) -> Dict[str, Any]:
         data = super().attributes(data)
-        if data.get("lastConnEvent", {}).get("category", "") == "DISCONNECTED":
+        if not self.parent.connection:
             data["parameters"]["machMode"].value = "0"
         data["active"] = bool(data.get("activity"))
         data["pause"] = data["parameters"]["machMode"] == "3"

pyhon/appliances/wd.py

@@ -7,7 +7,7 @@ from pyhon.appliances.base import ApplianceBase
 class Appliance(ApplianceBase):
     def attributes(self, data: Dict[str, Any]) -> Dict[str, Any]:
         data = super().attributes(data)
-        if data.get("lastConnEvent", {}).get("category", "") == "DISCONNECTED":
+        if not self.parent.connection:
             data["parameters"]["machMode"].value = "0"
         data["active"] = bool(data.get("activity"))
         data["pause"] = data["parameters"]["machMode"] == "3"

pyhon/connection/api.py

@@ -78,6 +78,7 @@ class HonAPI:
                 self._password,
                 session=self._session,
                 mobile_id=self._mobile_id,
+                refresh_token=self._refresh_token,
             ).create()
         return self
 

pyhon/connection/auth.py

@@ -120,18 +120,23 @@ class HonAuth:
         async with self._request.get(url) as response:
             text = await response.text()
             self._expires = datetime.utcnow()
-            login_url: List[str] = re.findall("url = '(.+?)'", text)
+            login_url: List[str] = re.findall("(?:url|href) ?= ?'(.+?)'", text)
             if not login_url:
                 if "oauth/done#access_token=" in text:
                     self._parse_token_data(text)
                     raise exceptions.HonNoAuthenticationNeeded()
                 await self._error_logger(response)
+            # As of July 2024 the login page has changed, and we started getting a /NewhOnLogin based relative URL in JS to parse
+            if login_url[0].startswith("/NewhOnLogin"):
+                # Force use of the old login page to avoid having to make the new one work..
+                login_url[0] = f"{const.AUTH_API}/s/login{login_url[0]}"
         return login_url[0]
 
     async def _manual_redirect(self, url: str) -> str:
         async with self._request.get(url, allow_redirects=False) as response:
-            if not (new_location := response.headers.get("Location", "")):
-                await self._error_logger(response)
+            new_location = response.headers.get("Location", "")
+            if not new_location:
+                return url
         return new_location
 
     async def _handle_redirects(self, login_url: str) -> str:

pyhon/connection/handler/hon.py

@@ -62,6 +62,7 @@ class HonConnectionHandler(ConnectionHandler):
             await self.auth.refresh(self._refresh_token)
         if not (self.auth.cognito_token and self.auth.id_token):
             await self.auth.authenticate()
+        self._refresh_token = self.auth.refresh_token
         headers["cognito-token"] = self.auth.cognito_token
         headers["id-token"] = self.auth.id_token
         return self._HEADERS | headers
@@ -77,7 +78,7 @@ class HonConnectionHandler(ConnectionHandler):
                 self.auth.token_expires_soon or response.status in [401, 403]
             ) and loop == 0:
                 _LOGGER.info("Try refreshing token...")
-                await self.auth.refresh()
+                await self.auth.refresh(self._refresh_token)
                 async with self._intercept(
                     method, url, *args, loop=loop + 1, **kwargs
                 ) as result:

pyhon/connection/mqtt.py

@@ -17,9 +17,10 @@ _LOGGER = logging.getLogger(__name__)
 
 
 class MQTTClient:
-    def __init__(self, hon: "Hon"):
+    def __init__(self, hon: "Hon", mobile_id: str) -> None:
         self._client: mqtt5.Client | None = None
         self._hon = hon
+        self._mobile_id = mobile_id or const.MOBILE_ID
         self._api = hon.api
         self._appliances = hon.appliances
         self._connection = False
@@ -34,6 +35,7 @@ class MQTTClient:
     async def create(self) -> "MQTTClient":
         await self._start()
         self._subscribe_appliances()
+        await self.start_watchdog()
         return self
 
     def _on_lifecycle_stopped(
@@ -62,6 +64,7 @@ class MQTTClient:
         self,
         lifecycle_connection_failure_data: mqtt5.LifecycleConnectFailureData,
     ) -> None:
+        self._connection = False
         _LOGGER.info(
             "Lifecycle Connection Failure - %s", str(lifecycle_connection_failure_data)
         )
@@ -87,13 +90,19 @@ class MQTTClient:
                     parameter
                 )
             appliance.sync_params_to_command("settings")
-            self._hon.notify()
-        elif topic and "connected" in topic:
-            _LOGGER.info("Connected %s", appliance.nick_name)
         elif topic and "disconnected" in topic:
-            _LOGGER.info("Disconnected %s", appliance.nick_name)
+            _LOGGER.info(
+                "Disconnected %s: %s",
+                appliance.nick_name,
+                payload.get("disconnectReason"),
+            )
+            appliance.connection = False
+        elif topic and "connected" in topic:
+            appliance.connection = True
+            _LOGGER.info("Connected %s", appliance.nick_name)
         elif topic and "discovery" in topic:
             _LOGGER.info("Discovered %s", appliance.nick_name)
+        self._hon.notify()
         _LOGGER.info("%s - %s", topic, payload)
 
     async def _start(self) -> None:
@@ -103,7 +112,7 @@ class MQTTClient:
             auth_authorizer_signature=await self._api.load_aws_token(),
             auth_token_key_name="token",
             auth_token_value=self._api.auth.id_token,
-            client_id=f"{const.MOBILE_ID}_{secrets.token_hex(8)}",
+            client_id=f"{self._mobile_id}_{secrets.token_hex(8)}",
             on_lifecycle_stopped=self._on_lifecycle_stopped,
             on_lifecycle_connection_success=self._on_lifecycle_connection_success,
             on_lifecycle_attempting_connect=self._on_lifecycle_attempting_connect,
@@ -126,7 +135,7 @@ class MQTTClient:
 
     async def start_watchdog(self) -> None:
         if not self._watchdog_task or self._watchdog_task.done():
-            await asyncio.create_task(self._watchdog())
+            self._watchdog_task = asyncio.create_task(self._watchdog())
 
     async def _watchdog(self) -> None:
         while True:

pyhon/hon.py

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 from pathlib import Path
 from types import TracebackType
@@ -16,6 +15,7 @@ from pyhon.exceptions import NoAuthenticationException
 _LOGGER = logging.getLogger(__name__)
 
 
+# pylint: disable=too-many-instance-attributes
 class Hon:
     def __init__(
         self,
@@ -92,13 +92,9 @@ class Hon:
         if appliance.mac_address == "":
             return
         try:
-            await asyncio.gather(
-                *[
-                    appliance.load_attributes(),
-                    appliance.load_commands(),
-                    appliance.load_statistics(),
-                ]
-            )
+            await appliance.load_commands()
+            await appliance.load_attributes()
+            await appliance.load_statistics()
         except (KeyError, ValueError, IndexError) as error:
             _LOGGER.exception(error)
             _LOGGER.error("Device data - %s", appliance_data)
@@ -124,7 +120,7 @@ class Hon:
             for appliance in await api.load_appliances():
                 await self._create_appliance(appliance, api)
         if not self._mqtt_client:
-            self._mqtt_client = await MQTTClient(self).create()
+            self._mqtt_client = await MQTTClient(self, self._mobile_id).create()
 
     def subscribe_updates(self, notify_function: Callable[[Any], None]) -> None:
         self._notify_function = notify_function

pyhon/parameter/program.py

@@ -45,7 +45,7 @@ class HonParameterProgram(HonParameterEnum):
         for name, parameter in self._programs.items():
             if "iot_" in name:
                 continue
-            if parameter.parameters.get("prCode"):
+            if not parameter.parameters.get("prCode"):
                 continue
             if (fav := parameter.parameters.get("favourite")) and fav.value == "1":
                 continue

setup.py

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