mirror of https://github.com/Andre0512/pyhOn.git
Compare commits
4 Commits
11da4ebfbc
...
6aa7dd8112
Author | SHA1 | Date |
---|---|---|
Andre Basche | 6aa7dd8112 | |
Andre Basche | 86c2956d69 | |
Andre Basche | bdf9d31be3 | |
Andre Basche | 53691e383e |
|
@ -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", ""))
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
@ -88,10 +89,16 @@ class MQTTClient:
|
|||
)
|
||||
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)
|
||||
_LOGGER.info("%s - %s", topic, payload)
|
||||
|
@ -103,7 +110,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,
|
||||
|
|
14
pyhon/hon.py
14
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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue