feat: improve recovery when adapter has gone silent and needs a USB reset (#222)

Author: bdraco

poetry.lock

@@ -39,7 +39,7 @@ bleak = ">=0.21.1"
 bleak-retry-connector = ">=3.9.0"
 bluetooth-data-tools = ">=1.28.0"
 bluetooth-adapters = ">=0.16.1"
-bluetooth-auto-recovery = ">=1.2.3"
+bluetooth-auto-recovery = ">=1.5.0"
 async-interrupt = ">=1.1.1"
 dbus-fast = { version = ">=2.30.2", markers = "platform_system == 'Linux'" }
 

pyproject.toml

@@ -301,7 +301,7 @@ async def _async_recover_failed_adapters(self) -> None:
                 for adapter, details in adapters.items()
                 if details[ADAPTER_ADDRESS] == FAILED_ADAPTER_MAC
             ]:
-                await async_reset_adapter(adapter, FAILED_ADAPTER_MAC)
+                await async_reset_adapter(adapter, FAILED_ADAPTER_MAC, False)
             await self._async_refresh_adapters()
 
     async def async_setup(self) -> None:

src/habluetooth/manager.py

@@ -357,7 +357,7 @@ async def _async_start_attempt(self, attempt: int) -> bool:
         except asyncio.TimeoutError as ex:
             await self._async_stop_scanner()
             if attempt == 2:
-                await self._async_reset_adapter()
+                await self._async_reset_adapter(False)
             if attempt < START_ATTEMPTS:
                 self._log_start_timeout(attempt)
                 return False
@@ -373,7 +373,7 @@ async def _async_start_attempt(self, attempt: int) -> bool:
                 # If discovery is stuck on, try to force stop it
                 await self._async_force_stop_discovery()
             if attempt == 2 and _error_indicates_reset_needed(error_str):
-                await self._async_reset_adapter()
+                await self._async_reset_adapter(False)
             elif (
                 attempt != START_ATTEMPTS
                 and _error_indicates_wait_for_adapter_to_init(error_str)
@@ -537,7 +537,7 @@ async def _async_restart_scanner(self) -> None:
                 self._start_time == self._last_detection
                 or self.time_since_last_detection() > SCANNER_WATCHDOG_MULTIPLE
             ):
-                await self._async_reset_adapter()
+                await self._async_reset_adapter(True)
             try:
                 await self._async_start()
             except ScannerStartError as ex:
@@ -547,13 +547,13 @@ async def _async_restart_scanner(self) -> None:
                     ex,
                 )
 
-    async def _async_reset_adapter(self) -> None:
+    async def _async_reset_adapter(self, gone_silent: bool) -> None:
         """Reset the adapter."""
         # There is currently nothing the user can do to fix this
         # so we log at debug level. If we later come up with a repair
         # strategy, we will change this to raise a repair issue as well.
         _LOGGER.debug("%s: adapter stopped responding; executing reset", self.name)
-        result = await async_reset_adapter(self.adapter, self.mac_address)
+        result = await async_reset_adapter(self.adapter, self.mac_address, gone_silent)
         _LOGGER.debug("%s: adapter reset result: %s", self.name, result)
 
     async def async_stop(self) -> None:

src/habluetooth/scanner.py

@@ -6,11 +6,13 @@
 from bluetooth_auto_recovery import recover_adapter
 
 
-async def async_reset_adapter(adapter: str | None, mac_address: str) -> bool | None:
+async def async_reset_adapter(
+    adapter: str | None, mac_address: str, gone_silent: bool
+) -> bool | None:
     """Reset the adapter."""
     if adapter and adapter.startswith("hci"):
         adapter_id = int(adapter[3:])
-        return await recover_adapter(adapter_id, mac_address)
+        return await recover_adapter(adapter_id, mac_address, gone_silent)
     return False
 
 

src/habluetooth/util.py

@@ -143,8 +143,8 @@ def adapters(self) -> dict[str, Any]:
 
     assert mock_async_reset_adapter.call_count == 2
     assert mock_async_reset_adapter.call_args_list == [
-        (("hci1", "00:00:00:00:00:00"),),
-        (("hci2", "00:00:00:00:00:00"),),
+        (("hci1", "00:00:00:00:00:00", False),),
+        (("hci2", "00:00:00:00:00:00", False),),
     ]
 
 

tests/test_manager.py

@@ -451,6 +451,12 @@ def register_detection_callback(
             await asyncio.sleep(0)
 
         assert len(mock_recover_adapter.mock_calls) == 1
+        assert mock_recover_adapter.call_args_list[0][0] == (
+            0,
+            "AA:BB:CC:DD:EE:FF",
+            True,
+        )
+
         assert called_start == 2
         await scanner.async_stop()