node-red-contrib-dmx-for-ha 0.3.8 → 0.4.1

package/nodes/ha-mqtt-button.js

@@ -56,7 +56,7 @@ module.exports = function (RED) {
             // but still respect cooldown to prevent accidental rapid-fire
             const now = Date.now();
             if (now - _lastDiscoveryTime < _DISCOVERY_COOLDOWN_MS) {
-                node.warn('Discovery cooldown active — please wait 5 seconds between manual triggers');
+                if (S.debugMode) node.debug('Discovery cooldown active — skipping duplicate auto-discover');
                 return;
             }
             _lastDiscoveryTime = now;

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

@@ -59,7 +59,7 @@ module.exports = function (RED) {
             // but still respect cooldown to prevent accidental rapid-fire
             const now = Date.now();
             if (now - _lastDiscoveryTime < _DISCOVERY_COOLDOWN_MS) {
-                node.warn('Discovery cooldown active — please wait 5 seconds between manual triggers');
+                if (S.debugMode) node.debug('Discovery cooldown active — skipping duplicate auto-discover');
                 return;
             }
             _lastDiscoveryTime = now;
@@ -236,6 +236,15 @@ module.exports = function (RED) {
             });
         }
 
+
+        function groupStatus(state, label) {
+            if (state === 'ON') {
+                setStatus('green', 'dot', label || `${groupId} ON`);
+            } else {
+                setStatus('grey', 'ring', label || `${groupId} OFF`);
+            }
+        }
+
         // ── Device add ────────────────────────────────────────────
         function handleDeviceAdd(incomingTrace) {
             if (!ctxGet('state') && !ctxGet('state', 'disk_values')) {
@@ -284,15 +293,12 @@ module.exports = function (RED) {
                 pubState({ state: payload.state, color_mode: S.colorMode, brightness: payload.brightness });
                 forwardToChildren(payload, null);
                 const _lbl = payload.effect ? `effect:${payload.effect}` : `${payload.state}`;
-                setStatus('green', 'dot', `${groupId} → ${_lbl}`);
-                setTimeout(() => setStatus('yellow', 'ring', `${groupId} ready`), 3000);
+                groupStatus(payload.state, `${groupId} → ${_lbl}`);
             }, node.id);
 
             setStatus('green', 'ring', `${groupId} discovery sent`);
             node.log(`Group device added: "${S.groupName || groupId}"`);
 
-            // Forward device:add to children via Link so they self-discover
-            node.send([{ device: 'add' }]);
 
             // Recovery
             setTimeout(() => {
@@ -300,8 +306,10 @@ module.exports = function (RED) {
                 const brightness = recall('brightness', 'brightness_disk', 255);
                 const color      = recall('color',      'color_disk',      null);
                 pubState({ state, color_mode: S.colorMode, brightness, color });
-                forwardToChildren({ state, brightness, color }, null);
-                setStatus('yellow', 'ring', `${groupId} ready`);
+                // NOTE: do NOT forward to children on recovery — each child node
+                // recovers its own state independently from its own disk store.
+                // Forwarding here would overwrite children with the group's state.
+                groupStatus(state, `${groupId} → ${state}`);
                 node.log(`${groupId} recovery — state:${state}`);
             }, 2000);
         }
@@ -309,6 +317,7 @@ module.exports = function (RED) {
         // ── Device remove ─────────────────────────────────────────
         function handleDeviceRemove(incomingTrace) {
             if (diskTimer) { clearTimeout(diskTimer); diskTimer = null; }
+            // No flush needed on remove — state is cleared below
             ctxSet('state', null); ctxSet('state', null, 'disk_values');
             pub(cfgTopic, '', true);
             broker.unsubscribe(cmdTopic, node.id);
@@ -330,8 +339,7 @@ module.exports = function (RED) {
                     saveGroupState(msg.payload);
                     pubState({ state: msg.payload.state, color_mode: S.colorMode, brightness: msg.payload.brightness });
                     forwardToChildren(msg.payload, msg.dmx_trace);
-                    setStatus('green', 'dot', `${groupId} → cascade:${msg.payload.state}`);
-                    setTimeout(() => setStatus('yellow', 'ring', `${groupId} ready`), 3000);
+                    groupStatus(msg.payload.state, `${groupId} → cascade:${msg.payload.state}`);
                 }
             } else {
                 const devReq = typeof msg.device === 'string'
@@ -348,8 +356,7 @@ module.exports = function (RED) {
                     saveGroupState(msg.payload);
                     pubState({ state: msg.payload.state, color_mode: S.colorMode, brightness: msg.payload.brightness });
                     forwardToChildren(msg.payload, null);
-                    setStatus('green', 'dot', `${groupId} → ${msg.payload.state}`);
-                    setTimeout(() => setStatus('yellow', 'ring', `${groupId} ready`), 3000);
+                    groupStatus(msg.payload.state, `${groupId} → ${msg.payload.state}`);
                 } else {
                     node.warn(`${groupId} — unrecognised message received and dropped. See node documentation.`);
                 }

package/nodes/ha-mqtt-dmx.js

@@ -66,7 +66,7 @@ module.exports = function (RED) {
             // but still respect cooldown to prevent accidental rapid-fire
             const now = Date.now();
             if (now - _lastDiscoveryTime < _DISCOVERY_COOLDOWN_MS) {
-                node.warn('Discovery cooldown active — please wait 5 seconds between manual triggers');
+                if (S.debugMode) node.debug('Discovery cooldown active — skipping duplicate auto-discover');
                 return;
             }
             _lastDiscoveryTime = now;
@@ -176,7 +176,20 @@ module.exports = function (RED) {
         // ── Disk save timer ───────────────────────────────────────
         let diskTimer = null;
         function startDiskSave(onComplete) {
-            if (diskTimer) { clearTimeout(diskTimer); diskTimer = null; }
+            if (diskTimer) {
+                clearTimeout(diskTimer);
+                diskTimer = null;
+                // Flush pending disk save immediately on close
+                const s=ctxGet('state'); const br=ctxGet('brightness');
+                const r=ctxGet('red'); const g=ctxGet('green'); const b=ctxGet('blue');
+                const w=ctxGet('white'); const ww=ctxGet('warmWhite');
+                if (s !== undefined) {
+                    ctxSet('state',s,'disk_values'); ctxSet('brightness',br,'disk_values');
+                    ctxSet('red',r,'disk_values'); ctxSet('green',g,'disk_values');
+                    ctxSet('blue',b,'disk_values'); ctxSet('white',w,'disk_values');
+                    ctxSet('warmWhite',ww,'disk_values');
+                }
+            }
             diskTimer = setTimeout(() => { diskTimer = null; onComplete(); }, S.diskDelay * 1000);
         }
 
@@ -666,7 +679,20 @@ module.exports = function (RED) {
         function handleDeviceRemove() {
             clearChannelRegistry();
             stopEffect();
-            if (diskTimer) { clearTimeout(diskTimer); diskTimer = null; }
+            if (diskTimer) {
+                clearTimeout(diskTimer);
+                diskTimer = null;
+                // Flush pending disk save immediately on close
+                const s=ctxGet('state'); const br=ctxGet('brightness');
+                const r=ctxGet('red'); const g=ctxGet('green'); const b=ctxGet('blue');
+                const w=ctxGet('white'); const ww=ctxGet('warmWhite');
+                if (s !== undefined) {
+                    ctxSet('state',s,'disk_values'); ctxSet('brightness',br,'disk_values');
+                    ctxSet('red',r,'disk_values'); ctxSet('green',g,'disk_values');
+                    ctxSet('blue',b,'disk_values'); ctxSet('white',w,'disk_values');
+                    ctxSet('warmWhite',ww,'disk_values');
+                }
+            }
             ['state','brightness','red','green','blue','white','warmWhite'].forEach(function (k) {
                 ctxSet(k, null); ctxSet(k, null, 'disk_values');
             });

package/nodes/ha-mqtt-pir.js

@@ -56,7 +56,7 @@ module.exports = function (RED) {
             // but still respect cooldown to prevent accidental rapid-fire
             const now = Date.now();
             if (now - _lastDiscoveryTime < _DISCOVERY_COOLDOWN_MS) {
-                node.warn('Discovery cooldown active — please wait 5 seconds between manual triggers');
+                if (S.debugMode) node.debug('Discovery cooldown active — skipping duplicate auto-discover');
                 return;
             }
             _lastDiscoveryTime = now;

package/nodes/ha-mqtt-relay.js

@@ -59,7 +59,7 @@ module.exports = function (RED) {
             // but still respect cooldown to prevent accidental rapid-fire
             const now = Date.now();
             if (now - _lastDiscoveryTime < _DISCOVERY_COOLDOWN_MS) {
-                node.warn('Discovery cooldown active — please wait 5 seconds between manual triggers');
+                if (S.debugMode) node.debug('Discovery cooldown active — skipping duplicate auto-discover');
                 return;
             }
             _lastDiscoveryTime = now;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-dmx-for-ha",
-  "version": "0.3.8",
+  "version": "0.4.1",
   "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",