Merge pull request #93 from Luligu/dev

Release version 2.4.2

CHANGELOG.md

@@ -4,11 +4,21 @@ If you like this project and find it useful, please consider giving it a star on
 
 All notable changes to this project will be documented in this file.
 
+## [2.4.2] - 2025-01-11
+
+### Fixed
+
+- [endpoint]: Fixed blacklist of child endpoints.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
 ## [2.4.1] - 2025-01-11
 
 ### Added
 
-- [selectEntity]: Added selectEntity to get the components names from a list in the config editor.
+- [selectEntity]: Added selectEntity to get the features names from a list in the config editor.
 - [configUrl]: Added zigbeeFrontend in the config to prefix configUrl to get a link to the zigbee2mqtt frontend from the Matterbridge frontend Devices page. This allows to open the device configuration from the frontend.
 
 ### Changed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge-zigbee2mqtt",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Matterbridge zigbee2mqtt plugin",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",

src/entity.ts

@@ -1102,12 +1102,12 @@ export class ZigbeeDevice extends ZigbeeEntity {
     // Set the device entity select
     platform.selectEntity.set('last_seen', { name: 'last_seen', description: 'Last seen', icon: 'hub' });
     for (const [index, property] of properties.entries()) {
-      zigbeeDevice.log.warn(`***Device ${zigbeeDevice.en}${device.friendly_name}${db} adds select device ${device.ieee_address} (${device.friendly_name})`);
+      zigbeeDevice.log.debug(`Device ${zigbeeDevice.en}${device.friendly_name}${db} adds select device ${device.ieee_address} (${device.friendly_name})`);
       if (!platform.selectDevice.get(device.ieee_address)) {
         platform.selectDevice.set(device.ieee_address, { serial: device.ieee_address, name: device.friendly_name, icon: 'wifi', entities: [] });
       }
 
-      zigbeeDevice.log.warn(`***Device ${zigbeeDevice.en}${device.friendly_name}${db} adds select entity ${property} (${descriptions[index]})`);
+      zigbeeDevice.log.debug(`Device ${zigbeeDevice.en}${device.friendly_name}${db} adds select entity ${property} (${descriptions[index]})`);
       if (endpoints[index] === '') platform.selectEntity.set(property, { name: property, description: descriptions[index], icon: 'hub' });
       platform.selectDevice.get(device.ieee_address)?.entities?.push({ name: property, description: descriptions[index], icon: 'hub' });
     }
@@ -1128,12 +1128,12 @@ export class ZigbeeDevice extends ZigbeeEntity {
     */
 
     for (const [index, name] of names.entries()) {
-      if (platform.featureBlackList.includes(name)) {
-        zigbeeDevice.log.debug(`Device ${zigbeeDevice.en}${device.friendly_name}${db} feature ${name} is globally blacklisted`);
+      if (platform.featureBlackList.includes(name) || platform.featureBlackList.includes(properties[index])) {
+        zigbeeDevice.log.debug(`Device ${zigbeeDevice.en}${device.friendly_name}${db} feature ${name} property ${properties[index]} is globally blacklisted`);
         continue;
       }
-      if (platform.deviceFeatureBlackList[device.friendly_name]?.includes(name)) {
-        zigbeeDevice.log.debug(`Device ${zigbeeDevice.en}${device.friendly_name}${db} feature ${name} is blacklisted`);
+      if (platform.deviceFeatureBlackList[device.friendly_name]?.includes(name) || platform.deviceFeatureBlackList[device.friendly_name]?.includes(properties[index])) {
+        zigbeeDevice.log.debug(`Device ${zigbeeDevice.en}${device.friendly_name}${db} feature ${name} property ${properties[index]} is blacklisted`);
         continue;
       }
       if (name === 'transition') {