@homebridge-plugins/homebridge-tado 8.3.0 → 8.4.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v8.4.0 - 2025-10-26
+- Improve state handling to ensure Apple Home states always reflect current tado states
+
+## v8.3.1 - 2025-10-25
+- Fix: Persist zone states only if not empty
+
 ## v8.3.0 - 2025-10-25
 - Add tado API counter
 - Improve task scheduling and interval handling

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homebridge-plugins/homebridge-tado",
-  "version": "8.3.0",
+  "version": "8.4.0",
   "description": "Homebridge plugin for controlling tado° devices.",
   "main": "index.js",
   "scripts": {

package/src/accessories/thermostat.js

@@ -199,17 +199,11 @@ export default class ThermostatAccessory {
       }
 
       this.waitForEndValue = setTimeout(() => {
-        if (value === 3) {
-          if (this.timeoutAuto) {
-            this.deviceHandler.setStates(this.accessory, this.accessories, 'State', value);
-            clearTimeout(this.timeoutAuto);
-            this.timeoutAuto = null;
-          } else {
-            this.deviceHandler.setStates(this.accessory, this.accessories, 'State', value);
-          }
-        } else {
-          this.deviceHandler.setStates(this.accessory, this.accessories, 'State', value);
+        if (this.settingTemperature) {
+          this.settingTemperature = false;
+          return;
         }
+        this.deviceHandler.setStates(this.accessory, this.accessories, 'State', value);
       }, 500);
     });
 
@@ -223,24 +217,10 @@ export default class ThermostatAccessory {
     service
       .getCharacteristic(this.api.hap.Characteristic.TargetTemperature)
       .onSet((value) => {
-        /*
-         *let tempUnit = service.getCharacteristic(this.api.hap.Characteristic.TemperatureDisplayUnits).value;
-         *
-         *let cToF = (c) => Math.round((c * 9) / 5 + 32);
-         *let fToC = (f) => Math.round(((f - 32) * 5) / 9);
-         *
-         *let newValue = tempUnit ? (value <= 25 ? cToF(value) : value) : value > 25 ? fToC(value) : value;
-         *
-         *service.getCharacteristic(this.api.hap.Characteristic.CurrentTemperature).updateValue(newValue);
-        */
-
-        this.timeoutAuto = setTimeout(() => {
-          let targetState = service.getCharacteristic(this.api.hap.Characteristic.TargetHeatingCoolingState).value;
-
-          if (targetState) this.deviceHandler.setStates(this.accessory, this.accessories, 'Temperature', value);
-
-          this.timeoutAuto = null;
-        }, 600);
+        this.settingTemperature = true;
+        const targetState = service.getCharacteristic(this.api.hap.Characteristic.TargetHeatingCoolingState).value;
+        if (targetState) this.deviceHandler.setStates(this.accessory, this.accessories, 'Temperature', value);
+        setTimeout(() => this.settingTemperature = false, 1000);
       })
       .on(
         'change',

package/src/helper/handler.js

@@ -26,6 +26,9 @@ export default (api, accessories, config, tado, telegram) => {
   const storagePath = api.user.storagePath();
 
   async function setStates(accessory, accs, target, value) {
+    let zoneUpdated = false;
+    let allZonesUpdated = false;
+
     accessories = accs.filter((acc) => acc && acc.context.config.homeName === config.homeName);
 
     try {
@@ -75,7 +78,7 @@ export default (api, accessories, config, tado, telegram) => {
 
               // Use AC-specific overlay for AIR_CONDITIONING zones
               if (accessory.context.config.type === 'AIR_CONDITIONING') {
-
+                zoneUpdated = true;
                 await tado.setACZoneOverlay(
                   config.homeId,
                   accessory.context.config.zoneId,
@@ -88,6 +91,7 @@ export default (api, accessories, config, tado, telegram) => {
                   accessory.context.config.temperatureUnit
                 );
               } else {
+                zoneUpdated = true;
                 await tado.setZoneOverlay(
                   config.homeId,
                   accessory.context.config.zoneId,
@@ -127,8 +131,8 @@ export default (api, accessories, config, tado, telegram) => {
                     accessory.context.config.mode === 'AUTO' &&
                     accessory.context.config.subtype.includes('heatercooler'))
                 ) {
+                  zoneUpdated = true;
                   await tado.clearZoneOverlay(config.homeId, accessory.context.config.zoneId);
-                  await updateZones(accessory.context.config.zoneId);
                   return;
                 }
 
@@ -143,6 +147,7 @@ export default (api, accessories, config, tado, telegram) => {
                 if (accessory.context.config.type === 'AIR_CONDITIONING') {
                   let acMode = value === 1 ? 'HEAT' : value === 2 ? 'COOL' : 'COOL';
 
+                  zoneUpdated = true;
                   await tado.setACZoneOverlay(
                     config.homeId,
                     accessory.context.config.zoneId,
@@ -155,6 +160,7 @@ export default (api, accessories, config, tado, telegram) => {
                     accessory.context.config.temperatureUnit
                   );
                 } else {
+                  zoneUpdated = true;
                   await tado.setZoneOverlay(
                     config.homeId,
                     accessory.context.config.zoneId,
@@ -188,8 +194,8 @@ export default (api, accessories, config, tado, telegram) => {
                   accessory.context.config.mode === 'CUSTOM' &&
                   accessory.context.config.subtype.includes('heatercooler'))
               ) {
+                zoneUpdated = true;
                 await tado.clearZoneOverlay(config.homeId, accessory.context.config.zoneId);
-                await updateZones(accessory.context.config.zoneId);
                 return;
               }
 
@@ -251,6 +257,7 @@ export default (api, accessories, config, tado, telegram) => {
                 }
               }
 
+              zoneUpdated = true;
               await tado.setACZoneOverlay(
                 config.homeId,
                 accessory.context.config.zoneId,
@@ -263,6 +270,7 @@ export default (api, accessories, config, tado, telegram) => {
                 accessory.context.config.temperatureUnit
               );
             } else {
+              zoneUpdated = true;
               await tado.setZoneOverlay(
                 config.homeId,
                 accessory.context.config.zoneId,
@@ -293,7 +301,7 @@ export default (api, accessories, config, tado, telegram) => {
 
           // Use AC-specific overlay for AIR_CONDITIONING zones
           if (accessory.context.config.type === 'AIR_CONDITIONING') {
-
+            zoneUpdated = true;
             await tado.setACZoneOverlay(
               config.homeId,
               accessory.context.config.zoneId,
@@ -306,6 +314,7 @@ export default (api, accessories, config, tado, telegram) => {
               accessory.context.config.temperatureUnit
             );
           } else {
+            zoneUpdated = true;
             await tado.setZoneOverlay(
               config.homeId,
               accessory.context.config.zoneId,
@@ -367,6 +376,7 @@ export default (api, accessories, config, tado, telegram) => {
             }
           }
 
+          allZonesUpdated = true;
           await tado.setPresenceLock(config.homeId, targetState);
 
           break;
@@ -418,6 +428,7 @@ export default (api, accessories, config, tado, telegram) => {
                 })
                 .filter((id) => id);
 
+              allZonesUpdated = true;
               await tado.resumeShedule(config.homeId, roomIds);
 
               //Turn all back to AUTO/ON
@@ -542,6 +553,7 @@ export default (api, accessories, config, tado, telegram) => {
               .updateValue(false);
           }
 
+          allZonesUpdated = true;
           await tado.switchAll(config.homeId, rooms);
 
           break;
@@ -557,6 +569,8 @@ export default (api, accessories, config, tado, telegram) => {
     } catch (err) {
       errorHandler(err);
     } finally {
+      //always update zone to set correct state in Apple Home
+      if (zoneUpdated || allZonesUpdated) await updateZones(allZonesUpdated ? undefined : accessory.context.config.zoneId);
       settingState = false;
     }
   }
@@ -717,11 +731,15 @@ export default (api, accessories, config, tado, telegram) => {
 
   async function persistStates(homeId, zoneStates) {
     try {
-      const homeData = {};
-      homeData.zoneStates = zoneStates ?? {};
-      await writeFile(join(storagePath, `tado-states-${homeId}.json`), JSON.stringify(homeData, null, 2), "utf-8");
+      if (zoneStates && Object.keys(zoneStates).length) {
+        const homeData = {};
+        homeData.zoneStates = zoneStates;
+        await writeFile(join(storagePath, `tado-states-${homeId}.json`), JSON.stringify(homeData, null, 2), "utf-8");
+      } else {
+        Logger.info(`Skipping persistence of tado states for home ${homeId}: zone states are empty.`);
+      }
     } catch (error) {
-      Logger.error(`Error while updating the tado states file for home id ${homeId}: ${error.message || error}`);
+      Logger.error(`Error while updating the tado states file for home ${homeId}: ${error.message || error}`);
     }
     try {
       const data = {};
@@ -731,10 +749,10 @@ export default (api, accessories, config, tado, telegram) => {
       Logger.error(`Error while updating the tado states file: ${error.message || error}`);
     }
     try {
-      //wait for fakegato services to be loaded
+      //wait for fakegato history services to be loaded
       await new Promise(r => setTimeout(r, 4000));
-      for (const fnRefreshHistory of aRefreshHistoryHandlers) {
-        fnRefreshHistory();
+      for (const refreshHistory of aRefreshHistoryHandlers) {
+        refreshHistory();
       }
     } catch (error) {
       Logger.error(`Error while refreshing history: ${error.message || error}`);
@@ -857,34 +875,36 @@ export default (api, accessories, config, tado, telegram) => {
         }
       }
 
-      const allZones = (await tado.getZones(config.homeId)) || [];
+      if (idToUpdate === undefined) {
+        const allZones = (await tado.getZones(config.homeId)) || [];
 
-      for (const [index, zone] of config.zones.entries()) {
-        allZones.forEach((zoneWithID) => {
-          if (zoneWithID.name === zone.name) {
-            const heatAccessory = accessories.filter(
-              (acc) => acc && acc.displayName === config.homeName + ' ' + zone.name + ' Heater'
-            );
+        for (const [index, zone] of config.zones.entries()) {
+          allZones.forEach((zoneWithID) => {
+            if (zoneWithID.name === zone.name) {
+              const heatAccessory = accessories.filter(
+                (acc) => acc && acc.displayName === config.homeName + ' ' + zone.name + ' Heater'
+              );
 
-            if (heatAccessory.length) heatAccessory[0].context.config.zoneId = zoneWithID.id;
-
-            config.zones[index].id = zoneWithID.id;
-            config.zones[index].battery = !config.zones[index].noBattery
-              ? zoneWithID.devices.filter(
-                (device) =>
-                  device &&
-                  (zone.type === 'HEATING' || zone.type === 'AIR_CONDITIONING') &&
-                  typeof device.batteryState === 'string' &&
-                  !device.batteryState.includes('NORMAL')
-              ).length
-                ? zoneWithID.devices.filter((device) => device && !device.batteryState.includes('NORMAL'))[0]
-                  .batteryState
-                : zoneWithID.devices.filter((device) => device && device.duties.includes('ZONE_LEADER'))[0].batteryState
-              : false;
-            config.zones[index].openWindowEnabled =
-              zoneWithID.openWindowDetection && zoneWithID.openWindowDetection.enabled ? true : false;
-          }
-        });
+              if (heatAccessory.length) heatAccessory[0].context.config.zoneId = zoneWithID.id;
+
+              config.zones[index].id = zoneWithID.id;
+              config.zones[index].battery = !config.zones[index].noBattery
+                ? zoneWithID.devices.filter(
+                  (device) =>
+                    device &&
+                    (zone.type === 'HEATING' || zone.type === 'AIR_CONDITIONING') &&
+                    typeof device.batteryState === 'string' &&
+                    !device.batteryState.includes('NORMAL')
+                ).length
+                  ? zoneWithID.devices.filter((device) => device && !device.batteryState.includes('NORMAL'))[0]
+                    .batteryState
+                  : zoneWithID.devices.filter((device) => device && device.duties.includes('ZONE_LEADER'))[0].batteryState
+                : false;
+              config.zones[index].openWindowEnabled =
+                zoneWithID.openWindowDetection && zoneWithID.openWindowDetection.enabled ? true : false;
+            }
+          });
+        }
       }
 
       let zonesToUpdate = [];
@@ -921,19 +941,21 @@ export default (api, accessories, config, tado, telegram) => {
 
               tempEqual = Math.round(currentTemp) === Math.round(targetTemp);
 
-              currentState = currentTemp <= targetTemp ? 1 : 2;
+              //show as currently heating if current temp is lower than target temp, otherwise show as temp set
+              currentState = currentTemp < targetTemp ? 1 : 0;
 
-              targetState = 1;
+              //check if auto mode is enabled
+              targetState = zoneState.overlayType === null ? 3 : 1;
 
               active = 1;
             } else {
+              //heating is switched off
               currentState = 0;
               targetState = 0;
               active = 0;
             }
 
-            if (zoneState.overlayType === null) {
-              currentState = 0;
+            if (targetState === undefined && zoneState.overlayType === null) {
               targetState = 3;
             }
           }
@@ -1568,7 +1590,7 @@ export default (api, accessories, config, tado, telegram) => {
       error = err;
     }
 
-    Logger.error(error, config.homeName);
+    Logger.error("Error:", error, config.homeName);
 
     return;
   }

package/src/tado/tado-api.js

@@ -72,6 +72,7 @@ export default class Tado {
   }
 
   async getToken() {
+    Logger.debug('Get access token...', this.name);
     if (!this._tadoTokenPromise) {
       this._tadoTokenPromise = this._getToken().finally(() => {
         this._tadoTokenPromise = undefined;
@@ -212,7 +213,6 @@ export default class Tado {
   }
 
   async apiCall(path, method = 'GET', data = {}, params = {}, tado_url_dif) {
-    Logger.debug('Get access token...', this.name);
     const access_token = this.skipAuth ? undefined : await this.getToken();
 
     let tadoLink = tado_url_dif || this.tadoApiUrl;