fix: Improve wake up retry logic

teslajsonpy/car.py

@@ -8,7 +8,7 @@
 import logging
 from typing import Optional
 
-from teslajsonpy.exceptions import HomelinkError
+from teslajsonpy.exceptions import HomelinkError, TeslaException
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -656,7 +656,7 @@ async def _send_command(
         additional_path_vars: dict = None,
         wake_if_asleep: bool = True,
         **kwargs,
-    ) -> dict:
+    ) -> Optional[dict]:
         """Wrap commands sent to Tesla API.
 
         Args
@@ -671,11 +671,23 @@ async def _send_command(
             path_vars.update(additional_path_vars)
 
         _LOGGER.debug("Sending command: %s", name)
-        data = await self._controller.api(
-            name, path_vars=path_vars, wake_if_asleep=wake_if_asleep, **kwargs
-        )
-        _LOGGER.debug("Response from command %s: %s", name, data)
-        return data
+        try:
+            data = await self._controller.api(
+                name, path_vars=path_vars, wake_if_asleep=wake_if_asleep, **kwargs
+            )
+            _LOGGER.debug("Response from command %s: %s", name, data)
+            return data
+        except TeslaException as ex:
+            if ex.code == 408 and not wake_if_asleep and not self.is_on:
+                # 408 due to being asleep and we didn't try to wake it
+                _LOGGER.debug(
+                    "Vehicle unavailable for command: %s, car state: %s, wake_if_asleep: %s",
+                    name,
+                    self.state,
+                    wake_if_asleep,
+                )
+                return None
+            raise ex
 
     def _get_lat_long(self) -> float:
         """Get current latitude and longitude."""
@@ -981,8 +993,7 @@ async def stop_charge(self) -> None:
 
     async def wake_up(self) -> None:
         """Send command to wake up."""
-        # Avoid wake wrapper loop for wake command
-        await self._send_command("WAKE_UP", wake_if_asleep=False)
+        await self._controller.wake_up(car_id=self.id)
 
     async def toggle_trunk(self) -> None:
         """Actuate rear trunk."""

teslajsonpy/const.py

@@ -11,6 +11,8 @@
 DRIVING_INTERVAL = 60  # interval when driving detected
 UPDATE_INTERVAL = 300  # Default polling interval for vehicle
 WEBSOCKET_TIMEOUT = 11  # time for websocket to timeout
+WAKE_TIMEOUT = 60  # max time to wait for vehicle to wake
+WAKE_CHECK_INTERVAL = 2  # wait period between wake checks after a wake request
 RELEASE_NOTES_URL = "https://teslascope.com/teslapedia/software/"
 AUTH_DOMAIN = "https://auth.tesla.com"
 API_URL = "https://owner-api.teslamotors.com"