carconnectivity-connector-skoda 0.4a7__tar.gz → 0.4a8__tar.gz

{carconnectivity_connector_skoda-0.4a7 → carconnectivity_connector_skoda-0.4a8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.4a7
+Version: 0.4a8
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License

{carconnectivity_connector_skoda-0.4a7 → carconnectivity_connector_skoda-0.4a8}/src/carconnectivity_connector_skoda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.4a7
+Version: 0.4a8
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License

{carconnectivity_connector_skoda-0.4a7 → carconnectivity_connector_skoda-0.4a8}/src/carconnectivity_connectors/skoda/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.4a7'
+__version__ = version = '0.4a8'
 __version_tuple__ = version_tuple = (0, 4)

{carconnectivity_connector_skoda-0.4a7 → carconnectivity_connector_skoda-0.4a8}/src/carconnectivity_connectors/skoda/connector.py

@@ -83,6 +83,8 @@ class Connector(BaseConnector):
 
         self.connection_state: EnumAttribute = EnumAttribute(name="connection_state", parent=self, value_type=ConnectionState,
                                                              value=ConnectionState.DISCONNECTED, tags={'connector_custom'})
+        self.rest_connected: bool = False
+        self.mqtt_connected: bool = False
         self.interval: DurationAttribute = DurationAttribute(name="interval", parent=self, tags={'connector_custom'})
         self.interval.minimum = timedelta(seconds=180)
         self.interval._is_changeable = True  # pylint: disable=protected-access
@@ -201,25 +203,43 @@ class Connector(BaseConnector):
                     raise
             except TooManyRequestsError as err:
                 LOG.error('Retrieval error during update. Too many requests from your account (%s). Will try again after 15 minutes', str(err))
+                self.connection_state._set_value(value=ConnectionState.ERROR)  # pylint: disable=protected-access
+                self.rest_connected = False
                 self._stop_event.wait(900)
             except RetrievalError as err:
                 LOG.error('Retrieval error during update (%s). Will try again after configured interval of %ss', str(err), interval)
+                self.connection_state._set_value(value=ConnectionState.ERROR)  # pylint: disable=protected-access
+                self.rest_connected = False
                 self._stop_event.wait(interval)
             except APIError as err:
                 LOG.error('API error during update (%s). Will try again after configured interval of %ss', str(err), interval)
+                self.connection_state._set_value(value=ConnectionState.ERROR)  # pylint: disable=protected-access
+                self.rest_connected = False
                 self._stop_event.wait(interval)
             except APICompatibilityError as err:
                 LOG.error('API compatability error during update (%s). Will try again after configured interval of %ss', str(err), interval)
+                self.connection_state._set_value(value=ConnectionState.ERROR)  # pylint: disable=protected-access
+                self.rest_connected = False
                 self._stop_event.wait(interval)
             except TemporaryAuthenticationError as err:
                 LOG.error('Temporary authentification error during update (%s). Will try again after configured interval of %ss', str(err), interval)
+                self.connection_state._set_value(value=ConnectionState.ERROR)  # pylint: disable=protected-access
+                self.rest_connected = False
                 self._stop_event.wait(interval)
             except Exception as err:
                 LOG.critical('Critical error during update: %s', traceback.format_exc())
+                self.connection_state._set_value(value=ConnectionState.ERROR)  # pylint: disable=protected-access
+                self.rest_connected = False
                 self.healthy._set_value(value=False)  # pylint: disable=protected-access
                 raise err
             else:
+                self.rest_connected = True
+                if self.mqtt_connected:
+                    self.connection_state._set_value(value=ConnectionState.CONNECTED)  # pylint: disable=protected-access
                 self._stop_event.wait(interval)
+        # When leaving the loop, set the connection state to disconnected
+        self.connection_state._set_value(value=ConnectionState.DISCONNECTED)  # pylint: disable=protected-access
+        self.rest_connected = False
 
     def persist(self) -> None:
         """

{carconnectivity_connector_skoda-0.4a7 → carconnectivity_connector_skoda-0.4a8}/src/carconnectivity_connectors/skoda/mqtt_client.py

@@ -22,6 +22,7 @@ from carconnectivity.util import robust_time_parse, log_extra_keys
 from carconnectivity.charging import Charging
 from carconnectivity.climatization import Climatization
 from carconnectivity.units import Speed, Power, Length
+from carconnectivity.enums import ConnectionState
 
 from carconnectivity_connectors.skoda.vehicle import SkodaVehicle, SkodaElectricVehicle
 from carconnectivity_connectors.skoda.charging import SkodaCharging, mapping_skoda_charging_state
@@ -77,6 +78,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         Returns:
             MQTTErrorCode: The result of the connection attempt.
         """
+        self._skoda_connector.connection_state._set_value(value=ConnectionState.CONNECTING)  # pylint: disable=protected-access
         return super().connect(*args, host='mqtt.messagehub.de', port=8883, keepalive=60, **kwargs)
 
     def _on_pre_connect_callback(self, client: Client, userdata: Any) -> None:
@@ -312,7 +314,9 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         # reason_code 0 means success
         if reason_code == 0:
             LOG.info('Connected to Skoda MQTT server')
-            self._skoda_connector.connected._set_value(value=True)  # pylint: disable=protected-access
+            if self._skoda_connector.rest_connected:
+                self._skoda_connector.connection_state._set_value(value=ConnectionState.CONNECTED)  # pylint: disable=protected-access
+            self._skoda_connector.mqtt_connected = True
             observer_flags: Observable.ObserverEvent = Observable.ObserverEvent.ENABLED | Observable.ObserverEvent.DISABLED
             self._skoda_connector.car_connectivity.garage.add_observer(observer=self._on_carconnectivity_vehicle_enabled,
                                                                        flag=observer_flags,
@@ -385,7 +389,8 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         del properties
         del flags
 
-        self._skoda_connector.connected._set_value(value=False)  # pylint: disable=protected-access
+        self._skoda_connector.connection_state._set_value(value=ConnectionState.DISCONNECTED)  # pylint: disable=protected-access
+        self._skoda_connector.mqtt_connected = False
         self._skoda_connector.car_connectivity.garage.remove_observer(observer=self._on_carconnectivity_vehicle_enabled)
 
         self.subscribed_topics.clear()