dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-08-28 23:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Home Assistant group discovery collision between different Zigbee2MQTT instances. https://github.com/Koenkk/zigbee2mqtt/issues/7918

Browse Source
This commit is contained in:
Koen Kanters
2021-07-02 20:21:18 +02:00
parent 0df8663c8b
commit cd1a4573b1
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/extension/homeassistant.js
+4 -1
View File
@@ -995,7 +995,10 @@ class HomeAssistant extends Extension {
}
getDiscoveryTopic(config, resolvedEntity) {
const key = resolvedEntity.type === 'device' ? resolvedEntity.device.ieeeAddr : resolvedEntity.group.groupID;
const key = resolvedEntity.type === 'device' ?
resolvedEntity.device.ieeeAddr :
`${settings.get().mqtt.base_topic.split('')
.map((s) => s.charCodeAt(0).toString()).join('')}_${resolvedEntity.group.groupID}`;
return `${config.type}/${key}/${config.object_id}/config`;
}
test/homeassistant.test.js
+3 -3
View File
@@ -76,7 +76,7 @@ describe('HomeAssistant extension', () => {
};
expect(MQTT.publish).toHaveBeenCalledWith(
'homeassistant/light/9/light/config',
'homeassistant/light/1221051039810110150109113116116_9/light/config',
stringify(payload),
{ retain: true, qos: 0 },
expect.any(Function),
@@ -100,7 +100,7 @@ describe('HomeAssistant extension', () => {
};
expect(MQTT.publish).toHaveBeenCalledWith(
'homeassistant/switch/9/switch/config',
'homeassistant/switch/1221051039810110150109113116116_9/switch/config',
stringify(payload),
{ retain: true, qos: 0 },
expect.any(Function),
@@ -1703,7 +1703,7 @@ describe('HomeAssistant extension', () => {
};
expect(MQTT.publish).toHaveBeenCalledWith(
'homeassistant/light/9/light/config',
'homeassistant/light/1221051039810110150109113116116_9/light/config',
stringify(payload),
{ retain: true, qos: 0 },
expect.any(Function),