Fix bluetooth device connection failure when device is seen by dbus but not bleak (#83281)

homeassistant/components/bluetooth/manifest.json

@@ -7,8 +7,8 @@
   "quality_scale": "internal",
   "requirements": [
     "bleak==0.19.2",
-    "bleak-retry-connector==2.9.0",
-    "bluetooth-adapters==0.11.0",
+    "bleak-retry-connector==2.10.1",
+    "bluetooth-adapters==0.12.0",
     "bluetooth-auto-recovery==0.5.4",
     "bluetooth-data-tools==0.3.0",
     "dbus-fast==1.75.0"

homeassistant/components/bluetooth/scanner.py

@@ -16,6 +16,7 @@ from bleak.backends.bluezdbus.advertisement_monitor import OrPattern
 from bleak.backends.bluezdbus.scanner import BlueZScannerArgs
 from bleak.backends.device import BLEDevice
 from bleak.backends.scanner import AdvertisementData, AdvertisementDataCallback
+from bleak_retry_connector import restore_discoveries
 from bluetooth_adapters import DEFAULT_ADDRESS
 from dbus_fast import InvalidMessageError
 
@@ -314,6 +315,7 @@ class HaScanner(BaseHaScanner):
 
         self.scanning = True
         self._async_setup_scanner_watchdog()
+        await restore_discoveries(self.scanner, self.adapter)
 
     @hass_callback
     def _async_setup_scanner_watchdog(self) -> None:

homeassistant/package_constraints.txt

@@ -10,9 +10,9 @@ atomicwrites-homeassistant==1.4.1
 attrs==21.2.0
 awesomeversion==22.9.0
 bcrypt==3.1.7
-bleak-retry-connector==2.9.0
+bleak-retry-connector==2.10.1
 bleak==0.19.2
-bluetooth-adapters==0.11.0
+bluetooth-adapters==0.12.0
 bluetooth-auto-recovery==0.5.4
 bluetooth-data-tools==0.3.0
 certifi>=2021.5.30

requirements_all.txt

@@ -422,7 +422,7 @@ bimmer_connected==0.10.4
 bizkaibus==0.1.1
 
 # homeassistant.components.bluetooth
-bleak-retry-connector==2.9.0
+bleak-retry-connector==2.10.1
 
 # homeassistant.components.bluetooth
 bleak==0.19.2
@@ -447,7 +447,7 @@ bluemaestro-ble==0.2.0
 # bluepy==1.3.0
 
 # homeassistant.components.bluetooth
-bluetooth-adapters==0.11.0
+bluetooth-adapters==0.12.0
 
 # homeassistant.components.bluetooth
 bluetooth-auto-recovery==0.5.4

requirements_test_all.txt

@@ -346,7 +346,7 @@ bellows==0.34.5
 bimmer_connected==0.10.4
 
 # homeassistant.components.bluetooth
-bleak-retry-connector==2.9.0
+bleak-retry-connector==2.10.1
 
 # homeassistant.components.bluetooth
 bleak==0.19.2
@@ -361,7 +361,7 @@ blinkpy==0.19.2
 bluemaestro-ble==0.2.0
 
 # homeassistant.components.bluetooth
-bluetooth-adapters==0.11.0
+bluetooth-adapters==0.12.0
 
 # homeassistant.components.bluetooth
 bluetooth-auto-recovery==0.5.4