Remove not used addon settings (#266)

Similar to #68

README.md

@@ -1,4 +1,5 @@
 # Volvo2Mqtt
+
 ![Supports aarch64 Architecture][aarch64-shield]
 ![Supports amd64 Architecture][amd64-shield]
 ![Supports armhf Architecture][armhf-shield]
@@ -21,12 +22,14 @@ If you like my work:<br>
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/U7U8MFXCF)
 
 ## Confirmed working with
+- EX30 BEV (2024)
 - XC40 BEV (2024)
 - XC40 BEV (2023)
 - XC40 BEV (2022)
 - XC40 PHEV (2021)
 - V60 T8 PHEV (2023)
 - V60 T6 PHEV (2025)
+- V60 CC B5 Mildhybrid (2024)
 - C40 BEV (2023)
 - C40 BEV (2022)
 - C40 BEV (2024)
@@ -157,6 +160,6 @@ Here is what every option means:
 [i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [releases]: https://github.com/Dielee/volvo2mqtt/releases
 [releases-shield]: https://img.shields.io/github/release/Dielee/volvo2mqtt.svg
-[maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2025.svg
 [commits-shield]: https://img.shields.io/github/commit-activity/y/Dielee/volvo2mqtt.svg
 [commits]: https://github.com/Dielee/volvo2mqtt/commits/main

src/CHANGELOG.md

@@ -1,20 +1,43 @@
+## v1.10.6
+
+### 🐛 Bug Fixes:
+
+- Fix missing refresh_token and API changes by volvo. Thanks to @esusxunil.
+
+
+## v1.10.5
+
+### 🐛 Bug Fixes:
+
+- Fix interior and exterior images if more than one car is in use
+
+## v1.10.4
+
+### 🐛 Bug Fixes:
+
+- re-fix bug if app needs to be re-authenticated with OTP while runtime
+
 ## v1.10.3
+
 ### 🐛 Bug Fixes:
 
 - Add more info logging for credential refresh process
 - Fix bug if app needs to be re-authenticated with OTP while runtime
- 
+
 ## v1.10.2
+
 ### 🐛 Bug Fixes:
 
 - Remove unused multiplier options #239
 
 ## v1.10.1
+
 ### 🚀 Features:
 
 - Optimize logging for vcc-api-key check #238
 
 ## v1.10.0
+
 ### 🚀 Features:
 
 - Remove unused multiplier options
@@ -24,38 +47,45 @@
 - Support new statistic keys #237
 
 ## v1.9.7
+
 ### 🐛 Bug Fixes:
 
 - Fix EX30 battery state #230
 
 ## v1.9.6
+
 ### 🐛 Bug Fixes:
 
 - Fixed interior and exterior Images #219
 - Take care of broken token files #220
 
 ## v1.9.5
+
 ### 🚀 Features:
 
 - Added "retain" states to survive HA reboot
 
 ## v1.9.4
+
 ### 🐛 Bug Fixes:
 
 - Fix backend state API url
 
 ## v1.9.3
+
 ### 🐛 Bug Fixes:
 
 - Ignore retained OTP messages #193
 
 ## v1.9.2
+
 ### 🐛 Bug Fixes:
 
 - Try to fix OTP Input
-- Fix `SyntaxWarning: invalid escape sequence '\d'` #196 
+- Fix `SyntaxWarning: invalid escape sequence '\d'` #196
 
 ## v1.9.1
+
 ### 🚀 Features:
 
 - The token file now survives an HA addon update/restart
@@ -65,14 +95,16 @@
 - Extend OTP retry time to 120 seconds
 
 ## v1.9.0
-### ⚠️ Breaking change 
+
+### ⚠️ Breaking change
+
 ### 🚀 Features:
 
 - Add "Battery Capacity" sensor. Thanks to @gurtjun!
 - OTP Auth
-        This addon uses the same OTP authentication as the Volvo app, now. 
+  This addon uses the same OTP authentication as the Volvo app, now.
-        The following steps are required for authentication in exactly this order:
+  The following steps are required for authentication in exactly this order:
-        
+
         1. Setup volvo2Mqtt, either via Docker, or via HA addon (take a look at the "Setup" section)
         2. Fill in your settings and start volvo2Mqtt
         3. Your log will show the following lines
@@ -84,61 +116,70 @@
         6. Paste your OTP into the text entity and press Enter
         7. If everything has worked, your addon is now authenticated. In the future, OTP authentication only needs to be done when updating, not when restarting the container.
 
-
 ## v1.8.27
+
 ### 🚀 Features:
 
 - Add state caching for "diagnostics" endpoint
 
 ## v1.8.26
+
 ### 🚀 Features:
 
 - Add option to disable updates #160 (Set the update interval to -1)
 
 ## v1.8.25
+
 ### 🚀 Features:
 
 - Fix INTERNAL_SERVER_ERROR #165
 
 ## v1.8.24
+
 ### 🚀 Features:
 
 - Add option for dynamic interval settings #160
 - Add warnings endpoint #151
 
 ## v1.8.23
+
 ### 🚀 Features:
 
 - Add new charging system states #152
 
 ## v1.8.22
+
 ### 🚀 Features:
 
 - Change units to HA default #148
 
 ## v1.8.21
+
 ### 🐛 Bug Fixes:
 
 - Try to fix addon build #146
 
 ## v1.8.20
+
 ### 🐛 Bug Fixes:
 
 - Fix Addon crash if icon state is `UNKOWN`
 - Add `UNSPECIFIED` state for windows
 
-
 ## v1.8.19
+
 ### 🐛 Bug Fixes:
 
-- Fix Estimated Charging Time not changing to zero #133 
+- Fix Estimated Charging Time not changing to zero #133
 
 ## v1.8.18
+
 ### 🐛 Bug Fixes:
 
 - Fix Backend State Sensor returning `null`
 
 ## v1.8.17
+
 ### 🚀 Features:
 
 - Move vehicle and vehicle details to v2 endpoint
@@ -148,6 +189,7 @@
 - Fix Battery Charge Level icon update
 
 ## v1.8.16
+
 ### 🚀 Features:
 
 - Add `Average energy consumption`, `Distance to empty battery` and `Washer fluid level` sensors
@@ -155,18 +197,21 @@
 - Use cached requests for fuel endpoint
 
 ## v1.8.15
+
 ### 🚀 Features:
 
 - Move `batteryChargeLevel` to the new v2 fuel endpoint
 - Add api backend status sensor
 
 ## v1.8.14
+
 ### 🐛 Bug Fixes:
 
 - Fix distance to empty sensor #127
 - Remove unused service warning trigger sensor
 
 ## v1.8.13
+
 ### 🐛 Bug Fixes:
 
 - Add "Time to Service" sensor #125<p>
@@ -174,62 +219,73 @@
   "Time to Service" contains this information now.
 
 ## v1.8.12
+
 ### 🐛 Bug Fixes:
 
 - Fix `AJAR` state for windows
 - Fix deprecation from `currentThread` to `current_thread`
 
 ## v1.8.11
+
 ### 🐛 Bug Fixes:
 
 - Remove old code from checks for running engine sensor
 - Move battery charge level sensor from v2 to v1, as v2 returns 404
 
 ## v1.8.10
+
 ### 🐛 Bug Fixes:
 
 - Add `AJAR` state for sunroof #123
 
 ## v1.8.9
+
 ### 🐛 Bug Fixes:
 
 - Fix api changes from volvo #121
 
 ## v1.8.8
+
 ### 🐛 Bug Fixes:
 
 - Fix json decode error, if volvo API returns a simple string #104
 
 ## v1.8.7
+
 ### 🚀 Features:
 
-- Add option to disable log completely #96 
+- Add option to disable log completely #96
 
 ### 🐛 Bug Fixes:
 
 - Fix regex error for some mailaddresses #97
 
 ## v1.8.6
+
 ### 🚀 Features:
 
 - Add option to use multiple docker containers (with different logins) #93
 
 ## 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 
+- Add `device_class: battery` for battery state sensors from BEV and PHEV
 
 ## v1.8.2
+
 ### 🚀 Features:
 
 - Add `updateInterval` limit to prevent abuse (60 Seconds)
@@ -237,17 +293,19 @@
 - 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 sometimes.
   Change your vccapikey config like this:
-  
+
   Old:
   ```
     "vccapikey": "vccapikey1" 
@@ -262,24 +320,28 @@
       - etc.
   ```
   More information about this feature [here](https://github.com/Dielee/volvo2mqtt/issues/84).
-    </b>
+  </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  
+- Fix "Estimated Charging Finish Time" Sensor
 
 ## v1.7.7
+
 ### 🚀 Features:
 
 - Added long term statistics for some sensors #68. Thanks to @bogdanbujdea!
@@ -287,44 +349,54 @@
 - Perpare for scheduler option (not yet ready)
 
 ## v1.7.6
+
 ### 🚀 Features:
 
-- Added support for interior and exterior images via the new [MQTT Image](https://www.home-assistant.io/integrations/image.mqtt/) entity. #62
+- Added support for interior and exterior images via the
+  new [MQTT Image](https://www.home-assistant.io/integrations/image.mqtt/) entity. #62
 
 <b>NOTE: This feature is only available using homeassistant version 2023.7.1 or greater.</b>
 
 ## v1.7.5
+
 ### 🚀 Features:
 
 - Added support for `LOCKING` and `UNLOCKING` state (Lock entity)
 
 ## v1.7.4
+
 ### 🐛 Bug Fixes:
 
 - Fixed undocumented charging connection state `CONNECTION_STATUS_FAULT` '#57
 
 ## v1.7.3
+
 ### 🐛 Bug Fixes:
 
 - Fixed API changes from Volvo #53
 
-<b>ATTENTION: Volvo optimized their API. Maybe you have to set your odometer multiplier to 1. 
+<b>ATTENTION: Volvo optimized their API. Maybe you have to set your odometer multiplier to 1.
 Also check all the other multipliers!</b>
+
 ## v1.7.2
+
 ### 🐛 Bug Fixes:
 
 - Fixed "Engine State" can be "true" or "false", not "RUNNING" or "STOPPED" #47
 
 ## v1.7.1
+
 ### 🚀 Features:
 
 - Moved "Engine State" from "sensor" to the "binary_sensor" domain
 - Improved HA Add-On security level to 7
 
-<b>NOTE: The old "sensor" entity will be not deleted automatically. If you want to clean up your mqtt device, just delete it and restart the volvo2mqtt addon.
+<b>NOTE: The old "sensor" entity will be not deleted automatically. If you want to clean up your mqtt device, just
+delete it and restart the volvo2mqtt addon.
 </b>
 
 ## v1.7.0
+
 ### 🚀 Features:
 
 - Added MQTT autodiscovery for HA Add-On users
@@ -337,21 +409,25 @@ Also check all the other multipliers!</b>
 ![image](https://i.imgur.com/GBamhFn.png)</b>
 
 ## v1.6.5
+
 ### 🐛 Bug Fixes:
 
 - Fixed missing key in unit mappings for `en_US` and `en_GB` mapping
 
 ## v1.6.4
+
 ### 🚀 Features:
 
-- Added dynamic icons for lock, battery and window state #43 
+- Added dynamic icons for lock, battery and window state #43
 
 ## v1.6.3
+
 ### 🚀 Features:
 
 - Moved data source for "Distance to empty" from extended api to connected api
 
 ## v1.6.2
+
 ### 🚀 Features:
 
 - Moved print statements to logger
@@ -359,17 +435,19 @@ Also check all the other multipliers!</b>
 - The full HA Addon log can now be found at your addon smb share `\\<Your HA IP>\addons\volvo2mqtt\log\volvo2mqtt.log`
 
 ## v1.6.1
+
 ### 🚀 Features:
 
-- Added "Washer Fluid Level" and "Distance to Empty" sensors #37 
+- Added "Washer Fluid Level" and "Distance to Empty" sensors #37
 - Expanded climate control for better state sync with HA
 
 ### 🐛 Bug Fixes:
 
 - Fixed wrong return values for not working endpoints
-- Fixed app crash on credential renewal timeout #39 
+- Fixed app crash on credential renewal timeout #39
 
 ## v1.6.0
+
 ### 🚀 Features:
 
 - Added conversion from metric to imperial system for `en_US` and `en_GB` locale

src/config.yaml

@@ -1,6 +1,6 @@
 name: "Volvo2Mqtt"
 description: "Volvo AAOS MQTT bridge"
-version: "1.10.3"
+version: "1.10.6"
 slug: "volvo2mqtt"
 init: false
 url: "https://github.com/Dielee/volvo2mqtt"

src/const.py

@@ -1,6 +1,6 @@
 from config import settings
 
-VERSION = "v1.10.3"
+VERSION = "v1.10.6"
 
 OAUTH_TOKEN_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
 OAUTH_AUTH_URL = "https://volvoid.eu.volvocars.com/as/authorization.oauth2"
@@ -123,8 +123,8 @@ supported_entities = [
                         {"name": "Tire Rear Right", "domain": "sensor", "id": "tyre_rear_right", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
                         {"name": "Engine State", "domain": "binary_sensor", "device_class": "running", "id": "engine_state", "icon": "engine", "url": ENGINE_STATE_URL},
                         {"name": "Fuel Level", "domain": "sensor", "id": "fuel_level", "unit": VOLUME_LITERS, "icon": "fuel", "url": FUEL_BATTERY_STATE_URL, "state_class": "measurement"},
-                        {"name": "Average Fuel Consumption", "domain": "sensor", "id": "average_fuel_consumption", "unit": VOLUME_LITERS, "icon": "fuel", "url": STATISTICS_URL},
+                        {"name": "Average Fuel Consumption", "domain": "sensor", "id": "average_fuel_consumption", "unit": VOLUME_LITERS, "icon": "fuel", "url": STATISTICS_URL, "state_class": "measurement"},
-                        {"name": "Average Energy Consumption", "domain": "sensor", "id": "average_energy_consumption", "unit": ENERGY_KILO_WATT_HOUR, "icon": "car-electric", "url": STATISTICS_URL},
+                        {"name": "Average Energy Consumption", "domain": "sensor", "id": "average_energy_consumption", "unit": ENERGY_KILO_WATT_HOUR, "icon": "car-electric", "url": STATISTICS_URL, "state_class": "measurement"},
                         {"name": "Distance to Empty Tank", "domain": "sensor", "id": "distance_to_empty_tank", "unit": LENGTH_KILOMETERS 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": "Distance to Empty Battery", "domain": "sensor", "id": "distance_to_empty_battery", "unit": LENGTH_KILOMETERS 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": SPEED_KILOMETERS_PER_HOUR if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["average_speed"]["unit"], "icon": "speedometer", "url": STATISTICS_URL, "state_class": "measurement"},
@@ -140,4 +140,4 @@ supported_entities = [
 
 old_entity_ids = ["months_to_service", "service_warning_trigger", "distance_to_empty"]
 otp_max_loops = 24
-otp_mqtt_topic = "volvoAAOS2mqtt/otp_code"
+otp_mqtt_topic = "volvoAAOS2mqtt/otp_code"

src/mqtt.py

@@ -108,37 +108,23 @@ def send_car_images(vin, data, device):
                        "sec-ch-ua-platform": "\"Windows\"", "sec-fetch-dest": "document", "Accept-Encoding": "gzip, deflate, br, zstd",
                        "sec-fetch-mode": "navigate", "sec-fetch-site": "none", "sec-fetch-user": "?1", "upgrade-insecure-requests": "1"}
 
-            # Post exterior image
+            # Post Images
-            if entity["id"] == "exterior_image":
+            if not os.path.exists(f'{entity["id"]}_{vin}.png'):
-                if not os.path.exists("exterior_image.png"):
+                data_path = "exteriorImageUrl" if entity["id"] == "exterior_image" else "internalImageUrl"
-                    response = requests.get(data["images"]["exteriorImageUrl"], headers=headers)
+                response = requests.get(data["images"][data_path], headers=headers)
-                    if response.status_code == 200:
+                if response.status_code == 200:
-                        with open("exterior_image.png", 'wb') as image:
+                    with open(f'{entity["id"]}_{vin}.png', 'wb') as image:
-                            image.write(response.content)
+                        image.write(response.content)
+                else:
+                    logging.warning("Error getting car images: " + str(response.status_code) + " Message: " + response.text)
 
-                if os.path.exists("exterior_image.png"):
+            if os.path.exists(f'{entity["id"]}_{vin}.png'):
-                    ext_image = open("exterior_image.png", mode="rb").read()
+                ext_image = open(f'{entity["id"]}_{vin}.png', mode="rb").read()
-                    mqtt_client.publish(
+                mqtt_client.publish(
-                        image_topic,
+                    image_topic,
-                        ext_image,
+                    ext_image,
-                        retain=True
+                    retain=True
-                    )
+                )
-
-            if entity["id"] == "interior_image":
-                # Post interior Image
-                if not os.path.exists("interior_image.png"):
-                    response = requests.get(data["images"]["internalImageUrl"], headers=headers)
-                    if response.status_code == 200:
-                        with open("interior_image.png", 'wb') as image:
-                            image.write(response.content)
-
-                if os.path.exists("interior_image.png"):
-                    int_image = open("interior_image.png", mode="rb").read()
-                    mqtt_client.publish(
-                        image_topic,
-                        int_image,
-                        retain=True
-                    )
 
 
 def on_connect(client, userdata, flags, rc):

src/settings.json

@@ -14,9 +14,6 @@
     "username": "",
     "password": "",
     "vin": "",
-	"vccapikey": [],
+	  "vccapikey": []
-    "odometerMultiplier": "",
-    "averageSpeedDivider": "",
-    "averageFuelConsumptionMultiplier": ""
   }
 }

src/translations/en.yaml

@@ -19,4 +19,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. 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!
+    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. Take a look at the GitHub repo for more information!

src/volvo.py

@@ -108,7 +108,7 @@ def authorize(renew_tokenfile=False):
     Thread(target=backend_status_loop).start()
 
 def continue_auth(auth_session, data):
-    next_url = data["_links"]["continueAuthentication"]["href"] + "?action=continueAuthentication"
+    next_url = data["_links"]["continueAuthentication"]["href"].replace("http://", "https://") + "?action=continueAuthentication"
     auth = auth_session.get(next_url)
 
     if auth.status_code == 200:
@@ -131,7 +131,7 @@ def get_token(auth_session, data):
 
 
 def check_username_password(auth_session, data):
-    next_url = data["_links"]["checkUsernamePassword"]["href"] + "?action=checkUsernamePassword"
+    next_url = data["_links"]["checkUsernamePassword"]["href"].replace("http://", "https://") + "?action=checkUsernamePassword"
     body = {"username": settings.volvoData["username"],
              "password": settings.volvoData["password"]}
     auth = auth_session.post(next_url, data=json.dumps(body))
@@ -145,7 +145,7 @@ def check_username_password(auth_session, data):
 
 def send_otp(auth_session, data):
     mqtt.create_otp_input()
-    next_url = data["_links"]["checkOtp"]["href"] + "?action=checkOtp"
+    next_url = data["_links"]["checkOtp"]["href"].replace("http://", "https://") + "?action=checkOtp"
     body = {"otp": ""}
 
     for i in range(otp_max_loops):
@@ -161,8 +161,8 @@ def send_otp(auth_session, data):
         raise Exception ("No OTP found, exting...")
 
     auth = auth_session.post(next_url, data=json.dumps(body))
+    mqtt.otp_code = None
     if auth.status_code == 200:
-        mqtt.otp_code = None
         return auth.json()
     else:
         message = auth.json()
@@ -191,16 +191,27 @@ def refresh_auth():
 
     if auth.status_code == 200:
         token_path = util.get_token_path()
-        data = auth.json()
+        refresh_data = auth.json()
-        util.save_to_json(data, token_path)
+
-        session.headers.update({"authorization": "Bearer " + data["access_token"]})
+        f = open(token_path)
+        try:
+            data = json.load(f)
+            refresh_token = data["refresh_token"]
+        except ValueError:
+            raise Exception("Cannot refresh token!")
+
+        refresh_data["refresh_token"] = refresh_token
+        util.save_to_json(refresh_data, token_path)
+        session.headers.update({"authorization": "Bearer " + refresh_data["access_token"]})
 
         global token_expires_at
-        token_expires_at = datetime.now(util.TZ) + timedelta(seconds=(data["expires_in"] - 30))
+        token_expires_at = datetime.now(util.TZ) + timedelta(seconds=(refresh_data["expires_in"] - 30))
-        refresh_token = data["refresh_token"]
+        refresh_token = refresh_data["refresh_token"]
+        return None
     else:
         logging.warning("Refreshing credentials failed!: " + str(auth.status_code) + " Message: " + auth.text)
         authorize(renew_tokenfile=True)
+        return None
 
 
 def get_vehicles():