hyundai-kia-connect-api 3.42.4__py2.py3-none-any.whl → 3.42.11__py2.py3-none-any.whl

hyundai_kia_connect_api/ApiImplType1.py

@@ -34,6 +34,7 @@ from .const import (
 
 from .exceptions import (
     APIError,
+    AuthenticationError,
     DuplicateRequestError,
     RequestTimeoutError,
     ServiceTemporaryUnavailable,
@@ -79,16 +80,28 @@ def _check_response_for_errors(response: dict) -> None:
         "9999": RequestTimeoutError,
     }
 
-    if not any(x in response for x in ["retCode", "resCode", "resMsg"]):
+    error_message_to_exception_mapping = {
+        "Key not authorized: Token is expired": AuthenticationError
+    }
+
+    if not any(x in response for x in ["retCode", "resCode", "resMsg", "error"]):
         _LOGGER.error(f"Unknown API response format: {response}")
         raise InvalidAPIResponseError()
 
-    if response["retCode"] == "F":
+    if "retCode" in response and response["retCode"] == "F":
         if response["resCode"] in error_code_mapping:
             raise error_code_mapping[response["resCode"]](response["resMsg"])
         raise APIError(
             f"Server returned:  '{response['resCode']}' '{response['resMsg']}'"
         )
+    elif "error" in response:
+        error_reason = response["error"]
+        if error_reason in error_message_to_exception_mapping:
+            _LOGGER.error(f"API error: {error_reason}")
+            raise error_message_to_exception_mapping[error_reason](error_reason)
+        else:
+            _LOGGER.error(f"Unknown error in API response: {error_reason}")
+            raise APIError(f"Unknown error in API response: {error_reason}")
 
 
 class ApiImplType1(ApiImpl):

hyundai_kia_connect_api/KiaUvoApiCA.py

@@ -80,9 +80,7 @@ class KiaUvoApiCA(ApiImpl):
     @property
     def sessions(self):
         if not self._sessions:
-            self._sessions = cloudscraper.create_scraper(
-                browser={"custom": "okhttp/4.12.0"}
-            )
+            self._sessions = cloudscraper.create_scraper()
         return self._sessions
 
     def _check_response_for_errors(self, response: dict) -> None:

hyundai_kia_connect_api/KiaUvoApiEU.py

@@ -36,7 +36,6 @@ from .const import (
     DISTANCE_UNITS,
     DOMAIN,
     ENGINE_TYPES,
-    LOGIN_TOKEN_LIFETIME,
     SEAT_STATUS,
     TEMPERATURE_UNITS,
     VALET_MODE_ACTION,
@@ -193,11 +192,12 @@ class KiaUvoApiEU(ApiImplType1):
         if authorization_code is None:
             raise AuthenticationError("Login Failed")
 
-        _, access_token, authorization_code = self._get_access_token(
+        _, access_token, authorization_code, expires_in = self._get_access_token(
             stamp, authorization_code
         )
+        valid_until = dt.datetime.now(pytz.utc) + dt.timedelta(seconds=expires_in)
+
         _, refresh_token = self._get_refresh_token(stamp, authorization_code)
-        valid_until = dt.datetime.now(pytz.utc) + LOGIN_TOKEN_LIFETIME
 
         return Token(
             username=username,
@@ -1226,7 +1226,8 @@ class KiaUvoApiEU(ApiImplType1):
         token_type = response["token_type"]
         access_token = token_type + " " + response["access_token"]
         authorization_code = response["refresh_token"]
-        return token_type, access_token, authorization_code
+        expires_in = response["expires_in"]
+        return token_type, access_token, authorization_code, expires_in
 
     def _get_refresh_token(self, stamp, authorization_code):
         # Get Refresh Token #

{hyundai_kia_connect_api-3.42.4.dist-info → hyundai_kia_connect_api-3.42.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyundai_kia_connect_api
-Version: 3.42.4
+Version: 3.42.11
 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
@@ -37,7 +37,7 @@ Dynamic: summary
 Code Maintainers Wanted
 =======================
 
-I no longer have a Kia or Hyundai so don't maintain this like I used to.  Others who are interested in jumping in are welcome to join the project!   Even just pull requests are appreciated!
+I no longer have a Kia or Hyundai so don't maintain this like I used to.  Others who are interested in jumping in are welcome to join the project! Even just pull requests are appreciated!
 
 Introduction
 ============
@@ -158,7 +158,6 @@ Example of getting trip info of the current month and day (vm is VehicleManager
                     for trip in reversed(vehicle.day_trip_info.trip_list):  # show oldest first
                         print(f"{day.yyyymmdd},{trip.hhmmss},{trip.drive_time},{trip.idle_time},{trip.distance},{trip.avg_speed},{trip.max_speed}")
 
-
 CLI Usage
 =========
 

{hyundai_kia_connect_api-3.42.4.dist-info → hyundai_kia_connect_api-3.42.11.dist-info}/RECORD

@@ -1,10 +1,10 @@
 hyundai_kia_connect_api/ApiImpl.py,sha256=UeG2FH4KCdU5LvGp5Ks793vrWbwBx8MN_DedbVRRouM,9612
-hyundai_kia_connect_api/ApiImplType1.py,sha256=9o0Ioxwah_trqe99c5H2oNS5WfRLLhCTGMeItB857fk,38605
+hyundai_kia_connect_api/ApiImplType1.py,sha256=aNVNnTzYOgahN-MCnJ0-bNKfHj_dZzJijUCkvA_51L8,39221
 hyundai_kia_connect_api/HyundaiBlueLinkApiUSA.py,sha256=8S57iex0zecJOqKPg9xA6pGMVvGlybn9vcxLIAxbycY,37209
 hyundai_kia_connect_api/KiaUvoApiAU.py,sha256=433Db-rp3drhyY8ZvN-GiVP85pl90Wwu4A2uAdkYH1c,36100
-hyundai_kia_connect_api/KiaUvoApiCA.py,sha256=OvnyBdwkj9fFYGp2dqNSXVO8W6b7bhPcEg7zbKOSzF0,34584
+hyundai_kia_connect_api/KiaUvoApiCA.py,sha256=IkpxawiPHQBJyCZGGwEtQm3nEQ9EsjPAOfPPSaeZWms,34519
 hyundai_kia_connect_api/KiaUvoApiCN.py,sha256=WP-rRI3wZmjuLYZmPXeOSk2NNNc6UhTrpOMuYMG6-iE,47043
-hyundai_kia_connect_api/KiaUvoApiEU.py,sha256=E9-teu7OVjLu-hGT3B8aGBfrKDTwFmei7uLt09LJZtE,50285
+hyundai_kia_connect_api/KiaUvoApiEU.py,sha256=-4QWgGFRVTYddd2wXm2gZDBQ0wnpueEAfHdFELz9pas,50340
 hyundai_kia_connect_api/KiaUvoApiIN.py,sha256=82DBrXoREUrmYsK165QHg5brSDclLQTdm9OaruQIjss,36960
 hyundai_kia_connect_api/KiaUvoApiUSA.py,sha256=XLi63R7OWXh8_VEbK8Kpn75p2XTgjroR3mpnSlsAqqI,31416
 hyundai_kia_connect_api/Token.py,sha256=ZsPvXh1ID7FUTGHAqhZUZyrKT7xVbOtIn6FRJn4Ygf0,370
@@ -15,10 +15,10 @@ hyundai_kia_connect_api/bluelink.py,sha256=JiNIHl-Qi8zwqyN6ywKg5CdXOLT74WkvpjVcn
 hyundai_kia_connect_api/const.py,sha256=ImISRt4QarbN8BOBlDGYRB3F69NKCcGu8ddFvNPhhXU,2370
 hyundai_kia_connect_api/exceptions.py,sha256=0dwKEPXN8KQVTeueDj2fL3E-TQMU7LjTEJbhcq8Mjx8,1467
 hyundai_kia_connect_api/utils.py,sha256=k-zSgLdMMLu_h4GJNDRtjbfgZyla_Qhd13pDrtUAu4M,2700
-hyundai_kia_connect_api-3.42.4.dist-info/licenses/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
-hyundai_kia_connect_api-3.42.4.dist-info/licenses/LICENSE,sha256=49hmc755oyMwKdZ-2epiorjStRB0PfcZR1w5_NXZPgs,1068
-hyundai_kia_connect_api-3.42.4.dist-info/METADATA,sha256=diqhgQpbWBSbRCULh9khznfUi5-PsD1F49Q2J06xDDM,7193
-hyundai_kia_connect_api-3.42.4.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-hyundai_kia_connect_api-3.42.4.dist-info/entry_points.txt,sha256=XfrroRdyC_9q9VXjEZe5SdRPhkQyCCE4S7ZK6XSKelA,67
-hyundai_kia_connect_api-3.42.4.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
-hyundai_kia_connect_api-3.42.4.dist-info/RECORD,,
+hyundai_kia_connect_api-3.42.11.dist-info/licenses/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
+hyundai_kia_connect_api-3.42.11.dist-info/licenses/LICENSE,sha256=49hmc755oyMwKdZ-2epiorjStRB0PfcZR1w5_NXZPgs,1068
+hyundai_kia_connect_api-3.42.11.dist-info/METADATA,sha256=3_OPxvVAshnAmZjfHOa8_cgnctX43IS9fZ1MwHT5CUs,7191
+hyundai_kia_connect_api-3.42.11.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+hyundai_kia_connect_api-3.42.11.dist-info/entry_points.txt,sha256=XfrroRdyC_9q9VXjEZe5SdRPhkQyCCE4S7ZK6XSKelA,67
+hyundai_kia_connect_api-3.42.11.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
+hyundai_kia_connect_api-3.42.11.dist-info/RECORD,,