feat: include scanner type in details (#284)

Author: bdraco

poetry.lock

@@ -38,7 +38,7 @@ python = ">=3.11,<3.14"
 bleak = ">=1.0.1"
 bleak-retry-connector = ">=4.2.0"
 bluetooth-data-tools = ">=1.28.0"
-bluetooth-adapters = ">=2"
+bluetooth-adapters = ">=2.1.0"
 bluetooth-auto-recovery = ">=1.5.1"
 async-interrupt = ">=1.1.1"
 dbus-fast = { version = ">=2.30.2", markers = "platform_system == 'Linux'" }

pyproject.toml

@@ -23,6 +23,7 @@
     HaScannerModeChange,
     HaScannerRegistration,
     HaScannerRegistrationEvent,
+    HaScannerType,
 )
 from .scanner import BluetoothScanningMode, HaScanner, ScannerStartError
 from .scanner_device import BluetoothScannerDevice
@@ -63,6 +64,7 @@
     "HaScannerModeChange",
     "HaScannerRegistration",
     "HaScannerRegistrationEvent",
+    "HaScannerType",
     "ScannerStartError",
     "discovered_device_advertisement_data_from_dict",
     "discovered_device_advertisement_data_to_dict",

src/habluetooth/__init__.py

@@ -27,6 +27,7 @@
     BluetoothServiceInfoBleak,
     HaBluetoothConnector,
     HaScannerDetails,
+    HaScannerType,
 )
 from .scanner_device import BluetoothScannerDevice
 from .storage import DiscoveredDeviceAdvertisementData
@@ -92,11 +93,26 @@ def __init__(
         self._cancel_watchdog: asyncio.TimerHandle | None = None
         self._loop: asyncio.AbstractEventLoop | None = None
         self._manager = get_manager()
+        # Determine scanner type based on class type
+        scanner_type = HaScannerType.UNKNOWN
+        if isinstance(self, BaseHaRemoteScanner):
+            scanner_type = HaScannerType.REMOTE
+        # Try to get adapter type from manager's cached adapters
+        elif (
+            (adapters := self._manager.get_cached_bluetooth_adapters())
+            and (adapter_details := adapters.get(adapter))
+            and (adapter_type := adapter_details.get("adapter_type"))
+        ):
+            if adapter_type == "usb":
+                scanner_type = HaScannerType.USB
+            elif adapter_type == "uart":
+                scanner_type = HaScannerType.UART
         self.details = HaScannerDetails(
             source=self.source,
             connectable=self.connectable,
             name=self.name,
             adapter=self.adapter,
+            scanner_type=scanner_type,
         )
         self._previous_service_info: dict[str, BluetoothServiceInfoBleak] = {}
         # Scanners only care about connectable devices. The manager

src/habluetooth/base_scanner.py

@@ -281,6 +281,10 @@ async def _async_refresh_adapters(self) -> None:
             self._adapter_refresh_future.set_result(None)
             self._adapter_refresh_future = None
 
+    def get_cached_bluetooth_adapters(self) -> dict[str, AdapterDetails] | None:
+        """Get cached bluetooth adapters synchronously."""
+        return self._adapters
+
     async def async_get_bluetooth_adapters(
         self, cached: bool = True
     ) -> dict[str, AdapterDetails]:

src/habluetooth/manager.py

@@ -82,6 +82,16 @@ class HaScannerDetails:
     connectable: bool
     name: str
     adapter: str
+    scanner_type: HaScannerType
+
+
+class HaScannerType(Enum):
+    """The type of scanner."""
+
+    USB = "usb"
+    UART = "uart"
+    REMOTE = "remote"
+    UNKNOWN = "unknown"
 
 
 class BluetoothScanningMode(Enum):

src/habluetooth/models.py

@@ -5,7 +5,8 @@
 import asyncio
 import time
 from datetime import timedelta
-from unittest.mock import ANY
+from typing import Any
+from unittest.mock import ANY, MagicMock, patch
 
 import pytest
 from bleak.backends.device import BLEDevice
@@ -14,10 +15,12 @@
 
 from habluetooth import (
     BaseHaRemoteScanner,
+    BaseHaScanner,
     BluetoothScanningMode,
     HaBluetoothConnector,
     HaScannerDetails,
     HaScannerModeChange,
+    HaScannerType,
     get_manager,
 )
 from habluetooth.const import (
@@ -150,6 +153,7 @@ async def test_remote_scanner(name_2: str | None) -> None:
         connectable=scanner.connectable,
         name=scanner.name,
         adapter=scanner.adapter,
+        scanner_type=HaScannerType.REMOTE,
     )
     unsetup = scanner.async_setup()
     cancel = manager.async_register_scanner(scanner)
@@ -538,6 +542,7 @@ async def test_merge_manufacturer_data_history_existing() -> None:
         connectable=scanner.connectable,
         name=scanner.name,
         adapter=scanner.adapter,
+        scanner_type=HaScannerType.REMOTE,
     )
     unsetup = scanner.async_setup()
     cancel = manager.async_register_scanner(scanner)
@@ -616,6 +621,7 @@ async def test_merge_manufacturer_data_history_new() -> None:
         connectable=scanner.connectable,
         name=scanner.name,
         adapter=scanner.adapter,
+        scanner_type=HaScannerType.REMOTE,
     )
     unsetup = scanner.async_setup()
     cancel = manager.async_register_scanner(scanner)
@@ -683,6 +689,7 @@ async def test_filter_apple_data() -> None:
         connectable=scanner.connectable,
         name=scanner.name,
         adapter=scanner.adapter,
+        scanner_type=HaScannerType.REMOTE,
     )
     unsetup = scanner.async_setup()
     cancel = manager.async_register_scanner(scanner)
@@ -807,3 +814,40 @@ def mode_callback(change: HaScannerModeChange) -> None:
     # Clean up
     unsetup()
     cancel()
+
+
+def test_remote_scanner_type() -> None:
+    """Test that remote scanners have REMOTE type."""
+
+    class TestRemoteScanner(BaseHaRemoteScanner):
+        """Test remote scanner implementation."""
+
+        pass
+
+    scanner = TestRemoteScanner("test_source", "test_adapter")
+    assert scanner.details.scanner_type is HaScannerType.REMOTE
+
+
+def test_base_scanner_with_connector() -> None:
+    """Test BaseHaScanner with connector and adapter type."""
+    manager = get_manager()
+
+    mock_adapters: dict[str, dict[str, Any]] = {
+        "test_adapter": {
+            "address": "00:1A:7D:DA:71:04",
+            "adapter_type": "usb",
+        }
+    }
+
+    connector = HaBluetoothConnector(
+        client=MagicMock, source="test_source", can_connect=lambda: True
+    )
+
+    with patch.object(manager, "_adapters", mock_adapters):
+        scanner = BaseHaScanner(
+            source="test_source",
+            adapter="test_adapter",
+            connector=connector,
+            connectable=True,
+        )
+        assert scanner.details.scanner_type is HaScannerType.USB