node-red-contrib-dmx-for-ha 0.6.28 → 0.6.33

package/README.md

@@ -32,7 +32,7 @@ Node-RED acts as the **virtual lighting desk** — it owns the DMX channels, man
 ```
 Home Assistant          Node-RED               DMX Hardware
 ──────────────          ────────               ────────────
-Automations      ←──→  ha-mqtt-dmx     ──→    EtherTen / 
+Automations      ←──→  ha-mqtt-dmx     ──→    EtherTen /
 Dashboards              ha-mqtt-group           DMX decoder /
 Scenes                  ha-mqtt-relay           MQTT bridge
 Voice control           ha-mqtt-button  ←──    Wall buttons
@@ -55,27 +55,17 @@ Most DMX implementations require either expensive proprietary hardware or comple
 
 - Full Home Assistant MQTT discovery — entities appear automatically in HA
 - RGBW, RGBWW, RGB, Colour Temperature, Brightness, and On/Off colour modes
-- Gamma-corrected DMX output
-- Transitions, effects, and group control
+- Gamma-corrected DMX output with configurable floor and limiter
+- Smooth transitions with configurable ON and OFF fade times
+- Effects engine — strobe, rainbow, fire, flicker, twinkle, police and more
+- Group control — virtual group entities fan commands to member fixtures
 - State persistence across reboots — survives power cycles and HA updates
 - Wall button and PIR motion sensor integration with remote commissioning support
 - 230V relay switching
 - DMX channel conflict detection — warns on duplicate channel assignments
-- Configurable DMX floor value — prevents low-value flicker on hardware that needs it
+- Per-node DMX floor — prevents low-value flicker on hardware that needs it
 - Debug mode per node — 12hr auto-disable, safe to leave in production flows
 
-## Licence
-
-This package is licensed under **[GPL v3](https://www.gnu.org/licenses/gpl-3.0.txt)**.
-
-You are free to use, modify, and distribute this package. Any derivative works must be distributed under the same GPL v3 licence. This package may not be taken proprietary, rebranded as closed source, or distributed without crediting the original author.
-
-This package was built from 6+ years of real-world professional installation experience. If you use it, improve it, or build on it — please contribute your changes back to the community.
-
----
-
-> **Note:** This is building automation DMX — fixtures, decoders, dimmers, relay switching. Not entertainment industry DMX (no movers, gobos, or fixture profiles). DMX is an open standard and this package works with any DMX controller that accepts MQTT payloads.
-
 ---
 
 ## Nodes included
@@ -84,7 +74,7 @@ This package was built from 6+ years of real-world professional installation exp
 |---|---|---|---|
 | `ha-mqtt-config` | *(config)* | — | Shared site config — broker, zone, HA settings |
 | `ha-mqtt-dmx` | DMX | Yellow | Single DMX fixture |
-| `ha-mqtt-dmx-group` | DMX Group | Gold | Virtual group — fans commands to child nodes |
+| `ha-mqtt-dmx-group` | DMX Group | Gold | Virtual group — fans commands to member fixtures |
 | `ha-mqtt-relay` | Relay | Red | 230V relay switching |
 | `ha-mqtt-button` | Button | Green | Wall button receiver |
 | `ha-mqtt-pir` | PIR | Purple | Motion sensor receiver |
@@ -160,10 +150,13 @@ Context store : 'disk_values' [module=localfilesystem]
 1. Drag a **DMX** node onto the canvas and open its editor
 2. Click **Add new ha-mqtt-config...** next to the Config field
 3. Fill in:
-   - **Config Label** — a friendly name e.g. "My House". Don't stress — this can be changed at any time.
+   - **Config Label** — a friendly name e.g. "My House"
    - **Site ID** — short slug for MQTT topics e.g. `home` (no spaces)
-   - **Zone** — physical zone e.g. `Master`, `BnB`. Used in MQTT topics. This can be updated later if needed.
+   - **Zone** — physical zone e.g. `Master`, `BnB`. Used in MQTT topics.
    - **Broker** — select your existing MQTT broker config
+   - **DMX Floor** — minimum DMX value sent to controllers (default 3). Prevents flicker on decoders that are unstable at values 1–2. Set to 0 to disable.
+   - **Default ON transition** — fade time in seconds when HA sends no transition (default 1s)
+   - **Default OFF transition** — fade time in seconds when HA turns off with no transition (default 1s)
 4. Click **Add**
 
 ### 2. Add a DMX fixture
@@ -172,7 +165,7 @@ Fill in the node editor:
 1. **Fixture ID** — Prefix (`L`), Plan ID, optional channel letter e.g. `L` `992` `-A`
 2. **Colour Mode** — RGBW, RGB, CCT etc.
 3. **Device Type** — e.g. Downlight, Strip light
-4. **Situation** — describes where the fixture is relative to its area. Options:
+4. **Situation** — describes where the fixture is relative to its area:
 
    | Situation | Example result |
    |---|---|
@@ -184,19 +177,90 @@ Fill in the node editor:
    | `outside` | Rail light **outside** Media Room |
    | `throughout` | Downlight **throughout** Living Area |
 
-   > **Tip:** Don't default to `in` for everything — `outside`, `near` and `above` are useful for fixtures in corridors, at thresholds, and above architectural features. On a large installation this makes fixture names immediately meaningful without opening a plan.
-
 5. **Config** — select your config node
 6. **Area** and **Sub-Area** — location on the property
 7. **DMX Channels** — channel numbers matching your fixture's DMX start address
 8. **Controller** and **Universe** numbers
-9. **Discovery Mode** — Enabled, Hidden, or Disabled
+9. **DMX Floor** — leave blank to use the config node default, or set a value to override for this fixture only
+10. **Discovery Mode** — Enabled, Hidden, or Disabled
 
 Deploy — the fixture appears in HA automatically.
 
-### 3. Auto-discovery
+---
+
+## DMX Floor
 
-Nodes auto-discover when deployed if the MQTT broker is connected. No external inject nodes or SYSTEM node needed.
+The DMX floor sets the **absolute minimum value** sent to the controller for any channel that is on. It prevents flickering on LED decoders that are unstable at values 1 or 2.
+
+```
+value = 0         → sends 0       (OFF — always honoured)
+0 < value < floor → sends floor   (snapped up)
+value >= floor    → sends value   (unchanged)
+```
+
+This is enforced at the output stage — no code path can bypass it.
+
+**Config node** sets the site-wide default (e.g. 3). **DMX node** can override it per fixture — leave blank to inherit from config, or set a specific value for fixtures that can handle lower values without flicker.
+
+---
+
+## DMX Group Node
+
+Appears as a single light entity in HA. Commands fan out to all member fixtures.
+
+### Two ways to define members
+
+**Method A — Wires (v1, still supported):**
+```
+[DMX Group LG-992]
+      │ Link output
+      ├──→ [DMX L-992-A]
+      ├──→ [DMX L-992-B]
+      └──→ [DMX L-992-C]
+```
+
+**Method B — Member list (v2, recommended):**
+
+Add fixture IDs directly in the group node editor. No wires needed. Commands are forwarded internally via the Node-RED message bus — no extra MQTT traffic.
+
+```
+Members:
+  local   L-992-A     → forwarded via RED.nodes.getNode() internally
+  local   L-992-B     → forwarded via RED.nodes.getNode() internally
+  local   P-149       → relay node, forwarded internally
+  remote  MW3D/BnB/group/cmd  → published via MQTT for cross-instance groups
+```
+
+Both methods can be used together. If a fixture appears in both wires and the member list it will receive the command twice — avoid this.
+
+### Member types
+
+| Type | Value | How it works |
+|---|---|---|
+| `local` | Fixture ID e.g. `L-992-A` | Resolved via fixture registry → `RED.nodes.getNode()` |
+| `remote` | MQTT topic e.g. `MW3D/BnB/group/cmd` | Published via MQTT with loop-detection envelope |
+
+### Duplicate member protection
+
+If the same fixture ID appears more than once in the member list, the **entire group command is blocked** and an orange warning is shown. The editor also prevents saving with duplicates.
+
+### Loop detection
+
+The node tracks the cascade path and blocks circular references. Works across wired groups, member list groups, and cross-instance remote groups. Max depth defaults to 10.
+
+### Node status
+
+| Colour | Meaning |
+|---|---|
+| Green dot | Healthy — all members resolved |
+| Yellow ring | One or more members not found in registry |
+| Orange ring | Duplicate member detected — group blocked |
+| Red dot | Loop detected |
+| Red ring | Broker disconnected |
+
+### Naming convention
+
+`L-992-A`, `L-992-B`, `L-992-C` group naturally under `LG-992`. The `LG` prefix is fixed.
 
 ---
 
@@ -230,8 +294,6 @@ Typical workflow: Remove → update node settings → Deploy → node auto-disco
 
 All nodes subscribe to a system control topic for **bulk add/remove during commissioning**. No wiring needed — publish one MQTT message and all matching nodes respond instantly.
 
-This is one of the most useful commissioning features in the package. On large installations with hundreds of entities, the ability to wipe and rediscover a specific zone or type in one click saves hours of manual work.
-
 **Topic:** `{siteId}/system/control` (e.g. `MW3D/system/control`)
 
 **Payload:**
@@ -247,116 +309,25 @@ This is one of the most useful commissioning features in the package. On large i
 | `zone` | `all`, or any zone name e.g. `Master`, `BnB` | Matches config node Zone field — case insensitive |
 | `type` | `all`, `dmx`, `group`, `button`, `pir`, `relay` | Node type filter |
 
-**Type reference:**
-
-| Type | Node | Description |
-|---|---|---|
-| `dmx` | ha-mqtt-dmx | Individual DMX fixtures |
-| `group` | ha-mqtt-dmx-group | DMX group nodes |
-| `button` | ha-mqtt-button | Wall button inputs |
-| `pir` | ha-mqtt-pir | PIR / motion sensors |
-| `relay` | ha-mqtt-relay | Relay / power outputs |
-| `all` | all of the above | Everything in the zone |
-
-**Commissioning workflow — roll out one type at a time:**
-```
-Day 1 — DMX lights:
-  ADD Master DMX    → all lights appear in HA
-  Test each light
-  REMOVE Master DMX → wipe and fix any wrong names/channels
-  ADD Master DMX    → rediscover clean
-
-Day 2 — Buttons:
-  ADD Master Button → all buttons appear in HA
-  Test each button
-  etc.
-```
-
-**How to send the command:**
-
-Option A — from anywhere on the network (MQTT Explorer, HA automation, script):
+**Commissioning workflow:**
 ```
-Topic:   MW3D/system/control
-Payload: {"cmd":"add","zone":"all","type":"all"}
+ADD Master DMX    → all lights appear in HA → test each light
+REMOVE Master DMX → wipe and fix any wrong names/channels
+ADD Master DMX    → rediscover clean
 ```
 
-Option B — from Node-RED using the included System Control flow:
-
-Import `system_control_flow.json` into Node-RED. Connect the MQTT out node to your broker. You get a dedicated tab with one-click buttons for every zone and type combination:
-
-```
-🗑 REMOVE ALL          ✅ ADD ALL
-
-🗑 REMOVE Master DMX   ✅ ADD Master DMX
-🗑 REMOVE Master Group ✅ ADD Master Group
-🗑 REMOVE Master Button ✅ ADD Master Button
-🗑 REMOVE Master PIR   ✅ ADD Master PIR
-🗑 REMOVE Master Relay ✅ ADD Master Relay
-
-🗑 REMOVE BnB DMX      ✅ ADD BnB DMX
-... etc.
-```
-
-Option C — wire an inject node directly to any ha-mqtt node input:
-```
-msg.device = "add"     → add that node only
-msg.device = "remove"  → remove that node only
-```
-
-> **Tip:** The system control topic is zone and type filtered — sending `REMOVE BnB DMX` only affects BnB DMX fixtures. Master lights, buttons, relays are completely unaffected. This makes it safe to use on a live installation with clients present.
-
----
-
-## DMX Group Node
-
-Appears as a single light entity in HA. Commands fan out to all nodes on its **Link** output.
-
-```
-[DMX Group LG-992]
-      │ Link
-      ├──→ [DMX L-992-A]
-      ├──→ [DMX L-992-B]
-      └──→ [DMX L-992-C]
-```
-
-Wire **Link** to child DMX or Relay node inputs. Supports nested groups.
-
-Naming: `L-992-A`, `L-992-B`, `L-992-C` group naturally under `LG-992`.
-
 ---
 
 ## Wall buttons
 
 Creates two HA entities per button:
 
-- **`binary_sensor.s_10_a`** — physical state. ON = pressed/held, OFF = released. Use this for automations and dashboard display.
+- **`binary_sensor.s_10_a`** — physical state. ON = pressed/held, OFF = released.
 - **`button.s_10_a_btn`** — momentary trigger. Simulates a physical press from the HA UI.
 
-### Why two entities?
-
-This package is designed for **professional installation** as well as home use. On large installations it is not practical to physically press every button every time you make a change — the building may be large, the button may be on the other side of the property, or you may be commissioning remotely.
-
-The `button` entity gives you a **virtual commissioning panel** — every physical wall button has a software mirror in HA that you can trigger from a laptop anywhere in the world without being on site.
-
-### Important — HA button entity behaviour
-
-The `button` domain in HA is **intentionally stateless** — it will never light up or show an active state. This is a HA platform design decision, not a bug. The `button` entity triggers and immediately resets with no persistent state.
+The `button` entity gives you a **virtual commissioning panel** — every physical wall button has a software mirror in HA that you can trigger from anywhere without being on site.
 
-For visual feedback always use the `binary_sensor` entity.
-
-### Recommended dashboard setup
-
-Hide the `button` entity from the default dashboard to keep things clean — it remains fully accessible when needed:
-
-```
-Settings → Devices → (button device) → button entity → ⋮ → Hide from dashboard
-```
-
-This gives you:
-- **Dashboard** — clean, only `binary_sensor` shown
-- **Device page** — both entities visible, Press button accessible for commissioning
-- **Automations** — both entities fully available, nothing hidden from logic
-- **Remote commissioning** — navigate to device page, simulate press from anywhere
+The `button` domain in HA is intentionally stateless — it will never show an active state. For visual feedback always use the `binary_sensor` entity.
 
 Letters `I` and `O` are never used as suffixes — they look too similar to `1` and `0`.
 
@@ -383,69 +354,22 @@ Entity IDs in HA are locked to the fixture ID and survive friendly name changes.
 
 ## Retain discovery — why the default is false
 
-If you search "MQTT discovery retain" you will find HA community posts and documentation recommending `retain=true` for discovery messages. **This advice is correct for ESP and battery-powered IoT devices — but not for Node-RED.**
-
-### Why ESP devices need retain=true
-
-An ESP sensor runs independently of HA. When HA restarts or updates, the ESP device has no way of knowing — it thinks it already discovered itself and won't re-send the discovery payload. Without `retain=true`, the device disappears from HA permanently until the ESP reboots.
-
-```
-ESP device                    Home Assistant
-──────────                    ──────────────
-Sends discovery once    →     HA restarts
-Doesn't know HA restarted     Retained message restores device ✓
-```
-
-### Why Node-RED is different
-
-Node-RED sits on the same server stack as HA. They are tightly coupled — if one goes down the other knows immediately via the websocket connection. When HA restarts, NR reconnects and re-discovers every device automatically. If NR goes down, HA *should* show nothing — because nothing is working.
-
-```
-Node-RED + Home Assistant (same server):
-  NR down  → no devices in HA  → client sees fault immediately ✓
-  HA restart → NR reconnects   → re-discovers everything      ✓
-  retain=true → ghost devices  → client confused, support call ✗
-```
-
-### The config node setting
+If you search "MQTT discovery retain" you will find HA community posts recommending `retain=true`. **This advice is correct for ESP and battery-powered IoT devices — but not for Node-RED.**
 
-The `Retain discovery` setting on the config node controls this behaviour:
-
-| Setting | Behaviour | Recommended for |
-|---|---|---|
-| `false` (default) | Devices disappear if NR stops | Professional installs — clear fault indication |
-| `true` | Devices persist if NR stops | Standalone IoT, voice assistant integrations where entity persistence matters |
-
-**Default is `false`** — if a client opens their HA dashboard and sees no lights, they know something is wrong with Node-RED. This is the correct behaviour for a professionally installed system where NR and HA live on the same hardware.
-
----
+Node-RED sits on the same server stack as HA. When HA restarts, NR reconnects and re-discovers every device automatically. With `retain=true`, ghost entities persist in HA even when NR is down — clients see lights that don't work and can't tell why.
 
-## MQTT topic formats
+With `retain=false` (default): if NR stops, entities disappear. Clients see a fault immediately. This is the correct behaviour for a professionally installed system.
 
-| Node | Topic |
+| Setting | Recommended for |
 |---|---|
-| DMX | `{siteId}/{zone}/dmx/{universe}` |
-| Relay | `{siteId}/{zone}/{controller}/relay/{relayNum}` |
-| HA discovery | `homeassistant/light/{fixtureId}/config` |
-
-DMX payload format: `"212255"` = channel 212, value 255 (3 digits each).
-
----
-
-## Multi-zone deployments
-
-Create one `ha-mqtt-config` per zone. Each node selects its zone via the Config dropdown.
-
-```
-Master Zone config → Zone: Master → topics: home/Master/dmx/1
-Guest Wing config  → Zone: GuestWing → topics: home/GuestWing/dmx/1
-```
+| `false` (default) | Professional installs — clear fault indication |
+| `true` | Standalone IoT where entity persistence matters more than fault clarity |
 
 ---
 
 ## Transition rate tuning
 
-The config node has two global transition settings that apply to all DMX nodes in the zone:
+The config node has two global transition settings:
 
 ### Transition rate limit
 
@@ -455,151 +379,56 @@ Controls the tick rate multiplier for all transitions and effects:
 ticksPerSec (per node) × rateLimit (config) = effectiveTicks/sec
 ```
 
-| Rate Limit | Effective ticks/sec | MQTT msgs/sec (RGBW × 30 nodes) | Use case |
-|---|---|---|---|
-| 1.0 | 31 | ~3,700 | Small deployment, fast hardware |
-| 0.5 | 15 | ~1,800 | Medium deployment, balanced |
-| 0.25 | 7 | ~840 | Large deployment, light load |
-| 0.1 | 3 | ~360 | Maximum scale, minimal load |
-
-Reduce `transitionRateLimit` if you observe:
-- MQTT broker lag or dropped messages
-- NR event loop warnings
-- DMX controller missing channel updates
-- Sluggish HA response during scene changes
+| Rate Limit | Effective ticks/sec | Use case |
+|---|---|---|
+| 1.0 | 31 | Small deployment, fast hardware |
+| 0.5 | 15 | Medium deployment, balanced |
+| 0.25 | 7 | Large deployment, light load |
+| 0.1 | 3 | Maximum scale, minimal load |
 
-### HA UI transition time
+Reduce `transitionRateLimit` if you see MQTT broker lag, NR event loop warnings, or sluggish HA response during scene changes.
 
-Fallback transition duration (seconds) used when HA sends a command with no
-transition specified. Default 1 second.
+### Default transition times
 
-```
-HA sends transition=3 → use 3 seconds
-HA sends no transition → use haUiTime (default 1s)
-```
+| Field | Default | Description |
+|---|---|---|
+| Default ON transition | 1s | Fade time when HA sends ON with no transition specified |
+| Default OFF transition | 1s | Fade time when HA sends OFF with no transition specified |
 
-Set to `0` to make all un-timed commands instant.
+Set to `0` for instant snap on/off.
 
 ---
 
 ## Context store — finding your files
 
-This is one of the most common questions with Node-RED on Home Assistant. The context store files are **not** where you expect them.
+The NR add-on runs in its own Docker container. Context store files are **not** accessible via Samba.
 
-### Where are the files?
-
-The NR add-on runs in its own Docker container with an isolated config directory. This is **separate** from the main HA config you see via Samba.
-
-| What you see | Actual path on host |
+| Location | Path |
 |---|---|
-| Samba `\\{haip}\config\` | HA config — flows, automations etc. |
 | NR add-on config | `/addon_configs/a0d7b954_nodered/` |
 | Context store files | `/addon_configs/a0d7b954_nodered/nodeRED/context_stores/context/` |
 
-The NR add-on config directory is **not accessible via Samba** — this trips everyone up.
-
-### How to find your context files
-
-Use the **Studio Code Server** add-on (VS Code in HA):
-
-1. Install Studio Code Server from the add-on store if not already installed
-2. Open it: Settings → Add-ons → Studio Code Server → Open Web UI
-3. Open a terminal: Terminal → New Terminal
-4. Run:
-
-```bash
-find / -name "*.json" -path "*context*" 2>/dev/null | grep -v proc
-```
-
-You should see something like:
-```
-/addon_configs/a0d7b954_nodered/nodeRED/context_stores/context/7e2467f26a0693a0/dd6582b967f0314a.json
-/addon_configs/a0d7b954_nodered/nodeRED/context_stores/context/7e2467f26a0693a0/75b10249fcbfd224.json
-...
-```
-
-One `.json` file per node, named by node ID.
-
-### Reading a context file
-
-```bash
-cat "/addon_configs/a0d7b954_nodered/nodeRED/context_stores/context/{flowId}/{nodeId}.json"
-```
-
-A healthy file looks like:
-```json
-{
-    "state": "ON",
-    "brightness": 255,
-    "red": 255,
-    "green": 255,
-    "blue": 255,
-    "white": 255,
-    "warmWhite": 0
-}
-```
-
-### Important: NR adds a `/context/` subfolder
-
-When you set `dir` in your context store config, NR automatically appends `/context/` to it. So:
-
-```javascript
-// You set:
-config: { dir: '/config/nodeRED/context_stores' }
-
-// NR actually writes to:
-// /config/nodeRED/context_stores/context/
-```
+Use **Studio Code Server** add-on to access these files. One `.json` file per node, named by node ID.
 
 ### Recommended config.js settings
 
 ```javascript
 contextStorage: {
     memory:      { module: 'memory' },
-    disk_values: { 
-        module: 'localfilesystem', 
-        config: { 
-            dir: '/config/nodeRED/context_stores',
-            flushInterval: 5   // Write to disk every 5 seconds (default is 30)
-        } 
-    },
-    disk_meta:   { 
-        module: 'localfilesystem', 
-        config: { 
+    disk_values: {
+        module: 'localfilesystem',
+        config: {
             dir: '/config/nodeRED/context_stores',
             flushInterval: 5
-        } 
+        }
     },
     default:     { module: 'memory' },
 },
 ```
 
-**Important:** Use an **absolute path** starting with `/config/`. A relative path will silently resolve to the wrong location and nothing will be saved.
-
-`flushInterval: 5` means NR writes to disk every 5 seconds instead of the default 30. This reduces the window of data loss on unexpected shutdown — after turning a light on, wait 5 seconds before restarting.
+Use an **absolute path** starting with `/config/`. A relative path will silently write to the wrong location.
 
-### Verifying context store is working
-
-After saving a state and waiting 5+ seconds, check your files appeared:
-
-```bash
-ls "/addon_configs/a0d7b954_nodered/nodeRED/context_stores/context/"
-```
-
-If the directory is empty or doesn't exist — check your `config.js` path is absolute and restart NR.
-
-### NR startup log confirmation
-
-On every startup NR logs which context stores loaded:
-
-```
-Context store  : 'memory'      [module=memory]
-Context store  : 'disk_values' [module=localfilesystem]
-Context store  : 'disk_meta'   [module=localfilesystem]
-Context store  : 'default'     [module=memory]
-```
-
-If `disk_values` shows `[module=memory]` — your config.js change didn't take effect.
+`flushInterval: 5` writes to disk every 5 seconds instead of the default 30 — reduces the window of data loss on unexpected shutdown.
 
 ---
 
@@ -617,44 +446,35 @@ If `disk_values` shows `[module=memory]` — your config.js change didn't take e
 
 **PIR stuck offline** — Warm-up timer running. Wait for configured warm-up period.
 
+**Group member not found (yellow warning)** — Fixture ID not in registry. Check the fixture node is deployed and registered. Command still fires to all other members.
+
+**Group command blocked (orange warning)** — Duplicate member in the list. Open the group node editor and remove the duplicate.
+
 ---
 
 ## Version history
 
 | Version | Changes |
 |---|---|
-| 0.4.4 | Recovery status shows actual state on canvas instead of "ready — awaiting HA" |
-| 0.4.3 | device:remove no longer clears disk state — state survives remove/add cycles |
-| 0.4.2 | Group node pubState includes color — fixes color wheel jitter in HA |
+| 0.6.31 | Group Node v2 — member list (local + remote), internal routing via RED.nodes.getNode(), duplicate detection, loop protection cross-instance. Registry stores nodeId + nodeType. |
+| 0.6.30 | Debug timer leak fixed — S._debugTimer saved and cleared on node close (all 5 nodes) |
+| 0.6.29 | Node label updated to match HA device format including subLocation |
+| 0.6.28 | Per-node DMX floor override field — blank inherits config default |
+| 0.6.27 | DMX floor enforced at sendDmxChannels level — absolute gate, covers all code paths |
+| 0.6.26 | pubState recovery + restoreAfterEffect floor fix (reverted — wrong approach) |
+| 0.6.25 | pubState handleON floor fix (reverted — wrong approach) |
+| 0.6.24 | User published manually |
+| 0.6.23 | colorValue>=3 bleed guard, ON/OFF transition UI fields (0-60s), brightness=0 hard zero restored |
+| 0.6.22 | Transition floor in runTransition, default OFF transition config field |
+| 0.6.21 | Reverted bad rgbw_color parsing block |
+| 0.6.20 | colorValue>=3 guard added, ON transition UI field |
+| 0.6.19 | unregisterFixtureId() on close (all 5 nodes), setMaxListeners(0), brightness=0 hard zero |
+| 0.6.17 | Group node separated from DMX type, README updated |
+| 0.4.4 | Recovery status shows actual state on canvas |
+| 0.4.3 | device:remove no longer clears disk state |
+| 0.4.2 | Group node pubState includes color |
 | 0.4.1 | Group node status reflects ON/OFF correctly |
-| 0.4.0 | Group recovery no longer forwards state to children — each node recovers independently |
-| 0.3.9 | Four fixes: group device:add forward removed, cooldown warn suppressed, group status permanent, disk flush on close |
-| 0.3.8 | Restored missing variable declarations wiped by debug block corruption |
-| 0.3.7 | Fix _debugId computed from S (not fixtureId) to avoid ReferenceError on startup |
-| 0.3.6 | DMX channel conflict detection, jitter timer tracked and cancellable |
-| 0.3.5 | Fix debug mode block initialisation order (S before debug) |
-| 0.3.4 | Debug hint text updated — notes 12hr auto-disable |
-| 0.3.3 | Debug mode canvas warning + 12hr auto-disable safety net |
-| 0.3.2 | Debug output to NR debug tab via node.warn with [DEBUG] prefix |
-| 0.3.1 | Double-fire fix — 5s cooldown + _discovered resets on broker close |
-| 0.3.0 | Debug mode toggle in Advanced section on all nodes |
-| 0.2.9 | _lastSent cache — skip redundant MQTT publishes (unchanged values) |
-| 0.2.8 | Transition jitter, micro-transition threshold, unconfigured ch skip |
-| 0.2.7 | transitionRateLimit + transitionHaUiTime wired from config node |
-| 0.2.6 | Zone optional — omitted from topic when blank |
-| 0.2.5 | buildLocation helper — strips parens, skips duplicates, uses " - " separator |
-| 0.2.4 | sw_version reads from package.json, unique_id = fixtureId only, MW3D removed |
-| 0.2.3 | Canvas label format: L-991-E · Downlight in Bedroom 1 |
-| 0.2.2 | Group Node status updates, broker feedback, version in editor panel |
-| 0.2.1 | Hidden mode — entity not auto-placed in dashboard |
-| 0.2.0 | Canvas button toggles remove/add, auto-discovery on deploy |
-| 0.1.9 | Correct disk store name, auto-discovery fallback, node ordering |
-| 0.1.8 | Section reordering all nodes, Config picker position |
-| 0.1.7 | Discovery Mode, broker already-connected fix |
-| 0.1.6 | Canvas button fix |
-| 0.1.5 | Context store error suppressed |
-| 0.1.2 | Original subflow colours restored |
-| 0.1.1 | UI fixes, postfix alphabet, Config Label, Discovery Mode |
+| 0.4.0 | Group recovery no longer forwards state to children |
 | 0.1.0 | Initial release |
 
 ---
@@ -663,6 +483,14 @@ If `disk_values` shows `[module=memory]` — your config.js change didn't take e
 
 DeSwaggy — Discord: @deswaggy
 
-## License
+## Licence
+
+This package is licensed under **[GPL v3](https://www.gnu.org/licenses/gpl-3.0.txt)**.
+
+You are free to use, modify, and distribute this package. Any derivative works must be distributed under the same GPL v3 licence. This package may not be taken proprietary, rebranded as closed source, or distributed without crediting the original author.
 
-Apache-2.0
+This package was built from 6+ years of real-world professional installation experience. If you use it, improve it, or build on it — please contribute your changes back to the community.
+
+---
+
+> **Note:** This is building automation DMX — fixtures, decoders, dimmers, relay switching. Not entertainment industry DMX (no movers, gobos, or fixture profiles). DMX is an open standard and this package works with any DMX controller that accepts MQTT payloads.

package/nodes/ha-mqtt-button.html

@@ -313,7 +313,7 @@
     </div>
 
     <div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
-        node-red-contrib-dmx-for-ha &nbsp;v0.6.28
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.33
     </div>
 
 </script>

package/nodes/ha-mqtt-button.js

@@ -137,7 +137,7 @@ module.exports = function (RED) {
         if (S.debugMode) {
             setStatus('red', 'dot', `ha-mqtt-button "${_debugId}" ⚠ DEBUG MODE ON`);
             node.warn(`[DEBUG] ha-mqtt-button "${_debugId}" — debug mode is enabled. Disable in production.`);
-            setTimeout(function () {
+            S._debugTimer = setTimeout(function () {
                 if (S.debugMode) {
                     S.debugMode = false;
                     node.warn(`[DEBUG] ha-mqtt-button "${_debugId}" — debug mode auto-disabled after 12 hours`);
@@ -171,11 +171,14 @@ module.exports = function (RED) {
             const regKey = `dmx_fixture_ids_${cfg.siteId}`;
             let reg = {};
             try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
-            if (reg[fixtureId] && reg[fixtureId] !== node.id) {
-                node.warn(`${fixtureId} ⚠ DUPLICATE FIXTURE ID — already registered by node ${reg[fixtureId]}`);
+            // Migration: handle old string format and new object format
+            const _existing = reg[fixtureId];
+            const _existingNodeId = _existing && typeof _existing === 'object' ? _existing.nodeId : _existing;
+            if (_existingNodeId && _existingNodeId !== node.id) {
+                node.warn(`${fixtureId} ⚠ DUPLICATE FIXTURE ID — already registered by node $_{_existingNodeId}`);
                 setStatus('red', 'dot', `DUPLICATE ID: ${fixtureId}`);
             } else {
-                reg[fixtureId] = node.id;
+                reg[fixtureId] = { nodeId: node.id, nodeType: 'ha-mqtt-button' };
                 try { globalCtx.set(regKey, reg); } catch(e) {}
             }
         }
@@ -184,7 +187,9 @@ module.exports = function (RED) {
             const regKey = `dmx_fixture_ids_${cfg.siteId}`;
             let reg = {};
             try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
-            if (reg[fixtureId] === node.id) {
+            const _unreg = reg[fixtureId];
+            const _unregNodeId = _unreg && typeof _unreg === 'object' ? _unreg.nodeId : _unreg;
+            if (_unregNodeId === node.id) {
                 delete reg[fixtureId];
                 try { globalCtx.set(regKey, reg); } catch(e) {}
             }
@@ -315,6 +320,7 @@ module.exports = function (RED) {
 
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
+            if (S._debugTimer) clearTimeout(S._debugTimer);
             broker.unsubscribe(S._activeBtnTopic || S.subscribeTopic, node.id);
             broker.unsubscribe(uiBtnCmdTopic,    node.id);
             broker.deregister(node, done);

package/nodes/ha-mqtt-config.html

@@ -22,7 +22,7 @@
             availTopic:      { value: 'avty' },
             enabledDefault:  { value: 'true' },
             diskDelay:            { value: '10' },
-            transitionRateLimit:  { value: '1' },
+            transitionRateLimit:  { value: 1, validate: RED.validators.number() },
             transitionHaUiTime:   { value: 1, validate: RED.validators.number() },
             offTransition:        { value: 1, validate: RED.validators.number() },
             flashShort:      { value: '1' },
@@ -228,6 +228,17 @@
         </span>
     </div>
 
+    <div class="form-row">
+        <label for="node-config-input-transitionRateLimit">
+            <i class="fa fa-tachometer"></i> Transition rate limit
+        </label>
+        <input type="number" id="node-config-input-transitionRateLimit"
+               min="0.1" max="1" step="0.05" style="width:70px" />
+        <span style="margin-left:8px; color:#999; font-size:0.85em;">
+            Multiplier for transition tick rate (0.1–1.0). Lower = fewer MQTT messages. Default: 1
+        </span>
+    </div>
+
     <div class="form-row">
         <label style="width:100%; font-weight:bold; color:#999; font-size:0.85em; text-transform:uppercase; letter-spacing:0.05em;">
             <i class="fa fa-sliders"></i> DMX Channel Limits

package/nodes/ha-mqtt-dmx-group.html

@@ -47,6 +47,8 @@
             showEffects:  { value: true },
             transitions:  { value: true },
             defaultState: { value: 'OFF' },
+            // Members
+            members:      { value: [] },
             // Advanced
             maxDepth:     { value: '10' },
             debugMode:      { value: false },
@@ -55,17 +57,77 @@
         label: function () {
             if (this.name) return this.name;
             const id   = `LG-${this.uid || '?'}${this.uidPostfix || ''}`;
-            const type = this.deviceType || '';
-            const sit  = this.situation  || 'in';
-            const area = this.area       || '';
-            return `${id} · ${type} Group ${sit} ${area}`.trim();
+            const type = this.deviceType  || '';
+            const sit  = this.situation   || 'in';
+            const area = this.area        || '';
+            const sub  = this.subLocation || '';
+            const loc  = sub ? `${area} - ${sub}` : area;
+            return `(${id}) - ${type} Group ${sit} the ${loc}`.trim();
         },
 
         labelStyle: function () {
             return this.name ? 'node_label_italic' : '';
         },
 
+        oneditsave: function () {
+            const members = [];
+            const seen = {};
+            let hasDuplicate = false;
+            let duplicateVal = '';
+
+            $('#node-input-members-list').editableList('items').each(function () {
+                const type  = $(this).find('select').val();
+                const value = $(this).find('input').val().trim();
+                if (!value) return;
+                const key = type + ':' + value;
+                if (seen[key]) { hasDuplicate = true; duplicateVal = value; }
+                seen[key] = true;
+                members.push({ type, value });
+            });
+
+            if (hasDuplicate) {
+                RED.notify(`Duplicate member "${duplicateVal}" — please remove the duplicate before saving.`, 'error');
+                return false;
+            }
+            this.members = members;
+        },
+
         oneditprepare: function () {
+            const node = this;
+
+            // ── Member list (editableList) ────────────────────────
+            $('#node-input-members-list').editableList({
+                addItem: function (container, i, data) {
+                    data = data || { type: 'local', value: '' };
+                    container.css({ display: 'flex', gap: '8px', alignItems: 'center', width: '100%' });
+
+                    const typeSelect = $('<select style="width:90px; flex-shrink:0;">')
+                        .append($('<option value="local">local</option>'))
+                        .append($('<option value="remote">remote</option>'))
+                        .val(data.type || 'local');
+
+                    const valueInput = $('<input type="text" style="flex:1; min-width:0;">')
+                        .attr('placeholder', data.type === 'remote' ? 'e.g. MW3D/BnB/group/cmd' : 'e.g. L-177-A')
+                        .val(data.value || '');
+
+                    typeSelect.on('change', function () {
+                        const t = $(this).val();
+                        valueInput.attr('placeholder', t === 'remote' ? 'e.g. MW3D/BnB/group/cmd' : 'e.g. L-177-A');
+                    });
+
+                    container.append(typeSelect).append(valueInput);
+                },
+                removable: true,
+                sortable: true,
+            });
+
+            // Populate existing members
+            const members = node.members || [];
+            members.forEach(function (m) {
+                $('#node-input-members-list').editableList('addItem', m);
+            });
+
+            // ── Area/sub-area lists ───────────────────────────────
             // Reuse area/sub-area lists from ha-mqtt-dmx if loaded,
             // otherwise define inline
             const areas = typeof HA_DMX_AREAS !== 'undefined' ? HA_DMX_AREAS : [
@@ -260,6 +322,22 @@
 
     <hr/>
 
+    <div class="form-row">
+        <label style="width:100%; font-weight:bold; color:#999; font-size:0.85em; text-transform:uppercase; letter-spacing:0.05em;">
+            <i class="fa fa-list"></i> Members
+        </label>
+    </div>
+
+    <div class="form-row">
+        <div style="margin-left:0; color:#999; font-size:0.85em; margin-bottom:8px;">
+            Add fixtures by ID (local) or MQTT topic (remote). Wires still work alongside this list.
+            Duplicate members will block the entire group command.
+        </div>
+        <ol id="node-input-members-list" style="width:100%;"></ol>
+    </div>
+
+    <hr/>
+
     <div class="form-row">
         <label style="width:100%; font-weight:bold; color:#999; font-size:0.85em; text-transform:uppercase; letter-spacing:0.05em;">
             <i class="fa fa-sliders"></i> Options
@@ -317,7 +395,7 @@
     </div>
 
     <div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
-        node-red-contrib-dmx-for-ha &nbsp;v0.6.28
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.33
     </div>
 
 </script>
@@ -328,9 +406,9 @@
      ============================================================ -->
 <script type="text/html" data-help-name="ha-mqtt-dmx-group">
     <p>
-        Virtual DMX group. Appears as a single light entity in Home Assistant.
-        Commands received from HA are forwarded via the <strong>Link</strong>
-        output to all downstream DMX and Relay nodes.
+        Virtual DMX group node (v2). Appears as a single light entity in Home Assistant.
+        Commands are forwarded to member fixtures via the internal NR message bus (no extra MQTT traffic).
+        Wires and member list can be used together or independently.
     </p>
 
     <h3>Setup</h3>
@@ -338,10 +416,26 @@
         <li>Select your <strong>Config</strong> node</li>
         <li>Set a <strong>Group Name</strong> — shown as the HA entity friendly name</li>
         <li>Set <strong>Group ID</strong> — matches the plan ID (prefix LG is fixed)</li>
-        <li>Wire the <strong>Link</strong> output to the input of each DMX or Relay node in the group</li>
+        <li>Add members to the <strong>Members</strong> list by fixture ID (local) or MQTT topic (remote)</li>
+        <li>Optionally wire the <strong>Link</strong> output to additional nodes</li>
         <li>Deploy — the group entity appears in HA</li>
     </ol>
 
+    <h3>Members list</h3>
+    <p>
+        <strong>Local</strong> members are resolved via the fixture ID registry (e.g. <code>L-177-A</code>, <code>P-149</code>).
+        Commands are forwarded internally via <code>RED.nodes.getNode()</code> — no MQTT round trip.
+        <strong>Remote</strong> members are MQTT topics for cross-instance groups (e.g. <code>MW3D/BnB/group/cmd</code>).
+        Remote commands include a <code>_dmxTrace</code> envelope for cross-instance loop detection.
+    </p>
+
+    <h3>Duplicate members</h3>
+    <p>
+        Duplicate entries in the member list will block the entire group command and show an orange warning.
+        The UI also prevents saving with duplicates. If a fixture ID is in both the member list and wired,
+        it will receive the command twice — avoid this by using one method only per fixture.
+    </p>
+
     <h3>Group ID</h3>
     <p>
         The <code>LG</code> prefix is fixed for all group nodes — it matches the
@@ -349,18 +443,12 @@
         and <code>L-992-C</code> form group <code>LG-992</code>.
     </p>
 
-    <h3>Link output</h3>
-    <p>
-        Wire the Link output to one or more DMX or Relay node inputs.
-        You can also wire it to another DMX Group Node input to create
-        a nested group hierarchy.
-    </p>
-
     <h3>Loop detection</h3>
     <p>
-        The node tracks the cascade path in <code>msg.dmx_trace</code> and
-        fires a warning if a loop is detected. Max group depth sets the
-        maximum number of hops before a loop is assumed. Set to 0 to disable.
+        The node tracks the cascade path in <code>msg.dmx_trace</code> and <code>_dmxTrace</code>
+        and fires a warning if a loop is detected. Works across both wired and member list paths,
+        and across instances via the remote MQTT envelope. Max depth sets the maximum hops before
+        a loop is assumed. Set to 0 to disable.
     </p>
 
     <h3>Inputs</h3>

package/nodes/ha-mqtt-dmx-group.js

@@ -131,6 +131,7 @@ module.exports = function (RED) {
             transitions:  config.transitions    !== false,
             defaultState: config.defaultState   || 'OFF',
             maxDepth:     parseInt(config.maxDepth) || 10,
+            members:      Array.isArray(config.members) ? config.members : [],
             flashShort:   cfg.flashShort,
             flashLong:    cfg.flashLong,
             diskDelay:    cfg.diskDelay,
@@ -142,7 +143,7 @@ module.exports = function (RED) {
         if (S.debugMode) {
             setStatus('red', 'dot', `ha-mqtt-dmx-group "${_debugId}" ⚠ DEBUG MODE ON`);
             node.warn(`[DEBUG] ha-mqtt-dmx-group "${_debugId}" — debug mode is enabled. Disable in production.`);
-            setTimeout(function () {
+            S._debugTimer = setTimeout(function () {
                 if (S.debugMode) {
                     S.debugMode = false;
                     node.warn(`[DEBUG] ha-mqtt-dmx-group "${_debugId}" — debug mode auto-disabled after 12 hours`);
@@ -160,11 +161,14 @@ module.exports = function (RED) {
             const regKey = `dmx_fixture_ids_${cfg.siteId}`;
             let reg = {};
             try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
-            if (reg[groupId] && reg[groupId] !== node.id) {
-                node.warn(`${groupId} ⚠ DUPLICATE FIXTURE ID — already registered by node ${reg[groupId]}`);
+            // Migration: handle old string format and new object format
+            const _existing = reg[groupId];
+            const _existingNodeId = _existing && typeof _existing === 'object' ? _existing.nodeId : _existing;
+            if (_existingNodeId && _existingNodeId !== node.id) {
+                node.warn(`${groupId} ⚠ DUPLICATE FIXTURE ID — already registered by node ${_existingNodeId}`);
                 setStatus('red', 'dot', `DUPLICATE ID: ${groupId}`);
             } else {
-                reg[groupId] = node.id;
+                reg[groupId] = { nodeId: node.id, nodeType: 'ha-mqtt-dmx-group' };
                 try { globalCtx.set(regKey, reg); } catch(e) {}
             }
         }
@@ -173,7 +177,9 @@ module.exports = function (RED) {
             const regKey = `dmx_fixture_ids_${cfg.siteId}`;
             let reg = {};
             try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
-            if (reg[groupId] === node.id) {
+            const _unreg = reg[groupId];
+            const _unregNodeId = _unreg && typeof _unreg === 'object' ? _unreg.nodeId : _unreg;
+            if (_unregNodeId === node.id) {
                 delete reg[groupId];
                 try { globalCtx.set(regKey, reg); } catch(e) {}
             }
@@ -250,7 +256,104 @@ module.exports = function (RED) {
             return { source: groupId, path: [groupId], depth: 1 };
         }
 
-        // ── Forward to children via Link output ───────────────────
+        // ── Member list — cache & resolution ─────────────────────
+        const _memberCache = {}; // fixtureId → { nodeId, nodeType }
+
+        function resolveMember(fixtureId) {
+            if (_memberCache[fixtureId]) return _memberCache[fixtureId];
+            const globalCtx = node.context().global;
+            const regKey = `dmx_fixture_ids_${cfg.siteId}`;
+            let reg = {};
+            try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
+            const entry = reg[fixtureId];
+            if (!entry) return null;
+            // Migration: handle old string format
+            const resolved = typeof entry === 'object'
+                ? entry
+                : { nodeId: entry, nodeType: 'unknown' };
+            _memberCache[fixtureId] = resolved;
+            return resolved;
+        }
+
+        function validateMembers() {
+            // Check for duplicate fixture IDs in member list
+            const seen = {};
+            for (const m of S.members) {
+                if (m.type !== 'local') continue;
+                if (seen[m.value]) return { ok: false, duplicate: m.value };
+                seen[m.value] = true;
+            }
+            // Check for duplicate remote topics
+            const seenTopics = {};
+            for (const m of S.members) {
+                if (m.type !== 'remote') continue;
+                if (seenTopics[m.value]) return { ok: false, duplicate: m.value };
+                seenTopics[m.value] = true;
+            }
+            return { ok: true };
+        }
+
+        function forwardToMemberList(payload, trace) {
+            if (S.members.length === 0) return;
+
+            // Validate — block entire group on duplicate
+            const validation = validateMembers();
+            if (!validation.ok) {
+                node.warn(`${groupId} — duplicate member "${validation.duplicate}" in list. Command blocked.`);
+                setStatus('orange', 'ring', `${groupId} DUPLICATE MEMBER: ${validation.duplicate}`);
+                return;
+            }
+
+            // Check for wire/list overlap
+            // We can't know wired node IDs here, but we can warn about any local member
+            // whose nodeId matches a node that received the message via wire
+            // This is handled by the DMX node itself receiving twice — we warn at group level
+            // by tracking which fixture IDs we're about to send to
+            const localIds = S.members
+                .filter(m => m.type === 'local')
+                .map(m => m.value);
+
+            let anyNotFound = false;
+
+            for (const member of S.members) {
+                if (member.type === 'local') {
+                    const resolved = resolveMember(member.value);
+                    if (!resolved) {
+                        node.warn(`${groupId} — member "${member.value}" not found in registry, skipping`);
+                        anyNotFound = true;
+                        continue;
+                    }
+                    // Skip sensor-only node types
+                    if (resolved.nodeType === 'ha-mqtt-button' || resolved.nodeType === 'ha-mqtt-pir') {
+                        if (S.debugMode) node.warn(`[DEBUG] ${groupId} — skipping ${member.value} (${resolved.nodeType} is receive-only)`);
+                        continue;
+                    }
+                    const targetNode = RED.nodes.getNode(resolved.nodeId);
+                    if (!targetNode) {
+                        node.warn(`${groupId} — member "${member.value}" node not found (${resolved.nodeId}), skipping`);
+                        anyNotFound = true;
+                        // Invalidate cache entry
+                        delete _memberCache[member.value];
+                        continue;
+                    }
+                    // Forward internally
+                    if (S.debugMode) node.warn(`[DEBUG] ${groupId} → internal → ${member.value} (${resolved.nodeType})`);
+                    targetNode.receive({ dmx_trace: trace, payload });
+
+                } else if (member.type === 'remote') {
+                    // Forward via MQTT with trace embedded
+                    const remotePayload = Object.assign({}, payload, { _dmxTrace: trace });
+                    pub(member.value, remotePayload, false);
+                    if (S.debugMode) node.warn(`[DEBUG] ${groupId} → remote → ${member.value}`);
+                }
+            }
+
+            if (anyNotFound) {
+                setStatus('yellow', 'ring', `${groupId} — some members not found`);
+            }
+        }
+
+        // ── Forward to children via Link output + member list ────
         function forwardToChildren(payload, incomingTrace) {
             if (isLoop(incomingTrace)) {
                 node.warn(`${groupId} — loop detected! path:[${incomingTrace && incomingTrace.path.join(' → ')}]`);
@@ -258,7 +361,10 @@ module.exports = function (RED) {
                 return;
             }
             const trace = buildTrace(incomingTrace);
+            // Wire output — backward compatible
             node.send([{ dmx_trace: trace, payload }]);
+            // Member list — internal + remote
+            forwardToMemberList(payload, trace);
         }
 
         // ── Effects ───────────────────────────────────────────────
@@ -417,6 +523,7 @@ module.exports = function (RED) {
 
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
+            if (S._debugTimer) clearTimeout(S._debugTimer);
             if (diskTimer) clearTimeout(diskTimer);
             broker.unsubscribe(cmdTopic, node.id);
             broker.deregister(node, done);

package/nodes/ha-mqtt-dmx.html

@@ -178,11 +178,13 @@
 
         label: function () {
             if (this.name) return this.name;
-            const id   = `${this.uidPrefix || 'L'}-${this.uid || '?'}${this.uidPostfix || ''}`;
-            const type = this.deviceType || '';
-            const sit  = this.situation  || 'in';
-            const area = this.area       || '';
-            return `${id} · ${type} ${sit} ${area}`.trim();
+            const id      = `${this.uidPrefix || 'L'}-${this.uid || '?'}${this.uidPostfix || ''}`;
+            const type    = this.deviceType  || '';
+            const sit     = this.situation   || 'in';
+            const area    = this.area        || '';
+            const sub     = this.subLocation || '';
+            const loc     = sub ? `${area} - ${sub}` : area;
+            return `(${id}) - ${type} ${sit} the ${loc}`.trim();
         },
 
         labelStyle: function () {
@@ -594,7 +596,7 @@
     </div>
 
     <div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
-        node-red-contrib-dmx-for-ha &nbsp;v0.6.28
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.33
     </div>
 
 </script>

package/nodes/ha-mqtt-dmx.js

@@ -172,7 +172,7 @@ module.exports = function (RED) {
         if (S.debugMode) {
             setStatus('red', 'dot', `ha-mqtt-dmx "${_debugId}" ⚠ DEBUG MODE ON`);
             node.warn(`[DEBUG] ha-mqtt-dmx "${_debugId}" — debug mode is enabled. Disable in production.`);
-            setTimeout(function () {
+            S._debugTimer = setTimeout(function () {
                 if (S.debugMode) {
                     S.debugMode = false;
                     node.warn(`[DEBUG] ha-mqtt-dmx "${_debugId}" — debug mode auto-disabled after 12 hours`);
@@ -653,11 +653,14 @@ module.exports = function (RED) {
             const regKey = `dmx_fixture_ids_${cfg.siteId}`;
             let reg = {};
             try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
-            if (reg[fixtureId] && reg[fixtureId] !== node.id) {
-                node.warn(`${fixtureId} ⚠ DUPLICATE FIXTURE ID — already registered by node ${reg[fixtureId]}`);
+            // Migration: handle old string format and new object format
+            const _existing = reg[fixtureId];
+            const _existingNodeId = _existing && typeof _existing === 'object' ? _existing.nodeId : _existing;
+            if (_existingNodeId && _existingNodeId !== node.id) {
+                node.warn(`${fixtureId} ⚠ DUPLICATE FIXTURE ID — already registered by node $_{_existingNodeId}`);
                 setStatus('red', 'dot', `DUPLICATE ID: ${fixtureId}`);
             } else {
-                reg[fixtureId] = node.id;
+                reg[fixtureId] = { nodeId: node.id, nodeType: 'ha-mqtt-dmx' };
                 try { globalCtx.set(regKey, reg); } catch(e) {}
             }
         }
@@ -666,7 +669,9 @@ module.exports = function (RED) {
             const regKey = `dmx_fixture_ids_${cfg.siteId}`;
             let reg = {};
             try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
-            if (reg[fixtureId] === node.id) {
+            const _unreg = reg[fixtureId];
+            const _unregNodeId = _unreg && typeof _unreg === 'object' ? _unreg.nodeId : _unreg;
+            if (_unregNodeId === node.id) {
                 delete reg[fixtureId];
                 try { globalCtx.set(regKey, reg); } catch(e) {}
             }
@@ -881,6 +886,7 @@ module.exports = function (RED) {
 
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
+            if (S._debugTimer) clearTimeout(S._debugTimer);
             clearChannelRegistry();
             stopEffect();
             if (diskTimer) clearTimeout(diskTimer);

package/nodes/ha-mqtt-pir.html

@@ -318,7 +318,7 @@
     </div>
 
     <div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
-        node-red-contrib-dmx-for-ha &nbsp;v0.6.28
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.33
     </div>
 
 </script>

package/nodes/ha-mqtt-pir.js

@@ -135,7 +135,7 @@ module.exports = function (RED) {
         if (S.debugMode) {
             setStatus('red', 'dot', `ha-mqtt-pir "${_debugId}" ⚠ DEBUG MODE ON`);
             node.warn(`[DEBUG] ha-mqtt-pir "${_debugId}" — debug mode is enabled. Disable in production.`);
-            setTimeout(function () {
+            S._debugTimer = setTimeout(function () {
                 if (S.debugMode) {
                     S.debugMode = false;
                     node.warn(`[DEBUG] ha-mqtt-pir "${_debugId}" — debug mode auto-disabled after 12 hours`);
@@ -171,11 +171,14 @@ module.exports = function (RED) {
             const regKey = `dmx_fixture_ids_${cfg.siteId}`;
             let reg = {};
             try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
-            if (reg[fixtureId] && reg[fixtureId] !== node.id) {
-                node.warn(`${fixtureId} ⚠ DUPLICATE FIXTURE ID — already registered by node ${reg[fixtureId]}`);
+            // Migration: handle old string format and new object format
+            const _existing = reg[fixtureId];
+            const _existingNodeId = _existing && typeof _existing === 'object' ? _existing.nodeId : _existing;
+            if (_existingNodeId && _existingNodeId !== node.id) {
+                node.warn(`${fixtureId} ⚠ DUPLICATE FIXTURE ID — already registered by node $_{_existingNodeId}`);
                 setStatus('red', 'dot', `DUPLICATE ID: ${fixtureId}`);
             } else {
-                reg[fixtureId] = node.id;
+                reg[fixtureId] = { nodeId: node.id, nodeType: 'ha-mqtt-pir' };
                 try { globalCtx.set(regKey, reg); } catch(e) {}
             }
         }
@@ -184,7 +187,9 @@ module.exports = function (RED) {
             const regKey = `dmx_fixture_ids_${cfg.siteId}`;
             let reg = {};
             try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
-            if (reg[fixtureId] === node.id) {
+            const _unreg = reg[fixtureId];
+            const _unregNodeId = _unreg && typeof _unreg === 'object' ? _unreg.nodeId : _unreg;
+            if (_unregNodeId === node.id) {
                 delete reg[fixtureId];
                 try { globalCtx.set(regKey, reg); } catch(e) {}
             }
@@ -349,6 +354,7 @@ module.exports = function (RED) {
 
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
+            if (S._debugTimer) clearTimeout(S._debugTimer);
             cancelWarmup();
             broker.unsubscribe(S._activePirTopic || S.subscribeTopic, node.id);
             broker.deregister(node, done);

package/nodes/ha-mqtt-relay.html

@@ -301,7 +301,7 @@
     </div>
 
     <div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
-        node-red-contrib-dmx-for-ha &nbsp;v0.6.28
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.33
     </div>
 
 </script>

package/nodes/ha-mqtt-relay.js

@@ -159,7 +159,7 @@ module.exports = function (RED) {
         if (S.debugMode) {
             setStatus('red', 'dot', `ha-mqtt-relay "${_debugId}" ⚠ DEBUG MODE ON`);
             node.warn(`[DEBUG] ha-mqtt-relay "${_debugId}" — debug mode is enabled. Disable in production.`);
-            setTimeout(function () {
+            S._debugTimer = setTimeout(function () {
                 if (S.debugMode) {
                     S.debugMode = false;
                     node.warn(`[DEBUG] ha-mqtt-relay "${_debugId}" — debug mode auto-disabled after 12 hours`);
@@ -178,11 +178,14 @@ module.exports = function (RED) {
             const regKey = `dmx_fixture_ids_${cfg.siteId}`;
             let reg = {};
             try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
-            if (reg[fixtureId] && reg[fixtureId] !== node.id) {
-                node.warn(`${fixtureId} ⚠ DUPLICATE FIXTURE ID — already registered by node ${reg[fixtureId]}`);
+            // Migration: handle old string format and new object format
+            const _existing = reg[fixtureId];
+            const _existingNodeId = _existing && typeof _existing === 'object' ? _existing.nodeId : _existing;
+            if (_existingNodeId && _existingNodeId !== node.id) {
+                node.warn(`${fixtureId} ⚠ DUPLICATE FIXTURE ID — already registered by node $_{_existingNodeId}`);
                 setStatus('red', 'dot', `DUPLICATE ID: ${fixtureId}`);
             } else {
-                reg[fixtureId] = node.id;
+                reg[fixtureId] = { nodeId: node.id, nodeType: 'ha-mqtt-relay' };
                 try { globalCtx.set(regKey, reg); } catch(e) {}
             }
         }
@@ -191,7 +194,9 @@ module.exports = function (RED) {
             const regKey = `dmx_fixture_ids_${cfg.siteId}`;
             let reg = {};
             try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
-            if (reg[fixtureId] === node.id) {
+            const _unreg = reg[fixtureId];
+            const _unregNodeId = _unreg && typeof _unreg === 'object' ? _unreg.nodeId : _unreg;
+            if (_unregNodeId === node.id) {
                 delete reg[fixtureId];
                 try { globalCtx.set(regKey, reg); } catch(e) {}
             }
@@ -453,6 +458,7 @@ module.exports = function (RED) {
 
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
+            if (S._debugTimer) clearTimeout(S._debugTimer);
             stopEffect();
             if (diskTimer) clearTimeout(diskTimer);
             broker.unsubscribe(cmdTopic, node.id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-dmx-for-ha",
-  "version": "0.6.28",
+  "version": "0.6.33",
   "description": "DMX lighting control for Home Assistant via Node-RED and MQTT. Place a node, fill in the settings, deploy. Full HA device registry integration with RGBW/RGBWW/CCT/brightness colour modes, transitions, effects, and group control.",
   "keywords": [
     "node-red",