hyundai-kia-connect-api 3.37.0__py2.py3-none-any.whl → 3.38.1__py2.py3-none-any.whl

hyundai_kia_connect_api/KiaUvoApiAU.py

@@ -28,7 +28,10 @@ from .const import (
     BRAND_HYUNDAI,
     BRAND_KIA,
     BRANDS,
+    REGIONS,
     DOMAIN,
+    REGION_AUSTRALIA,
+    REGION_NZ,
     DISTANCE_UNITS,
     TEMPERATURE_UNITS,
     SEAT_STATUS,
@@ -56,16 +59,30 @@ class KiaUvoApiAU(ApiImplType1):
 
     def __init__(self, region: int, brand: int, language: str) -> None:
         self.brand = brand
-        if BRANDS[brand] == BRAND_KIA:
+        if BRANDS[brand] == BRAND_KIA and REGIONS[region] == REGION_AUSTRALIA:
             self.BASE_URL: str = "au-apigw.ccs.kia.com.au:8082"
             self.CCSP_SERVICE_ID: str = "8acb778a-b918-4a8d-8624-73a0beb64289"
             self.APP_ID: str = "4ad4dcde-be23-48a8-bc1c-91b94f5c06f8"  # Android app ID
             self.BASIC_AUTHORIZATION: str = "Basic OGFjYjc3OGEtYjkxOC00YThkLTg2MjQtNzNhMGJlYjY0Mjg5OjdTY01NbTZmRVlYZGlFUEN4YVBhUW1nZVlkbFVyZndvaDRBZlhHT3pZSVMyQ3U5VA=="  # noqa
+            self.cfb = base64.b64decode(
+                "IDbMgWBXgic4MAyMgf5PFFRAdGX5O3IyC3uvN3scCs0gDpTFDuyvBorlAH9JMM2/wMc="
+            )
         elif BRANDS[brand] == BRAND_HYUNDAI:
             self.BASE_URL: str = "au-apigw.ccs.hyundai.com.au:8080"
             self.CCSP_SERVICE_ID: str = "855c72df-dfd7-4230-ab03-67cbf902bb1c"
             self.APP_ID: str = "f9ccfdac-a48d-4c57-bd32-9116963c24ed"  # Android app ID
             self.BASIC_AUTHORIZATION: str = "Basic ODU1YzcyZGYtZGZkNy00MjMwLWFiMDMtNjdjYmY5MDJiYjFjOmU2ZmJ3SE0zMllOYmhRbDBwdmlhUHAzcmY0dDNTNms5MWVjZUEzTUpMZGJkVGhDTw=="  # noqa
+            self.cfb = base64.b64decode(
+                "V60WkEmyRQaAfrBF1623/7QL62MjLVbCHdItGzQ1g5T/hkmKmMVTaMHv4cKGzgD3gL8="
+            )
+        elif BRANDS[brand] == BRAND_KIA and REGIONS[region] == REGION_NZ:
+            self.BASE_URL: str = "au-apigw.ccs.kia.com.au:8082"
+            self.CCSP_SERVICE_ID: str = "4ab606a7-cea4-48a0-a216-ed9c14a4a38c"
+            self.APP_ID: str = "97745337-cac6-4a5b-afc3-e65ace81c994"  # Android app ID
+            self.BASIC_AUTHORIZATION: str = "Basic NGFiNjA2YTctY2VhNC00OGEwLWEyMTYtZWQ5YzE0YTRhMzhjOjBoYUZxWFRrS2t0Tktmemt4aFowYWt1MzFpNzRnMHlRRm01b2QybXo0TGRJNW1MWQ=="  # noqa
+            self.cfb = base64.b64decode(
+                "IDbMgWBXgic4MAyMgf5PFGsDas7YzQmN/lcPSkArm/KVUTutuiJAZ+4ZFoVxsHFNNy4="
+            )
 
         self.USER_API_URL: str = "https://" + self.BASE_URL + "/api/v1/user/"
         self.SPA_API_URL: str = "https://" + self.BASE_URL + "/api/v1/spa/"
@@ -777,18 +794,8 @@ class KiaUvoApiAU(ApiImplType1):
             return None
 
     def _get_stamp(self) -> str:
-        if BRANDS[self.brand] == BRAND_KIA:
-            cfb = base64.b64decode(
-                "IDbMgWBXgic4MAyMgf5PFFRAdGX5O3IyC3uvN3scCs0gDpTFDuyvBorlAH9JMM2/wMc="
-            )
-        elif BRANDS[self.brand] == BRAND_HYUNDAI:
-            cfb = base64.b64decode(
-                "V60WkEmyRQaAfrBF1623/7QL62MjLVbCHdItGzQ1g5T/hkmKmMVTaMHv4cKGzgD3gL8="
-            )
-        else:
-            raise ValueError("Invalid brand")
         raw_data = f"{self.APP_ID}:{int(dt.datetime.now().timestamp())}".encode()
-        result = bytes(b1 ^ b2 for b1, b2 in zip(cfb, raw_data))
+        result = bytes(b1 ^ b2 for b1, b2 in zip(self.cfb, raw_data))
         return base64.b64encode(result).decode("utf-8")
 
     def _get_device_id(self, stamp):

hyundai_kia_connect_api/KiaUvoApiEU.py

@@ -790,13 +790,30 @@ class KiaUvoApiEU(ApiImplType1):
     def charge_port_action(
         self, token: Token, vehicle: Vehicle, action: CHARGE_PORT_ACTION
     ) -> str:
-        url = self.SPA_API_URL_V2 + "vehicles/" + vehicle.id + "/control/portdoor"
+        if vehicle.ccu_ccs2_protocol_support:
+            url = (
+                self.SPA_API_URL_V2
+                + "vehicles/"
+                + vehicle.id
+                + "/ccs2/control/portdoor"
+            )
 
-        payload = {"action": action.value}
-        _LOGGER.debug(f"{DOMAIN} - Charge Port Action Request: {payload}")
-        response = requests.post(
-            url, json=payload, headers=self._get_control_headers(token, vehicle)
-        ).json()
+            payload = {"command": action.value}
+            _LOGGER.debug(f"{DOMAIN} - Charge Port Action Request: {payload}")
+            response = requests.post(
+                url, json=payload, headers=self._get_control_headers(token, vehicle)
+            ).json()
+        else:
+            url = self.SPA_API_URL_V2 + "vehicles/" + vehicle.id + "/control/portdoor"
+            payload = {"action": action.value}
+            _LOGGER.debug(f"{DOMAIN} - Charge Port Action Request: {payload}")
+            response = requests.post(
+                url,
+                json=payload,
+                headers=self._get_authenticated_headers(
+                    token, vehicle.ccu_ccs2_protocol_support
+                ),
+            ).json()
         _LOGGER.debug(f"{DOMAIN} - Charge Port Action Response: {response}")
         _check_response_for_errors(response)
         token.device_id = self._get_device_id(self._get_stamp())

hyundai_kia_connect_api/VehicleManager.py

@@ -34,6 +34,7 @@ from .const import (
     REGION_EUROPE,
     REGION_USA,
     REGION_CHINA,
+    REGION_NZ,
     REGION_INDIA,
     REGIONS,
     VEHICLE_LOCK_ACTION,
@@ -314,6 +315,13 @@ class VehicleManager:
             return KiaUvoApiCN(region, brand, language)
         elif REGIONS[region] == REGION_AUSTRALIA:
             return KiaUvoApiAU(region, brand, language)
+        elif REGIONS[region] == REGION_NZ:
+            if BRANDS[brand] == BRAND_KIA:
+                return KiaUvoApiAU(region, brand, language)
+            else:
+                raise APIError(
+                    f"Unknown brand {BRANDS[brand]} for region {REGIONS[region]}"
+                )
         elif REGIONS[region] == REGION_INDIA:
             return KiaUvoApiIN(brand)
         else:

hyundai_kia_connect_api/const.py

@@ -21,6 +21,8 @@ REGION_CANADA = "Canada"
 REGION_USA = "USA"
 REGION_CHINA = "China"
 REGION_AUSTRALIA = "Australia"
+REGION_NZ = "New Zealand"
+
 REGION_INDIA = "India"
 REGIONS = {
     1: REGION_EUROPE,
@@ -29,6 +31,7 @@ REGIONS = {
     4: REGION_CHINA,
     5: REGION_AUSTRALIA,
     6: REGION_INDIA,
+    7: REGION_NZ,
 }
 
 LOGIN_TOKEN_LIFETIME = datetime.timedelta(hours=23)

{hyundai_kia_connect_api-3.37.0.dist-info → hyundai_kia_connect_api-3.38.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyundai_kia_connect_api
-Version: 3.37.0
+Version: 3.38.1
 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
@@ -70,7 +70,7 @@ Python 3.10 or newer is required to use this package. Vehicle manager is the key
 
 Key values for the int exist in the `const.py <https://github.com/Hyundai-Kia-Connect/hyundai_kia_connect_api/blob/master/hyundai_kia_connect_api/const.py>`_ file as::
 
-    REGIONS = {1: REGION_EUROPE, 2: REGION_CANADA, 3: REGION_USA, 4: REGION_CHINA, 5: REGION_AUSTRALIA}
+    REGIONS = {1: REGION_EUROPE, 2: REGION_CANADA, 3: REGION_USA, 4: REGION_CHINA, 5: REGION_AUSTRALIA, 6: REGION_NZ}
     BRANDS = {1: BRAND_KIA, 2: BRAND_HYUNDAI, 3: BRAND_GENESIS}
     GEO_LOCATION_PROVIDERS = {1: OPENSTREETMAP, 2: GOOGLE}
 

{hyundai_kia_connect_api-3.37.0.dist-info → hyundai_kia_connect_api-3.38.1.dist-info}/RECORD

@@ -1,24 +1,24 @@
 hyundai_kia_connect_api/ApiImpl.py,sha256=UeG2FH4KCdU5LvGp5Ks793vrWbwBx8MN_DedbVRRouM,9612
 hyundai_kia_connect_api/ApiImplType1.py,sha256=puAO4lN7vgzNJ2ZVE-rreJQNWN0Iwt7RYE87m47TX_o,37892
 hyundai_kia_connect_api/HyundaiBlueLinkApiUSA.py,sha256=TNuFJIZ6Kpd5vbV5rVJjcqp7z-Ys3blzsz6YYWZThiA,36710
-hyundai_kia_connect_api/KiaUvoApiAU.py,sha256=tJ_pQqjSA6qfRRO7_LgwlC0J_3x77U9wDftpCyH_XZI,35525
+hyundai_kia_connect_api/KiaUvoApiAU.py,sha256=433Db-rp3drhyY8ZvN-GiVP85pl90Wwu4A2uAdkYH1c,36100
 hyundai_kia_connect_api/KiaUvoApiCA.py,sha256=vP1WTSficCPSd3XrFh_FQZL2irJQbCYFVKm4OF2bWd8,32301
 hyundai_kia_connect_api/KiaUvoApiCN.py,sha256=WP-rRI3wZmjuLYZmPXeOSk2NNNc6UhTrpOMuYMG6-iE,47043
-hyundai_kia_connect_api/KiaUvoApiEU.py,sha256=vYmXY5so023HUTskBGPdOUgyyTpeTvRha0K_nwWpbKI,50171
+hyundai_kia_connect_api/KiaUvoApiEU.py,sha256=UqgzyeG9tpArc_WK4h6NA_eeWEiMCyI1SO2CCzDk0ZY,50801
 hyundai_kia_connect_api/KiaUvoApiIN.py,sha256=UQuoL2wAyX4JzHEd03XQYFUDdNe-OMr6-CD9H6WIwJc,34293
 hyundai_kia_connect_api/KiaUvoApiUSA.py,sha256=DeA-a2qq78XPYGB8U4vzy2oAcCQJ1xJRN9tlAK_I94o,30404
 hyundai_kia_connect_api/Token.py,sha256=ZsPvXh1ID7FUTGHAqhZUZyrKT7xVbOtIn6FRJn4Ygf0,370
 hyundai_kia_connect_api/Vehicle.py,sha256=DPMwJ2fXpV3VxdTdX6JGXfIVX5etyH4r6cnk_Q0AlE8,19039
-hyundai_kia_connect_api/VehicleManager.py,sha256=qe2K-Eo14DImn3NyKsIvaovGXeXArkFJe-FVD3qgeCU,11872
+hyundai_kia_connect_api/VehicleManager.py,sha256=BbMeM5HU38nimNTN4QsSFuEcsbeUYCcFdC7-MCU52AY,12183
 hyundai_kia_connect_api/__init__.py,sha256=IkyVeIMbcFJZgLaiiNnUVA1Ferxvrm1bXHKVg01cxvc,319
 hyundai_kia_connect_api/bluelink.py,sha256=JiNIHl-Qi8zwqyN6ywKg5CdXOLT74WkvpjVcn-rYEjI,19730
-hyundai_kia_connect_api/const.py,sha256=quNZV943B_xzDvAeQyyMKD5qFjC3uTRvxSJrtfoCaWo,2325
+hyundai_kia_connect_api/const.py,sha256=ImISRt4QarbN8BOBlDGYRB3F69NKCcGu8ddFvNPhhXU,2370
 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.37.0.dist-info/licenses/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
-hyundai_kia_connect_api-3.37.0.dist-info/licenses/LICENSE,sha256=49hmc755oyMwKdZ-2epiorjStRB0PfcZR1w5_NXZPgs,1068
-hyundai_kia_connect_api-3.37.0.dist-info/METADATA,sha256=olxsZ_AU8KS9wiHOtyz2ET7zecd6GqW02Nq9yvr1LFA,7142
-hyundai_kia_connect_api-3.37.0.dist-info/WHEEL,sha256=7wAbZI8A1UjN-j4-aYf66qBxOZ0Ioy0QNykkY5NcGJo,109
-hyundai_kia_connect_api-3.37.0.dist-info/entry_points.txt,sha256=XfrroRdyC_9q9VXjEZe5SdRPhkQyCCE4S7ZK6XSKelA,67
-hyundai_kia_connect_api-3.37.0.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
-hyundai_kia_connect_api-3.37.0.dist-info/RECORD,,
+hyundai_kia_connect_api-3.38.1.dist-info/licenses/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
+hyundai_kia_connect_api-3.38.1.dist-info/licenses/LICENSE,sha256=49hmc755oyMwKdZ-2epiorjStRB0PfcZR1w5_NXZPgs,1068
+hyundai_kia_connect_api-3.38.1.dist-info/METADATA,sha256=SYPMMq4urHcAsq_clj91mPKP6zkJLallqKjBidI_xM8,7156
+hyundai_kia_connect_api-3.38.1.dist-info/WHEEL,sha256=7wAbZI8A1UjN-j4-aYf66qBxOZ0Ioy0QNykkY5NcGJo,109
+hyundai_kia_connect_api-3.38.1.dist-info/entry_points.txt,sha256=XfrroRdyC_9q9VXjEZe5SdRPhkQyCCE4S7ZK6XSKelA,67
+hyundai_kia_connect_api-3.38.1.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
+hyundai_kia_connect_api-3.38.1.dist-info/RECORD,,