node-red-contrib-dmx-for-ha 0.3.5 → 0.3.6

package/README.md

@@ -290,6 +290,20 @@ Set to `0` to make all un-timed commands instant.
 
 | Version | Changes |
 |---|---|
+| 0.3.6 | DMX channel conflict detection, jitter timer cancellable on teardown |
+| 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 |

package/nodes/ha-mqtt-dmx.js

@@ -243,9 +243,11 @@ module.exports = function (RED) {
 
         // ── Effects ───────────────────────────────────────────────
         let effectTimer   = null;
+        let jitterTimer  = null;
         let preEffectState = null;
 
         function stopEffect() {
+            if (jitterTimer) { clearTimeout(jitterTimer); jitterTimer = null; }
             if (effectTimer) {
                 clearInterval(effectTimer); clearTimeout(effectTimer);
                 effectTimer = null;
@@ -329,7 +331,7 @@ module.exports = function (RED) {
             // Prevents thundering herd when many nodes start transitions simultaneously
             const jitter = Math.random() * intervalMs;
             // Fix 3: Jitter delay spreads load across event loop
-            setTimeout(function () {
+            jitterTimer = setTimeout(function () {
                 effectTimer = setInterval(function () {
                     tick++;
                     const progress = Math.min(1, tick / totalTicks);
@@ -521,6 +523,48 @@ module.exports = function (RED) {
             return [[vv,t,p],[q,vv,p],[p,vv,t],[p,q,vv],[t,p,vv],[vv,p,q]][i];
         }
 
+
+        // ── DMX channel conflict detection ───────────────────────────────────
+        function checkChannelConflicts() {
+            const globalCtx = node.context().global;
+            const registryKey = `dmx_channels_${cfg.siteId}_${cfg.zone}_${S.universe}`;
+            let registry = {};
+            try { registry = globalCtx.get(registryKey) || {}; } catch(e) {}
+
+            const myChannels = [S.ch.red, S.ch.green, S.ch.blue, S.ch.white, S.ch.warmWhite]
+                .filter(ch => ch && ch > 0);
+
+            let conflicts = [];
+            myChannels.forEach(function(ch) {
+                if (registry[ch] && registry[ch] !== fixtureId) {
+                    conflicts.push(`ch${ch} already used by ${registry[ch]}`);
+                }
+                registry[ch] = fixtureId;
+            });
+
+            try { globalCtx.set(registryKey, registry); } catch(e) {}
+
+            if (conflicts.length > 0) {
+                const msg = `${fixtureId} — DMX CHANNEL CONFLICT: ${conflicts.join(', ')}`;
+                node.warn(msg);
+                setStatus('red', 'dot', `${fixtureId} ⚠ CHANNEL CONFLICT`);
+                return false;
+            }
+            return true;
+        }
+
+        function clearChannelRegistry() {
+            try {
+                const globalCtx = node.context().global;
+                const registryKey = `dmx_channels_${cfg.siteId}_${cfg.zone}_${S.universe}`;
+                const registry = globalCtx.get(registryKey) || {};
+                [S.ch.red, S.ch.green, S.ch.blue, S.ch.white, S.ch.warmWhite]
+                    .filter(ch => ch && ch > 0)
+                    .forEach(ch => { if (registry[ch] === fixtureId) delete registry[ch]; });
+                globalCtx.set(registryKey, registry);
+            } catch(e) {}
+        }
+
         // ── Device add ────────────────────────────────────────────
         function handleDeviceAdd() {
             if (ctxGet('state') === undefined && ctxGet('state', 'disk_values') === undefined) {
@@ -565,6 +609,8 @@ module.exports = function (RED) {
             };
 
             pub(cfgTopic, discovery, true);
+            // Check for DMX channel conflicts before discovery
+            if (!checkChannelConflicts()) return;
             resetLastSent(); // Force full state re-publish after discovery
 
             broker.subscribe(cmdTopic, cfg.qos, function (topic, rawPayload) {
@@ -607,6 +653,7 @@ module.exports = function (RED) {
 
         // ── Device remove ─────────────────────────────────────────
         function handleDeviceRemove() {
+            clearChannelRegistry();
             stopEffect();
             if (diskTimer) { clearTimeout(diskTimer); diskTimer = null; }
             ['state','brightness','red','green','blue','white','warmWhite'].forEach(function (k) {
@@ -656,6 +703,7 @@ module.exports = function (RED) {
 
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
+            clearChannelRegistry();
             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.3.5",
+  "version": "0.3.6",
   "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",