Allow phone number as username #91

Optimize addon configuration
Add "device_class: battery" for battery state sensors from BEV and PHEV
2023-08-25 15:08:25 +02:00 · 2023-08-25 09:08:58 +02:00 · 2023-08-18 15:44:13 +02:00 · 2023-08-18 09:43:07 +02:00 · 2023-08-18 09:40:48 +02:00 · 2023-08-18 07:54:24 +02:00
10 changed files with 263 additions and 107 deletions
@@ -19,6 +19,7 @@ If you like my work:<br>
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/U7U8MFXCF)

 ## Confirmed working with
+- XC40 BEV (2024)
 - XC40 BEV (2023)
 - XC40 BEV (2022)
 - XC40 PHEV (2021)
@@ -26,6 +27,7 @@ If you like my work:<br>
 - C40 BEV (2023)
 - C40 BEV (2022)
 - XC90 T8 PHEV (2023)
+- XC60 PHEV (2024)
 - XC60 PHEV (2023)
 - XC60 PHEV (2022)
 - XC90 PHEV T8 (2023)
@@ -53,6 +55,12 @@ Please let me know if your car works with this addon so I can expand the list!<b
 - Sensor "Fuel Status"
 - Sensor "Average Fuel Consumption"
 - Sensor "Average Speed"
+- Sensor "Distance to Empty"
+- Sensor "Hours to Service"
+- Sensor "Distance to Service"
+- Sensor "Months to Service"
+- Sensor "Service warning status"
+- Sensor "Service warning trigger"
 - Car Device Tracker
 - Multiple cars

@@ -64,7 +72,7 @@ NOTE: Energy status currently available only for cars in the Europe / Middle Eas
 Just install this addon with the following command.
 Please note to fill in your settings inside the environment variables.

-`docker run -d --pull=always -e CONF_updateInterval=300 -e CONF_babelLocale='de' -e CONF_mqtt='@json {"broker": "", "username": "", "password": "", "port": 1883}' -e CONF_volvoData='@json {"username": "", "password": "", "vin": "", "vccapikey": "", "odometerMultiplier": 1, "averageSpeedDivider": 1, "averageFuelConsumptionMultiplier": 1}' -e TZ='Europe/Berlin' --name volvo2mqtt ghcr.io/dielee/volvo2mqtt:latest`
+`docker run -d --pull=always -e CONF_updateInterval=300 -e CONF_babelLocale='de' -e CONF_mqtt='@json {"broker": "", "username": "", "password": "", "port": 1883}' -e CONF_volvoData='@json {"username": "", "password": "", "vin": "", "vccapikey": ["key1", "key2"], "odometerMultiplier": 1, "averageSpeedDivider": 1, "averageFuelConsumptionMultiplier": 1}' -e TZ='Europe/Berlin' --name volvo2mqtt ghcr.io/dielee/volvo2mqtt:latest`

 <b>HA Add-On:</b><br>

@@ -83,81 +91,13 @@ Here is what every option means:
 | `CONF_volvoData`          | `json`    | `username`                            | **required** | Normally your email address to login into the Volvo App.
 | `CONF_volvoData`          | `json`    | `password`                            | **required** | Your password to login into the Volvo App.
 | `CONF_volvoData`          | `json`    | `vin`                                 | optional     | A single VIN like "VIN1" or a list of VINs like "["VIN1", "VIN2"]". Leave this empty if you don't know your VIN. The addon will use every car that is tied to your account.
-| `CONF_volvoData`          | `json`    | `vccapikey`                           | **required** | API key linked with your volvo developer account. Get your Vccapi key from [here](https://developer.volvocars.com/account/)
+| `CONF_volvoData`          | `json`    | `vccapikey`                           | **required** | VCCAPIKEY linked with your volvo developer account. Get your Vccapi key from [here](https://developer.volvocars.com/account/). <b>Starting version 1.8.0, it is possible to define multiple keys, like this: `["vccapikey1", "vccapikey2", "vccapikey3", "etc..."]`</b>
 | `CONF_volvoData`          | `json`    | `odometerMultiplier`                  | optional     | The multiplier value for the odometer value, as the volvo api delivers inconsistent data. For some cars this setting is 10, for some 1. Try what's right for your car. If you leave it empty, the multiplier will be 1.
 | `CONF_volvoData`          | `json`    | `averageSpeedDivider`                 | optional     | The divider value for the average speed value, as the volvo api delivers inconsistent data. For some cars this setting is 10, for some 1. Try what's right for your car. If you leave it empty, the divider will be 1.
 | `CONF_volvoData`          | `json`    | `averageFuelConsumptionMultiplier`    | optional     | The multiplier value for the average fuel consumption value, as the volvo api delivers inconsistent data. For some cars this setting is 10, for some 1. Try what's right for your car. If you leave it empty, the multiplier will be 1.
 | `CONF_debug`              | `string`  |                                       | optional     | Debug option (true/false). Normally you don't need this. |
 | `TZ`                      | `string`  |                                       | **required** | Container timezone eg "Europe/Berlin" from [here](https://docs.diladele.com/docker/timezones.html)|

-## Lovelace sample card
-<details>
-  <summary>Show me more!</summary><blockquote>
-  <br>
-    
-  ![alt text](https://raw.githubusercontent.com/Dielee/volvo2mqtt/main/img/lovelace_sample.png)<br>
-    
-  <details>
-  <summary>Lovelace card sample</summary>
-        		
-  ```
-   type: vertical-stack
-   title: Autostatus
-   cards:
-     - type: custom:vertical-stack-in-card
-       cards:
-         - type: custom:mushroom-lock-card
-           entity: lock.volvo_<your vin>_lock_status
-           name: Verrigelungsstatus
-         - type: horizontal-stack
-           cards:
-             - type: custom:mushroom-entity-card
-               entity: sensor.volvo_<your vin>_electric_range
-               name: Reichweite
-               layout: vertical
-             - type: custom:mushroom-entity-card
-               entity: sensor.volvo_<your vin>_battery_charge_level
-               name: Batteriestatus
-               layout: vertical
-             - type: custom:mushroom-entity-card
-               entity: sensor.volvo_<your vin>_estimated_charging_time
-               layout: vertical
-               name: Ladezeit
-         - type: horizontal-stack
-           cards:
-             - type: custom:mushroom-entity-card
-               entity: switch.volvo_<your vin>_climate_status
-               tap_action:
-                 action: toggle
-               layout: vertical
-               name: Klimatisieren/Heizen
-             - type: custom:mushroom-template-card
-               primary: Daten aktualisieren
-               secondary: '{{ states(''sensor.volvo_<your vin>_last_data_update'')}}'
-               icon: mdi:update
-               layout: vertical
-               entity: button.volvo_<your vin>_update_data
-         - type: conditional
-           conditions:
-             - entity: sensor.volvo_<your vin>_estimated_charging_time
-               state_not: '0'
-           card:
-             type: custom:mushroom-entity-card
-             entity: sensor.volvo_<your vin>_estimated_charging_finish_time
-             name: Ladung vorraussichtlich abgeschlossen
-             show_name: true
-         - type: map
-           entities:
-             - entity: device_tracker.volvo_<your vin>_location
-           default_zoom: 16
-           dark_mode: false
-           hours_to_show: 0
-           auto_fit: true
-           aspect_ratio: '16:9'
-  ```
-
-</details>
-</blockquote></details>


 [aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
@@ -1,8 +1,74 @@
+## v1.8.5
+### 🚀 Features:
+
+- Allow phone number as username #91
+
+## v1.8.4
+### 🚀 Features:
+
+- Optimize Addon configuration #90
+
+## v1.8.3
+### 🚀 Features:
+
+- Add `device_class: battery` for battery state sensors from BEV and PHEV 
+
+## v1.8.2
+### 🚀 Features:
+
+- Add `updateInterval` limit to prevent abuse (60 Seconds)
+- Add `vccapikey` limit to prevent abuse (3 Keys)
+- Optimize vcc api key change behaviour
+
+## v1.8.1
+### 🐛 Bug Fixes:
+
+- Fix app crash if `debug` is not set #86
+
+## v1.8.0
+### 🚀 Features:
+
+- <b>Breaking change: The `vccapikey` setting is now a list. It is possible to
+  add multiple VCCAPIKEYs. This will be helpful if you are extending your 10.000 call limit some times.
+  Change your vccapikey config like this:
+  
+  Old:
+  ```
+    "vccapikey": "vccapikey1" 
+  ```
+
+  New:
+  ```
+    vccapikey:
+      - vccapikey1
+      - vccapikey2
+      - vccapikey3
+      - etc.
+  ```
+  More information about this feature [here](https://github.com/Dielee/volvo2mqtt/issues/84).
+    </b>
+
+## v1.7.10
+### 🐛 Bug Fixes:
+
+- Fix application startup if using `en_US` or `en_GB` as locale
+
+## v1.7.9
+### 🚀 Features:
+
+- Added vehicle diagnostics sensors #75. Thanks to @aerrow5!
+
+## v1.7.8
+### 🐛 Bug Fixes:
+
+- Fix "Estimated Charging Finish Time" Sensor  
+
 ## v1.7.7
 ### 🚀 Features:

 - Added long term statistics for some sensors #68. Thanks to @bogdanbujdea!
 - Automatic redact sensitive data from debug log
+- Perpare for scheduler option (not yet ready)

 ## v1.7.6
 ### 🚀 Features:
@@ -1,6 +1,6 @@
 name: "Volvo2Mqtt"
 description: "Volvo AAOS MQTT bridge"
-version: "1.7.7"
+version: "1.8.5"
 slug: "volvo2mqtt"
 init: false
 url: "https://github.com/Dielee/volvo2mqtt"
@@ -24,14 +24,15 @@ options:
    username: null
    password: null
    vin: ""
-    vccapikey: null
+    vccapikey:
+        - null
    odometerMultiplier: 1
    averageSpeedDivider: 1
    averageFuelConsumptionMultiplier: 1
 schema:
-  updateInterval: int(10,)
+  updateInterval: int(60,)
  babelLocale: str
-  TZ: str
+  TZ: match(^.+/.+$)
  debug: bool
  mqtt:
    broker: str
@@ -39,10 +40,11 @@ schema:
    username: str?
    password: str?
  volvoData:
-    username: str
+    username: match(^([\w+\.]+@([\w-]+\.)+[\w-]{2,4})|(\+\d{5,20})$)
    password: str
    vin: str?
-    vccapikey: str
+    vccapikey:
+        - match(^\b\w{32}\b$)
    odometerMultiplier: int(1,)
    averageSpeedDivider: int(1,)
    averageFuelConsumptionMultiplier: int(1,)
@@ -1,6 +1,6 @@
 from config import settings

-VERSION = "v1.7.7"
+VERSION = "v1.8.5"

 OAUTH_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
 VEHICLES_URL = "https://api.volvocars.com/connected-vehicle/v1/vehicles"
@@ -20,6 +20,7 @@ BATTERY_CHARGE_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehic
 FUEL_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/fuel"
 STATISTICS_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/statistics"
 ENGINE_DIAGNOSTICS_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/engine"
+VEHICLE_DIAGNOSTICS_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/diagnostics"

 units = {
            "en_GB": {
@@ -27,14 +28,16 @@ units = {
                "electric_range": {"unit": "mi"},
                "odometer": {"unit": "mi"},
                "average_speed": {"unit": "mph"},
-                "distance_to_empty": {"unit": "mi"}
+                "distance_to_empty": {"unit": "mi"},
+                "distance_to_service": {"unit": "mi"}
            },
            "en_US": {
                "divider": 1.60934,
                "electric_range": {"unit": "mi"},
                "odometer": {"unit": "mi"},
                "average_speed": {"unit": "mph"},
-                "distance_to_empty": {"unit": "mi"}
+                "distance_to_empty": {"unit": "mi"},
+                "distance_to_service": {"unit": "mi"}
            }
        }

@@ -74,13 +77,13 @@ icon_states = {
 }

 supported_entities = [
-                        {"name": "Battery Charge Level", "domain": "sensor", "id": "battery_charge_level", "unit": "%", "icon": "car-battery", "url": RECHARGE_STATE_URL, "state_class": "measurement"},
-                        {"name": "Battery Charge Level", "domain": "sensor", "id": "battery_charge_level", "unit": "%", "icon": "car-battery", "url": BATTERY_CHARGE_STATE_URL, "state_class": "measurement"},
+                        {"name": "Battery Charge Level", "domain": "sensor", "device_class": "battery", "id": "battery_charge_level", "unit": "%", "icon": "car-battery", "url": RECHARGE_STATE_URL, "state_class": "measurement"},
+                        {"name": "Battery Charge Level", "domain": "sensor", "device_class": "battery", "id": "battery_charge_level", "unit": "%", "icon": "car-battery", "url": BATTERY_CHARGE_STATE_URL, "state_class": "measurement"},
                        {"name": "Electric Range", "domain": "sensor", "id": "electric_range", "unit": "km" if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["electric_range"]["unit"], "icon": "map-marker-distance", "url": RECHARGE_STATE_URL, "state_class": "measurement"},
                        {"name": "Estimated Charging Time", "domain": "sensor", "id": "estimated_charging_time", "unit": "minutes", "icon": "timer-sync-outline", "url": RECHARGE_STATE_URL, "state_class": "measurement"},
                        {"name": "Charging System Status", "domain": "sensor", "id": "charging_system_status", "icon": "ev-station", "url": RECHARGE_STATE_URL},
                        {"name": "Charging Connection Status", "domain": "sensor", "id": "charging_connection_status", "icon": "ev-plug-ccs2", "url": RECHARGE_STATE_URL},
-                        {"name": "Estimated Charging Finish Time", "domain": "sensor", "id": "estimated_charging_finish_time", "icon": "timer-sync-outline", "url": RECHARGE_STATE_URL, "state_class": "measurement"},
+                        {"name": "Estimated Charging Finish Time", "domain": "sensor", "id": "estimated_charging_finish_time", "icon": "timer-sync-outline", "url": RECHARGE_STATE_URL},
                        {"name": "Odometer", "domain": "sensor", "id": "odometer", "unit": "km" if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["odometer"]["unit"], "icon": "counter", "url": ODOMETER_STATE_URL, "state_class":"total_increasing"},
                        {"name": "Last Data Update", "domain": "sensor", "id": "last_data_update", "icon": "timer", "url": ""},
                        {"name": "Active schedules", "domain": "sensor", "id": "active_schedules", "icon": "timer", "url": ""},
@@ -109,5 +112,10 @@ supported_entities = [
                        {"name": "Fuel Level", "domain": "sensor", "id": "fuel_level", "unit": "liters", "icon": "fuel", "url": FUEL_STATE_URL, "state_class": "measurement"},
                        {"name": "Average Fuel Consumption", "domain": "sensor", "id": "average_fuel_consumption", "unit": "liters", "icon": "fuel", "url": STATISTICS_URL},
                        {"name": "Distance to Empty", "domain": "sensor", "id": "distance_to_empty", "unit": "km" if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["distance_to_empty"]["unit"], "icon": "map-marker-distance", "url": STATISTICS_URL, "state_class": "measurement"},
-                        {"name": "Average Speed", "domain": "sensor", "id": "average_speed", "unit": "km/h" if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["average_speed"]["unit"], "icon": "speedometer", "url": STATISTICS_URL, "state_class": "measurement"}
+                        {"name": "Average Speed", "domain": "sensor", "id": "average_speed", "unit": "km/h" if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["average_speed"]["unit"], "icon": "speedometer", "url": STATISTICS_URL, "state_class": "measurement"},
+                        {"name": "Hours to Service", "domain": "sensor", "id": "hours_to_service", "unit": "hour", "icon": "wrench-clock", "url": VEHICLE_DIAGNOSTICS_URL},
+                        {"name": "Distance to Service", "domain": "sensor", "id": "km_to_service", "unit": "km" if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["distance_to_service"]["unit"], "icon": "wrench-clock", "url": VEHICLE_DIAGNOSTICS_URL},
+                        {"name": "Months to Service", "domain": "sensor", "id": "months_to_service", "unit": "month", "icon": "wrench-clock", "url": VEHICLE_DIAGNOSTICS_URL},
+                        {"name": "Service warning status", "domain": "sensor", "id": "service_warning_status", "icon": "alert-outline", "url": VEHICLE_DIAGNOSTICS_URL},
+                        {"name": "Service warning trigger", "domain": "sensor", "id": "service_warning_trigger", "icon": "alert-outline", "url": VEHICLE_DIAGNOSTICS_URL}
 ]
@@ -2,14 +2,15 @@ import logging
 from volvo import authorize
 from mqtt import update_loop, connect
 from const import VERSION
-from util import set_tz, setup_logging, set_mqtt_settings
+from util import set_tz, setup_logging, set_mqtt_settings, validate_settings


 if __name__ == '__main__':
-    set_tz()
-    set_mqtt_settings()
    setup_logging()
    logging.info("Starting volvo2mqtt version " + VERSION)
-    authorize()
+    validate_settings()
+    set_tz()
+    set_mqtt_settings()
    connect()
+    authorize()
    update_loop()
@@ -352,3 +352,8 @@ def create_ha_devices():

 def send_heartbeat():
    mqtt_client.publish(availability_topic, "online")
+
+
+def send_offline():
+    mqtt_client.publish(availability_topic, "offline")
+
@@ -12,7 +12,7 @@
    "username": "",
    "password": "",
    "vin": "",
-	"vccapikey": "",
+	"vccapikey": [],
    "odometerMultiplier": "",
    "averageSpeedDivider": "",
    "averageFuelConsumptionMultiplier": ""
@@ -16,4 +16,4 @@ configuration:
    description: Leave the settings as they are if you are using the MQTT Mosquitto Addon. If not, take a look at the readme from volvo2mqtt.
  volvoData:
    name: Volvo configuration options
-    description: You have to enter your Volvo app credentials. The username is normally your email, and the password is the password you use for your Volvo app. The vin can stay empty. The Add-On will use any vin inside your Volvo account. VCCAPI key is required and comes from your Volvo developer account. Odometer multiplier is sometimes 10, sometimes 1. The same is applicable for average speed divider and average fuel consumption. Leave it as it is if you don't know what's right. Take a look at the GitHub repo for more information!
+    description: You have to enter your Volvo app credentials. The username is normally your email, and the password is the password you use for your Volvo app. The vin can stay empty. The Add-On will use any vin inside your Volvo account. VCCAPI key is required and comes from your Volvo developer account. This setting works as list, so it is possible to define multiple VCCAPI keys. Odometer multiplier is sometimes 10, sometimes 1. The same is applicable for average speed divider and average fuel consumption. Leave it as it is if you don't know what's right. Take a look at the GitHub repo for more information!
@@ -13,7 +13,8 @@ from pathlib import Path
 TZ = None
 SENSITIVE_PATTERNS = [
    r"[A-Z0-9]{17}",  # VIN
-    r"\d{1,2}\.\d{5,16}"  # Location
+    r"\d{1,2}\.\d{5,16}",  # Location
+    r"[a-z0-9]{32}"  # VCCAPIKEY
 ]


@@ -48,13 +49,16 @@ def setup_logging():
        '%(asctime)s volvo2mqtt [%(process)d] - %(levelname)s: %(message)s',
        '%b %d %H:%M:%S')
    file_log_handler.setFormatter(formatter)
-    sensitive_data_filter = SensitiveDataFilter(SENSITIVE_PATTERNS)
-    file_log_handler.addFilter(sensitive_data_filter)
-    logger = logging.getLogger()
+
+    if "debug" in settings:
+        if settings["debug"]:
+            sensitive_data_filter = SensitiveDataFilter(SENSITIVE_PATTERNS)
+            file_log_handler.addFilter(sensitive_data_filter)

    console_log_handler = logging.StreamHandler(sys.stdout)
    console_log_handler.setFormatter(formatter)

+    logger = logging.getLogger()
    logger.addHandler(console_log_handler)
    logger.addHandler(file_log_handler)
    logging.getLogger("urllib3").setLevel(logging.WARNING)
@@ -132,3 +136,15 @@ def set_mqtt_settings():
        config.settings["mqtt"]["port"] = broker_port
        config.settings["mqtt"]["username"] = broker_user
        config.settings["mqtt"]["password"] = broker_pass
+
+
+def validate_settings():
+    if not os.environ.get("DEV_MODE"):
+        setting_keys = settings.volvoData["vccapikey"]
+        if isinstance(setting_keys, list):
+            if len(setting_keys) > 3:
+                raise Exception("Settings invalid! Maximum allowed vccapikeys are three!")
+
+        update_interval = settings["updateInterval"]
+        if update_interval < 60:
+            raise Exception("Settings invalid! Minimum allowed update interval is 60 seconds!")
@@ -3,6 +3,7 @@ import requests
 import mqtt
 import util
 import time
+import re
 from threading import currentThread
 from datetime import datetime, timedelta
 from config import settings
@@ -14,7 +15,7 @@ from const import charging_system_states, charging_connection_states, door_state

 session = requests.Session()
 session.headers = {
-    "vcc-api-key": settings["volvoData"]["vccapikey"],
+    "vcc-api-key": "",
    "content-type": "application/json",
    "accept": "*/*"
 }
@@ -24,6 +25,7 @@ refresh_token = None
 vins = []
 supported_endpoints = {}
 cached_requests = {}
+vcc_api_keys = []


 def authorize():
@@ -42,12 +44,13 @@ def authorize():
    auth = requests.post(OAUTH_URL, data=body, headers=headers)
    if auth.status_code == 200:
        data = auth.json()
-        session.headers.update({'authorization': "Bearer " + data["access_token"]})
+        session.headers.update({"authorization": "Bearer " + data["access_token"]})

        global token_expires_at, refresh_token
        token_expires_at = datetime.now(util.TZ) + timedelta(seconds=(data["expires_in"] - 30))
        refresh_token = data["refresh_token"]

+        get_vcc_api_keys()
        get_vehicles()
        check_supported_endpoints()
    else:
@@ -77,7 +80,7 @@ def refresh_auth():

    if auth.status_code == 200:
        data = auth.json()
-        session.headers.update({'authorization': "Bearer " + data["access_token"]})
+        session.headers.update({"authorization": "Bearer " + data["access_token"]})

        global token_expires_at
        token_expires_at = datetime.now(util.TZ) + timedelta(seconds=(data["expires_in"] - 30))
@@ -88,8 +91,8 @@ def get_vehicles():
    global vins
    if not settings.volvoData["vin"]:
        vehicles = session.get(VEHICLES_URL)
+        data = vehicles.json()
        if vehicles.status_code == 200:
-            data = vehicles.json()
            if len(data["data"]) > 0:
                for vehicle in data["data"]:
                    vins.append(vehicle["vin"])
@@ -115,6 +118,95 @@ def get_vehicles():
        logging.info("Vin: " + str(vins) + " found!")


+def get_vcc_api_keys(used_key=None):
+    working_keys = None
+
+    while not working_keys:
+        setting_keys = settings.volvoData["vccapikey"]
+        if isinstance(setting_keys, str):
+            set_key_state(setting_keys)
+        elif isinstance(setting_keys, list):
+            for key in setting_keys:
+                set_key_state(key)
+
+        logging.debug(str(vcc_api_keys))
+        working_keys = [key["key"] for key in vcc_api_keys if not key.get("extended") and key.get('key') != used_key]
+        if len(working_keys) < 1:
+            used_key = None
+            logging.warning("No working VCCAPIKEY found, waiting 10 minutes. Then trying again!")
+            mqtt.send_offline()
+            time.sleep(600)
+        else:
+            mqtt.send_heartbeat()
+            session.headers.update({"vcc-api-key": working_keys[0]})
+            logging.info("Using VCCAPIKEY: " + working_keys[0])
+            for key_dict in vcc_api_keys:
+                if key_dict["key"] == working_keys[0]:
+                    key_dict["in_use"] = True
+
+        logging.debug(str(vcc_api_keys))
+
+
+def set_key_state(key):
+    global vcc_api_keys
+    list_index = next((index for (index, d) in enumerate(vcc_api_keys) if d["key"] == key), None)
+
+    if list_index or list_index == 0:
+        extended, extended_until = check_vcc_api_key(key, vcc_api_keys[list_index]["extended_until"])
+        vcc_api_keys[list_index] = ({"key": key, "extended": extended,
+                                     "extended_until": extended_until, "in_use": False})
+    else:
+        extended, extended_until = check_vcc_api_key(key)
+        vcc_api_keys.append({"key": key, "extended": extended,
+                             "extended_until": extended_until, "in_use": False})
+
+
+def check_vcc_api_key(test_key, extended_until=None):
+    if extended_until:
+        if extended_until >= datetime.now():
+            logging.warning("VCCAPIKEY " + test_key + " is extended and will be reusable at: "
+                            + format_datetime(extended_until, format="medium", locale=settings["babelLocale"]))
+            return True, extended_until
+
+    if datetime.now(util.TZ) >= token_expires_at:
+        refresh_auth()
+
+    token = session.headers.get("authorization")
+    headers = {
+        "vcc-api-key": test_key,
+        "content-type": "application/json",
+        "accept": "*/*",
+        "authorization": token
+    }
+
+    response = requests.get(VEHICLES_URL, headers=headers)
+    data = response.json()
+    if response.status_code == 200:
+        logging.debug("VCCAPIKEY " + test_key + " works!")
+        return False, None
+    elif response.status_code == 403 and "message" in data:
+        if "Out of call volume quota" in data["message"]:
+            reuse_search = re.search(r"\d{2}\:\d{2}\:\d{2}", data["message"])
+            if reuse_search:
+                reusable_in = reuse_search.group(0).split(":")
+                now = datetime.now()
+                extended_until = now + timedelta(hours=int(reusable_in[0]),
+                                                 minutes=int(reusable_in[1]),
+                                                 seconds=int(reusable_in[2]) + 10)
+                logging.warning("VCCAPIKEY " + test_key + " is extended and will be reusable at: "
+                                + format_datetime(extended_until, format="medium", locale=settings["babelLocale"]))
+        else:
+            logging.warning("VCCAPIKEY " + test_key + " isn't working! " + data["error"]["message"])
+    else:
+        logging.warning("VCCAPIKEY " + test_key + " isn't working! " + data["error"]["message"])
+    return True, extended_until
+
+
+def change_vcc_api_key():
+    used_vcc_api_key = session.headers.get("vcc-api-key")
+    get_vcc_api_keys(used_vcc_api_key)
+
+
 def get_vehicle_details(vin):
    response = session.get(VEHICLE_DETAILS_URL.format(vin), timeout=15)
    if response.status_code == 200:
@@ -171,8 +263,10 @@ def check_supported_endpoints():

 def initialize_scheduler(vins):
    for vin in vins:
+        topic = f"homeassistant/schedule/{vin}/command"
        mqtt.active_schedules[vin] = {"timers": []}
-        mqtt.subscribed_topics = [f"homeassistant/schedule/{vin}/command"]
+        mqtt.subscribed_topics = [topic]
+        mqtt.mqtt_client.subscribe(topic)


 def initialize_climate(vins):
@@ -223,14 +317,14 @@ def check_engine_status(vin):
        time.sleep(5)


-def api_call(url, method, vin, sensor_id=None, force_update=False):
-    global token_expires_at
+def api_call(url, method, vin, sensor_id=None, force_update=False, key_change=False):
    if datetime.now(util.TZ) >= token_expires_at:
        refresh_auth()

-    if url in [RECHARGE_STATE_URL, WINDOWS_STATE_URL, LOCK_STATE_URL, TYRE_STATE_URL, STATISTICS_URL]:
+    if url in [RECHARGE_STATE_URL, WINDOWS_STATE_URL, LOCK_STATE_URL, TYRE_STATE_URL,
+               STATISTICS_URL, ENGINE_DIAGNOSTICS_URL]:
        # Minimize API calls for endpoints with multiple values
-        response = cached_request(url, method, vin, force_update)
+        response = cached_request(url, method, vin, force_update, key_change)
        if response is None:
            # Exception caught while getting data from volvo api, doing nothing
            return None
@@ -253,9 +347,11 @@ def api_call(url, method, vin, sensor_id=None, force_update=False):
        return None

    logging.debug("Response status code: " + str(response.status_code))
+    data = response.json()
+
    if response.status_code == 200:
-        data = response.json()
        logging.debug(response.text)
+        return parse_api_data(data, sensor_id)
    else:
        logging.debug(response.text)
        if url == CLIMATE_START_URL and response.status_code == 503:
@@ -266,13 +362,20 @@ def api_call(url, method, vin, sensor_id=None, force_update=False):
            # Suppress 403 errors for unsupported extended-vehicle api cars
            logging.debug("Suppressed 403 for extended-vehicle API")
            return None
+        elif response.status_code == 403 and "message" in data:
+            if "Out of call volume quota" in data["message"]:
+                logging.warn("Quota extended. Try to change VCCAPIKEY!")
+                change_vcc_api_key()
+                api_call(url, method, vin, sensor_id, force_update, True)
+            else:
+                logging.error(
+                    "API Call failed. Status Code: " + str(response.status_code) + ". Error: " + response.text)
        else:
            logging.error("API Call failed. Status Code: " + str(response.status_code) + ". Error: " + response.text)
        return None
-    return parse_api_data(data, sensor_id)


-def cached_request(url, method, vin, force_update=False):
+def cached_request(url, method, vin, force_update=False, key_change=False):
    global cached_requests
    if not util.keys_exists(cached_requests, vin + "_" + url):
        # No API Data cached, get fresh data from API
@@ -288,8 +391,9 @@ def cached_request(url, method, vin, force_update=False):
    else:
        if (datetime.now(util.TZ) - cached_requests[vin + "_" + url]["last_update"]).total_seconds() \
                >= settings["updateInterval"] or (force_update and
-                                                  (datetime.now(util.TZ) - cached_requests[vin + "_" + url]
-                                                  ["last_update"]).total_seconds() >= 2):
+                                                  (datetime.now(util.TZ) - cached_requests[vin + "_" + url][
+                                                      "last_update"]).total_seconds() >= 2) \
+                or key_change:
            # Old Data in Cache, or force mode active, updating
            logging.debug("Starting " + method + " call against " + url)
            try:
@@ -436,5 +540,19 @@ def parse_api_data(data, sensor_id=None):
            if distance_to_empty > 0:
                return util.convert_metric_values(data["distanceToEmpty"]["value"])
        return None
+    elif sensor_id == "hours_to_service":
+        return data["engineHoursToService"]["value"] if util.keys_exists(data, "engineHoursToService") else None
+    elif sensor_id == "km_to_service":
+        if util.keys_exists(data, "kmToService"):
+            km_to_service = int(data["kmToService"]["value"])
+            if km_to_service > 0:
+                return util.convert_metric_values(data["kmToService"]["value"])
+        return None
+    elif sensor_id == "months_to_service":
+        return data["monthsToService"]["value"] if util.keys_exists(data, "monthsToService") else None
+    elif sensor_id == "service_warning_status":
+        return data["serviceWarningStatus"]["value"] if util.keys_exists(data, "serviceWarningStatus") else None
+    elif sensor_id == "service_warning_trigger":
+        return data["serviceWarningTrigger"]["value"] if util.keys_exists(data, "serviceWarningTrigger") else None
    else:
        return None
Author	SHA1	Message	Date
Linus Dietz	23246a464f	Allow phone number as username #91	2023-08-25 15:08:25 +02:00
Linus Dietz	1a5cc3db7a	Optimize addon configuration	2023-08-25 09:08:58 +02:00
Linus Dietz	974ad0e454	Add "device_class: battery" for battery state sensors from BEV and PHEV	2023-08-18 15:44:13 +02:00
Linus Dietz	7db02b5dc6	Update changelog	2023-08-18 09:43:07 +02:00
Linus Dietz	7c87c71ac8	Optimize vcc api key change	2023-08-18 09:40:48 +02:00
Linus Dietz	3482a5f893	Change addon settings to prevent abuse	2023-08-18 07:54:24 +02:00
Linus Dietz	3f1f793c1b	Add settings validation to prevent abuse	2023-08-18 07:53:58 +02:00
Linus DietzandGitHub	1039eab649	Update readme for 1.8.0	2023-08-17 14:35:53 +02:00
Linus Dietz	47bd726ebb	Add changelog info	2023-08-17 12:22:45 +02:00
Linus Dietz	0397d05522	Fix app crash if debug mode is not set #86	2023-08-17 12:19:29 +02:00
Linus DietzandGitHub	f0628e6a26	Add missing sensors	2023-08-17 11:29:05 +02:00
Linus DietzandGitHub	0f89258718	Add missing cars	2023-08-17 11:25:20 +02:00
Linus DietzandGitHub	075102c574	Allow multiple vcc api keys (#85 ) * Multiple vccapikeys function * Reduce api calls for key checks * Change sleeptime * Optimize logging * Format log datetime * Change default conf * Set device offline, if no working vcc api key can be found * Fix climate scheduler * Only redact sensitive data if debug is enabled	2023-08-17 10:43:03 +02:00
Linus Dietz	a05bf487bd	Fix #80	2023-08-06 09:35:11 +02:00
Linus Dietz GitHub Arthur van der Peijl Arthur van der Peijl	dc7b711219	Added vehicle diagnostics sensors (#78 ) * Added vehicle diagnostics for additional sensors (#76) Add support for vehicle diagnostics data --------- Co-authored-by: Arthur van der Peijl <arthur@artned.org> * Reduce VEHICLE_DIAGNOSTICS_URL api calls * Bump version --------- Co-authored-by: Arthur van der Peijl <aavanderpeijl@gmail.com> Co-authored-by: Arthur van der Peijl <arthur@artned.org>	2023-08-05 21:01:04 +02:00
Linus Dietz	fb8c5ed269	Fix "Estimated Charging Finish Time" Sensor	2023-08-05 12:21:45 +02:00
Linus Dietz	a7dd6fac00	update changelog for v1.7.7	2023-07-31 09:20:40 +02:00