Merge 8ad214a672 into 5b1d003bb2

* feat: subscribe the BLE device up messages even though the device is offline (#1170)

* fix: set all BLE devices online

custom_components/xiaomi_home/miot/const.py

@@ -85,6 +85,11 @@ SUPPORTED_PLATFORMS: list = [
     'water_heater',
 ]
 
+UNSUPPORTED_MODELS: list = [
+    'chuangmi.ir.v2',
+    'xiaomi.router.rd03'
+]
+
 DEFAULT_CLOUD_SERVER: str = 'cn'
 CLOUD_SERVERS: dict = {
     'cn': '中国大陆',

custom_components/xiaomi_home/miot/miot_client.py

@@ -1470,6 +1470,11 @@ class MIoTClient:
         """Update cloud devices.
         NOTICE: This function will operate the cloud_list
         """
+        # MIoT cloud service may not publish the online state updating message
+        # for the BLE device. Assume that all BLE devices are online.
+        for did, info in cloud_list.items():
+            if did.startswith('blt.'):
+                info['online'] = True
         for did, info in self._device_list_cache.items():
             if filter_dids and did not in filter_dids:
                 continue

custom_components/xiaomi_home/miot/miot_cloud.py

@@ -59,7 +59,8 @@ import aiohttp
 
 # pylint: disable=relative-beyond-top-level
 from .common import calc_group_id
-from .const import DEFAULT_OAUTH2_API_HOST, MIHOME_HTTP_API_TIMEOUT, OAUTH2_AUTH_URL
+from .const import (UNSUPPORTED_MODELS, DEFAULT_OAUTH2_API_HOST,
+                    MIHOME_HTTP_API_TIMEOUT, OAUTH2_AUTH_URL)
 from .miot_error import MIoTErrorCode, MIoTHttpError, MIoTOauthError
 
 _LOGGER = logging.getLogger(__name__)
@@ -567,6 +568,10 @@ class MIoTHttpClient:
                 # were implemented.
                 _LOGGER.info("ignore miwifi.* device, cloud, %s", did)
                 continue
+            if model in UNSUPPORTED_MODELS:
+                _LOGGER.info('ignore unsupported model %s, cloud, %s', model,
+                             did)
+                continue
             device_infos[did] = {
                 "did":
                     did,

custom_components/xiaomi_home/miot/miot_device.py

@@ -1250,16 +1250,9 @@ class MIoTPropertyEntity(Entity):
             f"{self.service.description_trans} {spec.description_trans}")
         self._attr_available = miot_device.online
 
-        _LOGGER.info(
-            "new miot property entity, %s, %s, %s, %s, %s, %s, %s",
-            self.miot_device.name,
-            self._attr_name,
-            spec.platform,
-            spec.device_class,
-            self.entity_id,
-            self._value_range,
-            self._value_list,
-        )
+        _LOGGER.info('new miot property entity, %s, %s, %s, %s, %s',
+                     self.miot_device.name, self._attr_name, spec.platform,
+                     spec.device_class, self.entity_id)
 
     @property
     def device_info(self) -> Optional[DeviceInfo]:

custom_components/xiaomi_home/miot/miot_mips.py

@@ -70,7 +70,7 @@ from paho.mqtt.client import (
 
 # pylint: disable=relative-beyond-top-level
 from .common import MIoTMatcher
-from .const import MIHOME_MQTT_KEEPALIVE
+from .const import UNSUPPORTED_MODELS, MIHOME_MQTT_KEEPALIVE
 from .miot_error import MIoTErrorCode, MIoTMipsError
 
 _LOGGER = logging.getLogger(__name__)
@@ -234,7 +234,7 @@ class _MipsClient(ABC):
     MQTT_INTERVAL_S = 1
     MIPS_QOS: int = 2
     UINT32_MAX: int = 0xFFFFFFFF
-    MIPS_RECONNECT_INTERVAL_MIN: float = 30
+    MIPS_RECONNECT_INTERVAL_MIN: float = 10
     MIPS_RECONNECT_INTERVAL_MAX: float = 600
     MIPS_SUB_PATCH: int = 300
     MIPS_SUB_INTERVAL: float = 1
@@ -667,7 +667,8 @@ class _MipsClient(ABC):
             return
         if not self._mqtt.is_connected():
             return
-        self.log_info(f"mips connect, {flags}, {rc}, {props}")
+        self.log_info(f'mips connect, {flags}, {rc}, {props}')
+        self.__reset_reconnect_time()
         self._mqtt_state = True
         self._internal_loop.call_soon(self._on_mips_connect, rc, props)
         with self._mips_state_sub_map_lock:
@@ -840,7 +841,7 @@ class _MipsClient(ABC):
         self._internal_loop.stop()
 
     def __get_next_reconnect_time(self) -> float:
-        if self._mips_reconnect_interval == 0:
+        if self._mips_reconnect_interval < self.MIPS_RECONNECT_INTERVAL_MIN:
             self._mips_reconnect_interval = self.MIPS_RECONNECT_INTERVAL_MIN
         else:
             self._mips_reconnect_interval = min(
@@ -848,6 +849,9 @@ class _MipsClient(ABC):
                 self.MIPS_RECONNECT_INTERVAL_MAX)
         return self._mips_reconnect_interval
 
+    def __reset_reconnect_time(self) -> None:
+        self._mips_reconnect_interval = 0
+
 
 class MipsCloudClient(_MipsClient):
     """MIoT Pub/Sub Cloud Client."""
@@ -1437,6 +1441,9 @@ class MipsLocalClient(_MipsClient):
             if name is None or urn is None or model is None:
                 self.log_error(f"invalid device info, {did}, {info}")
                 continue
+            if model in UNSUPPORTED_MODELS:
+                self.log_info(f'unsupported model, {model}, {did}')
+                continue
             device_list[did] = {
                 "did": did,
                 "name": name,

custom_components/xiaomi_home/miot/specs/spec_filter.yaml

@@ -44,9 +44,6 @@ urn:miot-spec-v2:device:motion-sensor:0000A014:xiaomi-pir1:
   services:
   - '1'
   - '5'
-urn:miot-spec-v2:device:router:0000A036:xiaomi-rd03:
-  services:
-  - '*'
 urn:miot-spec-v2:device:thermostat:0000A031:tofan-wk01:
   services:
   - '2'

custom_components/xiaomi_home/water_heater.py

@@ -141,12 +141,11 @@ class WaterHeater(MIoTServiceEntity, WaterHeaterEntity):
                     continue
                 self._mode_map = prop.value_list.to_map()
                 self._attr_operation_list = list(self._mode_map.values())
-                self._attr_supported_features |= (
-                    WaterHeaterEntityFeature.OPERATION_MODE)
                 self._prop_mode = prop
         if not self._attr_operation_list:
             self._attr_operation_list = [STATE_ON]
         self._attr_operation_list.append(STATE_OFF)
+        self._attr_supported_features |= WaterHeaterEntityFeature.OPERATION_MODE
 
     async def async_turn_on(self) -> None:
         """Turn the water heater on."""
@@ -197,5 +196,5 @@ class WaterHeater(MIoTServiceEntity, WaterHeaterEntity):
             return STATE_OFF
         if not self._prop_mode and self.get_prop_value(prop=self._prop_on):
             return STATE_ON
-        return self.get_map_value(map_=self._mode_map,
-                                  key=self.get_prop_value(prop=self._prop_mode))
+        return (None if self._prop_mode is None else self.get_map_value(
+            map_=self._mode_map, key=self.get_prop_value(prop=self._prop_mode)))