@homebridge-plugins/homebridge-tado 8.5.1-beta.2 → 8.5.1-beta.3

package/CHANGELOG.md

@@ -1,8 +1,8 @@
 # Changelog
 
-## v8.5.1 - 2025-10-29
-- Fix: Incorrect update of config zone properties leading to unwanted heating changes (#178)
-- Improve zone update handling when setting state
+## v8.6.0 - 2025-10-30
+- Fix: Incorrect update zones handling leading to unwanted heating changes (#178)
+- Improve zone update handling when setting state and update all zones if next scheduled update is more than 10s away
 
 ## v8.5.0 - 2025-10-27
 - Change minimum polling interval to 30s due to improvements made in v8.2.0

package/package.json

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

package/src/helper/handler.js

@@ -5,6 +5,7 @@ import { join } from "path";
 
 let settingState = false;
 let tasksInitialized = false;
+let lastGetStates = 0;
 const delayTimer = {};
 
 const timeout = (ms) => new Promise((res) => setTimeout(res, ms));
@@ -23,6 +24,7 @@ export async function getPersistedStates(storagePath) {
 }
 
 export default (api, accessories, config, tado, telegram) => {
+  const statesIntervalTime = Math.max(config.polling, 30) * 1000;
   const storagePath = api.user.storagePath();
 
   async function setStates(accessory, accs, target, value) {
@@ -565,9 +567,11 @@ export default (api, accessories, config, tado, telegram) => {
     } catch (err) {
       errorHandler(err);
     } finally {
-      //always update zone to set correct state in Apple Home
-      if (zoneUpdated) await updateZones(accessory.context.config.zoneId);
       settingState = false;
+      //update zones to ensure correct state in Apple Home
+      const timeSinceLastGetStates = Date.now() - lastGetStates;
+      const statesIntervalTimeLeft = statesIntervalTime - timeSinceLastGetStates;
+      if (zoneUpdated && statesIntervalTimeLeft > 10_000) await updateZones();
     }
   }
 
@@ -769,13 +773,14 @@ export default (api, accessories, config, tado, telegram) => {
     tasksInitialized = true;
 
     void getStates();
-    setInterval(() => getStates(), Math.max(config.polling, 30) * 1000);
+    setInterval(() => getStates(), statesIntervalTime);
 
     void logCounter();
     setInterval(() => logCounter(), 60 * 60 * 1000);
   }
 
   async function getStates() {
+    lastGetStates = Date.now();
     let zoneStates = {};
     try {
       //ME
@@ -845,12 +850,8 @@ export default (api, accessories, config, tado, telegram) => {
     }
   }
 
-  async function updateZones(idToUpdate) {
-    let zoneStates = {};
-    if (settingState && idToUpdate === undefined) {
-      await timeout(10 * 1000);
-      if (settingState) return zoneStates;
-    }
+  async function updateZones() {
+    if (settingState) return;
 
     Logger.debug('Polling Zones...', config.homeName);
 
@@ -901,17 +902,12 @@ export default (api, accessories, config, tado, telegram) => {
       });
     }
 
-    let zonesToUpdate = [];
-    if (idToUpdate !== undefined) {
-      zoneStates[idToUpdate] = await tado.getZoneState(config.homeId, idToUpdate);
-      zonesToUpdate = config.zones.filter(zone => zone.id === idToUpdate);
-    } else {
-      zoneStates = (await tado.getZoneStates(config.homeId))["zoneStates"];
-      zonesToUpdate = config.zones;
-    }
+    const zoneStates = (await tado.getZoneStates(config.homeId))["zoneStates"] ?? {};
+    const zonesToUpdate = config.zones;
 
     for (const zone of zonesToUpdate) {
-      const zoneState = zoneStates[zone.id];
+      const zoneState = zoneStates[zone.id.toString()];
+      Logger.debug(`Update state of zone ${zone.id} to:`, zoneState);
 
       let currentState, targetState, currentTemp, targetTemp, humidity, active, battery, tempEqual;
 
@@ -1244,6 +1240,8 @@ export default (api, accessories, config, tado, telegram) => {
       if (windowContactAccessory.length) {
         windowContactAccessory.forEach((acc) => {
           if (acc.displayName.includes(zone.name)) {
+            Logger.debug("Update window contact sensor.");
+
             let serviceBattery = acc.getService(api.hap.Service.BatteryService);
             let characteristicBattery = api.hap.Characteristic.BatteryLevel;
 
@@ -1264,6 +1262,8 @@ export default (api, accessories, config, tado, telegram) => {
       if (windowSwitchAccessory.length) {
         windowSwitchAccessory[0].services.forEach((switchService) => {
           if (switchService.subtype && switchService.subtype.includes(zone.name)) {
+            Logger.debug("Update window switch accessory.");
+
             let service = windowSwitchAccessory[0].getServiceById(api.hap.Service.Switch, switchService.subtype);
             let characteristic = api.hap.Characteristic.On;
 
@@ -1301,12 +1301,11 @@ export default (api, accessories, config, tado, telegram) => {
 
           let state = (inManualMode || inAutoMode) !== 0;
 
-          serviceSwitch.getCharacteristic(characteristicAuto).updateValue(inAutoMode);
+          Logger.debug(`Update central switch:`, { inAutoMode: inAutoMode, inManualMode: inManualMode, inOffMode: inOffMode, state: state });
 
+          serviceSwitch.getCharacteristic(characteristicAuto).updateValue(inAutoMode);
           serviceSwitch.getCharacteristic(characteristicManual).updateValue(inManualMode);
-
           serviceSwitch.getCharacteristic(characteristicOff).updateValue(inOffMode);
-
           serviceSwitch.getCharacteristic(characteristicOn).updateValue(state);
         }
       });