carconnectivity-connector-skoda 0.8__py3-none-any.whl → 0.8.2__py3-none-any.whl

{carconnectivity_connector_skoda-0.8.dist-info → carconnectivity_connector_skoda-0.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-skoda
-Version: 0.8
+Version: 0.8.2
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License
@@ -33,13 +33,14 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.7.1
+Requires-Dist: carconnectivity>=0.8.1
 Requires-Dist: oauthlib~=3.3.1
-Requires-Dist: requests~=2.32.3
+Requires-Dist: requests~=2.32.5
 Requires-Dist: pyjwt~=2.10
 Requires-Dist: paho-mqtt~=2.1.0
 Dynamic: license-file

{carconnectivity_connector_skoda-0.8.dist-info → carconnectivity_connector_skoda-0.8.2.dist-info}/RECORD

@@ -1,23 +1,23 @@
-carconnectivity_connector_skoda-0.8.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_skoda-0.8.2.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
 carconnectivity_connectors/skoda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/skoda/_version.py,sha256=i6raU8IDbjX2_qal-So090T9KiZO76P0n85Br_T16qg,506
+carconnectivity_connectors/skoda/_version.py,sha256=K6dg_KQgkOH-DF8J9hcSjz3upL94O2YIVOO7FP9tPpk,704
 carconnectivity_connectors/skoda/capability.py,sha256=TC8-yC23UUrf0faePdbZL0802DHXbtGDcSlt3vj5ltg,4770
 carconnectivity_connectors/skoda/charging.py,sha256=7DPNiTWFhxiiEFKVnbIIU2TCmkpmcMWx_zsHXGXFpAQ,6856
 carconnectivity_connectors/skoda/climatization.py,sha256=Jut468SkxjPBDTqroWFvDifVPfJBxGjsFed5pc4kZkg,1768
 carconnectivity_connectors/skoda/command_impl.py,sha256=wDCI3Bka5pXlbyI4yVFS353TgFGyiBHBkERpP2g0A9w,3230
-carconnectivity_connectors/skoda/connector.py,sha256=Nj1wkA5SI70Ivvh_UVvTxQVSu2oE9xpk3UqxJfwf1gQ,147265
+carconnectivity_connectors/skoda/connector.py,sha256=y25ZY1jCH-8IXSK847Stu4GbRK6j35xwZJKU9C7TSSU,147301
 carconnectivity_connectors/skoda/error.py,sha256=ffxzvjmci7vtp9Q1K4DR1kBF0kTJxN5Gluci3kDBkEI,2459
-carconnectivity_connectors/skoda/mqtt_client.py,sha256=D9_e_Bz842ULYKlRWd4JmosalhTtYr9DtCuvWrT3WQw,39126
+carconnectivity_connectors/skoda/mqtt_client.py,sha256=f4fRFeI1VUCGm9ZzGj_vnctiSIiMAoolYLAwKx4apqA,40086
 carconnectivity_connectors/skoda/vehicle.py,sha256=q5gwe-_yPfE_-aEc17UQ-Q0Z46IN7PCpNG5jLw5PZl0,3981
 carconnectivity_connectors/skoda/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_connectors/skoda/auth/auth_util.py,sha256=dGLUbUre0HBsTg_Ii5vW34f8DLrCykYJYCyzEvUBBEE,4434
-carconnectivity_connectors/skoda/auth/my_skoda_session.py,sha256=lSh23SFJs8opjmPwHTv-KNIKDep_WY4aItSP4Zq7bT8,10396
-carconnectivity_connectors/skoda/auth/openid_session.py,sha256=jlRBN6A1Z-U_YrgdD-X1itRG-aelnMGPQe_dg_XOmCs,16789
+carconnectivity_connectors/skoda/auth/my_skoda_session.py,sha256=5olw2TsId63BbJxmMk7i193Vww7RlBo9mpE3Ucl5fhw,11207
+carconnectivity_connectors/skoda/auth/openid_session.py,sha256=CiHKXWpZqlhjzKNCKQ_Y5f3RJgw4gEKbWp_I5_fXa7Y,16984
 carconnectivity_connectors/skoda/auth/session_manager.py,sha256=Uf1vujuDBYUCAXhYToOsZkgbTtfmY3Qe0ICTfwomBpI,2899
 carconnectivity_connectors/skoda/auth/skoda_web_session.py,sha256=tapjCRRPBu3tHrDoKmtuAlQhgxktib3oWTB8MHEzZTY,10816
 carconnectivity_connectors/skoda/auth/helpers/blacklist_retry.py,sha256=f3wsiY5bpHDBxp7Va1Mv9nKJ4u3qnCHZZmDu78_AhMk,1251
 carconnectivity_connectors/skoda/ui/connector_ui.py,sha256=lLjwoakRaU0S80hAVwVi4JA1wtHycGHcoM2-7S9qsqI,1386
-carconnectivity_connector_skoda-0.8.dist-info/METADATA,sha256=vX69lDP8qJUdrDCTtkAicZbgbN3c_JAHkw_XT85O5p8,5381
-carconnectivity_connector_skoda-0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-carconnectivity_connector_skoda-0.8.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_skoda-0.8.dist-info/RECORD,,
+carconnectivity_connector_skoda-0.8.2.dist-info/METADATA,sha256=LP-Xq58069bnrLJeiyEC8yg0zJGgGQGLt3AIuKStJes,5434
+carconnectivity_connector_skoda-0.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+carconnectivity_connector_skoda-0.8.2.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_skoda-0.8.2.dist-info/RECORD,,

carconnectivity_connectors/skoda/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.8'
-__version_tuple__ = version_tuple = (0, 8)
+__version__ = version = '0.8.2'
+__version_tuple__ = version_tuple = (0, 8, 2)
+
+__commit_id__ = commit_id = None

carconnectivity_connectors/skoda/auth/my_skoda_session.py

@@ -12,9 +12,11 @@ import random
 import string
 
 from urllib.parse import parse_qsl, urlparse
+from urllib3.exceptions import NameResolutionError
 
 import requests
 from requests.models import CaseInsensitiveDict
+from requests.exceptions import ReadTimeout, ConnectionError
 
 from oauthlib.common import add_params_to_uri, generate_nonce, to_unicode
 from oauthlib.oauth2 import InsecureTransportError
@@ -58,17 +60,24 @@ class MySkodaSession(SkodaWebSession):
     def login(self):
         super(MySkodaSession, self).login()
 
-        verifier = "".join(random.choices(string.ascii_uppercase + string.digits, k=16))
-        verifier_hash = hashlib.sha256(verifier.encode("utf-8")).digest()
-        code_challenge = base64.b64encode(verifier_hash).decode("utf-8").replace("+", "-").replace("/", "_").rstrip("=")
-        # retrieve authorization URL
-        authorization_url = self.authorization_url(url='https://identity.vwgroup.io/oidc/v1/authorize', prompt='login', code_challenge=code_challenge,
-                                                   code_challenge_method='s256')
-        # perform web authentication
-        response = self.do_web_auth(authorization_url)
-        # fetch tokens from web authentication response
-        self.fetch_tokens('https://mysmob.api.connect.skoda-auto.cz/api/v1/authentication/exchange-authorization-code?tokenType=CONNECT',
-                          authorization_response=response, verifier=verifier)
+        try:
+            verifier = "".join(random.choices(string.ascii_uppercase + string.digits, k=16))
+            verifier_hash = hashlib.sha256(verifier.encode("utf-8")).digest()
+            code_challenge = base64.b64encode(verifier_hash).decode("utf-8").replace("+", "-").replace("/", "_").rstrip("=")
+            # retrieve authorization URL
+            authorization_url = self.authorization_url(url='https://identity.vwgroup.io/oidc/v1/authorize', prompt='login', code_challenge=code_challenge,
+                                                       code_challenge_method='s256')
+            # perform web authentication
+            response = self.do_web_auth(authorization_url)
+            # fetch tokens from web authentication response
+            self.fetch_tokens('https://mysmob.api.connect.skoda-auto.cz/api/v1/authentication/exchange-authorization-code?tokenType=CONNECT',
+                              authorization_response=response, verifier=verifier)
+        except ReadTimeout as exc:
+            raise TemporaryAuthenticationError('Login timed out (Read timeout)') from exc
+        except ConnectionError as exc:
+            raise TemporaryAuthenticationError('Login failed due to connection error') from exc
+        except NameResolutionError as exc:
+            raise TemporaryAuthenticationError('Token could not be refreshed due to Name resolution error, probably no internet connection') from exc
 
     def refresh(self) -> None:
         # refresh tokens from refresh endpoint
@@ -118,7 +127,7 @@ class MySkodaSession(SkodaWebSession):
             token_response = self.post(token_url, headers=request_headers, data=body, allow_redirects=False,
                                             access_type=AccessType.NONE)  # pyright: ignore reportCallIssue
             if token_response.status_code != requests.codes['ok']:
-                raise TemporaryAuthenticationError(f'Token could not be fetched due to temporary WeConnect failure: {token_response.status_code}')
+                raise TemporaryAuthenticationError(f'Token could not be fetched due to temporary MySkoda failure: {token_response.status_code}')
             # parse token from response body
             token = self.parse_from_body(token_response.text)
             return token
@@ -132,7 +141,7 @@ class MySkodaSession(SkodaWebSession):
             # Tokens are in body of response in json format
             token = json.loads(token_response)
         except json.decoder.JSONDecodeError as err:
-            raise TemporaryAuthenticationError('Token could not be refreshed due to temporary WeConnect failure: json could not be decoded') from err
+            raise TemporaryAuthenticationError('Token could not be refreshed due to temporary MySkoda failure: json could not be decoded') from err
         found_tokens: Set[str] = set()
         # Fix token keys, we want access_token instead of accessToken
         if 'accessToken' in token:
@@ -222,3 +231,5 @@ class MySkodaSession(SkodaWebSession):
         except ConnectionError:
             self.login()
             return self.token
+        except NameResolutionError as exc:
+            raise TemporaryAuthenticationError('Token could not be refreshed due to Name resolution error, probably no internet connection') from exc

carconnectivity_connectors/skoda/auth/openid_session.py

@@ -149,22 +149,24 @@ class OpenIDSession(requests.Session):
         if new_token is not None:
             # If new token e.g. after refresh is missing expires_in we assume it is the same than before
             if 'expires_in' not in new_token:
-                if self._token is not None and 'expires_in' in self._token:
-                    new_token['expires_in'] = self._token['expires_in']
-                else:
-                    if 'id_token' in new_token:
-                        meta_data = jwt.decode(new_token['id_token'], options={"verify_signature": False})
-                        if 'exp' in meta_data:
-                            new_token['expires_at'] = meta_data['exp']
-                            expires_at = datetime.fromtimestamp(meta_data['exp'], tz=timezone.utc)
-                            new_token['expires_in'] = (expires_at - datetime.now(tz=timezone.utc)).total_seconds()
-                        else:
-                            new_token['expires_in'] = 3600
+                if 'id_token' in new_token:
+                    meta_data = jwt.decode(new_token['id_token'], options={"verify_signature": False})
+                    if 'exp' in meta_data:
+                        new_token['expires_at'] = meta_data['exp']
+                        expires_at = datetime.fromtimestamp(meta_data['exp'], tz=timezone.utc)
+                        new_token['expires_in'] = (expires_at - datetime.now(tz=timezone.utc)).total_seconds()
+                if 'expires_in' not in new_token:
+                    if self._token is not None and 'expires_in' in self._token:
+                        new_token['expires_in'] = self._token['expires_in']
                     else:
                         new_token['expires_in'] = 3600
             # If expires_in is set and expires_at is not set we calculate expires_at from expires_in using the current time
             if 'expires_in' in new_token and 'expires_at' not in new_token:
                 new_token['expires_at'] = time.time() + int(new_token.get('expires_in'))
+        if new_token['expires_in'] > 3600:
+            LOG.warning('unexpected Token expires_in > 3600s (%d)', new_token['expires_in'])
+        if new_token['expires_at'] > (time.time() + 3600):
+            LOG.warning('unexpected Token expires_at after more than 3600s')
         self._token = new_token
 
     @property

carconnectivity_connectors/skoda/connector.py

@@ -407,7 +407,7 @@ class Connector(BaseConnector):
         if vehicle is not None:
             if vehicle.connection_state is not None and vehicle.connection_state.enabled \
                     and vehicle.connection_state.value == GenericVehicle.ConnectionState.OFFLINE:
-                vehicle.state._set_value(GenericVehicle.State.OFFLINE)
+                vehicle.state._set_value(GenericVehicle.State.OFFLINE)  # pylint: disable=protected-access
             elif vehicle.in_motion is not None and vehicle.in_motion.enabled and vehicle.in_motion.value:
                 vehicle.state._set_value(GenericVehicle.State.IGNITION_ON)  # pylint: disable=protected-access
             elif vehicle.position is not None and vehicle.position.enabled and vehicle.position.position_type is not None \

carconnectivity_connectors/skoda/mqtt_client.py

@@ -13,7 +13,7 @@ from datetime import timedelta, timezone
 from paho.mqtt.client import Client
 from paho.mqtt.enums import MQTTProtocolVersion, CallbackAPIVersion, MQTTErrorCode
 
-from carconnectivity.errors import CarConnectivityError
+from carconnectivity.errors import CarConnectivityError, TemporaryAuthenticationError
 from carconnectivity.observable import Observable
 from carconnectivity.vehicle import GenericVehicle
 
@@ -70,6 +70,8 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         self.delayed_access_function_timers: Dict[str, threading.Timer] = {}
 
         self.tls_set(cert_reqs=ssl.CERT_NONE)
+        
+        self._retry_refresh_login_once = True
 
     def connect(self, *args, **kwargs) -> MQTTErrorCode:
         """
@@ -98,7 +100,12 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         del userdata
 
         if self._skoda_connector.session.expired or self._skoda_connector.session.access_token is None:
-            self._skoda_connector.session.refresh()
+            try:
+                self._skoda_connector.session.refresh()
+            except ConnectionError as exc:
+                LOG.error('Token refresh failed due to connection error: %s', exc)
+            except TemporaryAuthenticationError as exc:
+                LOG.error('Token refresh failed due to temporary MySkoda error: %s', exc)
         if not self._skoda_connector.session.expired and self._skoda_connector.session.access_token is not None:
             # pylint: disable-next=attribute-defined-outside-init # this is a false positive, password has a setter in super class
             self._password = self._skoda_connector.session.access_token  # This is a bit hacky but if password attribute is used here there is an Exception
@@ -321,6 +328,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
             self._skoda_connector.car_connectivity.garage.add_observer(observer=self._on_carconnectivity_vehicle_enabled,
                                                                        flag=observer_flags,
                                                                        priority=Observable.ObserverPriority.USER_MID)
+            self._retry_refresh_login_once = True
             self._subscribe_vehicles()
 
         # Handle different reason codes
@@ -338,6 +346,15 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
             LOG.error('Could not connect (%s): Client identifier not valid', reason_code)
         elif reason_code == 134:
             LOG.error('Could not connect (%s): Bad user name or password', reason_code)
+            if self._retry_refresh_login_once == True:
+                self._retry_refresh_login_once = False
+                LOG.info('trying a relogin once to resolve the error')
+                try:
+                    self._skoda_connector.session.login()
+                except TemporaryAuthenticationError as exc:
+                    LOG.error('Login failed due to temporary MySkoda error: %s', exc)
+                except ConnectionError as exc:
+                    LOG.error('Login failed due to connection error: %s', exc)
         elif reason_code == 135:
             LOG.error('Could not connect (%s): Not authorized', reason_code)
         elif reason_code == 136: