Merge pull request #499 from krahabb/dev

Moonlight.4.0

.vscode/settings.json

@@ -2,14 +2,6 @@
     "files.associations": {
         "*.yaml": "home-assistant"
     },
-    "python.analysis.typeCheckingMode": "basic",
-    "python.analysis.diagnosticSeverityOverrides": {
-        "reportPrivateImportUsage": "none",
-        "reportShadowedImports": "none"
-    },
-    "python.analysis.extraPaths": [
-        "./custom_components/meross_lan"
-    ],
     "testing.defaultGutterClickAction": "debug",
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,

custom_components/meross_lan/climate.py

@@ -177,7 +177,7 @@ async def async_turn_on(self):
     async def async_turn_off(self):
         await self.async_request_onoff(0)
 
-    async def async_set_hvac_mode(self, hvac_mode: "MtsClimate.HVACMode"):
+    async def async_set_hvac_mode(self, hvac_mode: climate.HVACMode):
         raise NotImplementedError()
 
     async def async_set_preset_mode(self, preset_mode: str):

custom_components/meross_lan/config_flow.py

@@ -6,6 +6,7 @@
 import json
 import logging
 from time import time
+from types import MappingProxyType
 import typing
 
 from homeassistant import config_entries as ce, const as hac
@@ -15,7 +16,12 @@
 import voluptuous as vol
 
 from . import MerossApi, const as mlc
-from .helpers import ConfigEntriesHelper, ConfigEntryType, reverse_lookup
+from .helpers import (
+    ConfigEntriesHelper,
+    ConfigEntryType,
+    get_default_no_verify_ssl_context,
+    reverse_lookup,
+)
 from .helpers.manager import CloudApiClient
 from .merossclient import (
     HostAddress,
@@ -320,7 +326,8 @@ async def async_step_profile(self, user_input=None):
                             # this patch is the best I can think of
                             ce.ConfigEntry(
                                 version=self.VERSION,
-                                minor_version=self.MINOR_VERSION,  # type: ignore
+                                minor_version=self.MINOR_VERSION,  # required since 2024.1
+                                discovery_keys=MappingProxyType({}), # required since 2024.10
                                 domain=mlc.DOMAIN,
                                 title=profile_config[mc.KEY_EMAIL],
                                 data=profile_config,
@@ -1238,7 +1245,11 @@ async def async_step_bind(self, user_input=None):
                 key = key or api.key or ""
                 userid = "" if userid is None else str(userid)
                 mqttclient = MerossMQTTDeviceClient(
-                    device.id, key=key, userid=userid, loop=hass.loop
+                    device.id,
+                    key=key,
+                    userid=userid,
+                    loop=hass.loop,
+                    sslcontext=get_default_no_verify_ssl_context(),
                 )
                 if api.isEnabledFor(api.VERBOSE):
                     mqttclient.enable_logger(api)  # type: ignore (Loggable is duck-compatible with Logger)

custom_components/meross_lan/const.py

@@ -199,6 +199,8 @@ class ProfileConfigType(
 """used when polling the cover state to monitor an ongoing transition"""
 PARAM_CLOUDMQTT_UPDATE_PERIOD = 1795
 """for polled entities over cloud MQTT use 'at least' this"""
+PARAM_CONFIG_UPDATE_PERIOD = 300
+"""read device config polling period"""
 PARAM_DIAGNOSTIC_UPDATE_PERIOD = 300
 """read diagnostic sensors only every ... second"""
 PARAM_ENERGY_UPDATE_PERIOD = 55

custom_components/meross_lan/devices/diffuser.py

@@ -16,18 +16,17 @@
 )
 from ..meross_entity import MEListChannelMixin
 from ..merossclient import const as mc, namespaces as mn
-from ..sensor import MLHumiditySensor, MLTemperatureSensor
+from ..sensor import MLHumiditySensor, MLNumericSensorDef, MLTemperatureSensor
 from .spray import MLSpray
 
 if typing.TYPE_CHECKING:
     from ..meross_device import DigestInitReturnType, MerossDevice
+    from ..sensor import MLNumericSensor
 
 
-DIFFUSER_SENSOR_CLASS_MAP: dict[
-    str, type[MLHumiditySensor] | type[MLTemperatureSensor]
-] = {
-    mc.KEY_HUMIDITY: MLHumiditySensor,
-    mc.KEY_TEMPERATURE: MLTemperatureSensor,
+DIFFUSER_SENSOR_CLASS_MAP: dict[str, MLNumericSensorDef] = {
+    mc.KEY_HUMIDITY: MLNumericSensorDef(MLHumiditySensor, {}),
+    mc.KEY_TEMPERATURE: MLNumericSensorDef(MLTemperatureSensor, {"device_scale": 10}),
 }
 
 
@@ -68,16 +67,14 @@ def _handle_Appliance_Control_Diffuser_Sensor(header: dict, payload: dict):
             }
             """
             entities = device.entities
-            for key in (mc.KEY_HUMIDITY, mc.KEY_TEMPERATURE):
+            for key in DIFFUSER_SENSOR_CLASS_MAP:
                 if key in payload:
                     try:
-                        entities[key].update_native_value(
-                            payload[key][mc.KEY_VALUE] / 10
-                        )
+                        entity: MLNumericSensor = entities[key]  # type: ignore
                     except KeyError:
-                        DIFFUSER_SENSOR_CLASS_MAP[key](
-                            device, None, device_value=payload[key][mc.KEY_VALUE] / 10
-                        )
+                        entity_def = DIFFUSER_SENSOR_CLASS_MAP[key]
+                        entity = entity_def.type(device, None, key, **entity_def.args)
+                    entity.update_device_value(payload[key][mc.KEY_VALUE])
 
         NamespaceHandler(
             device,
@@ -191,8 +188,8 @@ class MLDiffuserSpray(MEListChannelMixin, MLSpray):
 
     ns = mn.Appliance_Control_Diffuser_Spray
 
-    SPRAY_MODE_MAP = {
-        mc.DIFFUSER_SPRAY_MODE_OFF: MLSpray.OPTION_SPRAY_MODE_OFF,
-        mc.DIFFUSER_SPRAY_MODE_ECO: MLSpray.OPTION_SPRAY_MODE_ECO,
-        mc.DIFFUSER_SPRAY_MODE_FULL: MLSpray.OPTION_SPRAY_MODE_CONTINUOUS,
+    OPTIONS_MAP = {
+        mc.DIFFUSER_SPRAY_MODE_OFF: MLSpray.OPTIONS_MAP[mc.SPRAY_MODE_OFF],
+        mc.DIFFUSER_SPRAY_MODE_ECO: MLSpray.OPTIONS_MAP[mc.SPRAY_MODE_INTERMITTENT],
+        mc.DIFFUSER_SPRAY_MODE_FULL: MLSpray.OPTIONS_MAP[mc.SPRAY_MODE_CONTINUOUS],
     }