node-red-contrib-dmx-for-ha 0.3.9 → 0.4.3

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

@@ -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')) {
@@ -281,10 +290,10 @@ module.exports = function (RED) {
                 catch(e) { node.warn(`${groupId} — failed to parse HA command`); return; }
 
                 saveGroupState(payload);
-                pubState({ state: payload.state, color_mode: S.colorMode, brightness: payload.brightness });
+                pubState({ state: payload.state, color_mode: S.colorMode, brightness: payload.brightness, color: payload.color });
                 forwardToChildren(payload, null);
                 const _lbl = payload.effect ? `effect:${payload.effect}` : `${payload.state}`;
-                setStatus('green', 'dot', `${groupId} → ${_lbl}`);
+                groupStatus(payload.state, `${groupId} → ${_lbl}`);
             }, node.id);
 
             setStatus('green', 'ring', `${groupId} discovery sent`);
@@ -297,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);
         }
@@ -306,7 +317,9 @@ module.exports = function (RED) {
         // ── Device remove ─────────────────────────────────────────
         function handleDeviceRemove(incomingTrace) {
             if (diskTimer) { clearTimeout(diskTimer); diskTimer = null; }
-            ctxSet('state', null); ctxSet('state', null, 'disk_values');
+            // No flush needed on remove — state is cleared below
+            // Keep disk state on remove — state survives remove/add cycles
+            ctxSet('state', null); // RAM only
             pub(cfgTopic, '', true);
             broker.unsubscribe(cmdTopic, node.id);
             forwardToChildren({ device: 'remove' }, incomingTrace);
@@ -325,9 +338,9 @@ module.exports = function (RED) {
                 // Forward payload deeper
                 if (msg.payload) {
                     saveGroupState(msg.payload);
-                    pubState({ state: msg.payload.state, color_mode: S.colorMode, brightness: msg.payload.brightness });
+                    pubState({ state: msg.payload.state, color_mode: S.colorMode, brightness: msg.payload.brightness, color: msg.payload.color });
                     forwardToChildren(msg.payload, msg.dmx_trace);
-                    setStatus('green', 'dot', `${groupId} → cascade:${msg.payload.state}`);
+                    groupStatus(msg.payload.state, `${groupId} → cascade:${msg.payload.state}`);
                 }
             } else {
                 const devReq = typeof msg.device === 'string'
@@ -342,9 +355,9 @@ module.exports = function (RED) {
                     }
                 } else if (msg.payload && msg.payload.state != null) {
                     saveGroupState(msg.payload);
-                    pubState({ state: msg.payload.state, color_mode: S.colorMode, brightness: msg.payload.brightness });
+                    pubState({ state: msg.payload.state, color_mode: S.colorMode, brightness: msg.payload.brightness, color: msg.payload.color });
                     forwardToChildren(msg.payload, null);
-                    setStatus('green', 'dot', `${groupId} → ${msg.payload.state}`);
+                    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

@@ -693,8 +693,10 @@ module.exports = function (RED) {
                     ctxSet('warmWhite',ww,'disk_values');
                 }
             }
+            // Keep disk state on remove — state survives remove/add cycles
+            // Only clear RAM so recovery on re-add reads last known disk state
             ['state','brightness','red','green','blue','white','warmWhite'].forEach(function (k) {
-                ctxSet(k, null); ctxSet(k, null, 'disk_values');
+                ctxSet(k, null);
             });
             pub(cfgTopic, '', true);
             broker.unsubscribe(cmdTopic, node.id);

package/nodes/ha-mqtt-relay.js

@@ -332,7 +332,8 @@ module.exports = function (RED) {
         function handleDeviceRemove() {
             stopEffect();
             if (diskTimer) { clearTimeout(diskTimer); diskTimer = null; }
-            ctxSet('state', null); ctxSet('state', null, 'disk_values');
+            // Keep disk state on remove — state survives remove/add cycles
+            ctxSet('state', null); // RAM only
             pub(cfgTopic, '', true);
             broker.unsubscribe(cmdTopic, node.id);
             setStatus('red', 'ring', `${fixtureId} removed`);

package/package.json

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