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

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;
@@ -121,6 +121,17 @@ module.exports = function (RED) {
             }, 12 * 60 * 60 * 1000);
         }
 
+
+        // ── Fixture identity and topics ───────────────────────────────────────
+        const fixtureId     = `S-${S.uid}${S.uidPostfix}`;
+        const objectId      = `s_${S.uid}${S.uidPostfix}`.toLowerCase().replace(/[^a-z0-9_]/g, '_');
+        const fixtureTopic  = cfg.buildTopic(cfg.discoveryPrefix, 'binary_sensor', fixtureId);
+        const uiBtnTopic    = cfg.buildTopic(cfg.discoveryPrefix, 'button', fixtureId + '-BTN');
+        const cfgTopic      = `${fixtureTopic}/${cfg.configTopic}`;
+        const statTopic     = `${fixtureTopic}/${cfg.stateTopic}`;
+        const uiBtnCfgTopic = `${uiBtnTopic}/${cfg.configTopic}`;
+        const uiBtnCmdTopic = `${uiBtnTopic}/${cfg.commandTopic}`;
+
         // ── Helpers ───────────────────────────────────────────────
         function pub(topic, payload, retain) {
             const strPayload = typeof payload === 'object' ? JSON.stringify(payload) : String(payload);

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;
@@ -128,6 +128,15 @@ module.exports = function (RED) {
             }, 12 * 60 * 60 * 1000);
         }
 
+
+        // ── Group identity and topics ─────────────────────────────────────────
+        const groupId    = `LG-${S.uid}${S.uidPostfix}`;
+        const objectId   = `lg_${S.uid}${S.uidPostfix}`.toLowerCase().replace(/[^a-z0-9_]/g, '_');
+        const groupTopic = cfg.buildTopic(cfg.discoveryPrefix, 'light', groupId);
+        const cfgTopic   = `${groupTopic}/${cfg.configTopic}`;
+        const statTopic  = `${groupTopic}/${cfg.stateTopic}`;
+        const cmdTopic   = `${groupTopic}/${cfg.commandTopic}`;
+
         // ── Context helpers ───────────────────────────────────────
         // Check disk store available once on startup
         let diskAvailable = false;
@@ -276,14 +285,11 @@ module.exports = function (RED) {
                 forwardToChildren(payload, null);
                 const _lbl = payload.effect ? `effect:${payload.effect}` : `${payload.state}`;
                 setStatus('green', 'dot', `${groupId} → ${_lbl}`);
-                setTimeout(() => setStatus('yellow', 'ring', `${groupId} ready`), 3000);
             }, 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(() => {
@@ -322,7 +328,6 @@ module.exports = function (RED) {
                     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);
                 }
             } else {
                 const devReq = typeof msg.device === 'string'
@@ -340,7 +345,6 @@ module.exports = function (RED) {
                     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);
                 } 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);
         }
 
@@ -525,6 +538,16 @@ module.exports = function (RED) {
         }
 
 
+
+        // ── Fixture identity and topics ───────────────────────────────────────
+        const fixtureId    = `${S.uidPrefix}-${S.uid}${S.uidPostfix}`;
+        const objectId     = `${S.uidPrefix}_${S.uid}${S.uidPostfix}`.toLowerCase().replace(/[^a-z0-9_]/g, '_');
+        const fixtureTopic = cfg.buildTopic(cfg.discoveryPrefix, 'light', fixtureId);
+        const cfgTopic     = `${fixtureTopic}/${cfg.configTopic}`;
+        const statTopic    = `${fixtureTopic}/${cfg.stateTopic}`;
+        const cmdTopic     = `${fixtureTopic}/${cfg.commandTopic}`;
+        const dmxTopic     = cfg.buildTopic(cfg.siteId, cfg.zone, 'dmx', S.universe);
+
         // ── DMX channel conflict detection ───────────────────────────────────
         function checkChannelConflicts() {
             const globalCtx = node.context().global;
@@ -656,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;
@@ -122,6 +122,16 @@ module.exports = function (RED) {
             }, 12 * 60 * 60 * 1000);
         }
 
+
+        // ── Fixture identity and topics ───────────────────────────────────────
+        const fixtureId    = `S-${S.uid}${S.uidPostfix}`;
+        const objectId     = `s_${S.uid}${S.uidPostfix}`.toLowerCase().replace(/[^a-z0-9_]/g, '_');
+        const fixtureTopic = cfg.buildTopic(cfg.discoveryPrefix, 'binary_sensor', fixtureId);
+        const cfgTopic     = `${fixtureTopic}/${cfg.configTopic}`;
+        const statTopic    = `${fixtureTopic}/${cfg.stateTopic}`;
+        const cmdTopic     = `${fixtureTopic}/${cfg.commandTopic}`;
+        const avtyTopic    = `${fixtureTopic}/${cfg.availTopic}`;
+
         // ── Helpers ───────────────────────────────────────────────
         function pub(topic, payload, retain) {
             const strPayload = typeof payload === 'object' ? JSON.stringify(payload) : String(payload);

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;
@@ -128,6 +128,16 @@ module.exports = function (RED) {
             }, 12 * 60 * 60 * 1000);
         }
 
+
+        // ── Fixture identity and topics ───────────────────────────────────────
+        const fixtureId    = `${S.uidPrefix}-${S.uid}${S.uidPostfix}`;
+        const objectId     = `${S.uidPrefix}_${S.uid}${S.uidPostfix}`.toLowerCase().replace(/[^a-z0-9_]/g, '_');
+        const fixtureTopic = cfg.buildTopic(cfg.discoveryPrefix, 'light', fixtureId);
+        const cfgTopic     = `${fixtureTopic}/${cfg.configTopic}`;
+        const statTopic    = `${fixtureTopic}/${cfg.stateTopic}`;
+        const cmdTopic     = `${fixtureTopic}/${cfg.commandTopic}`;
+        const relayTopic   = cfg.buildTopic(cfg.siteId, cfg.zone, S.controllerNum, S.mqttSegment, S.relayNum);
+
         // ── Context helpers ───────────────────────────────────────
         // Check disk store available once on startup
         let diskAvailable = false;

package/package.json

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