Add statistics endpoint to cached responses

This reverts commit 1574fa96

.env.dist

@@ -0,0 +1,5 @@
+CONF_updateInterval=300
+CONF_babelLocale='de'
+CONF_mqtt='@json {"broker": "mqtt", "username": "", "password": ""}'
+CONF_volvoData='@json {"username": "", "password": "", "vin": "",   "vccapikey": ""}'
+TZ='Europe/Berlin'

.gitignore

@@ -1,3 +1,4 @@
 .idea
 venv
-src/settings.dev.json
+src/settings.dev.json
+.env

README.md

@@ -5,15 +5,20 @@ Maybe this component works also with other Volvo cars. Please try out the native
 
 ## Confirmed working with
 - XC40 BEV (2023)
+- XC40 BEV (2022)
+- XC40 PHEV (2021)
 - V60 T8 PHEV (2023)
 - C40 PHEV (2023)
 - C40 PHEV (2022)
 - XC90 T8 PHEV (2023)
 - XC60 PHEV (2023)
 - XC60 PHEV (2022)
-- V90 PHEV T8 (2019)
+- V90 PHEV T8 (2019)*
+
+*only partly working
+
+Please let me know if your car works with this addon so I can expand the list!<br>
 
-Please let me know if your car works with this addon so I can expand the list!
 
 ## Supported features
 - Lock/unlock car
@@ -21,7 +26,15 @@ Please let me know if your car works with this addon so I can expand the list!
 - Sensor "Battery Charge Level"
 - Sensor "Electric Range"
 - Sensor "Charging System Status"
+- Sensor "Charging Connection Status"
 - Sensor "Estimated Charging Finish Time"
+- Sensor "Door Lock Status"
+- Sensor "Engine Status"
+- Sensor "Window Lock Status"
+- Sensor "Odometer"
+- Sensor "Tire Status"
+- Sensor "Fuel Status"
+- Car Device Tracker
 - Multiple cars
 
 NOTE: Energy status currently available only for cars in the Europe / Middle East / Africa regions. [source](https://developer.volvocars.com/apis/energy/v1/overview/#availability)
@@ -32,7 +45,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": ""}' -e CONF_volvoData='@json {"username": "", "password": "", "vin": "",   "vccapikey": ""}' -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": "", "odometerMultiplier": 1}' -e TZ='Europe/Berlin' --name volvo2mqtt ghcr.io/dielee/volvo2mqtt:latest`
 
 <b>HA Add-On:</b><br>
 
@@ -44,10 +57,10 @@ Here is what every option means:
 | -------------------- | :-------: | :----------: | --------------------------------------------------------------- |
 | `CONF_updateInterval`     | `int`     | **required** | Update intervall in seconds.                                     |
 | `CONF_babelLocale`        | `string`  | **required** | Select your country from this [list](https://www.ibm.com/docs/en/radfws/9.7?topic=overview-locales-code-pages-supported). "Locale name" is the column you need!                                        |
-| `CONF_mqtt`               | `json`    | **required** | Broker = Mqtt Broker IP / Username and Passwort are optional!   |
+| `CONF_mqtt`               | `json`    | **required** | Broker = Mqtt Broker IP / Username and Passwort are optional! Broker port can be changed. If no value is given, port 1883 will be used.  |
-| `CONF_volvoData`          | `json`    | **required** | Username and password are REQUIRED. Car vin can be a single vin or a list of multiple vins like `["vin1", "vin2"]`. If no vin is provided, <b>ALL</b> of your vehicles will be used. Vccapi key is REQUIRED. Get your Vccapi key from [here](https://developer.volvocars.com/account/).                                   |
+| `CONF_volvoData`          | `json`    | **required** | Username and password are REQUIRED. Car vin can be a single vin or a list of multiple vins like `["vin1", "vin2"]`. If no vin is provided, <b>ALL</b> of your vehicles will be used. Vccapi key is REQUIRED. Get your Vccapi key from [here](https://developer.volvocars.com/account/). Odometer Multiplier is sometimes 10, sometimes 1. Try what's right for your car. If you leave it empty, the multiplier will be 1.                                 |
 | `CONF_debug`              | `string`  |              | Debug option (true/false) - optional! |
-| `TZ`                 | `string`  |              | Container timezone eg "Europe/Berlin" |
+| `TZ`                 | `string`  |              | Container timezone eg "Europe/Berlin" from [here](https://docs.diladele.com/docker/timezones.html)|
 
 If you like my work:
 

docker-compose.yml

@@ -0,0 +1,24 @@
+version: '3'
+services:
+  app:
+    build: .
+    env_file:
+      - .env
+    #    environment:
+    #      CONF_updateInterval: 300
+    #      CONF_babelLocale: 'de'
+    #      CONF_mqtt: '@json {"broker": "mqtt", "username": "", "password": ""}'
+    #      CONF_volvoData: '@json {"username": "", "password": "", "vin": "",   "vccapikey": ""}'
+    #      TZ: 'Europe/Berlin'
+    links:
+      - mqtt
+    depends_on:
+      - mqtt
+
+  mqtt:
+    container_name: mqtt
+    image: eclipse-mosquitto
+    expose:
+      - 1883
+    command: [ "/usr/sbin/mosquitto", "-c", "/mosquitto-no-auth.conf" ]
+

requirements.txt

@@ -1,4 +1,5 @@
 requests~=2.29.0
 dynaconf~=3.1.12
 paho-mqtt~=1.6.1
-Babel~=2.12.1
+Babel~=2.12.1
+pytz~=2023.3

src/Dockerfile

@@ -8,7 +8,7 @@ RUN apk add --no-cache python3 bash py3-pip
 WORKDIR /volvoAAOS2mqtt
 
 # download requirements.txt
-RUN wget https://raw.githubusercontent.com/Dielee/volvo2mqtt/main/requirements.txt
+RUN wget --no-cache https://raw.githubusercontent.com/Dielee/volvo2mqtt/main/requirements.txt
 
 # install dependencies
 RUN pip install -r requirements.txt

src/config.yaml

@@ -1,6 +1,6 @@
 name: "Volvo2Mqtt"
 description: "Volvo AAOS MQTT bridge"
-version: "1.3.1"
+version: "1.5.1"
 slug: "volvo2mqtt"
 init: false
 url: "https://github.com/Dielee/volvo2mqtt"
@@ -8,9 +8,11 @@ apparmor: true
 options:
   updateInterval: 300
   babelLocale: null
+  TZ: null
   debug: false
   mqtt:
     broker: null
+    port: 1883
     username: ""
     password: ""
   volvoData:
@@ -18,12 +20,15 @@ options:
     password: null
     vin: ""
     vccapikey: null
+    odometerMultiplier: 1
 schema:
   updateInterval: int(10,)
   babelLocale: str
+  TZ: str
   debug: bool
   mqtt:
     broker: str
+    port: int(1,)
     username: str?
     password: str?
   volvoData:
@@ -31,6 +36,7 @@ schema:
     password: str
     vin: str?
     vccapikey: str
+    odometerMultiplier: int(1,)
 arch:
   - aarch64
   - amd64

src/const.py

@@ -1,6 +1,6 @@
 from config import settings
 
-VERSION = "v1.3.1"
+VERSION = "v1.5.1"
 
 OAUTH_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
 VEHICLES_URL = "https://api.volvocars.com/connected-vehicle/v1/vehicles"
@@ -18,6 +18,9 @@ TYRE_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/ty
 ENGINE_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/engine-status"
 BATTERY_CHARGE_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/battery-charge-level"
 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"
+
+availability_topic = "volvoAAOS2mqtt/availability"
 
 charging_system_states = {"CHARGING_SYSTEM_CHARGING": "Charging", "CHARGING_SYSTEM_IDLE": "Idle",
                           "CHARGING_SYSTEM_FAULT": "Fault", "CHARGING_SYSTEM_UNSPECIFIED": "Unspecified"}
@@ -46,6 +49,7 @@ supported_entities = [
                         {"name": "Tailgate", "domain": "sensor", "id": "tailgate", "icon": "car-door-lock", "url": LOCK_STATE_URL},
                         {"name": "Engine Hood", "domain": "sensor", "id": "engine_hood", "icon": "car-door-lock", "url": LOCK_STATE_URL},
                         {"name": "Tank Lid", "domain": "sensor", "id": "tank_lid", "icon": "car-door-lock", "url": LOCK_STATE_URL},
+                        {"name": "Sunroof", "domain": "sensor", "id": "sunroof", "icon": "car-door-lock", "url": LOCK_STATE_URL},
                         {"name": "Air Conditioning", "domain": "switch", "id": "climate_status", "icon": "air-conditioner"},
                         {"name": "Lock state", "domain": "lock", "id": "lock_status", "icon": "lock", "url": LOCK_STATE_URL},
                         {"name": "Force Update Data", "domain": "button", "id": "update_data", "icon": "update", "url": ""},
@@ -55,5 +59,7 @@ supported_entities = [
                         {"name": "Tire Rear Left", "domain": "sensor", "id": "tyre_rear_left", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
                         {"name": "Tire Rear Right", "domain": "sensor", "id": "tyre_rear_right", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
                         {"name": "Engine State", "domain": "sensor", "id": "engine_state", "icon": "engine", "url": ENGINE_STATE_URL},
-                        {"name": "Fuel Level", "domain": "sensor", "id": "fuel_level", "unit": "liters", "icon": "fuel", "url": FUEL_STATE_URL}
+                        {"name": "Fuel Level", "domain": "sensor", "id": "fuel_level", "unit": "liters", "icon": "fuel", "url": FUEL_STATE_URL},
+                        {"name": "Average Fuel Consumption", "domain": "sensor", "id": "average_fuel_consumption", "unit": "liters", "icon": "fuel", "url": STATISTICS_URL},
+                        {"name": "Average Speed", "domain": "sensor", "id": "average_speed", "unit": "km/h" if settings["babelLocale"] != "en_US" else "mp/h", "icon": "fuel", "url": STATISTICS_URL}
 ]

src/main.py

@@ -1,9 +1,12 @@
 from volvo import authorize
 from mqtt import update_loop, connect
 from const import VERSION
+from util import set_tz
+
 
 if __name__ == '__main__':
     print("Starting volvo2mqtt version " + VERSION)
+    set_tz()
     authorize()
     connect()
     update_loop()

src/mqtt.py

@@ -2,26 +2,34 @@ import time
 import paho.mqtt.client as mqtt
 import json
 import volvo
+import util
 from threading import Thread, Timer
 from datetime import datetime
 from babel.dates import format_datetime
 from config import settings
 from const import CLIMATE_START_URL, CLIMATE_STOP_URL, CAR_LOCK_URL, \
-            CAR_UNLOCK_URL
+            CAR_UNLOCK_URL, availability_topic
 
 
 mqtt_client: mqtt.Client
 subscribed_topics = []
 assumed_climate_state = {}
 last_data_update = None
-climate_timer: Timer
+climate_timer = {}
 
 
 def connect():
     client = mqtt.Client("volvoAAOS2mqtt")
+    client.will_set(availability_topic, "offline", 0, False)
     if settings["mqtt"]["username"] and settings["mqtt"]["password"]:
         client.username_pw_set(settings["mqtt"]["username"], settings["mqtt"]["password"])
-    client.connect(settings["mqtt"]["broker"])
+    port = 1883
+    if util.keys_exists(settings["mqtt"], "port"):
+        conf_port = settings["mqtt"]["port"]
+        if isinstance(conf_port, int):
+            if conf_port > 0:
+                port = settings["mqtt"]["port"]
+    client.connect(settings["mqtt"]["broker"], port)
     client.loop_start()
     client.on_message = on_message
     client.on_disconnect = on_disconnect
@@ -32,6 +40,7 @@ def connect():
 
 
 def on_connect(client, userdata, flags, rc):
+    send_heartbeat()
     if len(subscribed_topics) > 0:
         for topic in subscribed_topics:
             mqtt_client.subscribe(topic)
@@ -56,24 +65,24 @@ def on_message(client, userdata, msg):
             api_thread.start()
             assumed_climate_state[vin] = "ON"
             # Starting timer to disable climate after 30 mins
-            climate_timer = Timer(1 * 60, volvo.disable_climate, (vin, ))
+            climate_timer[vin] = Timer(30 * 60, volvo.disable_climate, (vin, ))
-            climate_timer.start()
+            climate_timer[vin].start()
             update_car_data()
         elif payload == "OFF":
             api_thread = Thread(target=volvo.api_call, args=(CLIMATE_STOP_URL, "POST", vin))
             api_thread.start()
             assumed_climate_state[vin] = "OFF"
             # Stop timer if active
-            if climate_timer.is_alive():
+            if climate_timer[vin].is_alive():
-                climate_timer.cancel()
+                climate_timer[vin].cancel()
             update_car_data()
     elif "lock_status" in msg.topic:
         if payload == "LOCK":
             volvo.api_call(CAR_LOCK_URL, "POST", vin)
-            update_car_data()
+            update_car_data(True, {"entity_id": "lock_status", "vin": vin, "state": "LOCKED"})
         elif payload == "UNLOCK":
             volvo.api_call(CAR_UNLOCK_URL, "POST", vin)
-            update_car_data()
+            update_car_data(True, {"entity_id": "lock_status", "vin": vin, "state": "UNLOCKED"})
     elif "update_data" in msg.topic:
         if payload == "PRESS":
             update_car_data(True)
@@ -83,25 +92,37 @@ def update_loop():
     create_ha_devices()
     while True:
         print("Sending mqtt update...")
+        send_heartbeat()
         update_car_data()
         print("Mqtt update done. Next run in " + str(settings["updateInterval"]) + " seconds.")
         time.sleep(settings["updateInterval"])
 
 
-def update_car_data(force_update=False):
+def update_car_data(force_update=False, overwrite={}):
     global last_data_update
-    last_data_update = format_datetime(datetime.now(), format="medium", locale=settings["babelLocale"])
+    last_data_update = format_datetime(datetime.now(util.TZ), format="medium", locale=settings["babelLocale"])
     for vin in volvo.vins:
         for entity in volvo.supported_endpoints[vin]:
             if entity["domain"] == "button":
                 continue
 
+            ov_entity_id = ""
+            ov_vin = ""
+            ov_state = ""
+            if bool(overwrite):
+                ov_entity_id = overwrite["entity_id"]
+                ov_vin = overwrite["vin"]
+                ov_state = overwrite["state"]
+
             if entity["id"] == "climate_status":
                 state = assumed_climate_state[vin]
             elif entity["id"] == "last_data_update":
                 state = last_data_update
             else:
-                state = volvo.api_call(entity["url"], "GET", vin, entity["id"], force_update)
+                if entity["id"] == ov_entity_id and vin == ov_vin:
+                    state = ov_state
+                else:
+                    state = volvo.api_call(entity["url"], "GET", vin, entity["id"], force_update)
 
             if entity["domain"] == "device_tracker":
                 topic = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/attributes"
@@ -126,7 +147,8 @@ def create_ha_devices():
                         "icon": f"mdi:{entity['icon']}",
                         "state_topic": f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/state",
                         "device": device,
-                        "unique_id": f"volvoAAOS2mqtt_{vin}_{entity['id']}"
+                        "unique_id": f"volvoAAOS2mqtt_{vin}_{entity['id']}",
+                        "availability_topic": availability_topic
                     }
             if entity.get('unit'):
                 config["unit_of_measurement"] = entity["unit"]
@@ -143,5 +165,11 @@ def create_ha_devices():
             mqtt_client.publish(
                 f"homeassistant/{entity['domain']}/volvoAAOS2mqtt/{vin}_{entity['id']}/config",
                 json.dumps(config),
+                retain=True
             )
     time.sleep(2)
+    send_heartbeat()
+
+
+def send_heartbeat():
+    mqtt_client.publish(availability_topic, "online")

src/settings.json

@@ -1,8 +1,10 @@
 {
   "updateInterval": 300,
   "babelLocale": "de",
+  "TZ": "Europe/Berlin",
   "mqtt": {
     "broker": "",
+    "port": 1883,
     "username": "",
     "password": ""
   },

src/translations/en.yaml

@@ -5,12 +5,15 @@ configuration:
   babelLocale:
     name: Babel locale
     description: Select your country code or take a look at the GitHub repo for more infos!
+  TZ:
+    name: Timezone
+    description: Set your local timezone eg. "Europe/Berlin" or "America/New_York"
   debug:
     name: API debug mode
     description: Enable Volvo API debug, normaly this can stay off
   mqtt:
     name: MQTT Broker settings
-    description: Broker is your mqtt broker IP eg "192.168.0.1". Mqtt username and password are optional.
+    description: Broker is your mqtt broker IP eg "192.168.0.1". Mqtt username and password are optional. Broker port can be changed. If no value is given, port 1883 will be used.
   volvoData:
     name: Volvo APP credentials
-    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. 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. Odometer multiplier is sometimes 10, sometimes 1. Leave it empty if you don't know what's right. Take a look at the GitHub repo for more information!

src/util.py

@@ -1,3 +1,10 @@
+import pytz
+import os
+from config import settings
+
+TZ = None
+
+
 def keys_exists(element, *keys):
     """"
     Check if *keys (nested) exists in `element` (dict).
@@ -15,3 +22,15 @@ def keys_exists(element, *keys):
         except KeyError:
             return False
     return True
+
+
+def set_tz():
+    global TZ
+    env_tz = os.environ.get("TZ")
+    settings_tz = settings.get("TZ")
+    if env_tz:
+        TZ = pytz.timezone(env_tz)
+    elif settings_tz:
+        TZ = pytz.timezone(settings_tz)
+    else:
+        raise Exception("No timezone setting found! Please read the README!")

src/volvo.py

@@ -1,12 +1,13 @@
 import requests
-from datetime import datetime, timedelta
 import mqtt
+import util
+from datetime import datetime, timedelta
 from config import settings
 from babel.dates import format_datetime
-from util import keys_exists
 from const import charging_system_states, charging_connection_states, CLIMATE_START_URL, \
     OAUTH_URL, VEHICLES_URL, VEHICLE_DETAILS_URL, RECHARGE_STATE_URL, \
-    WINDOWS_STATE_URL, LOCK_STATE_URL, TYRE_STATE_URL, supported_entities, BATTERY_CHARGE_STATE_URL
+    WINDOWS_STATE_URL, LOCK_STATE_URL, TYRE_STATE_URL, supported_entities, BATTERY_CHARGE_STATE_URL, \
+    STATISTICS_URL
 
 session = requests.Session()
 session.headers = {
@@ -18,15 +19,8 @@ session.headers = {
 token_expires_at: datetime
 refresh_token = None
 vins = []
-recharge_cached_api_response = {}
-recharge_api_last_update = {}
-window_cached_api_response = {}
-window_api_last_update = {}
-door_cached_api_response = {}
-door_api_last_update = {}
-tyre_cached_api_response = {}
-tyre_api_last_update = {}
 supported_endpoints = {}
+cached_requests = {}
 
 
 def authorize():
@@ -48,7 +42,7 @@ def authorize():
         session.headers.update({'authorization': "Bearer " + data["access_token"]})
 
         global token_expires_at, refresh_token
-        token_expires_at = datetime.now() + timedelta(seconds=(data["expires_in"] - 30))
+        token_expires_at = datetime.now(util.TZ) + timedelta(seconds=(data["expires_in"] - 30))
         refresh_token = data["refresh_token"]
 
         get_vehicles()
@@ -77,7 +71,7 @@ def refresh_auth():
         session.headers.update({'authorization': "Bearer " + data["access_token"]})
 
         global token_expires_at
-        token_expires_at = datetime.now() + timedelta(seconds=(data["expires_in"] - 30))
+        token_expires_at = datetime.now(util.TZ) + timedelta(seconds=(data["expires_in"] - 30))
         refresh_token = data["refresh_token"]
 
 
@@ -172,27 +166,29 @@ def disable_climate(vin):
 
 def api_call(url, method, vin, sensor_id=None, force_update=False):
     global token_expires_at
-    if datetime.now() >= token_expires_at:
+    if datetime.now(util.TZ) >= token_expires_at:
         refresh_auth()
 
-    if url == RECHARGE_STATE_URL:
+    if url in [RECHARGE_STATE_URL, WINDOWS_STATE_URL, LOCK_STATE_URL, TYRE_STATE_URL, STATISTICS_URL]:
-        # Minimize API calls for recharge state
+        # Minimize API calls for endpoints with multiple values
-        response = pull_recharge_api(url, method, vin, force_update)
+        response = cached_request(url, method, vin, force_update)
-    elif url == WINDOWS_STATE_URL:
+        if response is None:
-        # Minimize API calls for window state
+            # Exception caught while getting data from volvo api, doing nothing
-        response = pull_window_api(url, method, vin, force_update)
+            return None
-    elif url == LOCK_STATE_URL:
-        # Minimize API calls for door state
-        response = pull_door_api(url, method, vin, force_update)
-    elif url == TYRE_STATE_URL:
-        # Minimize API calls for tyre state
-        response = pull_tyre_api(url, method, vin, force_update)
     elif method == "GET":
         print("Starting " + method + " call against " + url)
-        response = session.get(url.format(vin), timeout=15)
+        try:
+            response = session.get(url.format(vin), timeout=15)
+        except requests.exceptions.RequestException as e:
+            print("Error getting data: " + str(e))
+            return ""
     elif method == "POST":
         print("Starting " + method + " call against " + url)
-        response = session.post(url.format(vin), timeout=20)
+        try:
+            response = session.post(url.format(vin), timeout=20)
+        except requests.exceptions.RequestException as e:
+            print("Error getting data: " + str(e))
+            return ""
     else:
         print("Unkown method posted: " + method + ". Returning nothing")
         return ""
@@ -213,164 +209,126 @@ def api_call(url, method, vin, sensor_id=None, force_update=False):
     return parse_api_data(data, sensor_id)
 
 
-def pull_tyre_api(url, method, vin, force_update=False):
+def cached_request(url, method, vin, force_update=False):
-    global tyre_cached_api_response, tyre_api_last_update
+    global cached_requests
-    if not vin in tyre_cached_api_response or force_update:
+    if not util.keys_exists(cached_requests, vin + "_" + url):
-        # No API Data for vin cached, get fresh data from API
+        # No API Data cached, get fresh data from API
         print("Starting " + method + " call against " + url)
-        response = session.get(url.format(vin), timeout=15)
+        try:
-        tyre_cached_api_response[vin] = response
-        tyre_api_last_update[vin] = datetime.now()
-    else:
-        if (datetime.now() - tyre_api_last_update[vin]).total_seconds() >= settings["updateInterval"]:
-            # Old Data in Cache, updating
-            print("Starting " + method + " call against " + url)
             response = session.get(url.format(vin), timeout=15)
-            tyre_cached_api_response[vin] = response
+        except requests.exceptions.RequestException as e:
-            tyre_api_last_update[vin] = datetime.now()
+            print("Error getting data: " + str(e))
+            return None
+
+        data = {"response": response, "last_update": datetime.now(util.TZ)}
+        cached_requests[vin + "_" + url] = data
+    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):
+            # Old Data in Cache, or force mode active, updating
+            print("Starting " + method + " call against " + url)
+            try:
+                response = session.get(url.format(vin), timeout=15)
+            except requests.exceptions.RequestException as e:
+                print("Error getting data: " + str(e))
+                return None
+            data = {"response": response, "last_update": datetime.now(util.TZ)}
+            cached_requests[vin + "_" + url] = data
         else:
             # Data is up do date, returning cached data
-            response = tyre_cached_api_response[vin]
+            response = cached_requests[vin + "_" + url]["response"]
-    return response
-
-
-def pull_door_api(url, method, vin, force_update=False):
-    global door_cached_api_response, door_api_last_update
-    if not vin in door_cached_api_response or force_update:
-        # No API Data for vin cached, get fresh data from API
-        print("Starting " + method + " call against " + url)
-        response = session.get(url.format(vin), timeout=15)
-        door_cached_api_response[vin] = response
-        door_api_last_update[vin] = datetime.now()
-    else:
-        if (datetime.now() - door_api_last_update[vin]).total_seconds() >= settings["updateInterval"]:
-            # Old Data in Cache, updating
-            print("Starting " + method + " call against " + url)
-            response = session.get(url.format(vin), timeout=15)
-            door_cached_api_response[vin] = response
-            door_api_last_update[vin] = datetime.now()
-        else:
-            # Data is up do date, returning cached data
-            response = door_cached_api_response[vin]
-    return response
-
-
-def pull_window_api(url, method, vin, force_update=False):
-    global window_cached_api_response, window_api_last_update
-    if not vin in window_cached_api_response or force_update:
-        # No API Data for vin cached, get fresh data from API
-        print("Starting " + method + " call against " + url)
-        response = session.get(url.format(vin), timeout=15)
-        window_cached_api_response[vin] = response
-        window_api_last_update[vin] = datetime.now()
-    else:
-        if (datetime.now() - window_api_last_update[vin]).total_seconds() >= settings["updateInterval"]:
-            # Old Data in Cache, updating
-            print("Starting " + method + " call against " + url)
-            response = session.get(url.format(vin), timeout=15)
-            window_cached_api_response[vin] = response
-            window_api_last_update[vin] = datetime.now()
-        else:
-            # Data is up do date, returning cached data
-            response = window_cached_api_response[vin]
-    return response
-
-
-def pull_recharge_api(url, method, vin, force_update=False):
-    global recharge_cached_api_response, recharge_api_last_update
-    if not vin in recharge_cached_api_response or force_update:
-        # No API Data for vin cached, get fresh data from API
-        print("Starting " + method + " call against " + url)
-        response = session.get(url.format(vin), timeout=15)
-        recharge_cached_api_response[vin] = response
-        recharge_api_last_update[vin] = datetime.now()
-    else:
-        if (datetime.now() - recharge_api_last_update[vin]).total_seconds() >= settings["updateInterval"]:
-            # Old Data in Cache, updating
-            print("Starting " + method + " call against " + url)
-            response = session.get(url.format(vin), timeout=15)
-            recharge_cached_api_response[vin] = response
-            recharge_api_last_update[vin] = datetime.now()
-        else:
-            # Data is up do date, returning cached data
-            response = recharge_cached_api_response[vin]
     return response
 
 
 def parse_api_data(data, sensor_id=None):
     data = data["data"]
     if sensor_id == "battery_charge_level":
-        return data["batteryChargeLevel"]["value"] if keys_exists(data, "batteryChargeLevel") else None
+        return data["batteryChargeLevel"]["value"] if util.keys_exists(data, "batteryChargeLevel") else None
     elif sensor_id == "electric_range":
-        return data["electricRange"]["value"] if keys_exists(data, "electricRange") else None
+        return data["electricRange"]["value"] if util.keys_exists(data, "electricRange") else None
     elif sensor_id == "charging_system_status":
-        return charging_system_states[data["chargingSystemStatus"]["value"]] if keys_exists(data, "chargingSystemStatus") else None
+        return charging_system_states[data["chargingSystemStatus"]["value"]] if util.keys_exists(data,
+                                                                                            "chargingSystemStatus") else None
     elif sensor_id == "charging_connection_status":
-        return charging_connection_states[data["chargingConnectionStatus"]["value"]] if keys_exists(data, "chargingConnectionStatus") else None
+        return charging_connection_states[data["chargingConnectionStatus"]["value"]] if util.keys_exists(data,
+                                                                                                    "chargingConnectionStatus") else None
     elif sensor_id == "estimated_charging_time":
-        if keys_exists(data, "chargingSystemStatus"):
+        if util.keys_exists(data, "chargingSystemStatus"):
             charging_system_state = charging_system_states[data["chargingSystemStatus"]["value"]]
             if charging_system_state == "Charging":
-                return data["estimatedChargingTime"]["value"] if keys_exists(data, "estimatedChargingTime") else ""
+                return data["estimatedChargingTime"]["value"] if util.keys_exists(data, "estimatedChargingTime") else ""
             else:
                 return 0
         else:
             return None
     elif sensor_id == "estimated_charging_finish_time":
-        if keys_exists(data, "chargingSystemStatus"):
+        if util.keys_exists(data, "chargingSystemStatus"):
             charging_system_state = charging_system_states[data["chargingSystemStatus"]["value"]]
             if charging_system_state == "Charging":
-                charging_time = int(data["estimatedChargingTime"]["value"] if keys_exists(data, "estimatedChargingTime")
+                charging_time = int(data["estimatedChargingTime"]["value"] if util.keys_exists(data, "estimatedChargingTime")
                                     else 0)
-                charging_finished = datetime.now() + timedelta(minutes=charging_time)
+                charging_finished = datetime.now(util.TZ) + timedelta(minutes=charging_time)
                 return format_datetime(charging_finished, format="medium", locale=settings["babelLocale"])
             else:
                 return ""
         else:
             return None
     elif sensor_id == "lock_status":
-        return data["carLocked"]["value"] if keys_exists(data, "carLocked") else None
+        return data["carLocked"]["value"] if util.keys_exists(data, "carLocked") else None
     elif sensor_id == "odometer":
-        return int(data["odometer"]["value"]) * 10 if keys_exists(data, "odometer") else None
+        multiplier = 1
+        if util.keys_exists(settings["volvoData"], "odometerMultiplier"):
+            multiplier = settings["volvoData"]["odometerMultiplier"]
+            if isinstance(multiplier, str):
+                multiplier = 1
+            elif multiplier < 1:
+                multiplier = 1
+        return int(data["odometer"]["value"]) * multiplier if util.keys_exists(data, "odometer") else None
     elif sensor_id == "window_front_left":
-        return data["frontLeftWindowOpen"]["value"] if keys_exists(data, "frontLeftWindowOpen") else None
+        return data["frontLeftWindowOpen"]["value"] if util.keys_exists(data, "frontLeftWindowOpen") else None
     elif sensor_id == "window_front_right":
-        return data["frontRightWindowOpen"]["value"] if keys_exists(data, "frontRightWindowOpen") else None
+        return data["frontRightWindowOpen"]["value"] if util.keys_exists(data, "frontRightWindowOpen") else None
     elif sensor_id == "window_rear_left":
-        return data["rearLeftWindowOpen"]["value"] if keys_exists(data, "rearLeftWindowOpen") else None
+        return data["rearLeftWindowOpen"]["value"] if util.keys_exists(data, "rearLeftWindowOpen") else None
     elif sensor_id == "window_rear_right":
-        return data["rearRightWindowOpen"]["value"] if keys_exists(data, "rearRightWindowOpen") else None
+        return data["rearRightWindowOpen"]["value"] if util.keys_exists(data, "rearRightWindowOpen") else None
     elif sensor_id == "door_front_left":
-        return data["frontLeftDoorOpen"]["value"] if keys_exists(data, "frontLeftDoorOpen") else None
+        return data["frontLeftDoorOpen"]["value"] if util.keys_exists(data, "frontLeftDoorOpen") else None
     elif sensor_id == "door_front_right":
-        return data["frontRightDoorOpen"]["value"] if keys_exists(data, "frontRightDoorOpen") else None
+        return data["frontRightDoorOpen"]["value"] if util.keys_exists(data, "frontRightDoorOpen") else None
     elif sensor_id == "door_rear_left":
-        return data["rearLeftDoorOpen"]["value"] if keys_exists(data, "rearLeftDoorOpen") else None
+        return data["rearLeftDoorOpen"]["value"] if util.keys_exists(data, "rearLeftDoorOpen") else None
     elif sensor_id == "door_rear_right":
-        return data["rearRightDoorOpen"]["value"] if keys_exists(data, "rearRightDoorOpen") else None
+        return data["rearRightDoorOpen"]["value"] if util.keys_exists(data, "rearRightDoorOpen") else None
     elif sensor_id == "tailgate":
-        return data["tailGateOpen"]["value"] if keys_exists(data, "tailGateOpen") else None
+        return data["tailGateOpen"]["value"] if util.keys_exists(data, "tailGateOpen") else None
+    elif sensor_id == "sunroof":
+        return data["capOpen"]["value"] if util.keys_exists(data, "capOpen") else None
     elif sensor_id == "engine_hood":
-        return data["hoodOpen"]["value"] if keys_exists(data, "hoodOpen") else None
+        return data["hoodOpen"]["value"] if util.keys_exists(data, "hoodOpen") else None
     elif sensor_id == "tank_lid":
-        return data["tankLidOpen"]["value"] if keys_exists(data, "tankLidOpen") else None
+        return data["tankLidOpen"]["value"] if util.keys_exists(data, "tankLidOpen") else None
     elif sensor_id == "tyre_front_left":
-        return data["frontLeftTyrePressure"]["value"] if keys_exists(data, "frontLeftTyrePressure") else None
+        return data["frontLeftTyrePressure"]["value"] if util.keys_exists(data, "frontLeftTyrePressure") else None
     elif sensor_id == "tyre_front_right":
-        return data["frontRightTyrePressure"]["value"] if keys_exists(data, "frontRightTyrePressure") else None
+        return data["frontRightTyrePressure"]["value"] if util.keys_exists(data, "frontRightTyrePressure") else None
     elif sensor_id == "tyre_rear_left":
-        return data["rearLeftTyrePressure"]["value"] if keys_exists(data, "rearLeftTyrePressure") else None
+        return data["rearLeftTyrePressure"]["value"] if util.keys_exists(data, "rearLeftTyrePressure") else None
     elif sensor_id == "tyre_rear_right":
-        return data["rearRightTyrePressure"]["value"] if keys_exists(data, "rearRightTyrePressure") else None
+        return data["rearRightTyrePressure"]["value"] if util.keys_exists(data, "rearRightTyrePressure") else None
     elif sensor_id == "engine_state":
-        return data["engineRunning"]["value"] if keys_exists(data, "engineRunning") else None
+        return data["engineRunning"]["value"] if util.keys_exists(data, "engineRunning") else None
     elif sensor_id == "fuel_level":
-        return data["fuelAmount"]["value"] if keys_exists(data, "fuelAmount") else None
+        return data["fuelAmount"]["value"] if util.keys_exists(data, "fuelAmount") else None
+    elif sensor_id == "average_fuel_consumption":
+        return data["averageFuelConsumption"]["value"] if util.keys_exists(data, "averageFuelConsumption") else None
+    elif sensor_id == "average_speed":
+        return data["averageSpeed"]["value"] if util.keys_exists(data, "averageSpeed") else None
     elif sensor_id == "location":
         coordinates = {}
-        if keys_exists(data, "geometry"):
+        if util.keys_exists(data, "geometry"):
             raw_data = data["geometry"]
-            if keys_exists(raw_data, "coordinates"):
+            if util.keys_exists(raw_data, "coordinates"):
                 coordinates = {"longitude": raw_data["coordinates"][0],
                                "latitude": raw_data["coordinates"][1],
                                "gps_accuracy": 1}