From d821d2773037b898ced1283cbabc8461e4d06d39 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 10 Aug 2025 02:41:25 -0500
Subject: [PATCH] Bump habluetooth to 5.0.1 (#150320)

---
 homeassistant/components/bluetooth/__init__.py   | 14 ++++++++------
 homeassistant/components/bluetooth/manager.py    | 12 +++++-------
 homeassistant/components/bluetooth/manifest.json |  2 +-
 homeassistant/package_constraints.txt            |  2 +-
 requirements_all.txt                             |  2 +-
 requirements_test_all.txt                        |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/homeassistant/components/bluetooth/__init__.py b/homeassistant/components/bluetooth/__init__.py
index 7abc929fde5..e3428eb9b86 100644
--- a/homeassistant/components/bluetooth/__init__.py
+++ b/homeassistant/components/bluetooth/__init__.py
@@ -388,12 +388,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     mode = BluetoothScanningMode.PASSIVE if passive else BluetoothScanningMode.ACTIVE
     scanner = HaScanner(mode, adapter, address)
     scanner.async_setup()
-    try:
-        await scanner.async_start()
-    except (RuntimeError, ScannerStartError) as err:
-        raise ConfigEntryNotReady(
-            f"{adapter_human_name(adapter, address)}: {err}"
-        ) from err
     adapters = await manager.async_get_bluetooth_adapters()
     details = adapters[adapter]
     if entry.title == address:
@@ -401,8 +395,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             entry, title=adapter_title(adapter, details)
         )
     slots: int = details.get(ADAPTER_CONNECTION_SLOTS) or DEFAULT_CONNECTION_SLOTS
+    # Register the scanner before starting so
+    # any raw advertisement data can be processed
     entry.async_on_unload(async_register_scanner(hass, scanner, connection_slots=slots))
     await async_update_device(hass, entry, adapter, details)
+    try:
+        await scanner.async_start()
+    except (RuntimeError, ScannerStartError) as err:
+        raise ConfigEntryNotReady(
+            f"{adapter_human_name(adapter, address)}: {err}"
+        ) from err
     entry.async_on_unload(entry.add_update_listener(async_update_listener))
     entry.async_on_unload(scanner.async_stop)
     return True
diff --git a/homeassistant/components/bluetooth/manager.py b/homeassistant/components/bluetooth/manager.py
index 46c5425c730..5f3cb62c158 100644
--- a/homeassistant/components/bluetooth/manager.py
+++ b/homeassistant/components/bluetooth/manager.py
@@ -235,10 +235,9 @@ class HomeAssistantBluetoothManager(BluetoothManager):
 
     def _async_save_scanner_history(self, scanner: BaseHaScanner) -> None:
         """Save the scanner history."""
-        if isinstance(scanner, BaseHaRemoteScanner):
-            self.storage.async_set_advertisement_history(
-                scanner.source, scanner.serialize_discovered_devices()
-            )
+        self.storage.async_set_advertisement_history(
+            scanner.source, scanner.serialize_discovered_devices()
+        )
 
     def _async_unregister_scanner(
         self, scanner: BaseHaScanner, unregister: CALLBACK_TYPE
@@ -285,9 +284,8 @@ class HomeAssistantBluetoothManager(BluetoothManager):
         connection_slots: int | None = None,
     ) -> CALLBACK_TYPE:
         """Register a scanner."""
-        if isinstance(scanner, BaseHaRemoteScanner):
-            if history := self.storage.async_get_advertisement_history(scanner.source):
-                scanner.restore_discovered_devices(history)
+        if history := self.storage.async_get_advertisement_history(scanner.source):
+            scanner.restore_discovered_devices(history)
 
         unregister = super().async_register_scanner(scanner, connection_slots)
         return partial(self._async_unregister_scanner, scanner, unregister)
diff --git a/homeassistant/components/bluetooth/manifest.json b/homeassistant/components/bluetooth/manifest.json
index ce5d98f8edb..aa0d2076c3f 100644
--- a/homeassistant/components/bluetooth/manifest.json
+++ b/homeassistant/components/bluetooth/manifest.json
@@ -21,6 +21,6 @@
     "bluetooth-auto-recovery==1.5.2",
     "bluetooth-data-tools==1.28.2",
     "dbus-fast==2.44.3",
-    "habluetooth==4.0.2"
+    "habluetooth==5.0.1"
   ]
 }
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index b79b0ecf6be..ef3843e7da4 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -34,7 +34,7 @@ dbus-fast==2.44.3
 fnv-hash-fast==1.5.0
 go2rtc-client==0.2.1
 ha-ffmpeg==3.2.2
-habluetooth==4.0.2
+habluetooth==5.0.1
 hass-nabucasa==0.111.2
 hassil==2.2.3
 home-assistant-bluetooth==1.13.1
diff --git a/requirements_all.txt b/requirements_all.txt
index f3ee946e443..a36dafe552d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1130,7 +1130,7 @@ ha-silabs-firmware-client==0.2.0
 habiticalib==0.4.1
 
 # homeassistant.components.bluetooth
-habluetooth==4.0.2
+habluetooth==5.0.1
 
 # homeassistant.components.cloud
 hass-nabucasa==0.111.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 4d26a571437..5eaea0e4258 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -991,7 +991,7 @@ ha-silabs-firmware-client==0.2.0
 habiticalib==0.4.1
 
 # homeassistant.components.bluetooth
-habluetooth==4.0.2
+habluetooth==5.0.1
 
 # homeassistant.components.cloud
 hass-nabucasa==0.111.2