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

package/nodes/ha-mqtt-button.js

@@ -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

@@ -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;

package/nodes/ha-mqtt-dmx.js

@@ -525,6 +525,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;

package/nodes/ha-mqtt-pir.js

@@ -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

@@ -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.8",
   "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",