Skip to content

Fix VehicleStatus timestamp drift for invalid placeholder values #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tosate wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Fix VehicleStatus timestamp drift for invalid placeholder values #393

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0940f02
Fix VehicleStatus timestamp drift for invalid placeholder values
Nov 8, 2025
a7ebb74
float value as first argument for fromtimestamp
Nov 8, 2025
2828f43
Added None to the invalid timestamp check
Nov 8, 2025
08f5b65
Fix mypy error by checking None
Nov 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 26 additions & 8 deletions src/status_publisher/vehicle/vehicle_status_resp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from dataclasses import dataclass
import datetime
import logging
from typing import TYPE_CHECKING, Final, override

from saic_ismart_client_ng.api.vehicle import VehicleStatusResp
Expand All @@ -25,6 +26,8 @@
from publisher.core import Publisher
from vehicle_info import VehicleInfo

_logger = logging.getLogger(__name__)


@dataclass(kw_only=True, frozen=True)
class VehicleStatusRespProcessingResult:
Expand Down Expand Up @@ -54,15 +57,30 @@ def __init__(
def publish(
self, vehicle_status: VehicleStatusResp
) -> VehicleStatusRespProcessingResult:
vehicle_status_time = datetime.datetime.fromtimestamp(
vehicle_status.statusTime or 0, tz=datetime.UTC
)
now_time = datetime.datetime.now(tz=datetime.UTC)
vehicle_status_drift = abs(now_time - vehicle_status_time)
if vehicle_status.statusTime is None or vehicle_status.statusTime in (
0,
2147483647,
):
_logger.debug(
"Skipping vehicle status drift check because of invalid timestamp value: %s",
vehicle_status.statusTime,
)
else:
vehicle_status_time = datetime.datetime.fromtimestamp(
vehicle_status.statusTime, tz=datetime.UTC
)
now_time = datetime.datetime.now(tz=datetime.UTC)
vehicle_status_drift = abs(now_time - vehicle_status_time)
_logger.debug(
"Vehicle status timestamp: %s, current UTC time: %s, drift: %s",
vehicle_status_time,
now_time,
vehicle_status_drift,
)

if vehicle_status_drift > datetime.timedelta(minutes=15):
msg = f"Vehicle status time drifted more than 15 minutes from current time: {vehicle_status_drift}. Server reported {vehicle_status_time}"
raise MqttGatewayException(msg)
if vehicle_status_drift > datetime.timedelta(minutes=15):
msg = f"Vehicle status time drifted more than 15 minutes from current time: {vehicle_status_drift}. Server reported {vehicle_status_time}"
raise MqttGatewayException(msg)

basic_vehicle_status = vehicle_status.basicVehicleStatus
if basic_vehicle_status:
Expand Down