carconnectivity-connector-skoda 0.1a3__py3-none-any.whl → 0.1a4__py3-none-any.whl

{carconnectivity_connector_skoda-0.1a3.dist-info → carconnectivity_connector_skoda-0.1a4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: carconnectivity-connector-skoda
-Version: 0.1a3
+Version: 0.1a4
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License

{carconnectivity_connector_skoda-0.1a3.dist-info → carconnectivity_connector_skoda-0.1a4.dist-info}/RECORD

@@ -1,8 +1,8 @@
 carconnectivity_connectors/skoda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/skoda/_version.py,sha256=MxrCYTTCC48jBbLpi48mgHtAaKA57W1ry3ksdEQnH64,408
+carconnectivity_connectors/skoda/_version.py,sha256=k2_F9qhiZ-QdrUSPYbgP7u-QuYMDZVq_7Ev7i0J23L0,408
 carconnectivity_connectors/skoda/capability.py,sha256=JlNEaisVYF8qWv0wNDHTaas36uIpTIQ3NVR69wesiYQ,4513
-carconnectivity_connectors/skoda/connector.py,sha256=UT4C3xlLMs5m245_LrMKAcnyKLmYKoIPvWj9Ln_HUzY,42728
-carconnectivity_connectors/skoda/mqtt_client.py,sha256=zpfE5MGC6iLm1uLiLyVKo50Dw39-LVW5b7pdc8tavhk,18276
+carconnectivity_connectors/skoda/connector.py,sha256=uAf1WcSQ68fkMF_R2zPjLP5vJYjk1QzGcg-ZdX4mPZo,42473
+carconnectivity_connectors/skoda/mqtt_client.py,sha256=7Hn-TqBl7VsN7e7DoPLvXZQ2UsSaOl1P0bMhbQQPX7k,18933
 carconnectivity_connectors/skoda/vehicle.py,sha256=H3GRDNimMghFwFi--y9BsgoSK3pMibNf_l6SsDN6gvQ,2759
 carconnectivity_connectors/skoda/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_connectors/skoda/auth/auth_util.py,sha256=dGLUbUre0HBsTg_Ii5vW34f8DLrCykYJYCyzEvUBBEE,4434
@@ -11,8 +11,8 @@ carconnectivity_connectors/skoda/auth/openid_session.py,sha256=PLWSSKw9Dg7hBbhzJ
 carconnectivity_connectors/skoda/auth/session_manager.py,sha256=Uf1vujuDBYUCAXhYToOsZkgbTtfmY3Qe0ICTfwomBpI,2899
 carconnectivity_connectors/skoda/auth/skoda_web_session.py,sha256=cjzMkzx473Sh-4RgZAQULeRRcxB1MboddldCVM_y5LE,10640
 carconnectivity_connectors/skoda/auth/helpers/blacklist_retry.py,sha256=f3wsiY5bpHDBxp7Va1Mv9nKJ4u3qnCHZZmDu78_AhMk,1251
-carconnectivity_connector_skoda-0.1a3.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_skoda-0.1a3.dist-info/METADATA,sha256=MN054LLlHhhTqKeBoJATkbvGIaRtpr6JRyY7RuZDV3c,5326
-carconnectivity_connector_skoda-0.1a3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-carconnectivity_connector_skoda-0.1a3.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_skoda-0.1a3.dist-info/RECORD,,
+carconnectivity_connector_skoda-0.1a4.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_skoda-0.1a4.dist-info/METADATA,sha256=uAZPqSaCZIMMbLZLSkOBAA0XJyinzwcDNzrjmtKZy18,5326
+carconnectivity_connector_skoda-0.1a4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+carconnectivity_connector_skoda-0.1a4.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_skoda-0.1a4.dist-info/RECORD,,

carconnectivity_connectors/skoda/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1a3'
+__version__ = version = '0.1a4'
 __version_tuple__ = version_tuple = (0, 1)

carconnectivity_connectors/skoda/connector.py

@@ -123,8 +123,8 @@ class Connector(BaseConnector):
         session: requests.Session = self._manager.get_session(Service.MY_SKODA, SessionUser(username=username, password=password))
         if not isinstance(session, MySkodaSession):
             raise AuthenticationError('Could not create session')
-        self._session: MySkodaSession = session
-        self._session.refresh()
+        self.session: MySkodaSession = session
+        self.session.refresh()
 
         self._elapsed: List[timedelta] = []
 
@@ -142,11 +142,8 @@ class Connector(BaseConnector):
     def _background_connect_loop(self) -> None:
         while not self._stop_event.is_set():
             try:
-                if not self._session.expired and self._session.access_token is not None:
-                    access_token: str = self._session.access_token
-                    LOG.info('Connecting to Skoda MQTT-Server')
-                    self._mqtt_client.connect_client(access_token)
-                    break
+                self._mqtt_client.connect()
+                break
             except ConnectionRefusedError as e:
                 LOG.error('Could not connect to MQTT-Server: %s, will retry in 10 seconds', e)
                 self._stop_event.wait(10)
@@ -214,7 +211,7 @@ class Connector(BaseConnector):
         if self._background_connect_thread is not None:
             self._background_connect_thread.join()
         self.persist()
-        self._session.close()
+        self.session.close()
         return super().shutdown()
 
     def fetch_all(self) -> None:
@@ -236,7 +233,7 @@ class Connector(BaseConnector):
             None
         """
         url = 'https://mysmob.api.connect.skoda-auto.cz/api/v1/users'
-        data: Dict[str, Any] | None = self._fetch_data(url, session=self._session)
+        data: Dict[str, Any] | None = self._fetch_data(url, session=self.session)
         if data:
             if 'id' in data and data['id'] is not None:
                 self.user_id = data['id']
@@ -252,7 +249,7 @@ class Connector(BaseConnector):
         """
         garage: Garage = self.car_connectivity.garage
         url = 'https://mysmob.api.connect.skoda-auto.cz/api/v2/garage'
-        data: Dict[str, Any] | None = self._fetch_data(url, session=self._session)
+        data: Dict[str, Any] | None = self._fetch_data(url, session=self.session)
         seen_vehicle_vins: set[str] = set()
         if data is not None:
             if 'vehicles' in data and data['vehicles'] is not None:
@@ -293,7 +290,7 @@ class Connector(BaseConnector):
             raise APIError('VIN is missing')
         url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/garage/vehicles/{vin}?' \
             'connectivityGenerations=MOD1&connectivityGenerations=MOD2&connectivityGenerations=MOD3&connectivityGenerations=MOD4'
-        vehicle_data: Dict[str, Any] | None = self._fetch_data(url, self._session)
+        vehicle_data: Dict[str, Any] | None = self._fetch_data(url, self.session)
         if vehicle_data:
             if 'softwareVersion' in vehicle_data and vehicle_data['softwareVersion'] is not None:
                 vehicle.software.version._set_value(vehicle_data['softwareVersion'])  # pylint: disable=protected-access
@@ -331,7 +328,7 @@ class Connector(BaseConnector):
             log_extra_keys(LOG_API, 'api/v2/garage/vehicles/VIN', vehicle_data, {'softwareVersion'})
 
         url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/vehicle-status/{vin}/driving-range'
-        range_data: Dict[str, Any] | None = self._fetch_data(url, self._session)
+        range_data: Dict[str, Any] | None = self._fetch_data(url, self.session)
         if range_data:
             captured_at: datetime = robust_time_parse(range_data['carCapturedTimestamp'])
             # Check vehicle type and if it does not match the current vehicle type, create a new vehicle object using copy constructor
@@ -418,7 +415,7 @@ class Connector(BaseConnector):
                                                                                                'secondaryEngineRange'})
 
         url = f'https://api.connect.skoda-auto.cz/api/v2/vehicle-status/{vin}'
-        vehicle_status_data: Dict[str, Any] | None = self._fetch_data(url, self._session)
+        vehicle_status_data: Dict[str, Any] | None = self._fetch_data(url, self.session)
         if vehicle_status_data:
             if 'remote' in vehicle_status_data and vehicle_status_data['remote'] is not None:
                 vehicle_status_data = vehicle_status_data['remote']

carconnectivity_connectors/skoda/mqtt_client.py

@@ -37,28 +37,45 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
 
         self.username = 'android-app'
 
+        self.on_pre_connect = self._on_pre_connect_callback
         self.on_connect = self._on_connect_callback
         self.on_message = self._on_message_callback
         self.on_disconnect = self._on_disconnect_callback
         self.on_subscribe = self._on_subscribe_callback
         self.subscribed_topics: Set[str] = set()
 
-    def connect_client(self, access_token: str) -> MQTTErrorCode:
+        self.tls_set(cert_reqs=ssl.CERT_NONE)
+
+    def connect(self, *args, **kwargs) -> MQTTErrorCode:
         """
-        Connects the MQTT client using the provided access token.
+        Connects the MQTT client to the skoda server.
 
-        This method sets the client's password to the provided access token,
-        configures TLS settings, and attempts to connect to the MQTT broker.
+        Returns:
+            MQTTErrorCode: The result of the connection attempt.
+        """
+        return super().connect(*args, host='mqtt.messagehub.de', port=8883, keepalive=60, **kwargs)
+
+    def _on_pre_connect_callback(self, client, userdata) -> None:
+        """
+        Callback function that is called before the MQTT client connects to the broker.
+
+        Sets the client's password to the access token.
 
         Args:
-            access_token (str): The access token used as the password for the MQTT client.
+            client: The MQTT client instance (unused).
+            userdata: The user data passed to the callback (unused).
 
         Returns:
-            MQTTErrorCode: The result of the connection attempt.
+            None
         """
-        self.password = access_token  # pylint: disable=attribute-defined-outside-init # this is a false positive, password has a setter in super class
-        self.tls_set(cert_reqs=ssl.CERT_NONE)
-        return super().connect(host='mqtt.messagehub.de', port=8883, keepalive=60)
+        del client
+        del userdata
+
+        if self._skoda_connector.session.expired or self._skoda_connector.session.access_token is None:
+            self._skoda_connector.session.refresh()
+        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
 
     def _on_carconnectivity_vehicle_enabled(self, element, flags):
         """
@@ -268,7 +285,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         del properties
         # reason_code 0 means success
         if reason_code == 0:
-            LOG.info('Connected to MQTT broker')
+            LOG.info('Connected to Skoda MQTT server')
             self._skoda_connector.connected._set_value(value=True)  # pylint: disable=protected-access
             observer_flags: Observable.ObserverEvent = Observable.ObserverEvent.ENABLED | Observable.ObserverEvent.DISABLED
             self._skoda_connector.car_connectivity.garage.add_observer(observer=self._on_carconnectivity_vehicle_enabled,