Better query_display_name

Author: Bre77

tesla_fleet_api/tesla/vehicle/bluetooth.py

@@ -218,20 +218,20 @@ async def _send(self, msg: RoutableMessage, requires: str, timeout: int = 2) ->
                     if resp.HasField(requires):
                         return resp
 
-    async def query_name(self, strip_key=True):
+    async def query_display_name(self, max_attempts=5) -> str | None:
         """Read the device name via GATT characteristic if available"""
-        try:
-            # Standard GATT Device Name characteristic (0x2A00)
-            device_name = await self.client.read_gatt_char(NAME_UUID)
-            device_name = device_name.decode('utf-8')
-            if(strip_key):
-                device_name = device_name.replace("🔑 ","")
-            return device_name
-        except Exception as e:
-            LOGGER.error(f"Failed to read device name: {e}")
-            return None
-
-    async def query_appearance(self) -> bytearray:
+        for i in range(max_attempts):
+            try:
+                # Standard GATT Device Name characteristic (0x2A00)
+                device_name = (await self.client.read_gatt_char(NAME_UUID)).decode('utf-8')
+                if device_name.startswith("🔑 "):
+                    return device_name.replace("🔑 ","")
+                await asyncio.sleep(1)
+                LOGGER.debug(f"Attempt {i+1} to query display name failed, {device_name}")
+            except Exception as e:
+                LOGGER.error(f"Failed to read device name: {e}")
+
+    async def query_appearance(self) -> bytearray | None:
         """Read the device appearance via GATT characteristic if available"""
         try:
             # Standard GATT Appearance characteristic (0x2A01)

tesla_fleet_api/tesla/vehicle/vehicles.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+import asyncio
 from typing import TYPE_CHECKING
 from bleak import BleakClient
 from bleak.backends.device import BLEDevice
@@ -73,18 +74,26 @@ def createBluetooth(self, vin: str, key: ec.EllipticCurvePrivateKey | None = Non
         self[vin] = vehicle
         return vehicle
 
-    async def query_device_name(self, device: BLEDevice, max_attempts=3) -> str:
+    async def query_display_name(self, device: BLEDevice, max_attempts=5) -> str | None:
         """Queries the name of a bluetooth vehicle."""
-        async with await establish_connection(
+        client = await establish_connection(
             BleakClient,
             device,
             device.name or "Unknown",
             max_attempts=max_attempts
-        ) as client:
+        )
+        name: str | None = None
+        for i in range(max_attempts):
             try:
                 # Standard GATT Device Name characteristic (0x2A00)
-                device_name = await client.read_gatt_char(NAME_UUID)
-                return device_name.decode('utf-8').replace("🔑 ","")
+                device_name = (await client.read_gatt_char(NAME_UUID)).decode('utf-8')
+                if device_name.startswith("🔑 "):
+                    name = device_name.replace("🔑 ","")
+                    break
+                await asyncio.sleep(1)
+                LOGGER.debug(f"Attempt {i+1} to query display name failed, {device_name}")
             except Exception as e:
                 LOGGER.error(f"Failed to read device name: {e}")
-                return None
+
+        await client.disconnect()
+        return name