Merge 38296132a6 into 5d4b975f85

fix: the number of profile models updated from 660 to 823 (#583 )
feat: filter miwifi.* devices (#564 )
2026-01-17 23:50:42 +08:00 · 2025-01-07 22:20:17 +08:00 · 2025-01-07 20:22:06 +08:00 · 2025-01-07 20:21:43 +08:00 · 2025-01-07 20:21:24 +08:00 · 2025-01-07 20:21:04 +08:00
13 changed files with 857 additions and 46 deletions
--- a/README.md
+++ b/README.md
@ -351,7 +351,7 @@ The instance code is the code of the MIoT-Spec-V2 instance, which is in the form
 ```
 service:<siid>                  # service
 service:<siid>:property:<piid>  # property
-service:<siid>:property:<piid>:valuelist:<value> # the value in value-list of a property
+service:<siid>:property:<piid>:valuelist:<index> # The index of a value in the value-list of a property
 service:<siid>:event:<eiid>     # event
 service:<siid>:action:<aiid>    # action
 ```
--- a/custom_components/xiaomi_home/init.py
+++ b/custom_components/xiaomi_home/init.py
@ -155,7 +155,8 @@ async def async_setup_entry(
                    for entity in filter_entities:
                        device.entity_list[platform].remove(entity)
                        entity_id = device.gen_service_entity_id(
-                            ha_domain=platform, siid=entity.spec.iid)
+                            ha_domain=platform, siid=entity.spec.iid,
+                            description=entity.spec.description)
                        if er.async_get(entity_id_or_uuid=entity_id):
                            er.async_remove(entity_id=entity_id)
                if platform in device.prop_list:
--- a/custom_components/xiaomi_home/fan.py
+++ b/custom_components/xiaomi_home/fan.py
@ -55,7 +55,9 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.util.percentage import (
    percentage_to_ranged_value,
-    ranged_value_to_percentage
+    ranged_value_to_percentage,
+    ordered_list_item_to_percentage,
+    percentage_to_ordered_list_item
 )

 from .miot.miot_spec import MIoTSpecProperty
@ -89,10 +91,15 @@ class Fan(MIoTServiceEntity, FanEntity):
    _prop_fan_level: Optional[MIoTSpecProperty]
    _prop_mode: Optional[MIoTSpecProperty]
    _prop_horizontal_swing: Optional[MIoTSpecProperty]
+    _prop_wind_reverse: Optional[MIoTSpecProperty]
+    _prop_wind_reverse_forward: Any
+    _prop_wind_reverse_reverse: Any

-    _speed_min: Optional[int]
-    _speed_max: Optional[int]
-    _speed_step: Optional[int]
+    _speed_min: int
+    _speed_max: int
+    _speed_step: int
+    _speed_names: Optional[list]
+    _speed_name_map: Optional[dict[int, str]]
    _mode_list: Optional[dict[Any, Any]]

    def __init__(
@ -101,15 +108,22 @@ class Fan(MIoTServiceEntity, FanEntity):
        """Initialize the Fan."""
        super().__init__(miot_device=miot_device,  entity_data=entity_data)
        self._attr_preset_modes = []
+        self._attr_current_direction = None
        self._attr_supported_features = FanEntityFeature(0)

        self._prop_on = None
        self._prop_fan_level = None
        self._prop_mode = None
        self._prop_horizontal_swing = None
+        self._prop_wind_reverse = None
+        self._prop_wind_reverse_forward = None
+        self._prop_wind_reverse_reverse = None
        self._speed_min = 65535
        self._speed_max = 0
        self._speed_step = 1
+        self._speed_names = []
+        self._speed_name_map = {}
+
        self._mode_list = None

        # properties
@ -124,7 +138,8 @@ class Fan(MIoTServiceEntity, FanEntity):
                    self._speed_min = prop.value_range['min']
                    self._speed_max = prop.value_range['max']
                    self._speed_step = prop.value_range['step']
-                    self._attr_speed_count = self._speed_max - self._speed_min+1
+                    self._attr_speed_count = int((
+                        self._speed_max - self._speed_min)/self._speed_step)+1
                    self._attr_supported_features |= FanEntityFeature.SET_SPEED
                    self._prop_fan_level = prop
                elif (
@ -133,10 +148,13 @@ class Fan(MIoTServiceEntity, FanEntity):
                    and prop.value_list
                ):
                    # Fan level with value-list
-                    for item in prop.value_list:
-                        self._speed_min = min(self._speed_min, item['value'])
-                        self._speed_max = max(self._speed_max, item['value'])
-                    self._attr_speed_count = self._speed_max - self._speed_min+1
+                    # Fan level with value-range is prior to fan level with
+                    # value-list when a fan has both fan level properties.
+                    self._speed_name_map = {
+                        item['value']: item['description']
+                        for item in prop.value_list}
+                    self._speed_names = list(self._speed_name_map.values())
+                    self._attr_speed_count = len(prop.value_list)
                    self._attr_supported_features |= FanEntityFeature.SET_SPEED
                    self._prop_fan_level = prop
            elif prop.name == 'mode':
@ -156,6 +174,30 @@ class Fan(MIoTServiceEntity, FanEntity):
            elif prop.name == 'horizontal-swing':
                self._attr_supported_features |= FanEntityFeature.OSCILLATE
                self._prop_horizontal_swing = prop
+            elif prop.name == 'wind-reverse':
+                if prop.format_ == 'bool':
+                    self._prop_wind_reverse_forward = False
+                    self._prop_wind_reverse_reverse = True
+                elif (
+                    isinstance(prop.value_list, list)
+                    and prop.value_list
+                ):
+                    for item in prop.value_list:
+                        if item['name'].lower() in {'foreward'}:
+                            self._prop_wind_reverse_forward = item['value']
+                        elif item['name'].lower() in {
+                                'reversal', 'reverse'}:
+                            self._prop_wind_reverse_reverse = item['value']
+                if (
+                    self._prop_wind_reverse_forward is None
+                    or self._prop_wind_reverse_reverse is None
+                ):
+                    # NOTICE: Value may be 0 or False
+                    _LOGGER.info(
+                        'invalid wind-reverse, %s', self.entity_id)
+                    continue
+                self._attr_supported_features |= FanEntityFeature.DIRECTION
+                self._prop_wind_reverse = prop

    def __get_mode_description(self, key: int) -> Optional[str]:
        if self._mode_list is None:
@ -182,9 +224,19 @@ class Fan(MIoTServiceEntity, FanEntity):
        await self.set_property_async(prop=self._prop_on, value=True)
        # percentage
        if percentage:
-            await self.set_property_async(
-                prop=self._prop_fan_level,
-                value=int(percentage*self._attr_speed_count/100))
+            if self._speed_names:
+                speed = percentage_to_ordered_list_item(
+                    self._speed_names, percentage)
+                speed_value = self.get_map_value(
+                    map_=self._speed_name_map, description=speed)
+                await self.set_property_async(
+                    prop=self._prop_fan_level, value=speed_value)
+            else:
+                await self.set_property_async(
+                    prop=self._prop_fan_level,
+                    value=int(percentage_to_ranged_value(
+                        low_high_range=(self._speed_min, self._speed_max),
+                        percentage=percentage)))
        # preset_mode
        if preset_mode:
            await self.set_property_async(
@ -202,11 +254,19 @@ class Fan(MIoTServiceEntity, FanEntity):
    async def async_set_percentage(self, percentage: int) -> None:
        """Set the percentage of the fan speed."""
        if percentage > 0:
-            await self.set_property_async(
-                prop=self._prop_fan_level,
-                value=int(percentage_to_ranged_value(
-                    low_high_range=(self._speed_min, self._speed_max),
-                    percentage=percentage)))
+            if self._speed_names:
+                speed = percentage_to_ordered_list_item(
+                    self._speed_names, percentage)
+                speed_value = self.get_map_value(
+                    map_=self._speed_name_map, description=speed)
+                await self.set_property_async(
+                    prop=self._prop_fan_level, value=speed_value)
+            else:
+                await self.set_property_async(
+                    prop=self._prop_fan_level,
+                    value=int(percentage_to_ranged_value(
+                        low_high_range=(self._speed_min, self._speed_max),
+                        percentage=percentage)))
            if not self.is_on:
                # If the fan is off, turn it on.
                await self.set_property_async(prop=self._prop_on, value=True)
@ -221,6 +281,14 @@ class Fan(MIoTServiceEntity, FanEntity):

    async def async_set_direction(self, direction: str) -> None:
        """Set the direction of the fan."""
+        if not self._prop_wind_reverse:
+            return
+        await self.set_property_async(
+            prop=self._prop_wind_reverse,
+            value=(
+                self._prop_wind_reverse_reverse
+                if self.current_direction == 'reverse'
+                else self._prop_wind_reverse_forward))

    async def async_oscillate(self, oscillating: bool) -> None:
        """Oscillate the fan."""
@ -242,13 +310,28 @@ class Fan(MIoTServiceEntity, FanEntity):
                key=self.get_prop_value(prop=self._prop_mode))
            if self._prop_mode else None)

+    @property
+    def current_direction(self) -> Optional[str]:
+        """Return the current direction of the fan."""
+        if not self._prop_wind_reverse:
+            return None
+        return 'reverse' if self.get_prop_value(
+            prop=self._prop_wind_reverse
+        ) == self._prop_wind_reverse_reverse else 'forward'
+
    @property
    def percentage(self) -> Optional[int]:
        """Return the current percentage of the fan speed."""
        fan_level = self.get_prop_value(prop=self._prop_fan_level)
-        return ranged_value_to_percentage(
-            low_high_range=(self._speed_min, self._speed_max),
-            value=fan_level) if fan_level else None
+        if fan_level is None:
+            return None
+        if self._speed_names:
+            return ordered_list_item_to_percentage(
+                self._speed_names, self._speed_name_map[fan_level])
+        else:
+            return ranged_value_to_percentage(
+                low_high_range=(self._speed_min, self._speed_max),
+                value=fan_level)

    @property
    def oscillating(self) -> Optional[bool]:
@ -257,8 +340,3 @@ class Fan(MIoTServiceEntity, FanEntity):
            self.get_prop_value(
                prop=self._prop_horizontal_swing)
            if self._prop_horizontal_swing else None)
-
-    @property
-    def percentage_step(self) -> float:
-        """Return the step of the fan speed."""
-        return self._speed_step
--- a/custom_components/xiaomi_home/miot/lan/profile_models.yaml
+++ b/custom_components/xiaomi_home/miot/lan/profile_models.yaml
@ -18,6 +18,10 @@
  ts: 1603967572
 1245.airpurifier.dl01:
  ts: 1607502661
+17216.magic_touch.d150:
+  ts: 1575097876
+17216.magic_touch.d152:
+  ts: 1575097876
 17216.massage.ec1266a:
  ts: 1615881124
 397.light.hallight:
@ -56,6 +60,10 @@ bj352.airmonitor.m30:
  ts: 1686644541
 bj352.waterpuri.s100cm:
  ts: 1615795630
+bymiot.gateway.v1:
+  ts: 1575097876
+bymiot.gateway.v2:
+  ts: 1575097876
 cgllc.airmonitor.b1:
  ts: 1676339912
 cgllc.airmonitor.s1:
@ -64,6 +72,8 @@ cgllc.clock.cgc1:
  ts: 1686644422
 cgllc.clock.dove:
  ts: 1619607474
+cgllc.gateway.s1:
+  ts: 1575097876
 cgllc.magnet.hodor:
  ts: 1724329476
 cgllc.motion.cgpr1:
@ -120,8 +130,14 @@ chuangmi.cateye.ipc018:
  ts: 1632735241
 chuangmi.cateye.ipc508:
  ts: 1633677521
+chuangmi.door.hmi508:
+  ts: 1611733437
 chuangmi.door.hmi515:
  ts: 1640334316
+chuangmi.gateway.ipc011:
+  ts: 1575097876
+chuangmi.ir.v2:
+  ts: 1575097876
 chuangmi.lock.hmi501:
  ts: 1614742147
 chuangmi.lock.hmi501b01:
@ -142,10 +158,18 @@ chuangmi.plug.v1:
  ts: 1621925183
 chuangmi.plug.v3:
  ts: 1644480255
+chuangmi.plug.vtl_v1:
+  ts: 1575097876
 chuangmi.radio.v1:
  ts: 1531108800
 chuangmi.radio.v2:
  ts: 1531108800
+chuangmi.remote.h102a03:
+  ts: 1575097876
+chuangmi.remote.h102c01:
+  ts: 1575097876
+chuangmi.remote.v2:
+  ts: 1575097876
 chunmi.cooker.eh1:
  ts: 1607339278
 chunmi.cooker.eh402:
@ -204,6 +228,8 @@ dmaker.airfresh.t2017:
  ts: 1686731233
 dmaker.fan.p5:
  ts: 1655793784
+doco.fcb.docov001:
+  ts: 1575097876
 dsm.lock.h3:
  ts: 1615283790
 dsm.lock.q3:
@ -218,6 +244,30 @@ fawad.airrtc.fwd20011:
  ts: 1610607149
 fbs.airmonitor.pth02:
  ts: 1686644918
+fengmi.projector.fm05:
+  ts: 1575097876
+fengmi.projector.fm15:
+  ts: 1575097876
+fengmi.projector.fm154k:
+  ts: 1575097876
+fengmi.projector.l166:
+  ts: 1650352923
+fengmi.projector.l176:
+  ts: 1649936204
+fengmi.projector.l246:
+  ts: 1575097876
+fengmi.projector.m055:
+  ts: 1652839826
+fengmi.projector.m055d:
+  ts: 1654067980
+fengyu.intercom.beebird:
+  ts: 1575097876
+fengyu.intercom.sharkv1:
+  ts: 1575097876
+fotile.hood.emd1tmi:
+  ts: 1607483642
+guoshi.other.sem01:
+  ts: 1602662080
 hannto.printer.anise:
  ts: 1618989537
 hannto.printer.honey:
@ -226,14 +276,26 @@ hannto.printer.honey1s:
  ts: 1614332725
 hfjh.fishbowl.v1:
  ts: 1615278556
+hhcc.bleflowerpot.v2:
+  ts: 1575097876
 hhcc.plantmonitor.v1:
  ts: 1664163526
 hith.foot_bath.q2:
  ts: 1531108800
+hmpace.bracelet.v4:
+  ts: 1575097876
+hmpace.scales.mibfs:
+  ts: 1575097876
+hmpace.scales.miscale2:
+  ts: 1575097876
 huohe.lock.m1:
  ts: 1635410938
+huoman.litter_box.co1:
+  ts: 1687165034
 hutlon.lock.v0001:
  ts: 1634799698
+idelan.aircondition.g1:
+  ts: 1575097876
 idelan.aircondition.v1:
  ts: 1614666973
 idelan.aircondition.v2:
@ -248,14 +310,22 @@ ikea.light.led1537r6:
  ts: 1605162872
 ikea.light.led1545g12:
  ts: 1605162937
+ikea.light.led1546g12:
+  ts: 1575097876
 ikea.light.led1623g12:
  ts: 1605163009
 ikea.light.led1649c5:
  ts: 1605163064
+ikea.light.led1650r5:
+  ts: 1575097876
 imibar.cooker.mbihr3:
  ts: 1624620659
 imou99.camera.tp2:
  ts: 1531108800
+inovel.projector.me2:
+  ts: 1575097876
+iracc.aircondition.d19:
+  ts: 1609914362
 isa.camera.df3:
  ts: 1531108800
 isa.camera.hl5:
@ -266,18 +336,34 @@ isa.camera.isc5:
  ts: 1531108800
 isa.camera.isc5c1:
  ts: 1621238175
+isa.camera.qf3:
+  ts: 1575097876
+isa.cateye.hldb6:
+  ts: 1575097876
 isa.magnet.dw2hl:
  ts: 1638274655
+jieman.magic_touch.js78:
+  ts: 1575097876
+jiqid.mistory.ipen1:
+  ts: 1575097876
 jiqid.mistory.pro:
  ts: 1531108800
 jiqid.mistory.v1:
  ts: 1531108800
 jiqid.mistudy.v2:
  ts: 1610612349
+jiqid.robot.cube:
+  ts: 1575097876
 jiwu.lock.jwp01:
  ts: 1614752632
 jyaiot.cm.ccj01:
  ts: 1611824545
+k0918.toothbrush.kid01:
+  ts: 1575097876
+kejia.airer.th001:
+  ts: 1575097876
+ksmb.treadmill.k12:
+  ts: 1575097876
 ksmb.treadmill.v1:
  ts: 1611211447
 ksmb.treadmill.v2:
@ -390,6 +476,8 @@ loock.lock.xfvl10:
  ts: 1632814256
 loock.safe.v1:
  ts: 1619607755
+lumi.acpartner.mcn02:
+  ts: 1655791626
 lumi.acpartner.v1:
  ts: 1531108800
 lumi.acpartner.v2:
@ -462,6 +550,8 @@ lumi.lock.acn02:
  ts: 1623928631
 lumi.lock.acn03:
  ts: 1614752574
+lumi.lock.aq1:
+  ts: 1612518044
 lumi.lock.bacn01:
  ts: 1614741699
 lumi.lock.bmcn02:
@ -482,6 +572,8 @@ lumi.lock.mcn007:
  ts: 1650446757
 lumi.lock.mcn01:
  ts: 1679881881
+lumi.lock.v1:
+  ts: 1575097876
 lumi.lock.wbmcn1:
  ts: 1619422072
 lumi.motion.bmgl01:
@ -510,14 +602,20 @@ lumi.sensor_86sw1.v1:
  ts: 1609311038
 lumi.sensor_86sw2.v1:
  ts: 1608795035
+lumi.sensor_cube.aqgl01:
+  ts: 1575097876
 lumi.sensor_ht.v1:
  ts: 1621239877
 lumi.sensor_magnet.aq2:
  ts: 1641112867
+lumi.sensor_magnet.v1:
+  ts: 1606120416
 lumi.sensor_magnet.v2:
  ts: 1641113779
 lumi.sensor_motion.aq2:
  ts: 1676433994
+lumi.sensor_motion.v1:
+  ts: 1605093075
 lumi.sensor_motion.v2:
  ts: 1672818550
 lumi.sensor_natgas.v1:
@ -530,6 +628,8 @@ lumi.sensor_switch.aq2:
  ts: 1615256430
 lumi.sensor_switch.aq3:
  ts: 1607399487
+lumi.sensor_switch.v1:
+  ts: 1606874434
 lumi.sensor_switch.v2:
  ts: 1609310683
 lumi.sensor_wleak.aq1:
@ -574,6 +674,20 @@ miaomiaoce.sensor_ht.t1:
  ts: 1616057242
 miaomiaoce.sensor_ht.t2:
  ts: 1636603553
+miaomiaoce.thermo.t01:
+  ts: 1575097876
+midea.aircondition.v1:
+  ts: 1575097876
+midea.aircondition.xa1:
+  ts: 1575097876
+midea.aircondition.xa2:
+  ts: 1575097876
+midr.rv_mirror.m2:
+  ts: 1575097876
+midr.rv_mirror.m5:
+  ts: 1575097876
+midr.rv_mirror.v1:
+  ts: 1575097876
 miir.aircondition.ir01:
  ts: 1531108800
 miir.aircondition.ir02:
@ -612,6 +726,8 @@ minij.washer.v5:
  ts: 1622792196
 minij.washer.v8:
  ts: 1615777868
+minuo.tracker.lm001:
+  ts: 1575097876
 miot.light.plato2:
  ts: 1685518142
 miot.light.plato3:
@ -624,18 +740,32 @@ mmgg.feeder.snack:
  ts: 1607503182
 moyu.washer.s1hm:
  ts: 1624620888
+mrbond.airer.m0:
+  ts: 1575097876
 mrbond.airer.m1pro:
  ts: 1646393746
 mrbond.airer.m1s:
  ts: 1646393874
+mrbond.airer.m1super:
+  ts: 1575097876
 msj.f_washer.m1:
  ts: 1614914340
 mxiang.cateye.mdb10:
  ts: 1616140362
 mxiang.cateye.xmcatt1:
  ts: 1616140207
+nhy.airrtc.v1:
+  ts: 1575097876
+ninebot.scooter.v1:
+  ts: 1602662395
+ninebot.scooter.v6:
+  ts: 1575097876
+nuwa.robot.minikiwi:
+  ts: 1575097876
 nwt.derh.wdh318efw1:
  ts: 1611822375
+onemore.wifispeaker.sm4:
+  ts: 1575097876
 opple.light.bydceiling:
  ts: 1608187619
 opple.light.fanlight:
@ -646,6 +776,8 @@ opple.remote.5pb112:
  ts: 1627453840
 opple.remote.5pb113:
  ts: 1636599905
+orion.wifispeaker.cm1:
+  ts: 1575097876
 ows.towel_w.mj1x0:
  ts: 1610604939
 philips.light.bceiling1:
@ -696,6 +828,8 @@ pwzn.relay.apple:
  ts: 1611217196
 pwzn.relay.banana:
  ts: 1646647255
+qicyc.bike.tdp02z:
+  ts: 1575097876
 qike.bhf_light.qk201801:
  ts: 1608174909
 qmi.powerstrip.v1:
@ -726,8 +860,32 @@ roborock.vacuum.t6:
  ts: 1619423841
 rockrobo.vacuum.v1:
  ts: 1531108800
+roidmi.carairpuri.pro:
+  ts: 1575097876
+roidmi.carairpuri.v1:
+  ts: 1575097876
+roidmi.cleaner.f8pro:
+  ts: 1575097876
+roidmi.cleaner.v1:
+  ts: 1575097876
+roidmi.cleaner.v2:
+  ts: 1638514177
+roidmi.cleaner.v382:
+  ts: 1575097876
+roidmi.vacuum.v1:
+  ts: 1575097876
+rokid.robot.me:
+  ts: 1575097876
+rokid.robot.mini:
+  ts: 1575097876
+rokid.robot.pebble:
+  ts: 1575097876
+rokid.robot.pebble2:
+  ts: 1575097876
 roome.bhf_light.yf6002:
  ts: 1531108800
+rotai.magic_touch.sx300:
+  ts: 1602662578
 rotai.massage.rt5728:
  ts: 1610607000
 rotai.massage.rt5850:
@ -738,22 +896,42 @@ rotai.massage.rt5863:
  ts: 1611827937
 rotai.massage.rt5870:
  ts: 1632376570
+runmi.suitcase.v1:
+  ts: 1575097876
 scishare.coffee.s1102:
  ts: 1611824402
+shjszn.gateway.c1:
+  ts: 1575097876
+shjszn.lock.c1:
+  ts: 1575097876
+shjszn.lock.kx:
+  ts: 1575097876
+shuii.humidifier.jsq001:
+  ts: 1575097876
 shuii.humidifier.jsq002:
  ts: 1606376290
+skyrc.feeder.dfeed:
+  ts: 1626082349
 skyrc.pet_waterer.fre1:
  ts: 1608186812
+smith.w_soften.cxs05ta1:
+  ts: 1575097876
 smith.waterheater.cxea1:
  ts: 1611826349
 smith.waterheater.cxeb1:
  ts: 1611826388
 smith.waterpuri.jnt600:
  ts: 1531108800
+soocare.toothbrush.m1:
+  ts: 1575097876
 soocare.toothbrush.m1s:
  ts: 1610611310
+soocare.toothbrush.mc1:
+  ts: 1575097876
 soocare.toothbrush.t501:
  ts: 1672192586
+soocare.toothbrush.x3:
+  ts: 1575097876
 sxds.pillow.pillow02:
  ts: 1611222235
 syniot.curtain.syc1:
@ -778,6 +956,10 @@ tokit.oven.tk32pro1:
  ts: 1617002408
 tokit.pre_cooker.tkih1:
  ts: 1607410832
+trios1.bleshoes.v02:
+  ts: 1602662599
+txdd.wifispeaker.x1:
+  ts: 1575097876
 viomi.aircondition.v10:
  ts: 1606375041
 viomi.aircondition.v21:
@ -830,12 +1012,16 @@ viomi.fridge.u13:
  ts: 1614667152
 viomi.fridge.u15:
  ts: 1607505693
+viomi.fridge.u17:
+  ts: 1575097876
 viomi.fridge.u18:
  ts: 1614655755
 viomi.fridge.u2:
  ts: 1531108800
 viomi.fridge.u24:
  ts: 1614667214
+viomi.fridge.u25:
+  ts: 1575097876
 viomi.fridge.u4:
  ts: 1614667295
 viomi.fridge.u6:
@ -992,6 +1178,82 @@ xiaomi.aircondition.ma6:
  ts: 1721629272
 xiaomi.aircondition.ma9:
  ts: 1721629362
+xiaomi.plc.v1:
+  ts: 1575097876
+xiaomi.repeater.v1:
+  ts: 1575097876
+xiaomi.repeater.v2:
+  ts: 1575097876
+xiaomi.repeater.v3:
+  ts: 1575097876
+xiaomi.router.d01:
+  ts: 1575097876
+xiaomi.router.lv1:
+  ts: 1575097876
+xiaomi.router.lv3:
+  ts: 1575097876
+xiaomi.router.mv1:
+  ts: 1575097876
+xiaomi.router.r2100:
+  ts: 1575097876
+xiaomi.router.r3600:
+  ts: 1575097876
+xiaomi.router.r3a:
+  ts: 1575097876
+xiaomi.router.r3d:
+  ts: 1575097876
+xiaomi.router.r3g:
+  ts: 1575097876
+xiaomi.router.r3gv2:
+  ts: 1575097876
+xiaomi.router.r3gv2n:
+  ts: 1575097876
+xiaomi.router.r3p:
+  ts: 1575097876
+xiaomi.router.r4:
+  ts: 1575097876
+xiaomi.router.r4a:
+  ts: 1575097876
+xiaomi.router.r4ac:
+  ts: 1575097876
+xiaomi.router.r4c:
+  ts: 1575097876
+xiaomi.router.r4cm:
+  ts: 1575097876
+xiaomi.router.rm1800:
+  ts: 1575097876
+xiaomi.router.v1:
+  ts: 1575097876
+xiaomi.router.v2:
+  ts: 1575097876
+xiaomi.router.v3:
+  ts: 1575097876
+xiaomi.split_tv.b1:
+  ts: 1575097876
+xiaomi.split_tv.v1:
+  ts: 1575097876
+xiaomi.tv.b1:
+  ts: 1661248580
+xiaomi.tv.h1:
+  ts: 1575097876
+xiaomi.tv.i1:
+  ts: 1661248572
+xiaomi.tv.v1:
+  ts: 1670811870
+xiaomi.tvbox.b1:
+  ts: 1694503508
+xiaomi.tvbox.i1:
+  ts: 1694503515
+xiaomi.tvbox.v1:
+  ts: 1694503501
+xiaomi.watch.band1:
+  ts: 1575097876
+xiaomi.watch.band1A:
+  ts: 1575097876
+xiaomi.watch.band1S:
+  ts: 1575097876
+xiaomi.watch.band2:
+  ts: 1575097876
 xiaomi.wifispeaker.l04m:
  ts: 1658817956
 xiaomi.wifispeaker.l06a:
@ -1012,6 +1274,10 @@ xiaomi.wifispeaker.lx5a:
  ts: 1672299577
 xiaomi.wifispeaker.s12:
  ts: 1672299594
+xiaomi.wifispeaker.v1:
+  ts: 1575097876
+xiaomi.wifispeaker.v3:
+  ts: 1575097876
 xiaomi.wifispeaker.x08a:
  ts: 1672818945
 xiaomi.wifispeaker.x08c:
@ -1028,6 +1294,44 @@ xiaovv.camera.xvd5:
  ts: 1531108800
 xiaovv.camera.xvsnowman:
  ts: 1531108800
+xiaoxun.robot.v1:
+  ts: 1575097876
+xiaoxun.tracker.v1:
+  ts: 1575097876
+xiaoxun.watch.sw306:
+  ts: 1575097876
+xiaoxun.watch.sw560:
+  ts: 1575097876
+xiaoxun.watch.sw705:
+  ts: 1575097876
+xiaoxun.watch.sw710a2:
+  ts: 1575097876
+xiaoxun.watch.sw760:
+  ts: 1575097876
+xiaoxun.watch.sw900:
+  ts: 1575097876
+xiaoxun.watch.sw960:
+  ts: 1575097876
+xiaoxun.watch.v1:
+  ts: 1575097876
+xiaoxun.watch.v10:
+  ts: 1575097876
+xiaoxun.watch.v11:
+  ts: 1575097876
+xiaoxun.watch.v2:
+  ts: 1575097876
+xiaoxun.watch.v3:
+  ts: 1575097876
+xiaoxun.watch.v4:
+  ts: 1575097876
+xiaoxun.watch.v5:
+  ts: 1575097876
+xiaoxun.watch.v7:
+  ts: 1575097876
+xiaoxun.watch.v8:
+  ts: 1575097876
+xiaoxun.watch.v9:
+  ts: 1575097876
 xjx.toilet.pro:
  ts: 1615965466
 xjx.toilet.pure:
@ -1054,6 +1358,8 @@ yeelink.bhf_light.v3:
  ts: 1608790102
 yeelink.bhf_light.v5:
  ts: 1601292562
+yeelink.gateway.v1:
+  ts: 1575097876
 yeelink.light.bslamp1:
  ts: 1703120679
 yeelink.light.bslamp2:
@ -1192,6 +1498,10 @@ yunmi.kettle.r2:
  ts: 1606372087
 yunmi.kettle.r3:
  ts: 1637309534
+yunmi.kettle.v1:
+  ts: 1575097876
+yunmi.kettle.v9:
+  ts: 1602662686
 yunmi.plmachine.mg2:
  ts: 1611833658
 yunmi.waterpuri.c5:
@ -1230,18 +1540,26 @@ yunmi.waterpurifier.v2:
  ts: 1632377061
 yunmi.waterpurifier.v3:
  ts: 1611221428
+yunyi.camera.v1:
+  ts: 1575097876
 yyunyi.wopener.yypy24:
  ts: 1616741966
+yyzhn.gateway.yn181126:
+  ts: 1610689325
 zdeer.ajh.a8:
  ts: 1531108800
 zdeer.ajh.a9:
  ts: 1531108800
+zdeer.ajh.ajb:
+  ts: 1608276454
 zdeer.ajh.zda10:
  ts: 1531108800
 zdeer.ajh.zda9:
  ts: 1531108800
 zdeer.ajh.zjy:
  ts: 1531108800
+zhij.toothbrush.bv1:
+  ts: 1575097876
 zhimi.aircondition.ma1:
  ts: 1615185265
 zhimi.aircondition.ma3:
@ -1250,6 +1568,8 @@ zhimi.aircondition.ma4:
  ts: 1626334057
 zhimi.aircondition.v1:
  ts: 1610610931
+zhimi.aircondition.v2:
+  ts: 1575097876
 zhimi.aircondition.va1:
  ts: 1609924720
 zhimi.aircondition.za1:
@ -1276,8 +1596,12 @@ zhimi.airpurifier.sa2:
  ts: 1635820002
 zhimi.airpurifier.v1:
  ts: 1635855633
+zhimi.airpurifier.v2:
+  ts: 1575097876
 zhimi.airpurifier.v3:
  ts: 1676339933
+zhimi.airpurifier.v5:
+  ts: 1575097876
 zhimi.airpurifier.v6:
  ts: 1636978652
 zhimi.airpurifier.v7:
@ -1318,3 +1642,5 @@ zimi.mosq.v1:
  ts: 1620728957
 zimi.powerstrip.v2:
  ts: 1620812714
+zimi.projector.v1:
+  ts: 1575097876
--- a/custom_components/xiaomi_home/miot/miot_cloud.py
+++ b/custom_components/xiaomi_home/miot/miot_cloud.py
@ -531,9 +531,18 @@ class MIoTHttpClient:
            name = device.get('name', None)
            urn = device.get('spec_type', None)
            model = device.get('model', None)
-            if did is None or name is None or urn is None or model is None:
-                _LOGGER.error(
-                    'get_device_list, cloud, invalid device, %s', device)
+            if did is None or name is None:
+                _LOGGER.info(
+                    'invalid device, cloud, %s', device)
+                continue
+            if urn is None or model is None:
+                _LOGGER.info(
+                    'missing the urn|model field, cloud, %s', device)
+                continue
+            if did.startswith('miwifi.'):
+                # The miwifi.* routers defined SPEC functions, but none of them
+                # were implemented.
+                _LOGGER.info('ignore miwifi.* device, cloud, %s', did)
                continue
            device_infos[did] = {
                'did': did,
@ -634,7 +643,7 @@ class MIoTHttpClient:
        for did in dids:
            if did not in results:
                devices.pop(did, None)
-                _LOGGER.error('get device info failed, %s', did)
+                _LOGGER.info('get device info failed, %s', did)
                continue
            devices[did].update(results[did])
            # Whether sub devices
--- a/custom_components/xiaomi_home/miot/miot_device.py
+++ b/custom_components/xiaomi_home/miot/miot_device.py
@ -298,10 +298,11 @@ class MIoTDevice:
            f'{ha_domain}.{self._model_strs[0][:9]}_{self.did_tag}_'
            f'{self._model_strs[-1][:20]}')

-    def gen_service_entity_id(self, ha_domain: str, siid: int) -> str:
+    def gen_service_entity_id(self, ha_domain: str, siid: int,
+                              description: str) -> str:
        return (
            f'{ha_domain}.{self._model_strs[0][:9]}_{self.did_tag}_'
-            f'{self._model_strs[-1][:20]}_s_{siid}')
+            f'{self._model_strs[-1][:20]}_s_{siid}_{description}')

    def gen_prop_entity_id(
        self, ha_domain: str, spec_name: str, siid: int, piid: int
@ -744,7 +745,8 @@ class MIoTServiceEntity(Entity):
            self._attr_name = f' {self.entity_data.spec.description_trans}'
        elif isinstance(entity_data.spec, MIoTSpecService):
            self.entity_id = miot_device.gen_service_entity_id(
-                DOMAIN, siid=entity_data.spec.iid)
+                DOMAIN, siid=entity_data.spec.iid,
+                description=entity_data.spec.description)
            self._attr_name = (
                f'{"* "if self.entity_data.spec.proprietary else " "}'
                f'{self.entity_data.spec.description_trans}')
--- a/custom_components/xiaomi_home/miot/miot_spec.py
+++ b/custom_components/xiaomi_home/miot/miot_spec.py
@ -61,6 +61,7 @@ from .miot_storage import (
    MIoTStorage,
    SpecBoolTranslation,
    SpecFilter,
+    SpecCustomService,
    SpecMultiLang)

 _LOGGER = logging.getLogger(__name__)
@ -468,6 +469,7 @@ class MIoTSpecParser:
    _bool_trans: SpecBoolTranslation
    _multi_lang: SpecMultiLang
    _spec_filter: SpecFilter
+    _custom_service: SpecCustomService

    def __init__(
        self, lang: str = DEFAULT_INTEGRATION_LANGUAGE,
@ -486,6 +488,7 @@ class MIoTSpecParser:
            lang=self._lang, loop=self._main_loop)
        self._multi_lang = SpecMultiLang(lang=self._lang, loop=self._main_loop)
        self._spec_filter = SpecFilter(loop=self._main_loop)
+        self._custom_service = SpecCustomService(loop=self._main_loop)

    async def init_async(self) -> None:
        if self._init_done is True:
@ -493,6 +496,7 @@ class MIoTSpecParser:
        await self._bool_trans.init_async()
        await self._multi_lang.init_async()
        await self._spec_filter.init_async()
+        await self._custom_service.init_async()
        std_lib_cache: dict = None
        if self._storage:
            std_lib_cache: dict = await self._storage.load_async(
@ -538,6 +542,7 @@ class MIoTSpecParser:
        await self._bool_trans.deinit_async()
        await self._multi_lang.deinit_async()
        await self._spec_filter.deinit_async()
+        await self._custom_service.deinit_async()
        self._ram_cache.clear()

    async def parse(
@ -781,6 +786,12 @@ class MIoTSpecParser:
        _LOGGER.debug('parse urn, %s', urn)
        # Load spec instance
        instance: dict = await self.__get_instance(urn=urn)
+        urn_strs: list[str] = urn.split(':')
+        urn_key: str = ':'.join(urn_strs[:6])
+        # Modify the spec instance by custom spec
+        instance = self._custom_service.modify_spec(urn_key=urn_key,
+                                                    spec=instance)
+        # Check required fields in the device instance
        if (
            not isinstance(instance, dict)
            or 'type' not in instance
@ -798,8 +809,6 @@ class MIoTSpecParser:
                or not isinstance(res_trans['data'], dict)
            ):
                raise MIoTSpecError('invalid translation data')
-            urn_strs: list[str] = urn.split(':')
-            urn_key: str = ':'.join(urn_strs[:6])
            trans_data: dict[str, str] = None
            if self._lang == 'zh-Hans':
                # Simplified Chinese
--- a/custom_components/xiaomi_home/miot/miot_storage.py
+++ b/custom_components/xiaomi_home/miot/miot_storage.py
@ -1033,3 +1033,65 @@ class DeviceManufacturer:
        except Exception as err:  # pylint: disable=broad-exception-caught
            _LOGGER.error('get manufacturer info failed, %s', err)
        return None
+
+
+class SpecCustomService:
+    """Custom MIoT-Spec-V2 service defined by the user."""
+    CUSTOM_SPEC_FILE = 'specs/custom_service.json'
+    _main_loop: asyncio.AbstractEventLoop
+    _data: dict[str, dict[str, any]]
+
+    def __init__(self, loop: Optional[asyncio.AbstractEventLoop]) -> None:
+        self._main_loop = loop or asyncio.get_event_loop()
+        self._data = None
+
+    async def init_async(self) -> None:
+        if isinstance(self._data, dict):
+            return
+        custom_data = None
+        self._data = {}
+        try:
+            custom_data = await self._main_loop.run_in_executor(
+                None, load_json_file,
+                os.path.join(
+                    os.path.dirname(os.path.abspath(__file__)),
+                    self.CUSTOM_SPEC_FILE))
+        except Exception as err:  # pylint: disable=broad-exception-caught
+            _LOGGER.error('custom service, load file error, %s', err)
+            return
+        if not isinstance(custom_data, dict):
+            _LOGGER.error('custom service, invalid spec content')
+            return
+        for values in list(custom_data.values()):
+            if not isinstance(values, dict):
+                _LOGGER.error('custom service, invalid spec data')
+                return
+        self._data = custom_data
+
+    async def deinit_async(self) -> None:
+        self._data = None
+
+    def modify_spec(self, urn_key: str, spec: dict) -> dict | None:
+        """MUST call init_async() first."""
+        if not self._data:
+            _LOGGER.error('self._data is None')
+            return spec
+        if urn_key not in self._data:
+            return spec
+        if 'services' not in spec:
+            return spec
+        if isinstance(self._data[urn_key], str):
+            urn_key = self._data[urn_key]
+        spec_services = spec['services']
+        custom_spec = self._data.get(urn_key, None)
+        # Replace services by custom defined spec
+        for i, service in enumerate(spec_services):
+            siid = str(service['iid'])
+            if siid in custom_spec:
+                spec_services[i] = custom_spec[siid]
+        # Add new services
+        if 'new' in custom_spec:
+            for service in custom_spec['new']:
+                spec_services.append(service)
+
+        return spec
--- a/custom_components/xiaomi_home/miot/specs/custom_service.json
+++ b/custom_components/xiaomi_home/miot/specs/custom_service.json
@ -0,0 +1,152 @@
+{
+    "urn:miot-spec-v2:device:airer:0000A00D:hyd-lyjpro": {
+        "3": {
+            "iid": 3,
+            "type": "urn:miot-spec-v2:service:light:00007802:hyd-lyjpro:1",
+            "description": "Light",
+            "properties": [
+                {
+                    "iid": 1,
+                    "type": "urn:miot-spec-v2:property:on:00000006:hyd-lyjpro:1",
+                    "description": "Sunlight",
+                    "format": "bool",
+                    "access": [
+                        "read",
+                        "write",
+                        "notify"
+                    ]
+                },
+                {
+                    "iid": 3,
+                    "type": "urn:miot-spec-v2:property:flex-switch:000000EC:hyd-lyjpro:1",
+                    "description": "Flex Switch",
+                    "format": "uint8",
+                    "access": [
+                        "read",
+                        "write",
+                        "notify"
+                    ],
+                    "value-list": [
+                        {
+                            "value": 1,
+                            "description": "Overturn"
+                        }
+                    ]
+                }
+            ]
+        },
+        "new": [
+            {
+                "iid": 3,
+                "type": "urn:miot-spec-v2:service:light:00007802:hyd-lyjpro:1",
+                "description": "Moonlight",
+                "properties": [
+                    {
+                        "iid": 2,
+                        "type": "urn:miot-spec-v2:property:on:00000006:hyd-lyjpro:1",
+                        "description": "Switch Status",
+                        "format": "bool",
+                        "access": [
+                            "read",
+                            "write",
+                            "notify"
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+    "urn:miot-spec-v2:device:light:0000A001:yeelink-ceiling19": "urn:miot-spec-v2:device:light:0000A001:yeelink-ceiling4",
+    "urn:miot-spec-v2:device:light:0000A001:yeelink-ceiling20": "urn:miot-spec-v2:device:light:0000A001:yeelink-ceiling4",
+    "urn:miot-spec-v2:device:light:0000A001:yeelink-ceiling4": {
+        "new": [
+            {
+                "iid": 200,
+                "type": "urn:miot-spec-v2:service:ambient-light:0000789D:yeelink-ceiling4:1",
+                "description": "Ambient Light",
+                "properties": [
+                    {
+                        "iid": 201,
+                        "type": "urn:miot-spec-v2:property:on:00000006:yeelink-ceiling4:1",
+                        "description": "Switch Status",
+                        "format": "bool",
+                        "access": [
+                            "read",
+                            "write"
+                        ]
+                    },
+                    {
+                        "iid": 202,
+                        "type": "urn:miot-spec-v2:property:brightness:0000000D:yeelink-ceiling4:1",
+                        "description": "Brightness",
+                        "format": "uint8",
+                        "access": [
+                            "read",
+                            "write"
+                        ],
+                        "unit": "percentage",
+                        "value-range": [
+                            1,
+                            100,
+                            1
+                        ]
+                    },
+                    {
+                        "iid": 203,
+                        "type": "urn:miot-spec-v2:property:color-temperature:0000000F:yeelink-ceiling4:1",
+                        "description": "Color Temperature",
+                        "format": "uint32",
+                        "access": [
+                            "read",
+                            "write"
+                        ],
+                        "unit": "kelvin",
+                        "value-range": [
+                            1700,
+                            6500,
+                            1
+                        ]
+                    },
+                    {
+                        "iid": 204,
+                        "type": "urn:miot-spec-v2:property:color:0000000E:yeelink-ceiling4:1",
+                        "description": "Color",
+                        "format": "uint32",
+                        "access": [
+                            "read",
+                            "write"
+                        ],
+                        "unit": "rgb",
+                        "value-range": [
+                            1,
+                            16777215,
+                            1
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+    "urn:miot-spec-v2:device:water-heater:0000A02A:zimi-h03": {
+        "new": [
+            {
+                "iid": 2,
+                "type": "urn:miot-spec-v2:service:switch:0000780C:zimi-h03:1",
+                "description": "Heat Water",
+                "properties": [
+                    {
+                        "iid": 6,
+                        "type": "urn:miot-spec-v2:property:on:00000006:zimi-h03:1",
+                        "description": "Switch Status",
+                        "format": "bool",
+                        "access": [
+                            "read",
+                            "write",
+                            "notify"
+                        ]
+                    }
+                ]
+            }
+        ]
+    }
+}
--- a/custom_components/xiaomi_home/miot/specs/multi_lang.json
+++ b/custom_components/xiaomi_home/miot/specs/multi_lang.json
@ -155,7 +155,7 @@
            "service:004:property:001": "事件名稱"
        }
    },
-    "urn:miot-spec-v2:device:switch:0000A003:lumi-acn040:1": {
+    "urn:miot-spec-v2:device:switch:0000A003:lumi-acn040": {
        "en": {
            "service:011": "Right Button On and Off",
            "service:011:property:001": "Right Button On and Off",
--- a/custom_components/xiaomi_home/miot/specs/spec_filter.json
+++ b/custom_components/xiaomi_home/miot/specs/spec_filter.json
@ -59,5 +59,10 @@
            "1",
            "5"
        ]
+    },
+    "urn:miot-spec-v2:device:router:0000A036:xiaomi-rd03": {
+        "services": [
+            "*"
+        ]
    }
 }
--- a/custom_components/xiaomi_home/miot/specs/specv2entity.py
+++ b/custom_components/xiaomi_home/miot/specs/specv2entity.py
@ -289,7 +289,7 @@ SPEC_SERVICE_TRANS_MAP: dict[str, dict | str] = {
            }
        },
        'optional': {
-            'properties': {'mode', 'horizontal-swing'}
+            'properties': {'mode', 'horizontal-swing', 'wind-reverse'}
        },
        'entity': 'fan'
    },
--- a/test/check_rule_format.py
+++ b/test/check_rule_format.py
@ -20,6 +20,14 @@ SPEC_MULTI_LANG_FILE = path.join(
 SPEC_FILTER_FILE = path.join(
    ROOT_PATH,
    '../custom_components/xiaomi_home/miot/specs/spec_filter.json')
+CUSTOM_SERVICE_FILE = path.join(
+    ROOT_PATH,
+    '../custom_components/xiaomi_home/miot/specs/custom_service.json')
+
+BOOL_TRANS_URN_KEY_COLON_NUM: int = 4
+CUSTOM_SERVICE_URN_KEY_COLON_NUM: int = 5
+MULTI_LANG_URN_KEY_COLON_NUM: int = 5
+SPEC_FILTER_URN_KEY_COLON_NUM: int = 5


 def load_json_file(file_path: str) -> Optional[dict]:
@ -90,11 +98,18 @@ def nested_3_dict_str_str(d: dict) -> bool:
            return False
    return True

+def urn_key(d: dict, cnt: int) -> bool:
+    for k in d.keys():
+        if cnt != k.count(':'):
+            return False
+    return True

 def spec_filter(d: dict) -> bool:
    """restricted format: dict[str, dict[str, list<str>]]"""
    if not dict_str_dict(d):
        return False
+    if not urn_key(d, SPEC_FILTER_URN_KEY_COLON_NUM):
+        return False
    for value in d.values():
        for k, v in value.items():
            if not isinstance(k, str) or not isinstance(v, list):
@ -104,12 +119,130 @@ def spec_filter(d: dict) -> bool:
    return True


+def spec_instance_format(d: dict) -> bool:
+    """restricted format of MIoT-Spec-V2 instance"""
+    if ('iid' not in d) or ('type' not in d) or ('description' not in d):
+        return False
+    if not isinstance(d['iid'], int) or not isinstance(d['type'], str) or (
+        not isinstance(d['description'], str)):
+        return False
+    # optional keys for property
+    if 'format' in d:
+        if not isinstance(d['format'], str):
+            return False
+    if 'unit' in d:
+        if not isinstance(d['unit'], str):
+            return False
+    if 'access' in d:
+        if not isinstance(d['access'], list):
+            return False
+        for i in d['access']:
+            if not isinstance(i, str):
+                return False
+    if 'value-list' in d:
+        if not isinstance(d['value-list'], list):
+            return False
+        for i in d['value-list']:
+            if not isinstance(i, dict):
+                return False
+            if 'value' not in i or 'description' not in i:
+                return False
+            if not isinstance(i['value'], int) or not isinstance(i[
+                'description'], str):
+                return False
+            if i['description'].replace(' ','') == '':
+                return False
+    # optional keys for action
+    if 'in' in d:
+        if not isinstance(d['in'], list):
+            return False
+        for i in d['in']:
+            if not isinstance(i, int):
+                return False
+    if 'out' in d:
+        if not isinstance(d['out'], list):
+            return False
+        for i in d['out']:
+            if not isinstance(i, int):
+                return False
+    # optional keys for event
+    if 'arguments' in d:
+        if not isinstance(d['arguments'], list):
+            return False
+        for i in d['arguments']:
+            if not isinstance(i, int):
+                return False
+    # optional keys for service
+    if 'properties' in d:
+        if not isinstance(d['properties'], list):
+            return False
+        for i in d['properties']:
+            if not spec_instance_format(i):
+                return False
+    if 'actions' in d:
+        if not isinstance(d['actions'], list):
+            return False
+        for i in d['actions']:
+            if not spec_instance_format(i):
+                return False
+    if 'events' in d:
+        if not isinstance(d['events'], list):
+            return False
+        for i in d['events']:
+            if not spec_instance_format(i):
+                return False
+    return True
+
+
+def is_integer(s: str) -> bool:
+    try:
+        int(s)
+        return True
+    except ValueError:
+        return False
+
+
+def custom_service(d: dict) -> bool:
+    """restricted format: dict[str, dict[str, Any]] or dict[str, str]"""
+    if not isinstance(d, dict):
+        return False
+    for k, v in d.items():
+        if not isinstance(k, str):
+            return False
+        if not (isinstance(v, dict) or isinstance(v, str)):
+            return False
+    if not urn_key(d, CUSTOM_SERVICE_URN_KEY_COLON_NUM):
+        return False
+    for v in d.values():
+        if isinstance(v, str):
+            if CUSTOM_SERVICE_URN_KEY_COLON_NUM != v.count(':'):
+                return False
+            continue
+        for key, value in v.items():
+            if key=='new':
+                if not isinstance(value, list):
+                    return False
+                for i in value:
+                    if not spec_instance_format(i):
+                        return False
+            elif is_integer(key):
+                if not isinstance(value, dict):
+                    return False
+                if not spec_instance_format(value):
+                    return False
+            else:
+                return False
+    return True
+
+
 def bool_trans(d: dict) -> bool:
    """dict[str,  dict[str, str] | dict[str, dict[str, str]] ]"""
    if not isinstance(d, dict):
        return False
    if 'data' not in d or 'translate' not in d:
        return False
+    if not urn_key(d['data'], BOOL_TRANS_URN_KEY_COLON_NUM):
+        return False
    if not dict_str_str(d['data']):
        return False
    if not nested_3_dict_str_str(d['translate']):
@ -126,6 +259,13 @@ def bool_trans(d: dict) -> bool:
            return False
    return True

+def multi_lang(d: dict) -> bool:
+    """dict[str,  dict[str, dict[str, dict[str, str]] ] ]"""
+    if not nested_3_dict_str_str(d):
+        return False
+    if not urn_key(d, MULTI_LANG_URN_KEY_COLON_NUM):
+        return False
+    return True

 def compare_dict_structure(dict1: dict, dict2: dict) -> bool:
    if not isinstance(dict1, dict) or not isinstance(dict2, dict):
@ -160,13 +300,13 @@ def sort_bool_trans(file_path: str):


 def sort_multi_lang(file_path: str):
-    multi_lang: dict = load_json_file(file_path=file_path)
-    multi_lang = dict(sorted(multi_lang.items()))
-    for urn, trans in multi_lang.items():
-        multi_lang[urn] = dict(sorted(trans.items()))
-        for lang, spec in multi_lang[urn].items():
-            multi_lang[urn][lang] = dict(sorted(spec.items()))
-    return multi_lang
+    lang_data: dict = load_json_file(file_path=file_path)
+    lang_data = dict(sorted(lang_data.items()))
+    for urn, trans in lang_data.items():
+        lang_data[urn] = dict(sorted(trans.items()))
+        for lang, spec in lang_data[urn].items():
+            lang_data[urn][lang] = dict(sorted(spec.items()))
+    return lang_data


 def sort_spec_filter(file_path: str):
@ -177,6 +317,17 @@ def sort_spec_filter(file_path: str):
    return filter_data


+def sort_custom_service(file_path: str):
+    service_data: dict = load_json_file(file_path=file_path)
+    service_data = dict(sorted(service_data.items()))
+    for urn, spec in service_data.items():
+        if isinstance(spec, dict):
+            service_data[urn] = dict(sorted(spec.items()))
+        else:
+            service_data[urn] = spec
+    return service_data
+
+
@pytest.mark.github
 def test_bool_trans():
    data: dict = load_json_file(SPEC_BOOL_TRANS_FILE)
@ -195,7 +346,14 @@ def test_spec_filter():
 def test_multi_lang():
    data: dict = load_json_file(SPEC_MULTI_LANG_FILE)
    assert data, f'load {SPEC_MULTI_LANG_FILE} failed'
-    assert nested_3_dict_str_str(data), f'{SPEC_MULTI_LANG_FILE} format error'
+    assert multi_lang(data), f'{SPEC_MULTI_LANG_FILE} format error'
+
+
+@pytest.mark.github
+def test_custom_service():
+    data: dict = load_json_file(CUSTOM_SERVICE_FILE)
+    assert data, f'load {CUSTOM_SERVICE_FILE} failed'
+    assert custom_service(data), f'{CUSTOM_SERVICE_FILE} format error'


@pytest.mark.github
@ -278,6 +436,12 @@ def test_miot_data_sort():
                f'{SPEC_FILTER_FILE} not sorted, goto project root path'
                ' and run the following command sorting, ',
                'pytest -s -v -m update ./test/check_rule_format.py')
+    assert json.dumps(
+        load_json_file(file_path=CUSTOM_SERVICE_FILE)) == json.dumps(
+            sort_custom_service(file_path=CUSTOM_SERVICE_FILE)), (
+                f'{CUSTOM_SERVICE_FILE} not sorted, goto project root path'
+                ' and run the following command sorting, ',
+                'pytest -s -v -m update ./test/check_rule_format.py')


@pytest.mark.update
@ -291,3 +455,6 @@ def test_sort_spec_data():
    sort_data = sort_spec_filter(file_path=SPEC_FILTER_FILE)
    save_json_file(file_path=SPEC_FILTER_FILE, data=sort_data)
    print(SPEC_FILTER_FILE, 'formatted.')
+    sort_data = sort_custom_service(file_path=CUSTOM_SERVICE_FILE)
+    save_json_file(file_path=CUSTOM_SERVICE_FILE, data=sort_data)
+    print(CUSTOM_SERVICE_FILE, 'formatted.')
Author	SHA1	Message	Date
Li Shuzhen	f7f069eeca	Merge `38296132a6` into `5d4b975f85`	2025-01-07 22:20:17 +08:00
Paul Shawn	5d4b975f85	fix: the number of profile models updated from 660 to 823 (#583 ) Some checks failed Tests / check-rule-format (push) Has been cancelled Details Validate / validate-hassfest (push) Has been cancelled Details Validate / validate-hacs (push) Has been cancelled Details Validate / validate-lint (push) Has been cancelled Details Validate / validate-setup (push) Has been cancelled Details	2025-01-07 20:22:06 +08:00
Paul Shawn	0566546a99	feat: filter miwifi.* devices (#564 ) * feat: filter miwifi.* devices * feat: update log level * feat: filter special xiaomi router model, xiaomi.router.rd03	2025-01-07 20:21:43 +08:00
Paul Shawn	c0d100ce2b	feat: fan entity support direction ctrl (#556 ) * feat: fan entity support direction * fix: fix value judgement logic	2025-01-07 20:21:24 +08:00
Li Shuzhen	ce7ce7af4b	fix: fan speed (#464 ) * fix: fan speed * fix: fan speed names map * fix: set percentage * docs: the instance code format of valuelist * fix: fan level property * fix: pylint too long line. * style: code format --------- Co-authored-by: topsworld <sworldtop@gmail.com>	2025-01-07 20:21:04 +08:00
LiShuzhen	38296132a6	feat: yeelink.light.ceiling19 ambient light	2025-01-03 12:57:20 +08:00
LiShuzhen	11ab0290f1	Merge branch 'main' into feat-spec-custom-modify	2025-01-03 11:46:53 +08:00
LiShuzhen	e705ba56da	feat: zimi.waterheater.h03 standalone switch	2024-12-26 08:57:08 +08:00
LiShuzhen	ee05222abc	fix: pylint warn	2024-12-25 21:15:25 +08:00
LiShuzhen	51ff17f1bf	chore: urn key format	2024-12-25 21:13:23 +08:00
LiShuzhen	d5373e55b4	fix: rules take effect	2024-12-25 20:51:43 +08:00
LiShuzhen	5dd0047094	fix: pylint warn	2024-12-25 17:17:33 +08:00
LiShuzhen	beb35fe2a3	chore: custom_service.json format check	2024-12-25 17:04:42 +08:00
LiShuzhen	847d90c0ca	Merge branch 'main' into feat-spec-custom-modify	2024-12-25 14:24:31 +08:00
LiShuzhen	cc883d78e5	Merge branch 'main' into feat-spec-custom-modify	2024-12-20 16:41:46 +08:00
LiShuzhen	58923f31ef	feat: custom service spec	2024-12-20 16:40:38 +08:00