homebridge-tuya-plus 3.14.0-dev.11 → 3.14.0-dev.13

package/Changelog.md

@@ -7,10 +7,12 @@ All notable changes to this project will be documented in this file. This projec
 * [+] **Tuya Cloud support for devices that can't be reached over the LAN** — most notably battery-powered "sleepy" irrigation/sprinkler timers, which sleep almost all the time and only ever talk to Tuya's cloud, so the local protocol can never reach them. The plugin stays LAN-first: cloud is strictly opt-in. Add a top-level `cloud` credentials block (or a per-device `cloud` object) and set `"cloud": true` on the device.
   * Realtime updates arrive over Tuya's **MQTT** message service (via the optional `mqtt` dependency, installed automatically); initial state and control use the Tuya OpenAPI. There is no polling.
   * Works with both **Custom** and **Smart Home** Cloud projects (the latter via app-account login).
-  * The existing **IrrigationSystem** accessory works unchanged over the cloud — its data-points are simply addressed by Tuya "code" (e.g. `switch_1`, `battery_percentage`) instead of a numeric id; the device logs its codes on startup. Battery-only controllers with no rain sensor: set `"noRainSensor": true`.
+  * The existing **IrrigationSystem** accessory works unchanged over the cloud — its data-points are simply addressed by Tuya "code" (e.g. `switch_1`, `battery_percentage`) instead of a numeric id; the device logs its codes on startup.
   * See the wiki: **[Tuya Cloud Setup](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Tuya-Cloud-Setup.md)**.
 * [*] **Fix realtime (MQTT) cloud updates being silently dropped** — external changes (physical buttons, the Tuya app, the device's own timers) now show up in HomeKit within a second or two. The decryptor was verifying the AES-GCM auth tag (`decipher.final()`), but Tuya's real status frames don't carry a tag that verifies against the documented AAD, so every realtime message was being thrown away. Now decrypts with `update()` only, matching the official `tuya/tuya-homebridge` and `0x5e/homebridge-tuya-platform` implementations.
 * [*] **Fix cloud irrigation valves that could be turned on but not off** — the per-zone write coalescer was dropping any command that matched the last-known `device.state`. Cloud devices never optimistically advance `state` (it only moves once the realtime stream confirms the device), so an "off" issued before the "on" was echoed matched the stale "off" and was discarded — HomeKit showed the zone closed while it kept running. Queued commands are now sent as-is (callers already queue only genuine changes).
+* [*] **IrrigationSystem: remove the rain sensor.** It never reported reliably on these devices, and bundling a sensor (a different HomeKit category) in the same accessory forced the Home app to fragment the sprinkler into "sub-accessories" — blocking control from the main tile and hiding the system master on/off. The accessory is now a single, clean sprinkler tile (IrrigationSystem + valves + optional battery); any leftover Contact/Leak sensor service from a previous build is removed automatically on restart. The `noRainSensor`, `rainSensorType`, `rainInverted`, `dpRain` and `rainOnValue` options are gone.
+* [*] **IrrigationSystem: add the HAP Service Label service for multi-valve controllers** — an accessory that exposes a collection of same-type services (more than one `Valve`) must include a `ServiceLabel` service to anchor each valve's `ServiceLabelIndex`. It was missing, so stricter Home app clients (notably iOS) scattered the zones as separate tiles instead of nesting them under the single irrigation tile. The service is added automatically (with the Arabic-numerals namespace) whenever there is more than one valve; user-set zone names still take precedence.
 
 ## 2.0.1 (2021-03-25)
 This update includes the following changes:

package/Readme.MD

@@ -38,7 +38,7 @@ A community-maintained Homebridge plugin for controlling Tuya devices locally ov
 * Fan v2<sup>[7](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md)</sup>
 * Garages<sup>[8](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#garage-doors)</sup>
 * Heaters<sup>[9](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md)</sup>
-* Irrigation Systems / Sprinklers<sup>[17](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#irrigation-systems--sprinklers)</sup> (multi-valve, per-zone timers, rain sensor, battery)
+* Irrigation Systems / Sprinklers<sup>[17](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#irrigation-systems--sprinklers)</sup> (multi-valve, per-zone timers, battery)
 * Lights
   * On/Off<sup>[10](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md)</sup>
   * Brightness<sup>[11](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#tunable-white-light-bulbs)</sup>

package/config.schema.json

@@ -850,51 +850,6 @@
               "condition": {
                 "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type) && !model.devices[arrayIndices].noBattery;"
               }
-            },
-            "noRainSensor": {
-              "type": "boolean",
-              "title": "No rain sensor",
-              "description": "Disable the rain sensor (use if your controller doesn't report 'rain_sensor_state').",
-              "condition": {
-                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type);"
-              }
-            },
-            "rainSensorType": {
-              "type": "string",
-              "title": "Rain sensor type",
-              "default": "contact",
-              "oneOf": [
-                { "title": "Contact sensor (Open / Closed)", "enum": ["contact"] },
-                { "title": "Leak sensor (Leak Detected / Dry — note: fires critical alerts)", "enum": ["leak"] }
-              ],
-              "condition": {
-                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type) && !model.devices[arrayIndices].noRainSensor;"
-              }
-            },
-            "rainInverted": {
-              "type": "boolean",
-              "title": "Invert rain sensor",
-              "description": "Flip the reported state if 'raining' and 'dry' appear reversed in HomeKit.",
-              "condition": {
-                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type) && !model.devices[arrayIndices].noRainSensor;"
-              }
-            },
-            "dpRain": {
-              "type": ["integer", "string"],
-              "placeholder": "49 or rain_sensor_state",
-              "title": "Rain sensor data-point (numeric id, or cloud code)",
-              "condition": {
-                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type) && !model.devices[arrayIndices].noRainSensor;"
-              }
-            },
-            "rainOnValue": {
-              "type": "string",
-              "placeholder": "rain",
-              "title": "Rain sensor 'raining' value",
-              "description": "The enum value the device reports when it is raining (default 'rain').",
-              "condition": {
-                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type) && !model.devices[arrayIndices].noRainSensor;"
-              }
             }
           }
         }

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
@@ -101,14 +102,6 @@ class IrrigationSystemAccessory extends BaseAccessory {
         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 +142,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,18 +168,6 @@ 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))
@@ -180,12 +180,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.info('Removing rain sensor service %s (no longer supported)', svc.displayName);
+                this.accessory.removeService(svc);
+            }
+        });
     }
 
     /* ------------------------------------------------------------------ *
@@ -212,9 +219,6 @@ class IrrigationSystemAccessory extends BaseAccessory {
         // 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);
 
         // Per-zone runtime state
         this._valves = this._getValveConfigs();
@@ -290,6 +294,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 +325,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,18 +361,6 @@ 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();
     }
 
@@ -550,7 +540,7 @@ class IrrigationSystemAccessory extends BaseAccessory {
     }
 
     /* ------------------------------------------------------------------ *
-     *  Battery + rain mapping
+     *  Battery mapping
      * ------------------------------------------------------------------ */
 
     _batteryLevel(value) {
@@ -576,22 +566,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
      * ------------------------------------------------------------------ */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-tuya-plus",
-  "version": "3.14.0-dev.11",
+  "version": "3.14.0-dev.13",
   "description": "A community-maintained Homebridge plugin for controlling Tuya devices locally over LAN. Includes new features, fixes, and updated device support.",
   "main": "index.js",
   "scripts": {

package/test/IrrigationSystemAccessory.test.js

@@ -125,8 +125,8 @@ describe('IrrigationSystemAccessory — category', () => {
 });
 
 describe('IrrigationSystemAccessory — service topology', () => {
-    test('builds an IrrigationSystem (primary) + 4 linked valves + battery + contact sensor by default', () => {
-        const { accessory } = makeHarness({ '1': false, '2': false, '3': false, '4': false, '46': 80, '49': 'no_rain' });
+    test('builds an IrrigationSystem (primary) + 4 linked valves + battery by default', () => {
+        const { accessory } = makeHarness({ '1': false, '2': false, '3': false, '4': false, '46': 80 });
 
         const irr = irrigation(accessory);
         expect(irr).toBeDefined();
@@ -138,9 +138,9 @@ describe('IrrigationSystemAccessory — service topology', () => {
         // All four valves are linked to the irrigation system.
         expect(irr.linked).toHaveLength(4);
 
-        // Battery + ContactSensor present; LeakSensor absent.
+        // Battery present; no rain/leak sensor is ever created.
         expect(accessory.getService(Service.Battery)).toBeDefined();
-        expect(accessory.getService(Service.ContactSensor)).toBeDefined();
+        expect(accessory.getService(Service.ContactSensor)).toBeUndefined();
         expect(accessory.getService(Service.LeakSensor)).toBeUndefined();
     });
 
@@ -154,6 +154,19 @@ describe('IrrigationSystemAccessory — service topology', () => {
         });
     });
 
+    test('adds a ServiceLabel (ARABIC_NUMERALS) so the multi-valve zones group under the system', () => {
+        const { accessory } = makeHarness({ '1': false, '2': false, '3': false, '4': false });
+        const label = accessory.getService(Service.ServiceLabel);
+        expect(label).toBeDefined();
+        expect(label.getCharacteristic(Characteristic.ServiceLabelNamespace).value)
+            .toBe(Characteristic.ServiceLabelNamespace.ARABIC_NUMERALS);
+    });
+
+    test('a single-valve system omits the ServiceLabel (no collection to label)', () => {
+        const { accessory } = makeHarness({ '1': false }, { valveCount: 1 });
+        expect(accessory.getService(Service.ServiceLabel)).toBeUndefined();
+    });
+
     test('IrrigationSystem advertises the required characteristics', () => {
         const { accessory } = makeHarness({ '1': false });
         const irr = irrigation(accessory);
@@ -162,17 +175,23 @@ describe('IrrigationSystemAccessory — service topology', () => {
         expect(irr.getCharacteristic(Characteristic.InUse).value).toBe(Characteristic.InUse.NOT_IN_USE);
     });
 
-    test('noBattery / noRainSensor omit those services', () => {
-        const { accessory } = makeHarness({ '1': false }, { noBattery: true, noRainSensor: true });
+    test('noBattery omits the battery service', () => {
+        const { accessory } = makeHarness({ '1': false }, { noBattery: true });
         expect(accessory.getService(Service.Battery)).toBeUndefined();
-        expect(accessory.getService(Service.ContactSensor)).toBeUndefined();
-        expect(accessory.getService(Service.LeakSensor)).toBeUndefined();
     });
 
-    test('rainSensorType "leak" uses a LeakSensor instead of a ContactSensor', () => {
-        const { accessory } = makeHarness({ '49': 'rain' }, { rainSensorType: 'leak' });
-        expect(accessory.getService(Service.LeakSensor)).toBeDefined();
+    test('removes a stale rain sensor service left over from an older version', () => {
+        const { instance, accessory } = makeHarness({ '1': false });
+        // An accessory cached by an older plugin version may still carry the
+        // ContactSensor/LeakSensor; reconciliation must drop it so the sprinkler
+        // stays a clean, single-category tile.
+        accessory.addService(Service.ContactSensor, 'Old Rain');
+        accessory.addService(Service.LeakSensor, 'Old Leak');
+
+        instance._verifyCachedPlatformAccessory();
+
         expect(accessory.getService(Service.ContactSensor)).toBeUndefined();
+        expect(accessory.getService(Service.LeakSensor)).toBeUndefined();
     });
 });
 
@@ -361,16 +380,13 @@ describe('IrrigationSystemAccessory — device-side change reflection', () => {
         expect(v.getCharacteristic(Characteristic.RemainingDuration).value).toBe(600);
     });
 
-    test('battery + rain telemetry updates the corresponding characteristics', () => {
-        const { accessory, device } = makeHarness({ '46': 80, '49': 'no_rain' });
-        device.emitChange({ '46': 10, '49': 'rain' });
+    test('battery telemetry updates the corresponding characteristics', () => {
+        const { accessory, device } = makeHarness({ '46': 80 });
+        device.emitChange({ '46': 10 });
 
         const battery = accessory.getService(Service.Battery);
         expect(battery.getCharacteristic(Characteristic.BatteryLevel).value).toBe(10);
         expect(battery.getCharacteristic(Characteristic.StatusLowBattery).value).toBe(Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW);
-
-        const contact = accessory.getService(Service.ContactSensor);
-        expect(contact.getCharacteristic(Characteristic.ContactSensorState).value).toBe(Characteristic.ContactSensorState.CONTACT_NOT_DETECTED);
     });
 });
 
@@ -425,32 +441,11 @@ describe('IrrigationSystemAccessory — charging state', () => {
     });
 });
 
-describe('IrrigationSystemAccessory — rain mapping', () => {
-    test('contact sensor: rain → NOT_DETECTED, no_rain → DETECTED', () => {
-        const { instance } = makeHarness();
-        expect(instance._contactState('rain')).toBe(Characteristic.ContactSensorState.CONTACT_NOT_DETECTED);
-        expect(instance._contactState('no_rain')).toBe(Characteristic.ContactSensorState.CONTACT_DETECTED);
-    });
-
-    test('rainInverted flips the polarity', () => {
-        const { instance } = makeHarness({}, { rainInverted: true });
-        expect(instance._contactState('rain')).toBe(Characteristic.ContactSensorState.CONTACT_DETECTED);
-        expect(instance._contactState('no_rain')).toBe(Characteristic.ContactSensorState.CONTACT_NOT_DETECTED);
-    });
-
-    test('leak sensor maps rain → detected', () => {
-        const { instance } = makeHarness({}, { rainSensorType: 'leak' });
-        expect(instance._rainDetected('rain')).toBe(true);
-        expect(instance._rainDetected('no_rain')).toBe(false);
-    });
-});
-
 describe('IrrigationSystemAccessory — cloud mode (data-points keyed by code)', () => {
     // Mirrors a real Tuya "sfkzq" watering controller reached over the cloud:
-    // valves are switch_1..4, battery is battery_percentage, and there is no
-    // rain sensor.
+    // valves are switch_1..4 and battery is battery_percentage.
     const cloudState = () => ({ switch_1: false, switch_2: false, switch_3: false, switch_4: false, battery_percentage: 99 });
-    const cloudCtx = { cloud: true, noRainSensor: true };
+    const cloudCtx = { cloud: true };
 
     beforeEach(() => jest.useFakeTimers());
     afterEach(() => { jest.clearAllTimers(); jest.useRealTimers(); });
@@ -485,7 +480,7 @@ describe('IrrigationSystemAccessory — cloud mode (data-points keyed by code)',
     test('an explicit valve list may use custom codes', () => {
         const { accessory, device } = makeHarness(
             { zone_a: false, zone_b: false, battery_percentage: 50 },
-            { cloud: true, noRainSensor: true, valves: [{ name: 'A', dp: 'zone_a' }, { name: 'B', dp: 'zone_b' }] }
+            { cloud: true, valves: [{ name: 'A', dp: 'zone_a' }, { name: 'B', dp: 'zone_b' }] }
         );
         expect(valve(accessory, 'zone_a')).toBeTruthy();
         valve(accessory, 'zone_b').getCharacteristic(Characteristic.Active).triggerSet(1);

package/test/support/mocks.js

@@ -34,6 +34,7 @@ const HAP = {
         ProgramMode: { UUID: 'D1', NO_PROGRAM_SCHEDULED: 0, PROGRAM_SCHEDULED: 1, PROGRAM_SCHEDULED_MANUAL_MODE: 2 },
         IsConfigured: { UUID: 'D6', NOT_CONFIGURED: 0, CONFIGURED: 1 },
         ServiceLabelIndex: { UUID: 'CB' },
+        ServiceLabelNamespace: { UUID: 'CD', DOTS: 0, ARABIC_NUMERALS: 1 },
         ConfiguredName: { UUID: 'E3' },
         BatteryLevel: { UUID: '68' },
         StatusLowBattery: { UUID: '79', BATTERY_LEVEL_NORMAL: 0, BATTERY_LEVEL_LOW: 1 },
@@ -65,6 +66,7 @@ const HAP = {
         LockMechanism: { UUID: '45' },
         Valve: { UUID: 'D0' },
         IrrigationSystem: { UUID: 'CF' },
+        ServiceLabel: { UUID: 'CC' },
         Battery: { UUID: '96' },
         ContactSensor: { UUID: '80' },
         LeakSensor: { UUID: '83' },

package/wiki/Supported-Device-Types.md

@@ -751,12 +751,11 @@ If the light, brightness and turning the fan **off** all work, but turning the f
 
 ### Irrigation Systems / Sprinklers
 
-Multi-valve Tuya irrigation/sprinkler controllers (the battery-powered Wi-Fi "faucet timers" that expose several `switch_*` valves, a `battery_percentage` and a `rain_sensor_state`) are exposed as a single, fully-fledged HomeKit **Irrigation System** accessory:
+Multi-valve Tuya irrigation/sprinkler controllers (the battery-powered Wi-Fi "faucet timers" that expose several `switch_*` valves and a `battery_percentage`) are exposed as a single, fully-fledged HomeKit **Irrigation System** accessory:
 
 * one **Irrigation System** tile that contains every zone,
 * one **Valve** per zone (`ValveType = Irrigation`) — each with its own on/off, its own **Duration** picker and a live countdown,
-* an optional **Battery** service (level, low-battery warning, and — for solar/USB-C rechargeable units that report it — live charging status),
-* an optional **rain sensor** (a Contact sensor by default).
+* an optional **Battery** service (level, low-battery warning, and — for solar/USB-C rechargeable units that report it — live charging status).
 
 Because these devices are slow to respond, all zone changes that happen close together — turning the whole system on/off, or running a scene that toggles several zones — are merged into a **single** Tuya command instead of a burst of them.
 
@@ -769,14 +768,13 @@ Because these devices are slow to respond, all zone changes that happen close to
     "type": "IrrigationSystem",
     "id": "bfae6739xxxxxxxxxxxxxx",   // the cloud Device ID
     "cloud": true,
-    "valveCount": 4,
-    "noRainSensor": true              // many battery timers have no rain sensor
+    "valveCount": 4
 }
 ```
 
 #### Minimal Configuration
 
-The defaults match the common 4-zone layout (valves A–D on data-points `1`–`4`, battery on `46`, rain on `49`):
+The defaults match the common 4-zone layout (valves A–D on data-points `1`–`4`, battery on `46`):
 
 ```json5
 {
@@ -800,10 +798,6 @@ Each zone has its own **Duration**. When a zone is switched on it runs for that
 
 Switching the whole Irrigation System tile **off** closes every open zone, and switching it **on** opens every zone — each as one combined command (mirroring the physical "all" button many of these controllers have). Either direction can be disabled with `masterTurnsOffAllZones` / `masterTurnsOnAllZones`.
 
-#### Rain sensor: Contact vs Leak
-
-By default the rain sensor is a **Contact sensor** (`raining → Open`). You can switch it to a **Leak sensor** (`raining → Leak Detected`) with `"rainSensorType": "leak"` — leak sensors read more naturally for rain and make "when it starts raining" automations obvious, **but HomeKit treats them as safety accessories and raises critical alerts that bypass Do-Not-Disturb on every rainfall**, which many people find too noisy. Use `rainInverted` if the wet/dry states appear reversed.
-
 #### Full Configuration
 
 ```json5
@@ -841,12 +835,5 @@ By default the rain sensor is a **Contact sensor** (`raining → Open`). You can
     "lowBatteryThreshold": 20,
     "dpCharging": 101,   /* boolean charging-status DP (solar / USB-C); omit if not reported */
     /* "noBattery": true, */
-
-    /* --- Rain sensor (omit / set noRainSensor:true if not present) --- */
-    "dpRain": 49,
-    "rainSensorType": "contact", /* or "leak" */
-    "rainOnValue": "rain",       /* enum value reported while raining */
-    "rainInverted": false
-    /* "noRainSensor": true, */
 }
 ```

package/wiki/Tuya-Cloud-Setup.md

@@ -66,8 +66,7 @@ Authenticates as your app account (username/password), so it sees exactly the de
             "type": "IrrigationSystem",
             "id": "bfae6739xxxxxxxxxxxxxx",      // the cloud Device ID
             "cloud": true,
-            "valveCount": 4,
-            "noRainSensor": true                 // most battery timers have no rain DP
+            "valveCount": 4
         }
     ]
 }
@@ -124,8 +123,7 @@ The `IrrigationSystem` defaults already match the common 4-zone layout (`switch_
     { "name": "Front Lawn", "dp": "switch_1", "defaultDuration": 900 },
     { "name": "Back Lawn",  "dp": "switch_2", "defaultDuration": 900 }
 ],
-"dpBattery": "battery_percentage",
-"noRainSensor": true                  // or: "dpRain": "rain_sensor_state"
+"dpBattery": "battery_percentage"
 ```
 
 See **[Irrigation Systems / Sprinklers](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#irrigation-systems--sprinklers)** for all options (per-zone durations, master switch, etc.).