Upstream session fixes and lower BLE logging

Author: Bre77

tesla_fleet_api/tesla/vehicle/bluetooth.py

@@ -110,7 +110,7 @@ def receive_data(self, data: bytearray):
             if self.expected_length is None and len(self.buffer) >= 2:
                 self.expected_length = struct.unpack(">H", self.buffer[:2])[0] + 2
 
-            LOGGER.info(f"Buffer length: {len(self.buffer)}, Packet starts: {self.packet_starts}, Expected length: {self.expected_length}")
+            LOGGER.debug(f"Buffer length: {len(self.buffer)}, Packet starts: {self.packet_starts}, Expected length: {self.expected_length}")
 
             if self.expected_length is not None and self.expected_length > 1024:
                 LOGGER.warning(f"Expected length too large: {self.expected_length}")
@@ -270,7 +270,7 @@ async def _send(self, msg: RoutableMessage, requires: str, timeout: int = 5) ->
                     if resp.HasField(requires):
                         return resp
                     else:
-                        LOGGER.warning(f"Ignoring message since it does not contain the required field {requires}, {resp.HasField(requires)}")
+                        LOGGER.debug(f"Ignoring message since it does not contain the required field {requires}, {resp.HasField(requires)}")
 
     async def query_display_name(self, max_attempts=5) -> str | None:
         """Read the device name via GATT characteristic if available"""

tesla_fleet_api/tesla/vehicle/commands.py

@@ -158,24 +158,20 @@
 class Session:
     """A connect to a domain"""
 
-    domain: Domain
-    parent: Commands
-    key: bytes
-    counter: int
-    epoch: bytes
-    delta: int
-    sharedKey: bytes
-    hmac: bytes
-    publicKey: bytes
-    lock: Lock
-    ready: bool
-
     def __init__(self, parent: Commands, domain: Domain):
-        self.parent = parent
-        self.domain = domain
+        self.parent: Commands = parent
+        self.domain: Domain = domain
+        self.counter: int = 0
+        self.epoch: bytes | None = None
+        self.delta: int = 0
+        self.sharedKey: bytes | None = None
+        self.hmac: bytes | None = None
+        self.publicKey: bytes | None = None
         self.lock = Lock()
-        self.counter = 0
-        self.ready = False
+
+    @property
+    def ready(self) -> bool:
+        return self.epoch is not None and self.hmac is not None and self.delta > 0
 
     def update(self, sessionInfo: SessionInfo):
         """Update the session with new information"""
@@ -187,14 +183,14 @@ def update(self, sessionInfo: SessionInfo):
             self.publicKey = sessionInfo.publicKey
             self.sharedKey = self.parent.shared_key(sessionInfo.publicKey)
             self.hmac = hmac.new(self.sharedKey, "authenticated command".encode(), hashlib.sha256).digest()
-        self.ready = True
 
     def hmac_personalized(self) -> HMAC_Personalized_Signature_Data:
         """Sign a command and return session metadata"""
         self.counter += 1
         return HMAC_Personalized_Signature_Data(
             epoch=self.epoch,
             counter=self.counter,
+            # Expire command in 10 seconds
             expires_at=int(time.time()) - self.delta + 10,
         )
 
@@ -205,7 +201,8 @@ def aes_gcm_personalized(self) -> AES_GCM_Personalized_Signature_Data:
             epoch=self.epoch,
             nonce=randbytes(12),
             counter=self.counter,
-            expires_at=int(time.time()) - self.delta + 10,
+            # Expire command in 30 seconds (BLE can be slow)
+            expires_at=int(time.time()) - self.delta + 30,
         )