homebridge-tuya-plus 3.12.0 → 3.13.1-dev.1

package/.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# Changes to CI/release automation require the maintainer's review.
+# Enforced only when branch protection on `main` has
+# "Require review from Code Owners" enabled.
+/.github/workflows/ @adrianjagielak
+/.github/CODEOWNERS  @adrianjagielak

package/.github/workflows/publish-dev.yml

@@ -0,0 +1,91 @@
+name: Publish dev to npm
+
+# Publishes every commit on `main` to npm under the `dev` dist-tag.
+#
+# Security model (why a malicious PR cannot steal publishing rights):
+#   * No npm token is stored anywhere. Publishing uses npm Trusted
+#     Publishing (OIDC): GitHub mints a short-lived, cryptographically
+#     signed token that npm only accepts when its claims match THIS repo +
+#     THIS workflow file. There is no durable credential to exfiltrate.
+#   * This workflow never runs on `pull_request`, only on pushes to `main`
+#     (post-merge) and manual dispatch — so fork PRs get nothing.
+#   * The privileged `publish` job is minimal and isolated: it does not
+#     run `npm ci`, a build, or tests, and uses `--ignore-scripts`, so no
+#     repo/dependency code executes while the OIDC permission is present.
+#     Tests run in a separate, unprivileged job that gates publishing.
+#
+# One-time setup required for this to succeed (see PR/commit notes):
+#   1. npmjs.com -> package Settings -> Trusted Publisher:
+#        Publisher: GitHub Actions
+#        Organization/user: adrianjagielak
+#        Repository:        homebridge-tuya-plus
+#        Workflow filename: publish-dev.yml
+#        Environment:       npm-dev
+#   2. GitHub repo Settings -> Environments -> create `npm-dev`,
+#      restrict deployment branches to `main` (optional: required reviewer).
+
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+
+# Least privilege by default; only the publish job opts into id-token.
+permissions:
+  contents: read
+
+# Don't cancel an in-flight publish; let each commit publish its version.
+concurrency:
+  group: publish-dev
+  cancel-in-progress: false
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+      - run: npm ci
+      - run: npm run lint
+      - run: npm run test
+
+  publish:
+    needs: test
+    runs-on: ubuntu-latest
+    # Bind this environment in repo Settings to the `main` branch so that
+    # only main can ever reach the publish step.
+    environment: npm-dev
+    permissions:
+      contents: read # checkout
+      id-token: write # OIDC -> npm Trusted Publishing (no stored token)
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          registry-url: "https://registry.npmjs.org"
+
+      # Trusted Publishing (OIDC) requires npm >= 11.5.1.
+      - name: Ensure OIDC-capable npm
+        run: npm install -g npm@latest
+
+      - name: Compute dev version
+        id: ver
+        run: |
+          NEXT="$(node -e "const v=require('./package.json').version.split('.'); v[2]=Number(v[2])+1; console.log(v.join('.'))")"
+          VERSION="${NEXT}-dev.${GITHUB_RUN_NUMBER}"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "Will publish $VERSION"
+
+      # Writes package.json on the runner only; nothing is committed.
+      - name: Set version
+        run: npm version "${{ steps.ver.outputs.version }}" --no-git-tag-version --allow-same-version --ignore-scripts
+
+      # No NODE_AUTH_TOKEN: npm exchanges the OIDC id-token for a
+      # short-lived, package-scoped credential at publish time.
+      # --ignore-scripts ensures no lifecycle script runs with that credential.
+      # --provenance attaches a signed build attestation (needs a public repo).
+      - name: Publish (dev tag)
+        run: npm publish --tag dev --provenance --ignore-scripts

package/Readme.MD

@@ -17,6 +17,7 @@
 A community-maintained Homebridge plugin for controlling Tuya devices locally over LAN. Control your supported Tuya accessories locally in HomeKit.
 
 * [Supported Device Types](#supported-device-types)
+* [Supported Tuya Protocol Versions](#supported-tuya-protocol-versions)
 * [Installation Instructions](#installation-instructions)
 * [Configuration](#configuration)
 * [Known Issues](#known-issues)
@@ -37,6 +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)
 * 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>
@@ -48,6 +50,24 @@ A community-maintained Homebridge plugin for controlling Tuya devices locally ov
 
 Note: Motion, and other sensor types don't behave well with responce requests, so they will not be added. 
 
+## Supported Tuya Protocol Versions
+
+The plugin speaks every published Tuya LAN protocol version:
+
+| Tuya LAN protocol | Framing | Encryption | Status |
+|---|---|---|---|
+| 3.1 | `0x55AA` | AES-128-ECB (base64, control only) | ✅ Supported |
+| 3.2 | `0x55AA` | AES-128-ECB | ✅ Supported |
+| 3.3 | `0x55AA` | AES-128-ECB | ✅ Supported |
+| 3.4 | `0x55AA` | AES-128-ECB, session key, HMAC-SHA256 | ✅ Supported |
+| 3.5 | `0x6699` | AES-128-GCM, session key | ✅ Supported |
+| 3.6 and newer | — | — | ✅ Forward-compatible (see below) |
+
+The protocol version is auto-detected from the device's discovery broadcast, so you normally don't need to configure anything.
+
+Protocol **3.5** is currently the newest Tuya LAN protocol in existence: it is the latest version implemented by Tuya's own open-source device SDK ([TuyaOpen](https://github.com/tuya/TuyaOpen)) and by the reference reverse-engineered implementations ([tinytuya](https://github.com/jasonacox/tinytuya/blob/master/PROTOCOL.md)). No device firmware speaking a "3.6" protocol has been observed in the wild so far.
+
+This plugin is nevertheless **3.6-ready**: if a device reports a newer protocol version (e.g. `3.6`) in its broadcast, the plugin automatically talks to it using the newest (3.5/GCM) protocol stack while tagging payloads with the device's reported version — the same forward-compatibility strategy used by tinytuya. Should such a device misbehave, you can pin it to a specific protocol with the `forceVersion` device option (e.g. `"forceVersion": "3.5"`), or use `version` to set a protocol for devices that can't be discovered (e.g. on another subnet).
 
 ## Installation Instructions
 
@@ -61,6 +81,19 @@ Search for "Tuya" in [homebridge-config-ui-x](https://github.com/oznu/homebridge
 sudo npm install -g homebridge-tuya-plus
 ```
 
+#### Bleeding-edge (`dev`) builds:
+
+Every commit to `main` is automatically published to npm under the `dev` tag — a
+separate, unstable channel. The stable release always stays on `latest`, so this
+won't affect normal installs. To try the latest in-development build:
+
+```
+sudo npm install -g homebridge-tuya-plus@dev
+```
+
+These are versioned like `3.13.1-dev.<n>` and may be unstable; use the default
+install above for production.
+
 ## Configuration
 > UI
 

package/config.schema.json

@@ -70,6 +70,10 @@
                   "title": "Heat Convector",
                   "enum": ["Convector"]
                 },
+                {
+                  "title": "WLED Dimmer",
+                  "enum": ["WledDimmer"]
+                },
                 {
                   "title": "Simple Dimmer",
                   "enum": ["SimpleDimmer"]
@@ -82,6 +86,10 @@
                   "title": "Garage Door",
                   "enum": ["GarageDoor"]
                 },
+                {
+                  "title": "Simple Garage Door (Open/Stop/Close)",
+                  "enum": ["SimpleGarageDoor"]
+                },
                 {
                   "title": "Simple Blinds",
                   "enum": ["SimpleBlinds"]
@@ -105,6 +113,10 @@
                 {
                   "title": "Air Purifier",
                   "enum": ["AirPurifier"]
+                },
+                {
+                  "title": "Irrigation System (Multi-Valve / Sprinkler)",
+                  "enum": ["IrrigationSystem"]
                 }
               ]
             },
@@ -137,6 +149,24 @@
                 "functionBody": "return model.devices && model.devices[arrayIndices].type !== 'null';"
               }
             },
+            "version": {
+              "title": "Tuya protocol version",
+              "type": "string",
+              "placeholder": "e.g. 3.3",
+              "description": "Leave empty to auto-detect. Used when the device cannot be discovered (e.g. fixed IP across subnets). Supported: 3.1, 3.2, 3.3, 3.4, 3.5 (newer reported versions such as 3.6 are handled with the 3.5 stack automatically).",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices].type !== 'null';"
+              }
+            },
+            "forceVersion": {
+              "title": "Force Tuya protocol version",
+              "type": "string",
+              "placeholder": "e.g. 3.5",
+              "description": "Overrides the protocol version even when the device broadcasts a different one. Only set this if a device misbehaves with its auto-detected version.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices].type !== 'null';"
+              }
+            },
             "manufacturer": {
               "type": "string",
               "description": "Anything you'd like to use to help identify this device.",
@@ -204,16 +234,24 @@
               "type": "integer",
               "placeholder": "1",
               "condition": {
-                "functionBody": "return model.devices && model.devices[arrayIndices] && ['Outlet', 'TWLight', 'RGBTWLight', 'SimpleDimmer','RGBTWOutlet'].includes(model.devices[arrayIndices].type);"
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['Outlet', 'TWLight', 'RGBTWLight', 'WledDimmer', 'SimpleDimmer','RGBTWOutlet'].includes(model.devices[arrayIndices].type);"
               }
             },
             "dpBrightness": {
               "type": "integer",
               "placeholder": "2",
               "condition": {
-                "functionBody": "return model.devices && model.devices[arrayIndices] && ['TWLight', 'RGBTWLight', 'SimpleDimmer','RGBTWOutlet', 'FanLight'].includes(model.devices[arrayIndices].type);"
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['TWLight', 'RGBTWLight', 'WledDimmer', 'SimpleDimmer','RGBTWOutlet', 'FanLight'].includes(model.devices[arrayIndices].type);"
               }
             },
+            "syncBrightnessToWled": {
+              "type": "string",
+              "title": "Sync brightness to WLED (IP[:port])",
+              "placeholder": "192.168.1.100",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['WledDimmer', 'SimpleDimmer'].includes(model.devices[arrayIndices].type);"
+              }
+            },            
             "dpColorTemperature": {
               "type": "integer",
               "placeholder": "3",
@@ -225,14 +263,14 @@
               "type": "integer",
               "placeholder": "140",
               "condition": {
-                "functionBody": "return model.devices && model.devices[arrayIndices] && ['TWLight', 'RGBTWLight','RGBTWOutlet'].includes(model.devices[arrayIndices].type);"
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['TWLight', 'RGBTWLight','RGBTWOutlet', 'FanLight'].includes(model.devices[arrayIndices].type);"
               }
             },
             "maxWhiteColor": {
               "type": "integer",
               "placeholder": "400",
               "condition": {
-                "functionBody": "return model.devices && model.devices[arrayIndices] && ['TWLight', 'RGBTWLight','RGBTWOutlet'].includes(model.devices[arrayIndices].type);"
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['TWLight', 'RGBTWLight','RGBTWOutlet', 'FanLight'].includes(model.devices[arrayIndices].type);"
               }
             },
             "dpMode": {
@@ -256,11 +294,18 @@
                 "functionBody": "return model.devices && model.devices[arrayIndices] && ['RGBTWLight','RGBTWOutlet'].includes(model.devices[arrayIndices].type);"
               }
             },
+            "minBrightness": {
+              "type": "integer",
+              "placeholder": "1",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['FanLight','WledDimmer', 'SimpleDimmer'].includes(model.devices[arrayIndices].type);"
+              }
+            },
             "scaleBrightness": {
               "type": "integer",
               "placeholder": "255",
               "condition": {
-                "functionBody": "return model.devices && model.devices[arrayIndices] && ['TWLight','RGBTWLight','RGBTWOutlet', 'FanLight'].includes(model.devices[arrayIndices].type);"
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['RGBTWLight','RGBTWOutlet','FanLight','WledDimmer', 'SimpleDimmer'].includes(model.devices[arrayIndices].type);"
               }
             },
             "scaleWhiteColor": {
@@ -418,6 +463,15 @@
                 "functionBody": "return model.devices && model.devices[arrayIndices] && ['Fan', 'FanLight'].includes(model.devices[arrayIndices].type);"
               }
             },
+            "singleDpWrites": {
+              "title": "Send fan commands one DP at a time",
+              "description": "Enable if turning the fan on or changing its speed is silently ignored. Some fan firmwares reject LAN packets that carry more than one data point, so the fan on/off and speed are sent as separate packets instead of combined.",
+              "type": "boolean",
+              "placeholder": false,
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['FanLight'].includes(model.devices[arrayIndices].type);"
+              }
+            },
             "dpChildLock": {
               "type": "integer",
               "placeholder": "6",
@@ -493,6 +547,61 @@
                 "functionBody": "return model.devices && model.devices[arrayIndices] && ['GarageDoor'].includes(model.devices[arrayIndices].type);"
               }
             },
+            "dpOpen": {
+              "type": "integer",
+              "placeholder": "101",
+              "description": "Datapoint identifier for the open action.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleGarageDoor'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "dpClose": {
+              "type": "integer",
+              "placeholder": "102",
+              "description": "Datapoint identifier for the close action.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleGarageDoor'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "dpStop": {
+              "type": "integer",
+              "placeholder": "103",
+              "description": "Datapoint identifier for the stop action (used only for the partial-open feature).",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleGarageDoor'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "dpState": {
+              "type": "integer",
+              "placeholder": "105",
+              "description": "Datapoint identifier for the reported state. Values 11 (stopped) and 12 (opening/open) are treated as OPEN; 13 (closing/closed) is treated as CLOSED.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleGarageDoor'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "stopBeforeCloseMs": {
+              "type": "integer",
+              "placeholder": "1500",
+              "description": "Optional. The controller ignores a close command while the gate is actively moving, so unless the state DP already reads 11 (stopped) the plugin sends stop, waits this many milliseconds, then sends close. Tune to roughly how long the gate takes to halt after a stop. Default 1500.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleGarageDoor'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "partialOpenMs": {
+              "type": "integer",
+              "placeholder": "2000",
+              "description": "Optional. If set, exposes an extra stateful switch that mirrors whether the gate is currently open. Tapping it ON triggers a partial-open (the gate opens and then stops itself this many milliseconds later, leaving the gate partially open). Tapping it OFF triggers a standard full close. Leave empty to skip the switch.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleGarageDoor'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "forceSwitches": {
+              "type": "boolean",
+              "description": "Optional. Exposes extra Force Open and Force Close momentary switches alongside the main GarageDoorOpener. They fire the same open/close actions as the main toggle, but as plain switches they can be used in HomeKit automations (which won't accept GarageDoorOpener targets directly).",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleGarageDoor'].includes(model.devices[arrayIndices].type);"
+              }
+            },
             "flipState": {
               "type": "boolean",
               "condition": {
@@ -534,10 +643,160 @@
               "condition": {
                 "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleBlinds'].includes(model.devices[arrayIndices].type);"
               }
+            },
+            "valveCount": {
+              "type": "integer",
+              "title": "Number of Valves / Zones",
+              "placeholder": 4,
+              "description": "How many valves/zones the controller has. They are assumed to be on data-points 1, 2, 3, … For non-sequential data-points use the 'valves' list instead.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "valves": {
+              "type": "array",
+              "title": "Valves / Zones (advanced)",
+              "orderable": false,
+              "description": "Optional. Define each zone explicitly to set custom names, data-points and default run times. Overrides 'Number of Valves'.",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": { "type": "string", "title": "Zone name", "placeholder": "Lawn" },
+                  "dp": { "type": "integer", "title": "Data-point", "placeholder": 1 },
+                  "defaultDuration": { "type": "integer", "title": "Default run time (seconds, 0 = run indefinitely)", "placeholder": 600 }
+                }
+              },
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "defaultDuration": {
+              "type": "integer",
+              "title": "Default Run Time (seconds)",
+              "placeholder": 600,
+              "description": "Default per-zone run time used until you change it in the Home app. Set to 0 to make zones run indefinitely (until turned off) by default.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "maxDuration": {
+              "type": "integer",
+              "title": "Maximum Run Time (seconds)",
+              "placeholder": 7200,
+              "description": "Upper bound advertised to HomeKit for the duration picker (HAP default is 3600 / 1h). Apple's Home app only offers presets up to 1h regardless; longer values can be set from the config or apps like Eve.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "masterTurnsOnAllZones": {
+              "type": "boolean",
+              "title": "Master switch turns ON all zones",
+              "placeholder": true,
+              "description": "When you switch the whole irrigation system on (the main tile), open every zone in a single command. Disable to make the system switch a passive 'enabled' indicator.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "masterTurnsOffAllZones": {
+              "type": "boolean",
+              "title": "Master switch turns OFF all zones",
+              "placeholder": true,
+              "description": "When you switch the whole irrigation system off, close every open zone in a single command.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "commandDebounce": {
+              "type": "integer",
+              "title": "Command Debounce (ms)",
+              "placeholder": 500,
+              "description": "Zone changes that happen within this window are merged into one Tuya command — useful for this kind of laggy, battery-powered device. The Home app updates optimistically, so this delay isn't visible in the UI.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "noBattery": {
+              "type": "boolean",
+              "title": "No battery service",
+              "description": "Disable the battery service (use if your controller is mains-powered or doesn't report 'battery_percentage').",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type);"
+              }
+            },
+            "dpBattery": {
+              "type": "integer",
+              "placeholder": 46,
+              "title": "Battery data-point",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type) && !model.devices[arrayIndices].noBattery;"
+              }
+            },
+            "lowBatteryThreshold": {
+              "type": "integer",
+              "placeholder": 20,
+              "title": "Low-battery threshold (%)",
+              "description": "At or below this level HomeKit shows a low-battery warning.",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['IrrigationSystem'].includes(model.devices[arrayIndices].type) && !model.devices[arrayIndices].noBattery;"
+              }
+            },
+            "dpCharging": {
+              "type": "integer",
+              "placeholder": 101,
+              "title": "Charging-status data-point",
+              "description": "Boolean data-point reporting whether the battery is charging (e.g. solar / USB-C units). HomeKit shows Charging / Not Charging; if your controller doesn't report this, it shows Not Chargeable.",
+              "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",
+              "placeholder": 49,
+              "title": "Rain sensor data-point",
+              "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/index.js

@@ -13,7 +13,8 @@ const AirPurifierAccessory = require('./lib/AirPurifierAccessory');
 const DehumidifierAccessory = require('./lib/DehumidifierAccessory');
 const ConvectorAccessory = require('./lib/ConvectorAccessory');
 const GarageDoorAccessory = require('./lib/GarageDoorAccessory');
-const SimpleDimmerAccessory = require('./lib/SimpleDimmerAccessory');
+const SimpleGarageDoorAccessory = require('./lib/SimpleGarageDoorAccessory');
+const WledDimmerAccessory = require('./lib/WledDimmerAccessory');
 const SimpleDimmer2Accessory = require('./lib/SimpleDimmer2Accessory');
 const SimpleBlindsAccessory = require('./lib/SimpleBlindsAccessory');
 const SimpleHeaterAccessory = require('./lib/SimpleHeaterAccessory');
@@ -21,6 +22,7 @@ const SimpleFanAccessory = require('./lib/SimpleFanAccessory');
 const SimpleFanLightAccessory = require('./lib/SimpleFanLightAccessory');
 const SwitchAccessory = require('./lib/SwitchAccessory');
 const ValveAccessory = require('./lib/ValveAccessory');
+const IrrigationSystemAccessory = require('./lib/IrrigationSystemAccessory');
 const OilDiffuserAccessory = require('./lib/OilDiffuserAccessory');
 const DoorbellAccessory = require('./lib/DoorbellAccessory');
 const VerticalBlindsWithTilt = require('./lib/VerticalBlindsWithTilt');
@@ -47,7 +49,9 @@ const CLASS_DEF = {
     dehumidifier: DehumidifierAccessory,
     convector: ConvectorAccessory,
     garagedoor: GarageDoorAccessory,
-    simpledimmer: SimpleDimmerAccessory,
+    simplegaragedoor: SimpleGarageDoorAccessory,
+    simpledimmer: WledDimmerAccessory,
+    wleddimmer: WledDimmerAccessory,
     simpledimmer2: SimpleDimmer2Accessory,
     simpleblinds: SimpleBlindsAccessory,
     simpleheater: SimpleHeaterAccessory,
@@ -55,6 +59,7 @@ const CLASS_DEF = {
     fan: SimpleFanAccessory,
     fanlight: SimpleFanLightAccessory,
     watervalve: ValveAccessory,
+    irrigationsystem: IrrigationSystemAccessory,
     oildiffuser: OilDiffuserAccessory,
     doorbell: DoorbellAccessory,
     verticalblindswithtilt: VerticalBlindsWithTilt,
@@ -125,8 +130,12 @@ class TuyaLan {
 
                 this.log.info('Discovered %s (%s) identified as %s (%s)', devices[config.id].name, config.id, devices[config.id].type, config.version);
 
+                // The version broadcast by the device wins over a configured `version`,
+                // but `forceVersion` overrides everything (e.g. to pin a device that
+                // reports a newer protocol, like 3.6, to a specific stack).
                 const device = new TuyaAccessory({
                     ...devices[config.id], ...config,
+                    ...(devices[config.id].forceVersion ? {version: devices[config.id].forceVersion} : {}),
                     log: this.log,
                     UUID: UUID.generate(UUID_SEED + ':' + config.id),
                     connect: false
@@ -154,6 +163,7 @@ class TuyaLan {
 
                     const device = new TuyaAccessory({
                         ...devices[deviceId],
+                        ...(devices[deviceId].forceVersion ? {version: devices[deviceId].forceVersion} : {}),
                         log: this.log,
                         UUID: UUID.generate(UUID_SEED + ':' + deviceId),
                         connect: false
@@ -210,14 +220,22 @@ class TuyaLan {
         let accessory = this.cachedAccessories.get(deviceConfig.UUID),
             isCached = true;
 
-        if (accessory && accessory.category !== Accessory.getCategory(Categories)) {
-            this.log.info("%s has a different type (%s vs %s)", accessory.displayName, accessory.category, Accessory.getCategory(Categories));
+        const expectedCategory = Accessory.getCategory(Categories);
+
+        // Only treat a cached accessory as a "different type" when we actually
+        // have a category to compare against. If getCategory() resolves to
+        // undefined (e.g. an unknown HAP category constant), HomeKit stores the
+        // accessory as Categories.OTHER, so an undefined expectation would never
+        // match and we would needlessly unregister & recreate the accessory on
+        // every restart — wiping its HomeKit identity (name, room, automations).
+        if (accessory && expectedCategory !== undefined && accessory.category !== expectedCategory) {
+            this.log.info("%s has a different type (%s vs %s)", accessory.displayName, accessory.category, expectedCategory);
             this.removeAccessory(accessory);
             accessory = null;
         }
 
         if (!accessory) {
-            accessory = new PlatformAccessory(deviceConfig.name, deviceConfig.UUID, Accessory.getCategory(Categories));
+            accessory = new PlatformAccessory(deviceConfig.name, deviceConfig.UUID, expectedCategory);
             accessory.getService(Service.AccessoryInformation)
                 .setCharacteristic(Characteristic.Manufacturer, deviceConfig.manufacturer || "Unknown")
                 .setCharacteristic(Characteristic.Model, deviceConfig.model || "Unknown")

package/lib/BaseAccessory.js

@@ -1,4 +1,11 @@
 class BaseAccessory {
+    // Default HomeKit category. Subclasses should override with a real HAP
+    // category constant; falling back to OTHER keeps a forgotten override from
+    // throwing and from churning the accessory on every restart (see issue #45).
+    static getCategory(Categories) {
+        return Categories.OTHER;
+    }
+
     constructor(...props) {
         let isNew;
         [this.platform, this.accessory, this.device, isNew = true] = [...props];

package/lib/DehumidifierAccessory.js

@@ -4,7 +4,7 @@ const STATE_OTHER = 9;
 
 class DehumidifierAccessory extends BaseAccessory {
     static getCategory(Categories) {
-        return Categories.DEHUMIDIFIER;
+        return Categories.AIR_DEHUMIDIFIER;
     }
 
     constructor(...props) {