hyundai-kia-connect-api 3.32.3__py2.py3-none-any.whl → 3.32.5__py2.py3-none-any.whl

hyundai_kia_connect_api/ApiImpl.py

@@ -89,6 +89,11 @@ class ApiImpl:
         """Get cached vehicle data and update Vehicle instance with it"""
         pass
 
+    def test_token(self, token: Token) -> bool:
+        """Test if token is valid
+        Use any dummy request to test if token is still valid"""
+        return True
+
     def check_action_status(
         self,
         token: Token,

hyundai_kia_connect_api/KiaUvoApiCA.py

@@ -22,7 +22,6 @@ from .const import (
     DISTANCE_UNITS,
     DOMAIN,
     ENGINE_TYPES,
-    LOGIN_TOKEN_LIFETIME,
     OrderStatus,
     SEAT_STATUS,
     TEMPERATURE_UNITS,
@@ -37,9 +36,6 @@ from .utils import (
     parse_datetime,
 )
 
-
-CIPHERS = "ALL:@SECLEVEL=0"
-
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -64,17 +60,19 @@ class KiaUvoApiCA(ApiImpl):
         self.old_vehicle_status = {}
         self.API_URL: str = "https://" + self.BASE_URL + "/tods/api/"
         self.API_HEADERS = {
-            "content-type": "application/json;charset=UTF-8",
+            "content-type": "application/json",
             "accept": "application/json, text/plain, */*",
             "accept-encoding": "gzip, deflate, br",
             "accept-language": "en-US,en;q=0.9",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.142 Safari/537.36",  # noqa
+            "user-agent": "MyHyundai/2.0.25 (iPhone; iOS 18.3.1; Scale/3.00)",  # noqa
             "host": self.BASE_URL,
+            "client_id": "HATAHSPACA0232141ED9722C67715A0B",
+            "client_secret": "CLISCR01AHSPA",
             "origin": "https://" + self.BASE_URL,
             "referer": "https://" + self.BASE_URL + "/login",
-            "from": "CWP",
+            "from": "SPA",
             "language": "0",
-            "offset": "0",
+            "offset": "-5",
             "sec-fetch-dest": "empty",
             "sec-fetch-mode": "cors",
             "sec-fetch-site": "same-origin",
@@ -115,17 +113,19 @@ class KiaUvoApiCA(ApiImpl):
         url = self.API_URL + "v2/login"
         data = {"loginId": username, "password": password}
         headers = self.API_HEADERS
+        headers.pop("accessToken", None)
         response = self.sessions.post(url, json=data, headers=headers)
         _LOGGER.debug(f"{DOMAIN} - Sign In Response {response.text}")
         response = response.json()
         self._check_response_for_errors(response)
         response = response["result"]["token"]
+        token_expire_in = int(response["expireIn"]) - 60
         access_token = response["accessToken"]
         refresh_token = response["refreshToken"]
         _LOGGER.debug(f"{DOMAIN} - Access Token Value {access_token}")
         _LOGGER.debug(f"{DOMAIN} - Refresh Token Value {refresh_token}")
 
-        valid_until = dt.datetime.now(pytz.utc) + LOGIN_TOKEN_LIFETIME
+        valid_until = dt.datetime.now(pytz.utc) + dt.timedelta(seconds=token_expire_in)
 
         return Token(
             username=username,
@@ -135,6 +135,24 @@ class KiaUvoApiCA(ApiImpl):
             valid_until=valid_until,
         )
 
+    def test_token(self, token: Token) -> bool:
+        # Use "get number of notifications" as a dummy request to test the token
+        # Use this api because it's likely checked more frequently than other APIs, less
+        # chance to get banned. And it's short and simple.
+        url = self.API_URL + "ntcmsgcnt"
+        headers = self.API_HEADERS
+        headers["accessToken"] = token.access_token
+        response = self.sessions.post(url, headers=headers)
+        _LOGGER.debug(f"{DOMAIN} - Test Token Response {response.text}")
+        response = response.json()
+        token_errors = ["7403", "7602"]
+        if (
+            response["responseHeader"]["responseCode"] == 1
+            and response["error"]["errorCode"] in token_errors
+        ):
+            return False
+        return True
+
     def get_vehicles(self, token: Token) -> list[Vehicle]:
         url = self.API_URL + "vhcllst"
         headers = self.API_HEADERS

hyundai_kia_connect_api/VehicleManager.py

@@ -134,7 +134,10 @@ class VehicleManager:
     def check_and_refresh_token(self) -> bool:
         if self.token is None:
             self.initialize()
-        if self.token.valid_until <= dt.datetime.now(pytz.utc):
+        if (
+            self.token.valid_until <= dt.datetime.now(pytz.utc)
+            or self.api.test_token(self.token) is False
+        ):
             _LOGGER.debug(f"{DOMAIN} - Refresh token expired")
             self.token: Token = self.api.login(self.username, self.password)
             self.token.pin = self.pin

{hyundai_kia_connect_api-3.32.3.dist-info → hyundai_kia_connect_api-3.32.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: hyundai_kia_connect_api
-Version: 3.32.3
+Version: 3.32.5
 Summary: Python Boilerplate contains all the boilerplate you need to create a Python package.
 Home-page: https://github.com/Hyundai-Kia-Connect/hyundai_kia_connect_api
 Author: Fuat Akgun

{hyundai_kia_connect_api-3.32.3.dist-info → hyundai_kia_connect_api-3.32.5.dist-info}/RECORD

@@ -1,23 +1,23 @@
-hyundai_kia_connect_api/ApiImpl.py,sha256=eCEQEz6L-7EN2eKnrYiHrYC0pPV-ngGFcayF0tFdPxA,7569
+hyundai_kia_connect_api/ApiImpl.py,sha256=mZO8AT-MBMBFspB7sZ2MkK_uxbbJ59J3rM_uJmU4-fE,7737
 hyundai_kia_connect_api/ApiImplType1.py,sha256=PnKwpbCoYGOXBWzBLIlDSrC6daIYeW9qlfW7TM4HCU0,12184
 hyundai_kia_connect_api/HyundaiBlueLinkApiUSA.py,sha256=Tx-L4ZWiPhq-uHcjWSUzjLEsfunV6nzyzqQpjPTYuIo,36831
 hyundai_kia_connect_api/KiaUvoApiAU.py,sha256=tslh0gzvPBwYJmcWlf9B0l7PyYZdy2e7GqpRkl8_Svk,48471
-hyundai_kia_connect_api/KiaUvoApiCA.py,sha256=uANAbsqG-ywLxIWLPPzcsougiRL8hho9gzg2kxErgT8,30874
+hyundai_kia_connect_api/KiaUvoApiCA.py,sha256=IOiInYhUID1Vg15ChooBr7p8x1bwAUIGyZw7QqxmD80,31767
 hyundai_kia_connect_api/KiaUvoApiCN.py,sha256=cwIPZ0dU6HolKdooUQeQKlLAic6YU8dQmNs0VQDBgpQ,47035
 hyundai_kia_connect_api/KiaUvoApiEU.py,sha256=TxgO2dfLjKSKfSkRMoTL_fbmzRFRPb8oJ9IDztD50Ug,71300
 hyundai_kia_connect_api/KiaUvoApiUSA.py,sha256=G2sGtv88sBZuAz8qKYq_3_JNXIkxEjOBAzwM6R8GUi0,30548
 hyundai_kia_connect_api/Token.py,sha256=ZsPvXh1ID7FUTGHAqhZUZyrKT7xVbOtIn6FRJn4Ygf0,370
 hyundai_kia_connect_api/Vehicle.py,sha256=raCMzJsLuJnVHlFJ16VKdKat55L0uivbbcZRDCGWTxI,18793
-hyundai_kia_connect_api/VehicleManager.py,sha256=I0HDOsbXDen-26vyD7YR-RUgdaofOZrv_H_PPPuWjHg,11087
+hyundai_kia_connect_api/VehicleManager.py,sha256=SfGuCT0foCJqUNNLXs_9lRR5XGQ7xd-fodTIs3JEl0o,11167
 hyundai_kia_connect_api/__init__.py,sha256=IkyVeIMbcFJZgLaiiNnUVA1Ferxvrm1bXHKVg01cxvc,319
 hyundai_kia_connect_api/bluelink.py,sha256=sBU7hlElie21GU4Ma-i4a5vdztGc2jtmlVBbbgUqmTE,19720
 hyundai_kia_connect_api/const.py,sha256=scBlhrMims0W6_pESVVdQz2uUxczg2cf2qDQ7avbhVo,2174
 hyundai_kia_connect_api/exceptions.py,sha256=m7gyDnvA5OVAK4EXSP_ZwE0s0uV8HsGUV0tiYwqofK0,1343
 hyundai_kia_connect_api/utils.py,sha256=J0aXUX-nKIoS3XbelatNh-DZlHRU2_DYz_Mg_ZUKQJU,1957
-hyundai_kia_connect_api-3.32.3.dist-info/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
-hyundai_kia_connect_api-3.32.3.dist-info/LICENSE,sha256=49hmc755oyMwKdZ-2epiorjStRB0PfcZR1w5_NXZPgs,1068
-hyundai_kia_connect_api-3.32.3.dist-info/METADATA,sha256=E1v9297ptlZ8mATwHUzP88PdwPQZ3OHXGMxT2t7E1jk,6872
-hyundai_kia_connect_api-3.32.3.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-hyundai_kia_connect_api-3.32.3.dist-info/entry_points.txt,sha256=XfrroRdyC_9q9VXjEZe5SdRPhkQyCCE4S7ZK6XSKelA,67
-hyundai_kia_connect_api-3.32.3.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
-hyundai_kia_connect_api-3.32.3.dist-info/RECORD,,
+hyundai_kia_connect_api-3.32.5.dist-info/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
+hyundai_kia_connect_api-3.32.5.dist-info/LICENSE,sha256=49hmc755oyMwKdZ-2epiorjStRB0PfcZR1w5_NXZPgs,1068
+hyundai_kia_connect_api-3.32.5.dist-info/METADATA,sha256=sOCl_6n3H20DpGwXK7OCuEtfH6MTMVYo3DF2lHCUYqo,6872
+hyundai_kia_connect_api-3.32.5.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+hyundai_kia_connect_api-3.32.5.dist-info/entry_points.txt,sha256=XfrroRdyC_9q9VXjEZe5SdRPhkQyCCE4S7ZK6XSKelA,67
+hyundai_kia_connect_api-3.32.5.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
+hyundai_kia_connect_api-3.32.5.dist-info/RECORD,,