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

package/nodes/ha-mqtt-button.html

@@ -284,7 +284,7 @@
             Debug output to NR debug tab
         </label>
         <div style="margin-left:106px; margin-top:4px; color:#e74c3c; font-size:0.8em;">
-            ⚠ Disable in production — logs every MQTT publish
+            ⚠ Disable in production — logs every MQTT publish. Auto-disables after 12hrs.
         </div>
     </div>
 

package/nodes/ha-mqtt-button.js

@@ -37,14 +37,32 @@ module.exports = function (RED) {
             }, 1500);
         }
 
-        // Track if already discovered to prevent double-fire
+        // Track discovery state — prevents double-fire and allows reconnect re-discovery
         let _discovered = false;
+        let _lastDiscoveryTime = 0;
+        const _DISCOVERY_COOLDOWN_MS = 5000; // 5 second cooldown between discoveries
+
         function _tryDiscover() {
             if (_discovered) return;
+            const now = Date.now();
+            if (now - _lastDiscoveryTime < _DISCOVERY_COOLDOWN_MS) return;
             _discovered = true;
+            _lastDiscoveryTime = now;
             autoDiscover();
         }
 
+        function _manualDiscover() {
+            // Manual trigger (canvas button or input msg) — bypass _discovered flag
+            // 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');
+                return;
+            }
+            _lastDiscoveryTime = now;
+            handleDeviceAdd();
+        }
+
         // Auto-discover if broker already connected on deploy
         if (broker.connected) {
             _tryDiscover();
@@ -54,12 +72,15 @@ module.exports = function (RED) {
             _tryDiscover();
         });
         broker.on('close', function () {
+            _discovered = false; // Allow re-discovery on reconnect
             setStatus('red', 'ring', 'Broker disconnected');
         });
         broker.on('error', function (err) {
             node.warn('MQTT broker error: ' + (err.message || err));
             setStatus('red', 'dot', 'Broker error — check config');
         });
+
+
         // Fallback — if connect event already fired before listener registered
         setTimeout(function () {
             _tryDiscover();
@@ -86,14 +107,18 @@ module.exports = function (RED) {
             debugMode:     config.debugMode === true,
         };
 
-        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}`;
+        // ── Debug mode safeguards ─────────────────────────────────────────
+        if (S.debugMode) {
+            setStatus('red', 'dot', `ha-mqtt-button "${fixtureId}" ⚠ DEBUG MODE ON`);
+            node.warn(`[DEBUG] ha-mqtt-button "${fixtureId}" — debug mode is enabled. Disable in production.`);
+            setTimeout(function () {
+                if (S.debugMode) {
+                    S.debugMode = false;
+                    node.warn(`[DEBUG] ha-mqtt-button "${fixtureId}" — debug mode auto-disabled after 12 hours`);
+                    setStatus('yellow', 'ring', `${fixtureId} ready — awaiting HA`);
+                }
+            }, 12 * 60 * 60 * 1000);
+        }
 
         // ── Helpers ───────────────────────────────────────────────
         function pub(topic, payload, retain) {
@@ -104,7 +129,7 @@ module.exports = function (RED) {
                 qos:    cfg.qos,
                 retain: retain !== undefined ? retain : cfg.retain,
             });
-            if (S.debugMode) node.debug(`${fixtureId} → ${topic}  ${strPayload.substring(0, 120)}`);
+            if (S.debugMode) node.warn(`[DEBUG] ${fixtureId} → ${topic}  ${strPayload.substring(0, 120)}`);
         }
 
         function setStatus(fill, shape, text) {
@@ -190,7 +215,7 @@ module.exports = function (RED) {
 
             if (devReq) {
                 switch (devReq) {
-                    case 'add':    handleDeviceAdd();    break;
+                    case 'add':    _manualDiscover();    break;
                     case 'remove': handleDeviceRemove(); break;
                     default: node.warn(`${fixtureId} — unknown device.request: "${devReq}"`);
                 }

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

@@ -312,7 +312,7 @@
             Debug output to NR debug tab
         </label>
         <div style="margin-left:106px; margin-top:4px; color:#e74c3c; font-size:0.8em;">
-            ⚠ Disable in production — logs every MQTT publish
+            ⚠ Disable in production — logs every MQTT publish. Auto-disables after 12hrs.
         </div>
     </div>
 

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

@@ -40,14 +40,32 @@ module.exports = function (RED) {
             }, 1500);
         }
 
-        // Track if already discovered to prevent double-fire
+        // Track discovery state — prevents double-fire and allows reconnect re-discovery
         let _discovered = false;
+        let _lastDiscoveryTime = 0;
+        const _DISCOVERY_COOLDOWN_MS = 5000; // 5 second cooldown between discoveries
+
         function _tryDiscover() {
             if (_discovered) return;
+            const now = Date.now();
+            if (now - _lastDiscoveryTime < _DISCOVERY_COOLDOWN_MS) return;
             _discovered = true;
+            _lastDiscoveryTime = now;
             autoDiscover();
         }
 
+        function _manualDiscover() {
+            // Manual trigger (canvas button or input msg) — bypass _discovered flag
+            // 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');
+                return;
+            }
+            _lastDiscoveryTime = now;
+            handleDeviceAdd();
+        }
+
         // Auto-discover if broker already connected on deploy
         if (broker.connected) {
             _tryDiscover();
@@ -57,12 +75,15 @@ module.exports = function (RED) {
             _tryDiscover();
         });
         broker.on('close', function () {
+            _discovered = false; // Allow re-discovery on reconnect
             setStatus('red', 'ring', 'Broker disconnected');
         });
         broker.on('error', function (err) {
             node.warn('MQTT broker error: ' + (err.message || err));
             setStatus('red', 'dot', 'Broker error — check config');
         });
+
+
         // Fallback — if connect event already fired before listener registered
         setTimeout(function () {
             _tryDiscover();
@@ -93,12 +114,18 @@ module.exports = function (RED) {
             diskDelay:    cfg.diskDelay,
         };
 
-        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}`;
+        // ── Debug mode safeguards ─────────────────────────────────────────
+        if (S.debugMode) {
+            setStatus('red', 'dot', `ha-mqtt-dmx-group "${groupId}" ⚠ DEBUG MODE ON`);
+            node.warn(`[DEBUG] ha-mqtt-dmx-group "${groupId}" — debug mode is enabled. Disable in production.`);
+            setTimeout(function () {
+                if (S.debugMode) {
+                    S.debugMode = false;
+                    node.warn(`[DEBUG] ha-mqtt-dmx-group "${groupId}" — debug mode auto-disabled after 12 hours`);
+                    setStatus('yellow', 'ring', `${groupId} ready — awaiting HA`);
+                }
+            }, 12 * 60 * 60 * 1000);
+        }
 
         // ── Context helpers ───────────────────────────────────────
         // Check disk store available once on startup
@@ -136,7 +163,7 @@ module.exports = function (RED) {
                 qos:    cfg.qos,
                 retain: retain !== undefined ? retain : cfg.retain,
             });
-            if (S.debugMode) node.debug(`${groupId} → ${topic}  ${strPayload.substring(0, 120)}`);
+            if (S.debugMode) node.warn(`[DEBUG] ${groupId} → ${topic}  ${strPayload.substring(0, 120)}`);
         }
 
         function pubState(payload) {
@@ -303,7 +330,7 @@ module.exports = function (RED) {
 
                 if (devReq) {
                     switch (devReq) {
-                        case 'add':    handleDeviceAdd(null);    break;
+                        case 'add':    _manualDiscover();        break;
                         case 'remove': handleDeviceRemove(null); break;
                         default: node.warn(`${groupId} — unknown device.request: "${devReq}"`);
                     }

package/nodes/ha-mqtt-dmx.html

@@ -548,7 +548,7 @@
             Debug output to NR debug tab
         </label>
         <div style="margin-left:106px; margin-top:4px; color:#e74c3c; font-size:0.8em;">
-            ⚠ Disable in production — logs every MQTT publish
+            ⚠ Disable in production — logs every MQTT publish. Auto-disables after 12hrs.
         </div>
     </div>
 

package/nodes/ha-mqtt-dmx.js

@@ -47,14 +47,32 @@ module.exports = function (RED) {
             }, 1500);
         }
 
-        // Track if already discovered to prevent double-fire
+        // Track discovery state — prevents double-fire and allows reconnect re-discovery
         let _discovered = false;
+        let _lastDiscoveryTime = 0;
+        const _DISCOVERY_COOLDOWN_MS = 5000; // 5 second cooldown between discoveries
+
         function _tryDiscover() {
             if (_discovered) return;
+            const now = Date.now();
+            if (now - _lastDiscoveryTime < _DISCOVERY_COOLDOWN_MS) return;
             _discovered = true;
+            _lastDiscoveryTime = now;
             autoDiscover();
         }
 
+        function _manualDiscover() {
+            // Manual trigger (canvas button or input msg) — bypass _discovered flag
+            // 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');
+                return;
+            }
+            _lastDiscoveryTime = now;
+            handleDeviceAdd();
+        }
+
         // Auto-discover if broker already connected on deploy
         if (broker.connected) {
             _tryDiscover();
@@ -64,12 +82,15 @@ module.exports = function (RED) {
             _tryDiscover();
         });
         broker.on('close', function () {
+            _discovered = false; // Allow re-discovery on reconnect
             setStatus('red', 'ring', 'Broker disconnected');
         });
         broker.on('error', function (err) {
             node.warn('MQTT broker error: ' + (err.message || err));
             setStatus('red', 'dot', 'Broker error — check config');
         });
+
+
         // Fallback — if connect event already fired before listener registered
         setTimeout(function () {
             _tryDiscover();
@@ -117,13 +138,18 @@ module.exports = function (RED) {
             diskDelay:     cfg.diskDelay,
         };
 
-        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);
+        // ── Debug mode safeguards ─────────────────────────────────────────
+        if (S.debugMode) {
+            setStatus('red', 'dot', `ha-mqtt-dmx "${fixtureId}" ⚠ DEBUG MODE ON`);
+            node.warn(`[DEBUG] ha-mqtt-dmx "${fixtureId}" — debug mode is enabled. Disable in production.`);
+            setTimeout(function () {
+                if (S.debugMode) {
+                    S.debugMode = false;
+                    node.warn(`[DEBUG] ha-mqtt-dmx "${fixtureId}" — debug mode auto-disabled after 12 hours`);
+                    setStatus('yellow', 'ring', `${fixtureId} ready — awaiting HA`);
+                }
+            }, 12 * 60 * 60 * 1000);
+        }
 
         // ── Context helpers ───────────────────────────────────────
         // Check disk store available once on startup
@@ -180,12 +206,12 @@ module.exports = function (RED) {
                 if (payload === null) return;
                 // Skip if value unchanged since last publish
                 if (_lastSent[ch] === val) {
-                    if (S.debugMode) node.debug(`${fixtureId} → SKIP ch${ch}=${val} (unchanged)`);
+                    if (S.debugMode) node.warn(`[DEBUG] ${fixtureId} → SKIP ch${ch}=${val} (unchanged)`);
                     return;
                 }
                 _lastSent[ch] = val;
                 broker.publish({ topic: dmxTopic, payload, qos: cfg.qos, retain: false });
-                if (S.debugMode) node.debug(`${fixtureId} → ${dmxTopic}  "${payload}"`);
+                if (S.debugMode) node.warn(`[DEBUG] ${fixtureId} → ${dmxTopic}  "${payload}"`);
             });
         }
 
@@ -204,7 +230,7 @@ module.exports = function (RED) {
                 qos:    cfg.qos,
                 retain: retain !== undefined ? retain : cfg.retain,
             });
-            if (S.debugMode) node.debug(`${fixtureId} → ${topic}  ${strPayload.substring(0, 120)}`);
+            if (S.debugMode) node.warn(`[DEBUG] ${fixtureId} → ${topic}  ${strPayload.substring(0, 120)}`);
         }
 
         function pubState(payload) {
@@ -617,7 +643,7 @@ module.exports = function (RED) {
 
                 if (devReq) {
                     switch (devReq) {
-                        case 'add':    handleDeviceAdd();    break;
+                        case 'add':    _manualDiscover();    break;
                         case 'remove': handleDeviceRemove(); break;
                         default: node.warn(`${fixtureId} — unknown device.request: "${devReq}"`);
                     }

package/nodes/ha-mqtt-pir.html

@@ -289,7 +289,7 @@
             Debug output to NR debug tab
         </label>
         <div style="margin-left:106px; margin-top:4px; color:#e74c3c; font-size:0.8em;">
-            ⚠ Disable in production — logs every MQTT publish
+            ⚠ Disable in production — logs every MQTT publish. Auto-disables after 12hrs.
         </div>
     </div>
 

package/nodes/ha-mqtt-pir.js

@@ -37,14 +37,32 @@ module.exports = function (RED) {
             }, 1500);
         }
 
-        // Track if already discovered to prevent double-fire
+        // Track discovery state — prevents double-fire and allows reconnect re-discovery
         let _discovered = false;
+        let _lastDiscoveryTime = 0;
+        const _DISCOVERY_COOLDOWN_MS = 5000; // 5 second cooldown between discoveries
+
         function _tryDiscover() {
             if (_discovered) return;
+            const now = Date.now();
+            if (now - _lastDiscoveryTime < _DISCOVERY_COOLDOWN_MS) return;
             _discovered = true;
+            _lastDiscoveryTime = now;
             autoDiscover();
         }
 
+        function _manualDiscover() {
+            // Manual trigger (canvas button or input msg) — bypass _discovered flag
+            // 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');
+                return;
+            }
+            _lastDiscoveryTime = now;
+            handleDeviceAdd();
+        }
+
         // Auto-discover if broker already connected on deploy
         if (broker.connected) {
             _tryDiscover();
@@ -54,12 +72,15 @@ module.exports = function (RED) {
             _tryDiscover();
         });
         broker.on('close', function () {
+            _discovered = false; // Allow re-discovery on reconnect
             setStatus('red', 'ring', 'Broker disconnected');
         });
         broker.on('error', function (err) {
             node.warn('MQTT broker error: ' + (err.message || err));
             setStatus('red', 'dot', 'Broker error — check config');
         });
+
+
         // Fallback — if connect event already fired before listener registered
         setTimeout(function () {
             _tryDiscover();
@@ -87,13 +108,18 @@ module.exports = function (RED) {
             debugMode:     config.debugMode === true,
         };
 
-        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 cmdTopic    = `${fixtureTopic}/${cfg.commandTopic}`;
-        const cfgTopic    = `${fixtureTopic}/${cfg.configTopic}`;
-        const statTopic   = `${fixtureTopic}/${cfg.stateTopic}`;
-        const avtyTopic   = `${fixtureTopic}/${cfg.availTopic}`;
+        // ── Debug mode safeguards ─────────────────────────────────────────
+        if (S.debugMode) {
+            setStatus('red', 'dot', `ha-mqtt-pir "${fixtureId}" ⚠ DEBUG MODE ON`);
+            node.warn(`[DEBUG] ha-mqtt-pir "${fixtureId}" — debug mode is enabled. Disable in production.`);
+            setTimeout(function () {
+                if (S.debugMode) {
+                    S.debugMode = false;
+                    node.warn(`[DEBUG] ha-mqtt-pir "${fixtureId}" — debug mode auto-disabled after 12 hours`);
+                    setStatus('yellow', 'ring', `${fixtureId} ready — awaiting HA`);
+                }
+            }, 12 * 60 * 60 * 1000);
+        }
 
         // ── Helpers ───────────────────────────────────────────────
         function pub(topic, payload, retain) {
@@ -104,7 +130,7 @@ module.exports = function (RED) {
                 qos:    cfg.qos,
                 retain: retain !== undefined ? retain : cfg.retain,
             });
-            if (S.debugMode) node.debug(`${fixtureId} → ${topic}  ${strPayload.substring(0, 120)}`);
+            if (S.debugMode) node.warn(`[DEBUG] ${fixtureId} → ${topic}  ${strPayload.substring(0, 120)}`);
         }
 
         function setStatus(fill, shape, text) {

package/nodes/ha-mqtt-relay.html

@@ -285,7 +285,7 @@
             Debug output to NR debug tab
         </label>
         <div style="margin-left:106px; margin-top:4px; color:#e74c3c; font-size:0.8em;">
-            ⚠ Disable in production — logs every MQTT publish
+            ⚠ Disable in production — logs every MQTT publish. Auto-disables after 12hrs.
         </div>
     </div>
 

package/nodes/ha-mqtt-relay.js

@@ -40,14 +40,32 @@ module.exports = function (RED) {
             }, 1500);
         }
 
-        // Track if already discovered to prevent double-fire
+        // Track discovery state — prevents double-fire and allows reconnect re-discovery
         let _discovered = false;
+        let _lastDiscoveryTime = 0;
+        const _DISCOVERY_COOLDOWN_MS = 5000; // 5 second cooldown between discoveries
+
         function _tryDiscover() {
             if (_discovered) return;
+            const now = Date.now();
+            if (now - _lastDiscoveryTime < _DISCOVERY_COOLDOWN_MS) return;
             _discovered = true;
+            _lastDiscoveryTime = now;
             autoDiscover();
         }
 
+        function _manualDiscover() {
+            // Manual trigger (canvas button or input msg) — bypass _discovered flag
+            // 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');
+                return;
+            }
+            _lastDiscoveryTime = now;
+            handleDeviceAdd();
+        }
+
         // Auto-discover if broker already connected on deploy
         if (broker.connected) {
             _tryDiscover();
@@ -57,12 +75,15 @@ module.exports = function (RED) {
             _tryDiscover();
         });
         broker.on('close', function () {
+            _discovered = false; // Allow re-discovery on reconnect
             setStatus('red', 'ring', 'Broker disconnected');
         });
         broker.on('error', function (err) {
             node.warn('MQTT broker error: ' + (err.message || err));
             setStatus('red', 'dot', 'Broker error — check config');
         });
+
+
         // Fallback — if connect event already fired before listener registered
         setTimeout(function () {
             _tryDiscover();
@@ -93,13 +114,18 @@ module.exports = function (RED) {
             diskDelay:     cfg.diskDelay,
         };
 
-        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);
+        // ── Debug mode safeguards ─────────────────────────────────────────
+        if (S.debugMode) {
+            setStatus('red', 'dot', `ha-mqtt-relay "${fixtureId}" ⚠ DEBUG MODE ON`);
+            node.warn(`[DEBUG] ha-mqtt-relay "${fixtureId}" — debug mode is enabled. Disable in production.`);
+            setTimeout(function () {
+                if (S.debugMode) {
+                    S.debugMode = false;
+                    node.warn(`[DEBUG] ha-mqtt-relay "${fixtureId}" — debug mode auto-disabled after 12 hours`);
+                    setStatus('yellow', 'ring', `${fixtureId} ready — awaiting HA`);
+                }
+            }, 12 * 60 * 60 * 1000);
+        }
 
         // ── Context helpers ───────────────────────────────────────
         // Check disk store available once on startup
@@ -140,7 +166,7 @@ module.exports = function (RED) {
                 qos:    cfg.qos,
                 retain: retain !== undefined ? retain : cfg.retain,
             });
-            if (S.debugMode) node.debug(`${fixtureId} → ${topic}  ${strPayload.substring(0, 120)}`);
+            if (S.debugMode) node.warn(`[DEBUG] ${fixtureId} → ${topic}  ${strPayload.substring(0, 120)}`);
         }
 
         function pubRelay(value) {
@@ -325,7 +351,7 @@ module.exports = function (RED) {
 
                 if (devReq) {
                     switch (devReq) {
-                        case 'add':    handleDeviceAdd();    break;
+                        case 'add':    _manualDiscover();    break;
                         case 'remove': handleDeviceRemove(); break;
                         default: node.warn(`${fixtureId} — unknown device.request: "${devReq}"`);
                     }

package/package.json

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