@homebridge-plugins/homebridge-tado 8.6.0-beta.3 → 8.6.0-beta.4

package/CHANGELOG.md

@@ -6,6 +6,7 @@
 - Persist Tado zone states after zone state updates
 - Improved zone update logic: when setting a state, all zones are now updated immediately if the next scheduled update is more than 10 seconds away
 - Advanced queue handling for update and persistence tasks
+- Prevent updates during active setStates
 - Tado API counter now tracks and persists for each authenticated user
 - Fix: Polling and tasks for multiple homes (#178)
 - Fix: Corrected zone update handling that could previously cause unintended heating changes (#178)

package/config.schema.json

@@ -568,6 +568,11 @@
         "title": "Disable History Service",
         "type": "boolean",
         "description": "Optional: Skip creation of history service."
+      },
+      "preferSiriTemperature": {
+        "title": "Prefer Siri temperature changes",
+        "type": "boolean",
+        "description": "Prefers temperature changes when the Auto (state=3) mode is sent simultaneously. Default: false."
       }
     }
   },
@@ -575,6 +580,7 @@
     "name",
     "debug",
     "disableHistoryService",
+    "preferSiriTemperature",
     {
       "key": "homes",
       "type": "array",

package/homebridge-ui/public/js/main.js

@@ -133,6 +133,7 @@ async function createCustomSchema(home) {
     name: pluginConfig[0].name,
     debug: pluginConfig[0].debug,
     disableHistoryService: pluginConfig[0].disableHistoryService,
+    preferSiriTemperature: pluginConfig[0].preferSiriTemperature,
     homes: home
   });
 
@@ -141,6 +142,7 @@ async function createCustomSchema(home) {
     pluginConfig[0].name = config.name;
     pluginConfig[0].debug = config.debug;
     pluginConfig[0].disableHistoryService = config.disableHistoryService;
+    pluginConfig[0].preferSiriTemperature = config.preferSiriTemperature;
     pluginConfig[0].homes = pluginConfig[0].homes.map(myHome => {
       if (myHome.name === config.homes.name) {
         myHome = config.homes;
@@ -284,6 +286,7 @@ async function removeDeviceFromConfig(name) {
       if (!pluginConfig[0].homes.length) {
         delete pluginConfig[0].debug;
         delete pluginConfig[0].disableHistoryService;
+        delete pluginConfig[0].preferSiriTemperature;
       }
 
       await homebridge.updatePluginConfig(pluginConfig);

package/homebridge-ui/public/js/schema.js

@@ -560,12 +560,18 @@ const schema = {
       'title': 'Disable History Service',
       'type': 'boolean',
       'description': 'Optional: Skip creation of history service.'
+    },
+    'preferSiriTemperature': {
+      'title': 'Prefer Siri temperature changes',
+      'type': 'boolean',
+      'description': 'Prefers temperature changes when the Auto (state=3) mode is sent simultaneously. Default: false.'
     }
   },
   'layout': [
     'name',
     'debug',
     'disableHistoryService',
+    'preferSiriTemperature',
     'homes.name',
     'homes.polling',
     'homes.temperatureUnit',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homebridge-plugins/homebridge-tado",
-  "version": "8.6.0-beta.3",
+  "version": "8.6.0-beta.4",
   "description": "Homebridge plugin for controlling tado° devices.",
   "main": "index.js",
   "scripts": {
@@ -43,12 +43,12 @@
     "@babel/core": "7.28.5",
     "@babel/eslint-parser": "7.28.5",
     "@babel/eslint-plugin": "7.27.1",
-    "@eslint/js": "^9.38.0",
-    "eslint": "^9.38.0",
+    "@eslint/js": "^9.39.0",
+    "eslint": "^9.39.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-prettier": "^5.5.4",
-    "globals": "^16.4.0",
+    "globals": "^16.5.0",
     "prettier": "^3.6.2"
   }
 }

package/src/accessories/heatercooler.js

@@ -1,10 +1,11 @@
 import Logger from '../helper/logger.js';
 import moment from 'moment';
+import { TadoUpdateBuffer } from '../helper/update-buffer.js'
 
 const timeout = (ms) => new Promise((res) => setTimeout(res, ms));
 
 export default class HeaterCoolerAccessory {
-  constructor(api, accessory, accessories, tado, deviceHandler, FakeGatoHistoryService) {
+  constructor(api, accessory, accessories, tado, deviceHandler, preferSiriTemperature, FakeGatoHistoryService) {
     this.api = api;
     this.accessory = accessory;
     this.accessories = accessories;
@@ -15,6 +16,10 @@ export default class HeaterCoolerAccessory {
 
     this.autoDelayTimeout = null;
 
+    this.updateBuffer = new TadoUpdateBuffer((target, value) => {
+      return this.deviceHandler.setStates(this.accessory, this.accessories, target, value);
+    }, preferSiriTemperature);
+
     this.getService();
   }
 
@@ -258,16 +263,7 @@ export default class HeaterCoolerAccessory {
 
     service
       .getCharacteristic(this.api.hap.Characteristic.Active)
-      .onSet((value) => {
-        if (this.waitForEndValue) {
-          clearTimeout(this.waitForEndValue);
-          this.waitForEndValue = null;
-        }
-
-        this.waitForEndValue = setTimeout(() => {
-          this.deviceHandler.setStates(this.accessory, this.accessories, 'State', value);
-        }, 500);
-      })
+      .onSet(value => this.updateBuffer.setState(value))
       .on(
         'change',
         this.deviceHandler.changedStates.bind(this, this.accessory, this.historyService, this.accessory.displayName)
@@ -282,16 +278,7 @@ export default class HeaterCoolerAccessory {
 
     service
       .getCharacteristic(this.api.hap.Characteristic.HeatingThresholdTemperature)
-      .onSet((value) => {
-        if (this.waitForEndValue) {
-          clearTimeout(this.waitForEndValue);
-          this.waitForEndValue = null;
-        }
-
-        this.waitForEndValue = setTimeout(() => {
-          this.deviceHandler.setStates(this.accessory, this.accessories, 'Temperature', value);
-        }, 250);
-      })
+      .onSet(value => this.updateBuffer.setTemperature(value))
       .on(
         'change',
         this.deviceHandler.changedStates.bind(this, this.accessory, this.historyService, this.accessory.displayName)
@@ -301,16 +288,7 @@ export default class HeaterCoolerAccessory {
     if (this.accessory.context.config.type === 'AIR_CONDITIONING') {
       service
         .getCharacteristic(this.api.hap.Characteristic.CoolingThresholdTemperature)
-        .onSet((value) => {
-          if (this.waitForEndValue) {
-            clearTimeout(this.waitForEndValue);
-            this.waitForEndValue = null;
-          }
-
-          this.waitForEndValue = setTimeout(() => {
-            this.deviceHandler.setStates(this.accessory, this.accessories, 'Temperature', value);
-          }, 250);
-        })
+        .onSet(value => this.updateBuffer.setTemperature(value))
         .on(
           'change',
           this.deviceHandler.changedStates.bind(this, this.accessory, this.historyService, this.accessory.displayName)

package/src/accessories/thermostat.js

@@ -1,11 +1,12 @@
 import Logger from '../helper/logger.js';
 import moment from 'moment';
 import fs from 'fs-extra';
+import { TadoUpdateBuffer } from '../helper/update-buffer.js'
 
 const timeout = (ms) => new Promise((res) => setTimeout(res, ms));
 
 export default class ThermostatAccessory {
-  constructor(api, accessory, accessories, tado, deviceHandler, FakeGatoHistoryService) {
+  constructor(api, accessory, accessories, tado, deviceHandler, preferSiriTemperature, FakeGatoHistoryService) {
     this.api = api;
     this.accessory = accessory;
     this.accessories = accessories;
@@ -16,6 +17,10 @@ export default class ThermostatAccessory {
 
     this.autoDelayTimeout = null;
 
+    this.updateBuffer = new TadoUpdateBuffer((target, value) => {
+      return this.deviceHandler.setStates(this.accessory, this.accessories, target, value);
+    }, preferSiriTemperature);
+
     this.getService();
   }
 
@@ -192,20 +197,8 @@ export default class ThermostatAccessory {
       .getCharacteristic(this.api.hap.Characteristic.TemperatureDisplayUnits)
       .onSet(this.changeUnit.bind(this, service));
 
-    service.getCharacteristic(this.api.hap.Characteristic.TargetHeatingCoolingState).onSet((value) => {
-      if (this.waitForEndValue) {
-        clearTimeout(this.waitForEndValue);
-        this.waitForEndValue = null;
-      }
-
-      this.waitForEndValue = setTimeout(() => {
-        if (this.settingTemperature) {
-          this.settingTemperature = false;
-          return;
-        }
-        this.deviceHandler.setStates(this.accessory, this.accessories, 'State', value);
-      }, 500);
-    });
+    service.getCharacteristic(this.api.hap.Characteristic.TargetHeatingCoolingState)
+      .onSet(value => this.updateBuffer.setState(value));
 
     service
       .getCharacteristic(this.api.hap.Characteristic.CurrentTemperature)
@@ -216,12 +209,7 @@ export default class ThermostatAccessory {
 
     service
       .getCharacteristic(this.api.hap.Characteristic.TargetTemperature)
-      .onSet((value) => {
-        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);
-      })
+      .onSet(value => this.updateBuffer.setTemperature(value))
       .on(
         'change',
         this.deviceHandler.changedStates.bind(this, this.accessory, this.historyService, this.accessory.displayName)

package/src/helper/handler.js

@@ -2,6 +2,7 @@ import Logger from '../helper/logger.js';
 import moment from 'moment';
 import { writeFile } from 'fs/promises';
 import { join } from "path";
+import { randomUUID } from 'crypto';
 
 const timeout = (ms) => new Promise((res) => setTimeout(res, ms));
 const helpers = {};
@@ -10,7 +11,7 @@ export default (api, accessories, config, tado, telegram) => {
   //init helper variables for current home scope
   if (!helpers[config.homeId]) {
     helpers[config.homeId] = {
-      settingState: false,
+      activeSettingStateRuns: {},
       tasksInitialized: false,
       lastGetStates: 0,
       lastPersistZoneStates: 0,
@@ -24,11 +25,16 @@ export default (api, accessories, config, tado, telegram) => {
     }
   }
 
+  function settingStates() {
+    return Object.keys(helpers[config.homeId].activeSettingStateRuns).length > 0;
+  }
+
   async function setStates(accessory, accs, target, value) {
     let zoneUpdated = false;
     accessories = accs.filter((acc) => acc && acc.context.config.homeName === config.homeName);
+    const runId = randomUUID();
     try {
-      helpers[config.homeId].settingState = true;
+      helpers[config.homeId].activeSettingStateRuns[runId] = true;
       value = typeof value === 'number' ? parseFloat(value.toFixed(2)) : value;
       Logger.info(target + ': ' + value, accessory.displayName);
 
@@ -558,13 +564,14 @@ export default (api, accessories, config, tado, telegram) => {
           break;
       }
     } catch (err) {
+      console.log("error at setStates", err);
       errorHandler(err);
     } finally {
-      helpers[config.homeId].settingState = false;
+      delete helpers[config.homeId].activeSettingStateRuns[runId];
       //update zones to ensure correct state in Apple Home
       const timeSinceLastGetStates = helpers[config.homeId].lastGetStates === 0 ? 0 : (Date.now() - helpers[config.homeId].lastGetStates);
       const statesIntervalTimeLeft = helpers[config.homeId].statesIntervalTime - timeSinceLastGetStates;
-      if (zoneUpdated && statesIntervalTimeLeft > (10 * 1000)) await updateZones();
+      if (!settingStates() && zoneUpdated && statesIntervalTimeLeft > (10 * 1000)) await updateZones();
     }
   }
 
@@ -797,7 +804,7 @@ export default (api, accessories, config, tado, telegram) => {
   }
 
   async function updateMe() {
-    if (helpers[config.homeId].settingState) return;
+    if (settingStates()) return;
 
     Logger.debug('Polling User Info...', config.homeName);
 
@@ -809,7 +816,7 @@ export default (api, accessories, config, tado, telegram) => {
   }
 
   async function updateHome() {
-    if (helpers[config.homeId].settingState) return;
+    if (settingStates()) return;
 
     Logger.debug('Polling Home Info...', config.homeName);
 
@@ -859,7 +866,7 @@ export default (api, accessories, config, tado, telegram) => {
   }
 
   async function _updateZones() {
-    if (helpers[config.homeId].settingState) return;
+    if (settingStates()) return;
 
     Logger.debug('Polling Zones...', config.homeName);
 
@@ -910,8 +917,11 @@ export default (api, accessories, config, tado, telegram) => {
       });
     }
 
-    const zoneStates = (await tado.getZoneStates(config.homeId))["zoneStates"] ?? {};
-    void persistZoneStates(config.homeId, zoneStates);
+    let zoneStates = {};
+    if (config.zones?.length) {
+      zoneStates = (await tado.getZoneStates(config.homeId))["zoneStates"] ?? {};
+      void persistZoneStates(config.homeId, zoneStates);
+    }
 
     for (const zone of config.zones) {
       const zoneState = zoneStates[zone.id.toString()];
@@ -1322,7 +1332,7 @@ export default (api, accessories, config, tado, telegram) => {
   }
 
   async function updateMobileDevices() {
-    if (helpers[config.homeId].settingState) return;
+    if (settingStates()) return;
 
     Logger.debug('Polling MobileDevices...', config.homeName);
 
@@ -1376,7 +1386,7 @@ export default (api, accessories, config, tado, telegram) => {
   }
 
   async function updateWeather() {
-    if (helpers[config.homeId].settingState) return;
+    if (settingStates()) return;
 
     const weatherTemperatureAccessory = accessories.filter(
       (acc) => acc && acc.displayName === acc.context.config.homeName + ' Weather'
@@ -1431,7 +1441,7 @@ export default (api, accessories, config, tado, telegram) => {
   }
 
   async function updatePresence() {
-    if (helpers[config.homeId].settingState) return;
+    if (settingStates()) return;
 
     const presenceLockAccessory = accessories.filter(
       (acc) => acc && acc.displayName === acc.context.config.homeName + ' Presence Lock'
@@ -1476,7 +1486,7 @@ export default (api, accessories, config, tado, telegram) => {
   }
 
   async function updateRunningTime() {
-    if (helpers[config.homeId].settingState) return;
+    if (settingStates()) return;
 
     const centralSwitchAccessory = accessories.filter(
       (acc) => acc && acc.displayName === acc.context.config.homeName + ' Central Switch'
@@ -1521,7 +1531,7 @@ export default (api, accessories, config, tado, telegram) => {
   }
 
   async function updateDevices() {
-    if (helpers[config.homeId].settingState) return;
+    if (settingStates()) return;
 
     Logger.debug('Polling Devices...', config.homeName);
 

package/src/helper/update-buffer.js

@@ -0,0 +1,69 @@
+import { hrtime } from "process";
+import Logger from '../helper/logger.js';
+
+export class TadoUpdateBuffer {
+  constructor(sendUpdateFn, preferSiriTemperature = false) {
+    this.preferSiriTemperature = !!preferSiriTemperature;
+    this.sendUpdateFn = sendUpdateFn;
+    this.delay = 400;
+    this.timer = null;
+    this.pendingState = null;
+    this.pendingTemperature = null;
+    this.lastUpdateTime = null;
+    this.lastTemperature = 20;
+  }
+
+  setState(value) {
+    this.pendingState = value;
+    this._schedule();
+    Logger.debug("[TadoUpdateBuffer] setState", value, hrtime.bigint());
+  }
+
+  setTemperature(value) {
+    this.pendingTemperature = value;
+    this._schedule();
+    Logger.debug("[TadoUpdateBuffer] setTemperature", value, hrtime.bigint());
+  }
+
+  _schedule() {
+    if (this.timer) clearTimeout(this.timer);
+    this.timer = setTimeout(() => this._apply(), this.delay);
+  }
+
+  _apply() {
+    this.timer = null;
+    const state = this.pendingState;
+    const temp = this.pendingTemperature;
+    const tempSet = temp !== null && temp !== undefined && temp >= 5;
+    this.pendingState = null;
+    this.pendingTemperature = null;
+    if (tempSet) this.lastTemperature = temp;
+
+    //Siri temperature heuristic
+    if (this.preferSiriTemperature && state === 3 && tempSet) {
+      if (temp === 5) {
+        //set auto mode on
+        Logger.debug("[TadoUpdateBuffer] preferSiriTemperature active but temp=5 -> treat as auto mode");
+        return this.sendUpdateFn("State", 3);
+      }
+      //set temperature
+      Logger.debug("[TadoUpdateBuffer] Siri temperature change detected -> ignore state 3, apply temperature only");
+      return this.sendUpdateFn("Temperature", temp);
+    }
+
+    //default behaviour
+    if (state === 0) {
+      //set heating off
+      return this.sendUpdateFn("State", 0);
+    } else if (state === 3) {
+      //set auto mode on
+      return this.sendUpdateFn("State", 3);
+    } else if (tempSet) {
+      //set heating on with temperature provided
+      return this.sendUpdateFn("Temperature", temp);
+    } else if (state === 1) {
+      //heating on without temperature provided
+      return this.sendUpdateFn("Temperature", this.lastTemperature);
+    }
+  }
+}

package/src/platform.js

@@ -237,12 +237,12 @@ class TadoPlatform {
 
     switch (device.subtype) {
       case 'zone-thermostat':
-        new ThermostatAccessory(this.api, accessory, this.accessories, tado, deviceHandler, FakeGatoHistoryService);
+        new ThermostatAccessory(this.api, accessory, this.accessories, tado, deviceHandler, this.config.preferSiriTemperature, FakeGatoHistoryService);
         break;
       case 'zone-heatercooler':
       case 'zone-heatercooler-boiler':
       case 'zone-heatercooler-ac':
-        new HeaterCoolerAccessory(this.api, accessory, this.accessories, tado, deviceHandler, FakeGatoHistoryService);
+        new HeaterCoolerAccessory(this.api, accessory, this.accessories, tado, deviceHandler, this.config.preferSiriTemperature, FakeGatoHistoryService);
         break;
       case 'zone-switch':
       case 'zone-window-switch':