From e1ba0717e21e3336179cf2670aa2c5fc1b4b877b Mon Sep 17 00:00:00 2001
From: Marcio Granzotto Rodrigues <oscensores@gmail.com>
Date: Thu, 26 May 2022 01:12:43 -0300
Subject: [PATCH] Fix bond device state with v3 firmwares (#72516)

---
 homeassistant/components/bond/__init__.py    |  2 +-
 homeassistant/components/bond/button.py      |  2 +-
 homeassistant/components/bond/config_flow.py |  2 +-
 homeassistant/components/bond/cover.py       |  2 +-
 homeassistant/components/bond/entity.py      | 10 +++--
 homeassistant/components/bond/fan.py         |  2 +-
 homeassistant/components/bond/light.py       |  2 +-
 homeassistant/components/bond/manifest.json  |  4 +-
 homeassistant/components/bond/switch.py      |  2 +-
 homeassistant/components/bond/utils.py       |  2 +-
 requirements_all.txt                         |  2 +-
 requirements_test_all.txt                    |  2 +-
 tests/components/bond/common.py              |  2 +-
 tests/components/bond/test_button.py         |  2 +-
 tests/components/bond/test_cover.py          |  2 +-
 tests/components/bond/test_entity.py         | 42 +++++++++++++++-----
 tests/components/bond/test_fan.py            |  2 +-
 tests/components/bond/test_init.py           |  2 +-
 tests/components/bond/test_light.py          |  2 +-
 tests/components/bond/test_switch.py         |  2 +-
 20 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/homeassistant/components/bond/__init__.py b/homeassistant/components/bond/__init__.py
index 062c1d844c4..557e68272c2 100644
--- a/homeassistant/components/bond/__init__.py
+++ b/homeassistant/components/bond/__init__.py
@@ -5,7 +5,7 @@ import logging
 from typing import Any
 
 from aiohttp import ClientError, ClientResponseError, ClientTimeout
-from bond_api import Bond, BPUPSubscriptions, start_bpup
+from bond_async import Bond, BPUPSubscriptions, start_bpup
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
diff --git a/homeassistant/components/bond/button.py b/homeassistant/components/bond/button.py
index 0152bedde23..0465e4c51fe 100644
--- a/homeassistant/components/bond/button.py
+++ b/homeassistant/components/bond/button.py
@@ -5,7 +5,7 @@ from dataclasses import dataclass
 import logging
 from typing import Any
 
-from bond_api import Action, BPUPSubscriptions
+from bond_async import Action, BPUPSubscriptions
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.config_entries import ConfigEntry
diff --git a/homeassistant/components/bond/config_flow.py b/homeassistant/components/bond/config_flow.py
index d3a7b4adf72..6eba9897468 100644
--- a/homeassistant/components/bond/config_flow.py
+++ b/homeassistant/components/bond/config_flow.py
@@ -6,7 +6,7 @@ import logging
 from typing import Any
 
 from aiohttp import ClientConnectionError, ClientResponseError
-from bond_api import Bond
+from bond_async import Bond
 import voluptuous as vol
 
 from homeassistant import config_entries, exceptions
diff --git a/homeassistant/components/bond/cover.py b/homeassistant/components/bond/cover.py
index a50f7b93bbb..3938de0d4bd 100644
--- a/homeassistant/components/bond/cover.py
+++ b/homeassistant/components/bond/cover.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from bond_api import Action, BPUPSubscriptions, DeviceType
+from bond_async import Action, BPUPSubscriptions, DeviceType
 
 from homeassistant.components.cover import (
     ATTR_POSITION,
diff --git a/homeassistant/components/bond/entity.py b/homeassistant/components/bond/entity.py
index 583f1cd96f7..832e9b5d464 100644
--- a/homeassistant/components/bond/entity.py
+++ b/homeassistant/components/bond/entity.py
@@ -8,7 +8,7 @@ import logging
 from typing import Any
 
 from aiohttp import ClientError
-from bond_api import BPUPSubscriptions
+from bond_async import BPUPSubscriptions
 
 from homeassistant.const import (
     ATTR_HW_VERSION,
@@ -156,9 +156,13 @@ class BondEntity(Entity):
         self._apply_state(state)
 
     @callback
-    def _async_bpup_callback(self, state: dict) -> None:
+    def _async_bpup_callback(self, json_msg: dict) -> None:
         """Process a state change from BPUP."""
-        self._async_state_callback(state)
+        topic = json_msg["t"]
+        if topic != f"devices/{self._device_id}/state":
+            return
+
+        self._async_state_callback(json_msg["b"])
         self.async_write_ha_state()
 
     async def async_added_to_hass(self) -> None:
diff --git a/homeassistant/components/bond/fan.py b/homeassistant/components/bond/fan.py
index 9acc7874657..f2f6b15f923 100644
--- a/homeassistant/components/bond/fan.py
+++ b/homeassistant/components/bond/fan.py
@@ -6,7 +6,7 @@ import math
 from typing import Any
 
 from aiohttp.client_exceptions import ClientResponseError
-from bond_api import Action, BPUPSubscriptions, DeviceType, Direction
+from bond_async import Action, BPUPSubscriptions, DeviceType, Direction
 import voluptuous as vol
 
 from homeassistant.components.fan import (
diff --git a/homeassistant/components/bond/light.py b/homeassistant/components/bond/light.py
index c0c3fc428b8..55084f37b03 100644
--- a/homeassistant/components/bond/light.py
+++ b/homeassistant/components/bond/light.py
@@ -5,7 +5,7 @@ import logging
 from typing import Any
 
 from aiohttp.client_exceptions import ClientResponseError
-from bond_api import Action, BPUPSubscriptions, DeviceType
+from bond_async import Action, BPUPSubscriptions, DeviceType
 import voluptuous as vol
 
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
diff --git a/homeassistant/components/bond/manifest.json b/homeassistant/components/bond/manifest.json
index 187602057c0..52e9dd1763f 100644
--- a/homeassistant/components/bond/manifest.json
+++ b/homeassistant/components/bond/manifest.json
@@ -3,10 +3,10 @@
   "name": "Bond",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/bond",
-  "requirements": ["bond-api==0.1.18"],
+  "requirements": ["bond-async==0.1.20"],
   "zeroconf": ["_bond._tcp.local."],
   "codeowners": ["@bdraco", "@prystupa", "@joshs85", "@marciogranzotto"],
   "quality_scale": "platinum",
   "iot_class": "local_push",
-  "loggers": ["bond_api"]
+  "loggers": ["bond_async"]
 }
diff --git a/homeassistant/components/bond/switch.py b/homeassistant/components/bond/switch.py
index 01c224d8307..da0b19dd9ff 100644
--- a/homeassistant/components/bond/switch.py
+++ b/homeassistant/components/bond/switch.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 from typing import Any
 
 from aiohttp.client_exceptions import ClientResponseError
-from bond_api import Action, BPUPSubscriptions, DeviceType
+from bond_async import Action, BPUPSubscriptions, DeviceType
 import voluptuous as vol
 
 from homeassistant.components.switch import SwitchEntity
diff --git a/homeassistant/components/bond/utils.py b/homeassistant/components/bond/utils.py
index fc78c5758c1..cba213d9450 100644
--- a/homeassistant/components/bond/utils.py
+++ b/homeassistant/components/bond/utils.py
@@ -5,7 +5,7 @@ import logging
 from typing import Any, cast
 
 from aiohttp import ClientResponseError
-from bond_api import Action, Bond
+from bond_async import Action, Bond
 
 from homeassistant.util.async_ import gather_with_concurrency
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 054f38972db..2404e4331a1 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -417,7 +417,7 @@ blockchain==1.4.4
 # bluepy==1.3.0
 
 # homeassistant.components.bond
-bond-api==0.1.18
+bond-async==0.1.20
 
 # homeassistant.components.bosch_shc
 boschshcpy==0.2.30
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index f35d8da8ec8..0153a1b3323 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -318,7 +318,7 @@ blebox_uniapi==1.3.3
 blinkpy==0.19.0
 
 # homeassistant.components.bond
-bond-api==0.1.18
+bond-async==0.1.20
 
 # homeassistant.components.bosch_shc
 boschshcpy==0.2.30
diff --git a/tests/components/bond/common.py b/tests/components/bond/common.py
index 9c53c0afb8b..4b45a4016c0 100644
--- a/tests/components/bond/common.py
+++ b/tests/components/bond/common.py
@@ -8,7 +8,7 @@ from typing import Any
 from unittest.mock import MagicMock, patch
 
 from aiohttp.client_exceptions import ClientResponseError
-from bond_api import DeviceType
+from bond_async import DeviceType
 
 from homeassistant import core
 from homeassistant.components.bond.const import DOMAIN as BOND_DOMAIN
diff --git a/tests/components/bond/test_button.py b/tests/components/bond/test_button.py
index ee6e98b8462..4411b25657b 100644
--- a/tests/components/bond/test_button.py
+++ b/tests/components/bond/test_button.py
@@ -1,6 +1,6 @@
 """Tests for the Bond button device."""
 
-from bond_api import Action, DeviceType
+from bond_async import Action, DeviceType
 
 from homeassistant import core
 from homeassistant.components.bond.button import STEP_SIZE
diff --git a/tests/components/bond/test_cover.py b/tests/components/bond/test_cover.py
index ca467d4a38d..ccb44402a3e 100644
--- a/tests/components/bond/test_cover.py
+++ b/tests/components/bond/test_cover.py
@@ -1,7 +1,7 @@
 """Tests for the Bond cover device."""
 from datetime import timedelta
 
-from bond_api import Action, DeviceType
+from bond_async import Action, DeviceType
 
 from homeassistant import core
 from homeassistant.components.cover import (
diff --git a/tests/components/bond/test_entity.py b/tests/components/bond/test_entity.py
index 122e9c2f04e..9245f4513ed 100644
--- a/tests/components/bond/test_entity.py
+++ b/tests/components/bond/test_entity.py
@@ -3,7 +3,8 @@ import asyncio
 from datetime import timedelta
 from unittest.mock import patch
 
-from bond_api import BPUPSubscriptions, DeviceType
+from bond_async import BPUPSubscriptions, DeviceType
+from bond_async.bpup import BPUP_ALIVE_TIMEOUT
 
 from homeassistant import core
 from homeassistant.components import fan
@@ -44,24 +45,47 @@ async def test_bpup_goes_offline_and_recovers_same_entity(hass: core.HomeAssista
     bpup_subs.notify(
         {
             "s": 200,
-            "t": "bond/test-device-id/update",
+            "t": "devices/test-device-id/state",
             "b": {"power": 1, "speed": 3, "direction": 0},
         }
     )
     await hass.async_block_till_done()
     assert hass.states.get("fan.name_1").attributes[fan.ATTR_PERCENTAGE] == 100
 
+    # Send a message for the wrong device to make sure its ignored
+    # we should never get this callback
+    bpup_subs.notify(
+        {
+            "s": 200,
+            "t": "devices/other-device-id/state",
+            "b": {"power": 1, "speed": 1, "direction": 0},
+        }
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get("fan.name_1").attributes[fan.ATTR_PERCENTAGE] == 100
+
+    # Test we ignore messages for the wrong topic
+    bpup_subs.notify(
+        {
+            "s": 200,
+            "t": "devices/test-device-id/other_topic",
+            "b": {"power": 1, "speed": 1, "direction": 0},
+        }
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get("fan.name_1").attributes[fan.ATTR_PERCENTAGE] == 100
+
     bpup_subs.notify(
         {
             "s": 200,
-            "t": "bond/test-device-id/update",
+            "t": "devices/test-device-id/state",
             "b": {"power": 1, "speed": 1, "direction": 0},
         }
     )
     await hass.async_block_till_done()
     assert hass.states.get("fan.name_1").attributes[fan.ATTR_PERCENTAGE] == 33
 
-    bpup_subs.last_message_time = 0
+    bpup_subs.last_message_time = -BPUP_ALIVE_TIMEOUT
     with patch_bond_device_state(side_effect=asyncio.TimeoutError):
         async_fire_time_changed(hass, utcnow() + timedelta(seconds=230))
         await hass.async_block_till_done()
@@ -75,7 +99,7 @@ async def test_bpup_goes_offline_and_recovers_same_entity(hass: core.HomeAssista
         bpup_subs.notify(
             {
                 "s": 200,
-                "t": "bond/test-device-id/update",
+                "t": "devices/test-device-id/state",
                 "b": {"power": 1, "speed": 2, "direction": 0},
             }
         )
@@ -106,7 +130,7 @@ async def test_bpup_goes_offline_and_recovers_different_entity(
     bpup_subs.notify(
         {
             "s": 200,
-            "t": "bond/test-device-id/update",
+            "t": "devices/test-device-id/state",
             "b": {"power": 1, "speed": 3, "direction": 0},
         }
     )
@@ -116,14 +140,14 @@ async def test_bpup_goes_offline_and_recovers_different_entity(
     bpup_subs.notify(
         {
             "s": 200,
-            "t": "bond/test-device-id/update",
+            "t": "devices/test-device-id/state",
             "b": {"power": 1, "speed": 1, "direction": 0},
         }
     )
     await hass.async_block_till_done()
     assert hass.states.get("fan.name_1").attributes[fan.ATTR_PERCENTAGE] == 33
 
-    bpup_subs.last_message_time = 0
+    bpup_subs.last_message_time = -BPUP_ALIVE_TIMEOUT
     with patch_bond_device_state(side_effect=asyncio.TimeoutError):
         async_fire_time_changed(hass, utcnow() + timedelta(seconds=230))
         await hass.async_block_till_done()
@@ -133,7 +157,7 @@ async def test_bpup_goes_offline_and_recovers_different_entity(
     bpup_subs.notify(
         {
             "s": 200,
-            "t": "bond/not-this-device-id/update",
+            "t": "devices/not-this-device-id/state",
             "b": {"power": 1, "speed": 2, "direction": 0},
         }
     )
diff --git a/tests/components/bond/test_fan.py b/tests/components/bond/test_fan.py
index 061e94595bf..7c860e68efc 100644
--- a/tests/components/bond/test_fan.py
+++ b/tests/components/bond/test_fan.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 from datetime import timedelta
 from unittest.mock import call
 
-from bond_api import Action, DeviceType, Direction
+from bond_async import Action, DeviceType, Direction
 import pytest
 
 from homeassistant import core
diff --git a/tests/components/bond/test_init.py b/tests/components/bond/test_init.py
index 88615d98122..03eb490b65e 100644
--- a/tests/components/bond/test_init.py
+++ b/tests/components/bond/test_init.py
@@ -3,7 +3,7 @@ import asyncio
 from unittest.mock import MagicMock, Mock
 
 from aiohttp import ClientConnectionError, ClientResponseError
-from bond_api import DeviceType
+from bond_async import DeviceType
 import pytest
 
 from homeassistant.components.bond.const import DOMAIN
diff --git a/tests/components/bond/test_light.py b/tests/components/bond/test_light.py
index 6556c25efe2..c7d8f195423 100644
--- a/tests/components/bond/test_light.py
+++ b/tests/components/bond/test_light.py
@@ -1,7 +1,7 @@
 """Tests for the Bond light device."""
 from datetime import timedelta
 
-from bond_api import Action, DeviceType
+from bond_async import Action, DeviceType
 import pytest
 
 from homeassistant import core
diff --git a/tests/components/bond/test_switch.py b/tests/components/bond/test_switch.py
index 619eac69e71..b63bad2d431 100644
--- a/tests/components/bond/test_switch.py
+++ b/tests/components/bond/test_switch.py
@@ -1,7 +1,7 @@
 """Tests for the Bond switch device."""
 from datetime import timedelta
 
-from bond_api import Action, DeviceType
+from bond_async import Action, DeviceType
 import pytest
 
 from homeassistant import core