Fixes

Author: Bre77

pyproject.toml

@@ -1,2 +1,5 @@
 [tool.ruff]
 exclude = ["tesla_fleet_api/tesla/vehicle/proto/*"]
+
+[tool.pyright]
+exclude = ["tesla_fleet_api/tesla/vehicle/proto/*"]

tesla_fleet_api/exceptions.py

@@ -21,7 +21,6 @@ class ResponseError(TeslaFleetError):
     """The response from the server was not JSON."""
 
     message = "The response from the server was not JSON."
-    data: str | None = None
 
 
 class InvalidCommand(TeslaFleetError):

tesla_fleet_api/tesla/energysite.py

@@ -159,11 +159,12 @@ class EnergySites(dict[int, EnergySite]):
     """Class describing the Tesla Fleet API partner endpoints"""
 
     _parent: TeslaFleetApi
+    Site = EnergySite
 
     def __init__(self, parent: TeslaFleetApi):
         self._parent = parent
 
     def create(self, energy_site_id: int) -> EnergySite:
         """Create a specific energy site."""
-        self[energy_site_id] = EnergySite(self._parent, energy_site_id)
+        self[energy_site_id] = self.Site(self._parent, energy_site_id)
         return self[energy_site_id]

tesla_fleet_api/tesla/vehicle/bluetooth.py

@@ -118,7 +118,17 @@ def get_device(self) -> BLEDevice:
 
     async def connect(self, device: BLEDevice | None = None, max_attempts: int = MAX_CONNECT_ATTEMPTS) -> None:
         """Connect to the Tesla BLE device."""
-        self.client = await establish_connection(BleakClient, self.device, self.vin, max_attempts=max_attempts, ble_device_callback=self.get_device)
+        if device:
+            self.device = device
+        if not self.device:
+            raise ValueError(f"Device {self.ble_name} not found")
+        self.client = await establish_connection(
+            BleakClient,
+            self.device,
+            self.vin,
+            max_attempts=max_attempts,
+            ble_device_callback=self.get_device
+        )
         await self.client.start_notify(READ_UUID, self._on_notify)
 
     async def disconnect(self) -> bool:
@@ -140,34 +150,43 @@ async def _on_notify(self,sender: BleakGATTCharacteristic,data : bytearray) -> N
             self._recv += data
         else:
             self._recv_len = int.from_bytes(data[:2], 'big')
+            if self._recv_len > 1024:
+                LOGGER.error("Parsed very large message length")
+                self._recv = bytearray()
+                self._recv_len = 0
+                return
             self._recv = data[2:]
-        LOGGER.debug(f"Received {len(self._recv)} of {self._recv_len} bytes")
-        while len(self._recv) > self._recv_len:
-            LOGGER.warn(f"Received more data than expected: {len(self._recv)} > {self._recv_len}")
-            await self._on_message(bytes(self._recv[:self._recv_len]))
-            self._recv_len = int.from_bytes(self._recv[self._recv_len:self._recv_len+2], 'big')
-            self._recv = self._recv[self._recv_len+2:]
-            continue
-        if len(self._recv) == self._recv_len:
-            await self._on_message(bytes(self._recv))
-            self._recv = bytearray()
-            self._recv_len = 0
-
-    async def _on_message(self, data:bytes) -> None:
+        #while len(self._recv) > self._recv_len:
+        #
+        #    # Maybe this needs to trigger a reset
+        #    await self._on_message(bytes(self._recv[:self._recv_len]))
+        #    self._recv_len = int.from_bytes(self._recv[self._recv_len:self._recv_len+2], 'big')
+        #    self._recv = self._recv[self._recv_len+2:]
+        #    continue
+        if len(self._recv) >= self._recv_len:
+            if len(self._recv) > self._recv_len:
+                LOGGER.debug(f"Received more data than expected: {len(self._recv)} > {self._recv_len}")
+            try:
+                msg = RoutableMessage.FromString(bytes(self._recv[:self._recv_len]))
+                await self._on_message(msg)
+                self._recv = bytearray()
+                self._recv_len = 0
+            except DecodeError:
+                # Attempt parsing the whole payload
+                msg = RoutableMessage.FromString(bytes(self._recv))
+                LOGGER.warn(f"Parsed more data than length: {len(self._recv)} > {self._recv_len}")
+                await self._on_message(msg)
+                self._recv = bytearray()
+                self._recv_len = 0
+
+    async def _on_message(self, msg: RoutableMessage) -> None:
         """Receive messages from the Tesla BLE data."""
-        try:
-            msg = RoutableMessage.FromString(data)
-        except DecodeError as e:
-            LOGGER.error(f"Error parsing message: {e}")
-            self._recv = bytearray()
-            self._recv_len = 0
-            return
 
         if(msg.to_destination.routing_address != self._from_destination):
             # Ignore ephemeral key broadcasts
             return
 
-        LOGGER.info(f"Received response: {msg}")
+        LOGGER.debug(f"Received response: {msg}")
         await self._queues[msg.from_destination.domain].put(msg)
 
     async def _send(self, msg: RoutableMessage, requires: str) -> RoutableMessage:
@@ -184,7 +203,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(10):
+            async with asyncio.timeout(2):
                 while True:
                     resp = await self._queues[domain].get()
                     LOGGER.debug(f"Received message {resp}")
@@ -217,7 +236,7 @@ async def pair(self, role: Role = Role.ROLE_OWNER, form: KeyFormFactor = KeyForm
             ),
             protobuf_message_as_bytes=request.SerializeToString(),
         )
-        resp = await self._send(msg)
+        resp = await self._send(msg, "protobuf_message_as_bytes")
         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/signed.py

@@ -5,14 +5,6 @@
 
 from tesla_fleet_api.tesla.vehicle.fleet import VehicleFleet
 from tesla_fleet_api.tesla.vehicle.commands import Commands
-from tesla_fleet_api.exceptions import (
-    MESSAGE_FAULTS,
-    NotOnWhitelistFault,
-)
-from tesla_fleet_api.tesla.vehicle.proto.signatures_pb2 import (
-    Session_Info_Status,
-    SessionInfo,
-)
 from tesla_fleet_api.tesla.vehicle.proto.universal_message_pb2 import (
     RoutableMessage,
 )
@@ -41,9 +33,6 @@ async def _send(self, msg: RoutableMessage, requires: str) -> RoutableMessage:
             json = await self.signed_command(
                 base64.b64encode(msg.SerializeToString()).decode()
             )
-
             resp = RoutableMessage.FromString(base64.b64decode(json["response"]))
-
             self.validate_msg(resp)
-
             return resp

tesla_fleet_api/tesla/vehicle/vehicle.py

@@ -1,10 +1,18 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
-
 if TYPE_CHECKING:
     from tesla_fleet_api.tesla.tesla import Tesla
 
+MODELS = {
+    "S": "Model S",
+    "X": "Model X",
+    "3": "Model 3",
+    "Y": "Model Y",
+    "C": "Cybertruck",
+    "R": "Roadster",
+    "T": "Semi",
+}
 
 class Vehicle:
     """Base class describing a Tesla vehicle."""
@@ -14,6 +22,12 @@ class Vehicle:
     def __init__(self, parent: Tesla, vin: str):
         self.vin = vin
 
-    def pre2021(self, vin: str) -> bool:
+
+    def pre2021(self) -> bool:
         """Checks if a vehicle is a pre-2021 model S or X."""
-        return vin[3] in ["S", "X"] and (vin[9] <= "L" or (vin[9] == "M" and vin[7] in ['1', '2', '3', '4']))
+        return self.vin[3] in ["S", "X"] and (self.vin[9] <= "L" or (self.vin[9] == "M" and self.vin[7] in ['1', '2', '3', '4']))
+
+    @property
+    def model(self) -> str:
+        """Returns the model of the vehicle."""
+        return MODELS.get(self.vin[3], "Unknown")

tesla_fleet_api/tesla/vehicle/vehicles.py

@@ -15,25 +15,28 @@ class Vehicles(dict[str, Vehicle]):
     """Class containing and creating vehicles."""
 
     _parent: TeslaFleetApi
+    Fleet = VehicleFleet
+    Signed = VehicleSigned
+    Bluetooth = VehicleBluetooth
 
     def __init__(self, parent: TeslaFleetApi):
         self._parent = parent
 
     def createFleet(self, vin: str) -> VehicleFleet:
         """Creates a Fleet API vehicle."""
-        vehicle = VehicleFleet(self._parent, vin)
+        vehicle = self.Fleet(self._parent, vin)
         self[vin] = vehicle
         return vehicle
 
     def createSigned(self, vin: str) -> VehicleSigned:
         """Creates a Fleet API vehicle that uses command protocol."""
-        vehicle = VehicleSigned(self._parent, vin)
+        vehicle = self.Signed(self._parent, vin)
         self[vin] = vehicle
         return vehicle
 
     def createBluetooth(self, vin: str):
         """Creates a bluetooth vehicle that uses command protocol."""
-        vehicle = VehicleBluetooth(self._parent, vin)
+        vehicle = self.Bluetooth(self._parent, vin)
         self[vin] = vehicle
         return vehicle