homebridge-tuya-plus 3.14.0-dev.4 → 3.14.0-dev.40

package/lib/AirPurifierAccessory.js

@@ -80,7 +80,7 @@ class AirPurifierAccessory extends BaseAccessory {
     _addAirQualityService() {
         const {Service} = this.hap;
         const nameAirQuality = this.device.context.nameAirQuality || 'Air Quality';
-        this.log.info('Adding air quality sensor: %s', nameAirQuality);
+        this.log.debug('Adding air quality sensor: %s', nameAirQuality);
         this.accessory.addService(Service.AirQualitySensor, nameAirQuality);
     }
 

package/lib/BaseAccessory.js

@@ -24,7 +24,7 @@ class BaseAccessory {
         });
 
         this.device.once('change', () => {
-            this.log(`Ready to handle ${this.device.context.name} (${this.device.context.type}:${this.device.context.version}) with signature ${JSON.stringify(this.device.state)}`);
+            this.log.debug(`Ready to handle ${this.device.context.name} (${this.device.context.type}:${this.device.context.version}) with signature ${JSON.stringify(this.device.state)}`);
 
             this._registerCharacteristics(this.device.state);
         });
@@ -65,8 +65,18 @@ class BaseAccessory {
         return typeof b === 'boolean' ? b : (typeof b === 'string' ? b.toLowerCase().trim() === 'true' : (typeof b === 'number' ? b !== 0 : df));
     }
 
+    // A HapStatusError to throw from a get/set handler when the value can't be
+    // served (device unreachable, or an unusable reading). HomeKit shows the
+    // accessory as "No Response". Preferred over a plain `throw new Error(...)`,
+    // which newer Homebridge logs a characteristic warning for before falling
+    // back to this same status code (SERVICE_COMMUNICATION_FAILURE, -70402).
+    _commError() {
+        const {HapStatusError, HAPStatus} = this.hap;
+        return new HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
+    }
+
     getState(dp, callback) {
-        if (!this.device.connected) return callback(true);
+        if (!this.device.connected) return callback(this._commError());
         const _callback = () => {
             if (Array.isArray(dp)) {
                 const ret = {};
@@ -91,36 +101,37 @@ class BaseAccessory {
         //For devices like the DETA Smart Fan Controller Switch that by default set the speed as 3 the new code in the setMultiState function causes issues.
         if (!this.device.connected) {
             this.log.debug(`${this.device.context.name}: skipping write, device not connected`);
-            return callback && callback();
+            return callback && callback(this._commError());
         }
         const ret = this.device.update(dps);
-        callback && callback(!ret);
+        callback && callback(ret === false ? this._commError() : null);
     }
 
     setMultiState(dps, callback) {
         if (!this.device.connected) {
             this.log.debug(`${this.device.context.name}: skipping write, device not connected`);
-            return callback && callback();
+            return callback && callback(this._commError());
         }
+        let failed = false;
         for (const dp in dps) {
             if (dps.hasOwnProperty(dp) && dps[dp] !== this.device.state[dp]){
-                this.__ret = this.device.update({[dp.toString()] : dps[dp]});
+                if (this.device.update({[dp.toString()] : dps[dp]}) === false) failed = true;
             }
         }
-        callback && callback(!this.__ret);
+        callback && callback(failed ? this._commError() : null);
     }
 
     getDividedState(dp, divisor, callback) {
         this.getState(dp, (err, data) => {
             if (err) return callback(err);
-            if (!isFinite(data)) return callback(true);
+            if (!isFinite(data)) return callback(this._commError());
 
             callback(null, this._getDividedState(data, divisor));
         });
     }
 
     getStateAsync(dp) {
-        if (!this.device.connected) throw new Error('Not connected');
+        if (!this.device.connected) throw this._commError();
         if (Array.isArray(dp)) {
             const ret = {};
             dp.forEach(p => { ret[p] = this.device.state[p]; });
@@ -133,29 +144,55 @@ class BaseAccessory {
         return this.setMultiStateAsync({[dp.toString()]: value});
     }
 
-    setMultiStateAsync(dps) {
+    // Throws a "No Response" HapStatusError when the device is unreachable or the
+    // write is rejected, so a get/set handler that returns this promise surfaces
+    // the failure to HomeKit instead of silently pretending the write succeeded.
+    // `device.update` returns a boolean for LAN devices and an awaitable boolean
+    // for cloud devices (false == the command did not go through).
+    async setMultiStateAsync(dps) {
         if (!this.device.connected) {
             this.log.debug(`${this.device.context.name}: skipping write, device not connected`);
-            return;
+            throw this._commError();
         }
+        const writes = [];
         for (const dp in dps) {
             if (dps.hasOwnProperty(dp) && dps[dp] !== this.device.state[dp]) {
-                this.device.update({[dp.toString()]: dps[dp]});
+                writes.push(this.device.update({[dp.toString()]: dps[dp]}));
             }
         }
+        const results = await Promise.all(writes);
+        if (results.some(ok => ok === false)) throw this._commError();
     }
 
-    setMultiStateLegacyAsync(dps) {
+    async setMultiStateLegacyAsync(dps) {
         if (!this.device.connected) {
             this.log.debug(`${this.device.context.name}: skipping write, device not connected`);
-            return;
+            throw this._commError();
         }
-        this.device.update(dps);
+        if (await this.device.update(dps) === false) throw this._commError();
+    }
+
+    // Non-throwing write helpers for callers that are NOT inside a HomeKit
+    // get/set handler — setTimeout callbacks, multi-step command sequences, etc.
+    // The async helpers above reject on a disconnected/failed write so HomeKit
+    // can show "No Response"; in a detached/background context there is no
+    // HomeKit request to fail and an unhandled rejection would crash Homebridge,
+    // so these swallow the error (the helper has already logged it).
+    setStateInBackground(dp, value) {
+        this.setStateAsync(dp, value).catch(() => {});
+    }
+
+    setMultiStateInBackground(dps) {
+        this.setMultiStateAsync(dps).catch(() => {});
+    }
+
+    setMultiStateLegacyInBackground(dps) {
+        this.setMultiStateLegacyAsync(dps).catch(() => {});
     }
 
     getDividedStateAsync(dp, divisor) {
         const data = this.getStateAsync(dp);
-        if (!isFinite(data)) throw new Error('Invalid state');
+        if (!isFinite(data)) throw this._commError();
         return this._getDividedState(data, divisor);
     }
 
@@ -167,7 +204,7 @@ class BaseAccessory {
         this.colorFunction = this.device.context.colorFunction && {HSB: 'HSB', HEXHSB: 'HEXHSB'}[this.device.context.colorFunction.toUpperCase()];
         if (!this.colorFunction && value) {
             this.colorFunction = {12: 'HSB', 14: 'HEXHSB'}[value.length] || 'Unknown';
-            if (this.colorFunction) this.log.info(`Color format for ${this.device.context.name} (${this.device.context.version}) identified as ${this.colorFunction} (length: ${value.length}).`);
+            if (this.colorFunction) this.log.debug(`Color format for ${this.device.context.name} (${this.device.context.version}) identified as ${this.colorFunction} (length: ${value.length}).`);
         }
         if (!this.colorFunction) {
             this.colorFunction = 'Unknown';

package/lib/ConvectorAccessory.js

@@ -55,7 +55,7 @@ class ConvectorAccessory extends BaseAccessory {
         service.getCharacteristic(Characteristic.TargetHeaterCoolerState)
             .setProps({ minValue: 1, maxValue: 1, validValues: [Characteristic.TargetHeaterCoolerState.HEAT] })
             .updateValue(this._getTargetHeaterCoolerState())
-            .onGet(() => this._getTargetHeaterCoolerState())
+            .onGet(() => { if (!this.device.connected) throw this._commError(); return this._getTargetHeaterCoolerState(); })
             .onSet(() => this.setStateAsync(this.dpActive, true));
 
         const characteristicCurrentTemperature = service.getCharacteristic(Characteristic.CurrentTemperature)

package/lib/CustomMultiOutletAccessory.js

@@ -74,6 +74,7 @@ class CustomMultiOutletAccessory extends BaseAccessory {
     }
 
     setPower(dp, value) {
+        if (!this.device.connected) throw this._commError();
         if (!this._pendingPower) {
             this._pendingPower = {props: {}, resolvers: []};
         }
@@ -87,7 +88,7 @@ class CustomMultiOutletAccessory extends BaseAccessory {
             this._pendingPower.timer = setTimeout(() => {
                 const {props, resolvers} = this._pendingPower;
                 this._pendingPower = null;
-                this.setMultiStateAsync(props);
+                this.setMultiStateInBackground(props);
                 resolvers.forEach(r => r());
             }, 500);
         });

package/lib/DoorbellAccessory.js

@@ -11,7 +11,8 @@ const LOCK_TIMEOUT = 5000;
 
 class DoorbellDelegate /*extends CameraStreamingDelegate*/ {
 
-    constructor() {
+    constructor(log) {
+        this.log = log || console;
         this.cameraImage = undefined;
     }
 
@@ -27,7 +28,7 @@ class DoorbellDelegate /*extends CameraStreamingDelegate*/ {
                 var body=Buffer.alloc(0);
 
                 if (res.statusCode!==200) {
-                    return console.error('HTTP '+res.statusCode);
+                    return me.log.error('Doorbell image fetch failed: HTTP %s', res.statusCode);
                 }
 
                 res.on('data', function(chunk) {
@@ -36,13 +37,12 @@ class DoorbellDelegate /*extends CameraStreamingDelegate*/ {
 
                 res.on('end', function() {
                     me.setCameraImage(body);
-                    console.log("Image stored");
+                    me.log.debug('Doorbell image stored.');
                     callback();
-                    console.log("Callback after image store complete");
                 });
 
                 res.on('error', function(err) {
-                    console.error(err);
+                    me.log.error('Doorbell image fetch error:', err);
                 });
             }
         );
@@ -96,12 +96,9 @@ class DoorbellAccessory extends BaseAccessory {
 
 
         this.device.on('change', (changes, state) => {
-            //console.log(`Changes: ${JSON.stringify(changes)}, State: ${JSON.stringify(state)}`);
-
             if (changes.hasOwnProperty(DP_DOORBELL)) {
                 const urlBase64 = changes[DP_DOORBELL];
                 const strUrl = Buffer.from(urlBase64, 'base64');
-                //console.log(`Image URL: ${strUrl}`);
 
                 this.streamingDelegate.storeImage(strUrl.toString(), () => {
                   service.updateCharacteristic(Characteristic.ProgrammableSwitchEvent, Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
@@ -109,18 +106,18 @@ class DoorbellAccessory extends BaseAccessory {
             }
 
             if (changes.hasOwnProperty(DP_DOOR)) {
-                console.log("Door button pressed");
+                this.log.debug('Door button pressed');
             }
 
             if (changes.hasOwnProperty(DP_GATE)) {
-                console.log("Gate button pressed");
+                this.log.debug('Gate button pressed');
             }
         });
     }
 
     configureCamera() {
-        this.streamingDelegate = new DoorbellDelegate();
-        console.log("created streaming delegate");
+        this.streamingDelegate = new DoorbellDelegate(this.log);
+        this.log.debug('Created camera streaming delegate.');
         const options = {
           cameraStreamCount: 1, 
           delegate: this.streamingDelegate,
@@ -157,12 +154,8 @@ class DoorbellAccessory extends BaseAccessory {
           },
         };
     
-        //console.log("created options");
         const cameraController = new this.hap.CameraController(options);
-        //console.log("created controller");
-    
         this.accessory.configureController(cameraController);
-        //console.log("configured controller with accessory");
     }
 
     pushDoor(callback) {

package/lib/GarageDoorAccessory.js

@@ -105,7 +105,7 @@ class GarageDoorAccessory extends BaseAccessory {
             .onGet(() => this.getCurrentDoorState());
 
         this.device.on('change', changes => {
-            this._alwaysLog('changed:' + JSON.stringify(changes));
+            this._debugLog('changed:' + JSON.stringify(changes));
 
             if (changes.hasOwnProperty(this.dpStatus)) {
                 const newCurrentDoorState = this._getCurrentDoorState(changes[this.dpStatus]);

package/lib/IrrigationSystemAccessory.js

@@ -4,8 +4,8 @@ const BaseAccessory = require('./BaseAccessory');
  * IrrigationSystemAccessory
  *
  * A fully-fledged HomeKit irrigation controller for Tuya multi-valve devices
- * (e.g. the 4-zone faucet/valve timers that expose `switch_1..switch_n`, a
- * `battery_percentage` and a `rain_sensor_state`).
+ * (e.g. the 4-zone faucet/valve timers that expose `switch_1..switch_n` and a
+ * `battery_percentage`).
  *
  * HomeKit modelling (one bridged accessory, category SPRINKLER):
  *
@@ -13,8 +13,9 @@ const BaseAccessory = require('./BaseAccessory');
  *     ├─ Valve  "Zone A"   (linked, ValveType=IRRIGATION, ServiceLabelIndex 1)
  *     ├─ Valve  "Zone B"   (linked, ServiceLabelIndex 2)
  *     ├─ ...
+ *   ServiceLabel       (labels the multi-valve collection so the Home app nests
+ *                       the zones under the system tile; added when >1 valve)
  *   Battery            (BatteryLevel + StatusLowBattery)
- *   ContactSensor      (rain — or LeakSensor, configurable)
  *
  * Each Valve carries its own SetDuration/RemainingDuration so the Home app shows
  * the familiar per-zone "Duration" picker and a live countdown. A zone whose
@@ -45,14 +46,13 @@ class IrrigationSystemAccessory extends BaseAccessory {
         // Self-contained (no reliance on instance state) so it is safe to call
         // both during early service reconciliation and later when wiring
         // characteristics.
-        const cloud = this._isCloud();
         const defaultDuration = isFinite(this.device.context.defaultDuration) ? parseInt(this.device.context.defaultDuration) : 600;
 
         if (Array.isArray(this.device.context.valves) && this.device.context.valves.length) {
             return this.device.context.valves.map((valve, i) => {
-                // A data-point may be a numeric LAN id (1, 2, …) or a Tuya Cloud
-                // code (e.g. "switch_1"). Accept either; only an empty value is
-                // invalid.
+                // A data-point may be a numeric id (1, 2, …) or a Tuya code
+                // (e.g. "switch_1"); both resolve over either transport. Only an
+                // empty value is invalid.
                 const dp = (valve && valve.dp !== undefined && valve.dp !== null) ? ('' + valve.dp).trim() : '';
                 if (!dp) {
                     throw new Error(`The valve definition #${i + 1} is missing a 'dp': ${JSON.stringify(valve)}`);
@@ -71,9 +71,7 @@ class IrrigationSystemAccessory extends BaseAccessory {
         const configs = [];
         for (let i = 0; i < count; i++) {
             configs.push({
-                // Cloud devices address valves by code (switch_1, switch_2, …);
-                // LAN devices by numeric data-point id (1, 2, …).
-                dp: cloud ? ('switch_' + (i + 1)) : String(i + 1),
+                dp: String(i + 1),
                 name: 'Valve ' + (letters[i] || (i + 1)),
                 index: i + 1,
                 duration: defaultDuration
@@ -82,33 +80,17 @@ class IrrigationSystemAccessory extends BaseAccessory {
         return configs;
     }
 
-    // True when this device is reached over the Tuya Cloud (data-points keyed by
-    // string code) rather than the LAN (numeric data-point ids).
-    _isCloud() {
-        return this._coerceBoolean(this.device.context.cloud, false);
-    }
-
-    // Resolve a configurable data-point that may be given as a numeric LAN id or
-    // a Tuya Cloud code, falling back to a sensible default for the active
-    // transport.
-    _resolveDP(value, cloudDefault, lanDefault) {
+    // Resolve a configurable data-point (a numeric id or a Tuya code), trimming and
+    // falling back to a default when it isn't set.
+    _resolveDP(value, fallback) {
         const v = (value === undefined || value === null) ? '' : ('' + value).trim();
-        if (v !== '') return v;
-        return this._isCloud() ? cloudDefault : lanDefault;
+        return v !== '' ? v : fallback;
     }
 
     _hasBattery() {
         return !this._coerceBoolean(this.device.context.noBattery, false);
     }
 
-    _hasRainSensor() {
-        return !this._coerceBoolean(this.device.context.noRainSensor, false);
-    }
-
-    _usesLeakSensor() {
-        return ('' + (this.device.context.rainSensorType || 'contact')).trim().toLowerCase() === 'leak';
-    }
-
     /* ------------------------------------------------------------------ *
      *  Service registration / cache reconciliation
      * ------------------------------------------------------------------ */
@@ -149,6 +131,25 @@ class IrrigationSystemAccessory extends BaseAccessory {
             irrigation.addLinkedService(valve);
         });
 
+        // --- Service Label (required when the accessory exposes a *collection*
+        //     of same-type services, i.e. more than one Valve) ---
+        // HAP's Service Label profile says an accessory holding several services
+        // of the same type must carry a Service Label service, with each member
+        // service tagged by a ServiceLabelIndex. We already set the indices; the
+        // anchoring Service Label service was missing. Without it the stricter
+        // Home app clients (notably iOS) scatter the zones as separate tiles
+        // rather than nesting them under the irrigation system — macOS happens to
+        // render leniently either way. The namespace is set in
+        // _registerCharacteristics. A single-valve system is not a collection, so
+        // it needs no label.
+        const multiValve = valveConfigs.length > 1;
+        const existingLabel = this.accessory.getService(Service.ServiceLabel);
+        if (multiValve && !existingLabel) {
+            this.accessory.addService(Service.ServiceLabel, this.device.context.name);
+        } else if (!multiValve && existingLabel) {
+            this.accessory.removeService(existingLabel);
+        }
+
         // --- Battery (optional) ---
         if (this._hasBattery()) {
             if (!this.accessory.getService(Service.Battery)) {
@@ -156,23 +157,11 @@ class IrrigationSystemAccessory extends BaseAccessory {
             }
         }
 
-        // --- Rain sensor (optional): Contact (default) or Leak ---
-        if (this._hasRainSensor()) {
-            const WantedSensor = this._usesLeakSensor() ? Service.LeakSensor : Service.ContactSensor;
-            const UnwantedSensor = this._usesLeakSensor() ? Service.ContactSensor : Service.LeakSensor;
-            // Drop the other sensor type if the user switched `rainSensorType`.
-            const stale = this.accessory.getService(UnwantedSensor);
-            if (stale) this.accessory.removeService(stale);
-            if (!this.accessory.getService(WantedSensor)) {
-                this.accessory.addService(WantedSensor, this.device.context.name + ' Rain');
-            }
-        }
-
         // --- Remove services that no longer belong (config changed) ---
         this.accessory.services
             .filter(service => service.UUID === Service.Valve.UUID && !validValveSubtypes.includes(service.subtype))
             .forEach(service => {
-                this.log.info('Removing stale valve service %s', service.displayName);
+                this.log.debug('Removing stale valve service %s', service.displayName);
                 this.accessory.removeService(service);
             });
 
@@ -180,12 +169,19 @@ class IrrigationSystemAccessory extends BaseAccessory {
             const battery = this.accessory.getService(Service.Battery);
             if (battery) this.accessory.removeService(battery);
         }
-        if (!this._hasRainSensor()) {
-            [Service.ContactSensor, Service.LeakSensor].forEach(S => {
-                const svc = this.accessory.getService(S);
-                if (svc) this.accessory.removeService(svc);
-            });
-        }
+
+        // Rain/leak sensors are no longer supported: they never reported
+        // reliably on these devices, and bundling a sensor in the same accessory
+        // forced the Home app to fragment the sprinkler into "sub-accessories"
+        // (blocking control from the main tile). Drop any left over from an older
+        // version so the accessory stays a clean, single-category sprinkler tile.
+        [Service.ContactSensor, Service.LeakSensor].forEach(S => {
+            const svc = this.accessory.getService(S);
+            if (svc) {
+                this.log.debug('Removing rain sensor service %s (no longer supported)', svc.displayName);
+                this.accessory.removeService(svc);
+            }
+        });
     }
 
     /* ------------------------------------------------------------------ *
@@ -208,13 +204,10 @@ class IrrigationSystemAccessory extends BaseAccessory {
         this._cascadeOn = this._coerceBoolean(this.device.context.masterTurnsOnAllZones, true);
         this._cascadeOff = this._coerceBoolean(this.device.context.masterTurnsOffAllZones, true);
 
-        // Data-points accept a numeric LAN id or a Tuya Cloud code; defaults
-        // differ per transport (cloud uses the standard Tuya codes).
-        this.dpBattery = this._resolveDP(this.device.context.dpBattery, 'battery_percentage', '46');
-        this.dpCharging = this._resolveDP(this.device.context.dpCharging, 'charge_state', '101');
-        this.dpRain = this._resolveDP(this.device.context.dpRain, 'rain_sensor_state', '49');
-        this._rainOnValue = ('' + (this.device.context.rainOnValue || 'rain')).trim();
-        this._rainInverted = this._coerceBoolean(this.device.context.rainInverted, false);
+        // Data-points default to this device's numeric ids; a Tuya code may be
+        // configured instead and works over either transport.
+        this.dpBattery = this._resolveDP(this.device.context.dpBattery, '46');
+        this.dpCharging = this._resolveDP(this.device.context.dpCharging, '101');
 
         // Per-zone runtime state
         this._valves = this._getValveConfigs();
@@ -234,7 +227,7 @@ class IrrigationSystemAccessory extends BaseAccessory {
 
         this._systemActiveChar = irrigation.getCharacteristic(Characteristic.Active)
             .updateValue(this._anyValveOn() ? Characteristic.Active.ACTIVE : Characteristic.Active.INACTIVE)
-            .onGet(() => this._anyValveOn() ? Characteristic.Active.ACTIVE : Characteristic.Active.INACTIVE)
+            .onGet(() => this._reportCached(this._systemActiveChar))
             .onSet(value => this._setSystemActive(value));
 
         this._systemInUseChar = irrigation.getCharacteristic(Characteristic.InUse)
@@ -277,10 +270,10 @@ class IrrigationSystemAccessory extends BaseAccessory {
                 .updateValue(0)
                 .onGet(() => this._valveRemaining(cfg));
 
-            valve.getCharacteristic(Characteristic.Active)
+            const activeChar = valve.getCharacteristic(Characteristic.Active)
                 .updateValue(on ? Characteristic.Active.ACTIVE : Characteristic.Active.INACTIVE)
-                .onGet(() => (this.getStateAsync(cfg.dp) ? 1 : 0))
                 .onSet(value => this._setValveActive(cfg, value));
+            activeChar.onGet(() => this._reportCached(activeChar));
 
             valve.getCharacteristic(Characteristic.InUse)
                 .updateValue(on ? Characteristic.InUse.IN_USE : Characteristic.InUse.NOT_IN_USE);
@@ -290,6 +283,19 @@ class IrrigationSystemAccessory extends BaseAccessory {
             if (on) this._reflectValve(cfg, true);
         });
 
+        // --- Service Label namespace ---
+        // Anchors the per-valve ServiceLabelIndex so the Home app groups the
+        // zones under the irrigation tile (see _verifyCachedPlatformAccessory).
+        // Arabic numerals: zones are labelled 1, 2, 3… — the user-set zone names
+        // (ConfiguredName) still take precedence in the Home app.
+        if (this._valves.length > 1) {
+            const serviceLabel = this.accessory.getService(Service.ServiceLabel);
+            if (serviceLabel) {
+                serviceLabel.getCharacteristic(Characteristic.ServiceLabelNamespace)
+                    .updateValue(Characteristic.ServiceLabelNamespace.ARABIC_NUMERALS);
+            }
+        }
+
         // --- Battery ---
         if (this._hasBattery()) {
             const battery = this.accessory.getService(Service.Battery);
@@ -308,25 +314,10 @@ class IrrigationSystemAccessory extends BaseAccessory {
                 .onGet(() => this._chargingState(this.getStateAsync(this.dpCharging)));
         }
 
-        // --- Rain sensor ---
-        if (this._hasRainSensor()) {
-            if (this._usesLeakSensor()) {
-                const leak = this.accessory.getService(Service.LeakSensor);
-                leak.getCharacteristic(Characteristic.LeakDetected)
-                    .updateValue(this._rainDetected(dps[this.dpRain]) ? Characteristic.LeakDetected.LEAK_DETECTED : Characteristic.LeakDetected.LEAK_NOT_DETECTED)
-                    .onGet(() => this._rainDetected(this.getStateAsync(this.dpRain)) ? 1 : 0);
-            } else {
-                const contact = this.accessory.getService(Service.ContactSensor);
-                contact.getCharacteristic(Characteristic.ContactSensorState)
-                    .updateValue(this._contactState(dps[this.dpRain]))
-                    .onGet(() => this._contactState(this.getStateAsync(this.dpRain)));
-            }
-        }
-
         this._syncAggregate();
 
         // --- React to device-side changes (physical buttons, our own writes
-        //     being confirmed, battery/rain telemetry) ---
+        //     being confirmed, battery telemetry) ---
         this.device.on('change', (changes) => this._onDeviceChange(changes));
     }
 
@@ -359,21 +350,22 @@ class IrrigationSystemAccessory extends BaseAccessory {
                 .updateValue(this._chargingState(changes[this.dpCharging]));
         }
 
-        if (changes.hasOwnProperty(this.dpRain) && this._hasRainSensor()) {
-            if (this._usesLeakSensor()) {
-                const leak = this.accessory.getService(Service.LeakSensor);
-                if (leak) leak.getCharacteristic(Characteristic.LeakDetected)
-                    .updateValue(this._rainDetected(changes[this.dpRain]) ? 1 : 0);
-            } else {
-                const contact = this.accessory.getService(Service.ContactSensor);
-                if (contact) contact.getCharacteristic(Characteristic.ContactSensorState)
-                    .updateValue(this._contactState(changes[this.dpRain]));
-            }
-        }
-
         if (valveChanged) this._syncAggregate();
     }
 
+    // onGet handler for the system / valve Active characteristics. Returns the
+    // value HomeKit already shows — the optimistic value written on press and
+    // then confirmed (or corrected) by device-side change events — rather than
+    // the raw `device.state`. Cloud devices don't advance `device.state` until
+    // the realtime stream echoes the write back, so reading it here returned the
+    // pre-press value for a moment and made the Home app toggle visibly flicker
+    // back to the old state before settling. Throwing while disconnected keeps
+    // the HomeKit "No Response" behaviour.
+    _reportCached(char) {
+        if (!this.device.connected) throw this._commError();
+        return char.value;
+    }
+
     /* ------------------------------------------------------------------ *
      *  Valve activation + timer logic
      * ------------------------------------------------------------------ */
@@ -550,7 +542,7 @@ class IrrigationSystemAccessory extends BaseAccessory {
     }
 
     /* ------------------------------------------------------------------ *
-     *  Battery + rain mapping
+     *  Battery mapping
      * ------------------------------------------------------------------ */
 
     _batteryLevel(value) {
@@ -576,22 +568,6 @@ class IrrigationSystemAccessory extends BaseAccessory {
             : Characteristic.ChargingState.NOT_CHARGING;
     }
 
-    // True when the device reports rain.
-    _rainDetected(value) {
-        let raining;
-        if (typeof value === 'boolean') raining = value;
-        else raining = ('' + value).trim().toLowerCase() === this._rainOnValue.toLowerCase();
-        return this._rainInverted ? !raining : raining;
-    }
-
-    _contactState(value) {
-        const {Characteristic} = this.hap;
-        // "Rain" is treated as the triggered/abnormal state → CONTACT_NOT_DETECTED.
-        return this._rainDetected(value)
-            ? Characteristic.ContactSensorState.CONTACT_NOT_DETECTED
-            : Characteristic.ContactSensorState.CONTACT_DETECTED;
-    }
-
     /* ------------------------------------------------------------------ *
      *  Batched writes — coalesce DP updates into a single Tuya command
      * ------------------------------------------------------------------ */
@@ -614,16 +590,19 @@ class IrrigationSystemAccessory extends BaseAccessory {
             return;
         }
 
-        const dps = {};
-        let count = 0;
-        Object.keys(pending.dps).forEach(dp => {
-            if (pending.dps[dp] !== this.device.state[dp]) {
-                dps[dp] = pending.dps[dp];
-                count++;
-            }
-        });
-
-        if (count) this.device.update(dps);
+        // Send exactly what was queued. We deliberately do NOT drop data-points
+        // that appear to already match `device.state`: cloud devices never
+        // optimistically advance `state` (it only moves when the realtime/refresh
+        // stream confirms the device), so comparing against it would silently
+        // swallow a genuine command. The most visible symptom was a valve that
+        // could be turned on but never off — the "off" matched the stale "off"
+        // still in `state` (the "on" hadn't been echoed back yet) and was
+        // discarded, so HomeKit showed the zone closed while it kept running.
+        // Callers (_setValveActive, _setSystemActive, the auto-shutoff timers)
+        // already queue only real changes, judged against the HomeKit state the
+        // user sees, so there is nothing left to de-dupe here.
+        const dps = pending.dps;
+        if (Object.keys(dps).length) this.device.update(dps);
     }
 
     _valveService(cfg) {

package/lib/MultiOutletAccessory.js

@@ -34,7 +34,7 @@ class MultiOutletAccessory extends BaseAccessory {
         this.accessory.services
             .filter(service => service.UUID === Service.Outlet.UUID && !_validServices.includes(service))
             .forEach(service => {
-                this.log.info('Removing', service.displayName);
+                this.log.debug('Removing', service.displayName);
                 this.accessory.removeService(service);
             });
     }
@@ -69,6 +69,7 @@ class MultiOutletAccessory extends BaseAccessory {
     }
 
     setPower(dp, value) {
+        if (!this.device.connected) throw this._commError();
         if (!this._pendingPower) {
             this._pendingPower = {props: {}, resolvers: []};
         }
@@ -82,7 +83,7 @@ class MultiOutletAccessory extends BaseAccessory {
             this._pendingPower.timer = setTimeout(() => {
                 const {props, resolvers} = this._pendingPower;
                 this._pendingPower = null;
-                this.setMultiStateAsync(props);
+                this.setMultiStateInBackground(props);
                 resolvers.forEach(r => r());
             }, 500);
         });