Fix duplicate events from multiple gateways #1039

Author: AlexxIT

custom_components/xiaomi_gateway3/core/gateway/miot.py

@@ -24,8 +24,15 @@ async def miot_process_properties(self, data: list):
         # convert miio response format to multiple responses in lumi format
         devices: Dict[str, Optional[list]] = {}
         for item in data:
-            if item["did"] not in self.devices:
+            device = self.devices.get(item["did"])
+            if not device:
                 continue
+
+            if seq := item.get("tid"):
+                if device.extra.get("seq") == seq:
+                    return
+                device.extra["seq"] = seq
+
             devices.setdefault(item["did"], []).append(item)
 
         for did, payload in devices.items():
@@ -38,6 +45,12 @@ async def miot_process_event(self, data: dict):
         device = self.devices.get(data["did"])
         if not device:
             return
+
+        if seq := data.get("tid"):
+            if device.extra.get("seq") == seq:
+                return
+            device.extra["seq"] = seq
+
         payload = device.decode_miot([data])
         device.update(payload)
 

tests/test_gateway.py

@@ -0,0 +1,39 @@
+import asyncio
+
+from homeassistant.components.sensor import DOMAIN
+
+from custom_components.xiaomi_gateway3.core.converters import MESH
+from custom_components.xiaomi_gateway3.core.device import XDevice
+from custom_components.xiaomi_gateway3.core.gateway.miot import MIoTGateway
+
+assert DOMAIN  # fix circular import
+
+
+def test_sequence():
+    decode_miot = []
+
+    device = XDevice(MESH, 0, "123", "112233aabbcc")
+    device.decode_miot = lambda *args: decode_miot.extend(args)
+
+    gw = MIoTGateway()
+    gw.devices["123"] = device
+
+    loop = asyncio.new_event_loop()
+
+    # test 1
+    coro = gw.miot_process_properties(
+        [{"did": "123", "siid": 2, "piid": 4, "tid": 229, "value": 90}]
+    )
+    loop.run_until_complete(coro)
+
+    assert decode_miot
+
+    # test 2
+    decode_miot.clear()
+
+    coro = gw.miot_process_properties(
+        [{"did": "123", "siid": 2, "piid": 4, "tid": 229, "value": 90}]
+    )
+    loop.run_until_complete(coro)
+
+    assert not decode_miot