Fixes

Author: Bre77

tesla_fleet_api/exceptions.py

@@ -875,9 +875,6 @@ class SignedMessageInformationFaultCouldNotHashMetadata(SignedMessageInformation
 class WhitelistOperationStatus(TeslaFleetError):
     message = "Whitelist operation failed"
 
-    def __init__(self, message):
-        self.message = message
-
 class WhitelistOperationUndocumentedError(WhitelistOperationStatus):
     message = "Undocumented whitelist operation error"
     code = 1

tesla_fleet_api/tesla/vehicle/bluetooth.py

@@ -99,10 +99,11 @@ def __init__(
 
     async def find_vehicle(self, name: str | None = None, address: str | None = None, scanner: BleakScanner = BleakScanner()) -> BLEDevice:
         """Find the Tesla BLE device."""
-        if name is not None:
-            device = await scanner.find_device_by_name(name)
-        elif address is not None:
+
+        if address is not None:
             device = await scanner.find_device_by_address(address)
+        elif name is not None:
+            device = await scanner.find_device_by_name(name)
         else:
             device = await scanner.find_device_by_name(self.ble_name)
         if not device:
@@ -116,12 +117,10 @@ def set_device(self, device: BLEDevice) -> None:
     def get_device(self) -> BLEDevice:
         return self.device
 
-    async def connect(self, device: BLEDevice | None = None, max_attempts: int = MAX_CONNECT_ATTEMPTS) -> None:
+    async def connect(self, max_attempts: int = MAX_CONNECT_ATTEMPTS) -> None:
         """Connect to the Tesla BLE device."""
-        if device:
-            self.device = device
-        if not self.device:
-            raise ValueError(f"Device {self.ble_name} not found or provided")
+        if not hasattr(self, 'device'):
+            raise ValueError(f"BLEDevice {self.ble_name} has not been found or set")
         self.client = await establish_connection(
             BleakClient,
             self.device,
@@ -189,7 +188,7 @@ async def _on_message(self, msg: RoutableMessage) -> None:
         LOGGER.debug(f"Received response: {msg}")
         await self._queues[msg.from_destination.domain].put(msg)
 
-    async def _send(self, msg: RoutableMessage, requires: str) -> RoutableMessage:
+    async def _send(self, msg: RoutableMessage, requires: str, timeout: int = 2) -> RoutableMessage:
         """Serialize a message and send to the vehicle and wait for a response."""
         domain = msg.to_destination.domain
         async with self._sessions[domain].lock:
@@ -203,7 +202,7 @@ async def _send(self, msg: RoutableMessage, requires: str) -> RoutableMessage:
             await self.client.write_gatt_char(WRITE_UUID, payload, True)
 
             # Process the response
-            async with asyncio.timeout(2):
+            async with asyncio.timeout(timeout):
                 while True:
                     resp = await self._queues[domain].get()
                     LOGGER.debug(f"Received message {resp}")
@@ -213,7 +212,7 @@ async def _send(self, msg: RoutableMessage, requires: str) -> RoutableMessage:
                     if resp.HasField(requires):
                         return resp
 
-    async def pair(self, role: Role = Role.ROLE_OWNER, form: KeyFormFactor = KeyFormFactor.KEY_FORM_FACTOR_CLOUD_KEY):
+    async def pair(self, role: Role = Role.ROLE_OWNER, form: KeyFormFactor = KeyFormFactor.KEY_FORM_FACTOR_CLOUD_KEY, timeout: int = 60):
         """Pair the key."""
 
         request = UnsignedMessage(
@@ -236,7 +235,7 @@ async def pair(self, role: Role = Role.ROLE_OWNER, form: KeyFormFactor = KeyForm
             ),
             protobuf_message_as_bytes=request.SerializeToString(),
         )
-        resp = await self._send(msg, "protobuf_message_as_bytes")
+        resp = await self._send(msg, "protobuf_message_as_bytes", timeout)
         respMsg = FromVCSECMessage.FromString(resp.protobuf_message_as_bytes)
         if(respMsg.commandStatus.whitelistOperationStatus.whitelistOperationInformation):
             if(respMsg.commandStatus.whitelistOperationStatus.whitelistOperationInformation < len(WHITELIST_OPERATION_STATUS)):

tesla_fleet_api/tesla/vehicle/vehicles.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
+from bleak.backends.device import BLEDevice
+from cryptography.hazmat.primitives.asymmetric import ec
 
 from tesla_fleet_api.tesla.vehicle.signed import VehicleSigned
 from tesla_fleet_api.tesla.vehicle.bluetooth import VehicleBluetooth
@@ -58,8 +60,12 @@ class VehiclesBluetooth(dict[str, Vehicle]):
     def __init__(self, parent: TeslaBluetooth):
         self._parent = parent
 
-    def create(self, vin: str) -> VehicleBluetooth:
+    def create(self, vin: str, key: ec.EllipticCurvePrivateKey | None = None, device: BLEDevice | None = None) -> VehicleBluetooth:
         """Creates a bluetooth vehicle that uses command protocol."""
-        vehicle = self.Bluetooth(self._parent, vin)
+        return self.createBluetooth(vin, key, device)
+
+    def createBluetooth(self, vin: str, key: ec.EllipticCurvePrivateKey | None = None, device: BLEDevice | None = None) -> VehicleBluetooth:
+        """Creates a bluetooth vehicle that uses command protocol."""
+        vehicle = self.Bluetooth(self._parent, vin, key, device)
         self[vin] = vehicle
         return vehicle