fix request tracker

Author: tillsteinbach

weconnect/elements/generic_status.py

@@ -94,12 +94,12 @@ def update(self, fromDict: Dict[str, Any], ignoreAttributes: Optional[List[str]]
                 if 'requestId' in request:
                     for knownRequest in self.requests:
                         if knownRequest.requestId.enabled and knownRequest.requestId.value == request['requestId']:
-                            request.update(fromDict=request)
+                            knownRequest.update(fromDict=request)
                             updated = True
                 elif 'operation' in request:
                     for knownRequest in self.requests:
                         if knownRequest.operation.enabled and knownRequest.operation.value.value == request['operation']:
-                            request.update(fromDict=request)
+                            knownRequest.update(fromDict=request)
                             updated = True
 
                 if not updated:
@@ -145,7 +145,6 @@ def __init__(
 
         def update(self, fromDict: Dict[str, Any]) -> None:  # noqa: C901
             LOG.debug('Update Status Target from dict')
-
             self.status.fromDict(fromDict, 'status')
             self.operation.fromDict(fromDict, 'operation')
             self.body.fromDict(fromDict, 'body')

weconnect/elements/helpers/request_tracker.py

@@ -1,6 +1,7 @@
 from typing import TYPE_CHECKING, Tuple
 from datetime import datetime, timedelta
 from threading import Timer
+import logging
 
 if TYPE_CHECKING:
     from weconnect.elements.vehicle import Vehicle
@@ -9,6 +10,9 @@
 from weconnect.domain import Domain
 
 
+LOG = logging.getLogger("weconnect")
+
+
 class RequestTracker:
     def __init__(self, vehicle: 'Vehicle') -> None:
         self.vehicle: 'Vehicle' = vehicle
@@ -23,6 +27,7 @@ def clear(self) -> None:
     def trackRequest(self, id: str, domain: Domain, minTime: int, maxTime: int) -> None:
         minDate = datetime.now() + timedelta(seconds=minTime)
         maxDate = datetime.now() + timedelta(seconds=maxTime)
+        LOG.debug('Track requests for id %s in %s at lesat until %s, at most until %s every 5 seconds', id, domain.value, minDate, maxDate)
         if domain not in self.requests:
             self.requests[domain] = [(id, minDate, maxDate)]
         else:
@@ -34,6 +39,7 @@ def trackRequest(self, id: str, domain: Domain, minTime: int, maxTime: int) -> N
             self.__timer.start()
 
     def update(self) -> None:  # noqa: C901
+        LOG.debug('request tracking update status for %d domains', len(self.requests))
         self.vehicle.updateStatus(force=True, selective=self.requests)
         openRequests = []
         for domain, statuses in self.vehicle.domains.items():
@@ -47,17 +53,20 @@ def update(self) -> None:  # noqa: C901
 
                 if maxDate < datetime.now():
                     requests.remove(request)
+                    LOG.debug('request tracking for id %s timed out', id)
                 else:
                     for openRequest in openRequests:
                         if openRequest.requestId.value == id:
                             if openRequest.status.value not in (GenericStatus.Request.Status.IN_PROGRESS,
                                                                 GenericStatus.Request.Status.QUEUED,
                                                                 GenericStatus.Request.Status.DELAYED):
                                 requests.remove(request)
+                                LOG.debug('request tracking for id %s finished with status %s', id, openRequest.status.value)
                             request = (id, datetime.now(), maxDate)
             if not requests:
                 self.requests.pop(domain)
 
-        self.__timer = Timer(5, self.update)
-        self.__timer.daemon = True
-        self.__timer.start()
+        if self.requests:  # Restart timer if there are still requests left
+            self.__timer = Timer(5, self.update)
+            self.__timer.daemon = True
+            self.__timer.start()