matterbridge-zigbee2mqtt 2.8.1 → 3.0.0-dev-20251102-bcdd456

package/CHANGELOG.md

@@ -8,6 +8,36 @@ If you like this project and find it useful, please consider giving it a star on
   <img src="bmc-button.svg" alt="Buy me a coffee" width="120">
 </a>
 
+## [3.0.0] - 2025-11-02
+
+### Added
+
+- [tvoc]: Added voc_index to the converter. Thanks Funca (https://github.com/Luligu/matterbridge-zigbee2mqtt/issues/129).
+
+### Changed
+
+- [package]: Updated dependencies.
+- [package]: Bumped platform to v.3.0.0.
+- [package]: Bumped entity to v.3.3.0.
+- [package]: Bumped zigbee to v.3.0.0.
+- [package]: Bumped package to automator v.2.0.10.
+- [jest]: Bumped jestHelpers to v.1.0.11.
+- [package]: Require matterbridge v.3.3.0.
+- [package]: Added default config.
+- [package]: Added typed ZigbeePlatformConfig.
+- [platform]: Updated to new signature PlatformMatterbridge.
+- [workflows]: Improved speed on Node CI.
+- [devcontainer]: Added the plugin name to the container.
+- [devcontainer]: Improved performance of first build with shallow clone.
+
+### Fixed
+
+- [platform]: Fixed specific zbminir2 device case for all devices. Thanks subst4nc3 (https://github.com/Luligu/matterbridge-zigbee2mqtt/issues/126).
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="bmc-button.svg" alt="Buy me a coffee" width="80">
+</a>
+
 ## [2.8.1] - 2025-10-02
 
 ### Automations and scenes

package/dist/entity.js

@@ -58,7 +58,7 @@ export class ZigbeeEntity extends EventEmitter {
         this.log = new AnsiLogger({
             logName: this.entityName,
             logTimestampFormat: 4,
-            logLevel: platform.debugEnabled ? "debug" : platform.log.logLevel,
+            logLevel: platform.config.debug ? "debug" : platform.log.logLevel,
         });
         this.log.debug(`Created MatterEntity: ${this.entityName}`);
         this.platform.z2m.on('MESSAGE-' + this.entityName, (payload) => {
@@ -256,12 +256,12 @@ export class ZigbeeEntity extends EventEmitter {
                 this.publishCommand(command, (this.isGroup ? this.group?.friendly_name : this.device?.friendly_name), this.cachePayload);
             this.cachePayload = {};
             this.noUpdate = true;
-            this.log.debug(`****No update for 2 seconds to allow the device ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} to update its state`);
+            this.log.debug(`No update for 2 seconds to allow the device ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} to update its state`);
             clearTimeout(this.noUpdateTimeout);
             this.noUpdateTimeout = setTimeout(() => {
                 clearTimeout(this.noUpdateTimeout);
                 this.noUpdateTimeout = undefined;
-                this.log.debug(`****No update is now reset for the device ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db}`);
+                this.log.debug(`No update is now reset for the device ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db}`);
                 this.noUpdate = false;
             }, this.noUpdateTimeoutTime).unref();
         }, this.cachePublishTimeoutTime).unref();
@@ -318,60 +318,65 @@ export class ZigbeeEntity extends EventEmitter {
         else if (endpoint.hasClusterServer(OnOff.Cluster.id)) {
             colorMode = 5;
         }
-        this.log.debug(`***Set attributes called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} colorMode ${CYAN}${lookupColorMode[colorMode]}${db} payload ${debugStringify(this.cachePayload)}`);
+        this.log.debug(`Set attributes called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} colorMode ${CYAN}${lookupColorMode[colorMode]}${db} payload ${debugStringify(this.cachePayload)}`);
     }
     async onCommandHandler(data) {
         if (data.endpoint.getAttribute(OnOff.Cluster.id, 'onOff') === true) {
-            this.log.debug(`*Command on ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} already ON`);
+            this.log.debug(`Command on ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} already ON`);
             return;
         }
         this.log.debug(`Command on called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber}`);
-        this.setCachePublishAttributes(data.endpoint, this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : undefined);
-        this.cachePublish('on', { ['state' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: 'ON' });
+        const isChildEndpoint = data.endpoint.deviceName !== this.entityName;
+        this.setCachePublishAttributes(data.endpoint, isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : undefined);
+        this.cachePublish('on', { ['state' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: 'ON' });
     }
     async offCommandHandler(data) {
         if (data.endpoint.getAttribute(OnOff.Cluster.id, 'onOff') === false) {
-            this.log.debug(`*Command off ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} already OFF`);
+            this.log.debug(`Command off ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} already OFF`);
             return;
         }
         this.log.debug(`Command off called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber}`);
-        this.cachePublish('off', { ['state' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: 'OFF' });
+        const isChildEndpoint = data.endpoint.deviceName !== this.entityName;
+        this.cachePublish('off', { ['state' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: 'OFF' });
     }
     async toggleCommandHandler(data) {
         this.log.debug(`Command toggle called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber}`);
+        const isChildEndpoint = data.endpoint.deviceName !== this.entityName;
         if (data.endpoint.getAttribute(OnOff.Cluster.id, 'onOff') === false) {
-            this.setCachePublishAttributes(data.endpoint, this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : undefined);
-            this.cachePublish('toggle', { ['state' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: 'ON' });
+            this.setCachePublishAttributes(data.endpoint, isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : undefined);
+            this.cachePublish('toggle', { ['state' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: 'ON' });
         }
         else {
-            this.cachePublish('toggle', { ['state' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: 'OFF' });
+            this.cachePublish('toggle', { ['state' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: 'OFF' });
         }
     }
     async moveToLevelCommandHandler(data) {
         if (data.endpoint.getAttribute(OnOff.Cluster.id, 'onOff') === false || data.endpoint.getAttribute(LevelControl.Cluster.id, 'currentLevel') === data.request.level) {
-            this.log.debug(`*Command moveToLevel ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} light OFF or level unchanged`);
+            this.log.debug(`Command moveToLevel ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} light OFF or level unchanged`);
             return;
         }
         this.log.debug(`Command moveToLevel called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} request: ${data.request.level} transition: ${data.request.transitionTime}`);
-        this.cachePublish('moveToLevel', { ['brightness' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: data.request.level }, data.request.transitionTime);
+        const isChildEndpoint = data.endpoint.deviceName !== this.entityName;
+        this.cachePublish('moveToLevel', { ['brightness' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: data.request.level }, data.request.transitionTime);
     }
     async moveToLevelWithOnOffCommandHandler(data) {
         this.log.debug(`Command moveToLevelWithOnOff called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} request: ${data.request.level} transition: ${data.request.transitionTime}`);
+        const isChildEndpoint = data.endpoint.deviceName !== this.entityName;
         if (data.request['level'] <= (data.endpoint.getAttribute(LevelControl.Cluster.id, 'minLevel') ?? 1)) {
             if (data.endpoint.getAttribute(OnOff.Cluster.id, 'onOff') === false) {
                 this.log.debug(`*Command moveToLevelWithOnOff ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} light OFF`);
                 return;
             }
-            data.endpoint.log.debug(`***Command moveToLevelWithOnOff received with level <= minLevel(${data.endpoint.getAttribute(LevelControl.Cluster.id, 'minLevel')}) => turn off the light`);
-            this.cachePublish('moveToLevelWithOnOff', { ['state' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: 'OFF' }, data.request.transitionTime);
+            data.endpoint.log.debug(`Command moveToLevelWithOnOff received with level <= minLevel(${data.endpoint.getAttribute(LevelControl.Cluster.id, 'minLevel')}) => turn off the light`);
+            this.cachePublish('moveToLevelWithOnOff', { ['state' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: 'OFF' }, data.request.transitionTime);
         }
         else {
             if (data.endpoint.getAttribute(OnOff.Cluster.id, 'onOff') === false) {
-                data.endpoint.log.debug(`***Command moveToLevelWithOnOff received with level > minLevel(${data.endpoint.getAttribute(LevelControl.Cluster.id, 'minLevel')}) and light is off => turn on the light with attributes`);
-                this.cachePayload['state' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')] = 'ON';
-                this.setCachePublishAttributes(data.endpoint, this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '');
+                data.endpoint.log.debug(`Command moveToLevelWithOnOff received with level > minLevel(${data.endpoint.getAttribute(LevelControl.Cluster.id, 'minLevel')}) and light is off => turn on the light with attributes`);
+                this.cachePayload['state' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')] = 'ON';
+                this.setCachePublishAttributes(data.endpoint, isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '');
             }
-            this.cachePublish('moveToLevelWithOnOff', { ['brightness' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: data.request.level }, data.request.transitionTime);
+            this.cachePublish('moveToLevelWithOnOff', { ['brightness' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: data.request.level }, data.request.transitionTime);
         }
     }
     async moveToColorTemperatureCommandHandler(data) {
@@ -381,50 +386,55 @@ export class ZigbeeEntity extends EventEmitter {
             return;
         }
         this.log.debug(`Command moveToColorTemperature called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} request: ${data.request.colorTemperatureMireds} transition: ${data.request.transitionTime}`);
+        const isChildEndpoint = data.endpoint.deviceName !== this.entityName;
         if (this.propertyMap.get('color_temp')) {
-            this.cachePublish('moveToColorTemperature', { ['color_temp' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: data.request.colorTemperatureMireds }, data.request.transitionTime);
+            this.cachePublish('moveToColorTemperature', { ['color_temp' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: data.request.colorTemperatureMireds }, data.request.transitionTime);
         }
         else {
             const rgb = kelvinToRGB(miredToKelvin(data.request.colorTemperatureMireds));
-            this.cachePublish('moveToColorTemperature', { ['color' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: { r: rgb.r, g: rgb.g, b: rgb.b } }, data.request.transitionTime);
-            this.log.debug(`***Command moveToColorTemperature called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} but color_temp property is not available. Converting ${data.request.colorTemperatureMireds} to RGB ${debugStringify(rgb)}.`);
+            this.cachePublish('moveToColorTemperature', { ['color' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: { r: rgb.r, g: rgb.g, b: rgb.b } }, data.request.transitionTime);
+            this.log.debug(`Command moveToColorTemperature called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} but color_temp property is not available. Converting ${data.request.colorTemperatureMireds} to RGB ${debugStringify(rgb)}.`);
         }
     }
     async moveToColorCommandHandler(data) {
         delete this.cachePayload['color_temp'];
         if (data.endpoint.getAttribute(OnOff.Cluster.id, 'onOff') === false || (data.endpoint.getAttribute(ColorControl.Cluster.id, 'colorMode') === ColorControl.ColorMode.CurrentXAndCurrentY && data.endpoint.getAttribute(ColorControl.Cluster.id, 'currentX') === data.request.colorX && data.endpoint.getAttribute(ColorControl.Cluster.id, 'currentY') === data.request.colorY)) {
-            this.log.debug(`*Command moveToColor ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} light OFF or color unchanged`);
+            this.log.debug(`Command moveToColor ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} light OFF or color unchanged`);
             return;
         }
         this.log.debug(`Command moveToColor called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} request: X: ${data.request.colorX} Y: ${data.request.colorY} transition: ${data.request.transitionTime}`);
-        this.cachePublish('moveToColor', { ['color' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: { x: Math.round(data.request.colorX / 65536 * 10000) / 10000, y: Math.round(data.request.colorY / 65536 * 10000) / 10000 } }, data.request.transitionTime);
+        const isChildEndpoint = data.endpoint.deviceName !== this.entityName;
+        this.cachePublish('moveToColor', { ['color' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: { x: Math.round(data.request.colorX / 65536 * 10000) / 10000, y: Math.round(data.request.colorY / 65536 * 10000) / 10000 } }, data.request.transitionTime);
     }
     async moveToHueCommandHandler(data) {
         delete this.cachePayload['color_temp'];
         if (data.endpoint.getAttribute(OnOff.Cluster.id, 'onOff') === false || (data.endpoint.getAttribute(ColorControl.Cluster.id, 'colorMode') === ColorControl.ColorMode.CurrentHueAndCurrentSaturation && data.endpoint.getAttribute(ColorControl.Cluster.id, 'currentHue') === data.request.hue)) {
-            this.log.debug(`*Command moveToHue ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} light OFF or hue unchanged`);
+            this.log.debug(`Command moveToHue ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} light OFF or hue unchanged`);
             return;
         }
         this.log.debug(`Command moveToHue called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} request: ${data.request.hue} transition: ${data.request.transitionTime}`);
-        this.cachePublish('moveToHue', { ['color' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: { h: Math.round(data.request.hue / 254 * 360), s: Math.round(data.endpoint.getAttribute(ColorControlCluster.id, 'currentSaturation') / 254 * 100) } }, data.request.transitionTime);
+        const isChildEndpoint = data.endpoint.deviceName !== this.entityName;
+        this.cachePublish('moveToHue', { ['color' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: { h: Math.round(data.request.hue / 254 * 360), s: Math.round(data.endpoint.getAttribute(ColorControlCluster.id, 'currentSaturation') / 254 * 100) } }, data.request.transitionTime);
     }
     async moveToSaturationCommandHandler(data) {
         delete this.cachePayload['color_temp'];
         if (data.endpoint.getAttribute(OnOff.Cluster.id, 'onOff') === false || (data.endpoint.getAttribute(ColorControl.Cluster.id, 'colorMode') === ColorControl.ColorMode.CurrentHueAndCurrentSaturation && data.endpoint.getAttribute(ColorControl.Cluster.id, 'currentSaturation') === data.request.saturation)) {
-            this.log.debug(`*Command moveToSaturation ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} light OFF or saturation unchanged`);
+            this.log.debug(`Command moveToSaturation ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} light OFF or saturation unchanged`);
             return;
         }
         this.log.debug(`Command moveToSaturation called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} request: ${data.request.saturation} transition: ${data.request.transitionTime}`);
-        this.cachePublish('moveToSaturation', { ['color' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: { h: Math.round(data.endpoint.getAttribute(ColorControlCluster.id, 'currentHue') / 254 * 360), s: Math.round(data.request.saturation / 254 * 100) } }, data.request.transitionTime);
+        const isChildEndpoint = data.endpoint.deviceName !== this.entityName;
+        this.cachePublish('moveToSaturation', { ['color' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: { h: Math.round(data.endpoint.getAttribute(ColorControlCluster.id, 'currentHue') / 254 * 360), s: Math.round(data.request.saturation / 254 * 100) } }, data.request.transitionTime);
     }
     async moveToHueAndSaturationCommandHandler(data) {
         delete this.cachePayload['color_temp'];
         if (data.endpoint.getAttribute(OnOff.Cluster.id, 'onOff') === false || (data.endpoint.getAttribute(ColorControl.Cluster.id, 'colorMode') === ColorControl.ColorMode.CurrentHueAndCurrentSaturation && data.endpoint.getAttribute(ColorControl.Cluster.id, 'currentHue') === data.request.hue && data.endpoint.getAttribute(ColorControl.Cluster.id, 'currentSaturation') === data.request.saturation)) {
-            this.log.debug(`*Command moveToHueAndSaturation ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} light OFF or hue/saturation unchanged`);
+            this.log.debug(`Command moveToHueAndSaturation ignored for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} light OFF or hue/saturation unchanged`);
             return;
         }
         this.log.debug(`Command moveToHueAndSaturation called for ${this.ien}${this.isGroup ? this.group?.friendly_name : this.device?.friendly_name}${rs}${db} endpoint: ${data.endpoint?.maybeId}:${data.endpoint?.maybeNumber} request: ${data.request.hue} - ${data.request.saturation} transition: ${data.request.transitionTime}`);
-        this.cachePublish('moveToHueAndSaturation', { ['color' + (this.hasEndpoints ? '_' + data.endpoint.uniqueStorageKey : '')]: { h: Math.round(data.request.hue / 254 * 360), s: Math.round(data.request.saturation / 254 * 100) } }, data.request.transitionTime);
+        const isChildEndpoint = data.endpoint.deviceName !== this.entityName;
+        this.cachePublish('moveToHueAndSaturation', { ['color' + (isChildEndpoint ? '_' + data.endpoint.uniqueStorageKey : '')]: { h: Math.round(data.request.hue / 254 * 360), s: Math.round(data.request.saturation / 254 * 100) } }, data.request.transitionTime);
     }
     addBridgedDeviceBasicInformation() {
         if (!this.bridgedDevice)
@@ -839,6 +849,7 @@ const z2ms = [
     { type: '', name: 'pressure', property: 'pressure', deviceType: pressureSensor, cluster: PressureMeasurement.Cluster.id, attribute: 'measuredValue', converter: (value) => { return value; } },
     { type: '', name: 'air_quality', property: 'air_quality', deviceType: airQualitySensor, cluster: AirQuality.Cluster.id, attribute: 'airQuality', valueLookup: ['unknown', 'excellent', 'good', 'moderate', 'poor', 'unhealthy', 'out_of_range'] },
     { type: '', name: 'voc', property: 'voc', deviceType: airQualitySensor, cluster: TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id, attribute: 'measuredValue', converter: (value) => { return Math.min(65535, value); } },
+    { type: '', name: 'voc_index', property: 'voc_index', deviceType: airQualitySensor, cluster: TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id, attribute: 'measuredValue', converter: (value) => { return Math.min(65535, value); } },
     { type: '', name: 'co', property: 'co', deviceType: airQualitySensor, cluster: CarbonMonoxideConcentrationMeasurement.Cluster.id, attribute: 'measuredValue', converter: (value) => { return Math.round(value); } },
     { type: '', name: 'co2', property: 'co2', deviceType: airQualitySensor, cluster: CarbonDioxideConcentrationMeasurement.Cluster.id, attribute: 'measuredValue', converter: (value) => { return Math.round(value); } },
     { type: '', name: 'formaldehyd', property: 'formaldehyd', deviceType: airQualitySensor, cluster: FormaldehydeConcentrationMeasurement.Cluster.id, attribute: 'measuredValue', converter: (value) => { return Math.round(value); } },

package/dist/{platform.js → module.js}

@@ -5,6 +5,9 @@ import { isValidNumber, isValidString, waiter } from 'matterbridge/utils';
 import { BridgedDeviceBasicInformation, DoorLock } from 'matterbridge/matter/clusters';
 import { ZigbeeDevice, ZigbeeGroup } from './entity.js';
 import { Zigbee2MQTT } from './zigbee2mqtt.js';
+export default function initializePlugin(matterbridge, log, config) {
+    return new ZigbeePlatform(matterbridge, log, config);
+}
 export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
     bridgedDevices = [];
     zigbeeEntities = [];
@@ -24,7 +27,6 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
     featureBlackList = [];
     deviceFeatureBlackList = {};
     postfix = '';
-    debugEnabled;
     shouldStart;
     shouldConfigure;
     z2m;
@@ -39,10 +41,9 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
     availabilityTimer;
     constructor(matterbridge, log, config) {
         super(matterbridge, log, config);
-        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.0.4')) {
-            throw new Error(`This plugin requires Matterbridge version >= "3.0.4". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend."`);
+        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.3.0')) {
+            throw new Error(`This plugin requires Matterbridge version >= "3.3.0". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend."`);
         }
-        this.debugEnabled = config.debug;
         this.shouldStart = false;
         this.shouldConfigure = false;
         if (config.host && typeof config.host === 'string') {
@@ -81,8 +82,8 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
         config.port = this.mqttPort;
         config.protocolVersion = this.mqttProtocol;
         config.topic = this.mqttTopic;
-        config.username = this.mqttUsername;
-        config.password = this.mqttPassword;
+        config.username = this.mqttUsername ?? '';
+        config.password = this.mqttPassword ?? '';
         config.postfix = this.postfix;
         if (config.postfixHostname !== undefined)
             delete config.postfixHostname;
@@ -96,8 +97,8 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
             config.scenesPrefix = true;
         this.log.info(`Initializing platform: ${CYAN}${this.config.name}${nf} version: ${CYAN}${this.config.version}${rs}`);
         this.log.info(`Loaded zigbee2mqtt parameters from ${CYAN}${path.join(matterbridge.matterbridgeDirectory, 'matterbridge-zigbee2mqtt.config.json')}${rs}`);
-        this.z2m = new Zigbee2MQTT(this.mqttHost, this.mqttPort, this.mqttTopic, this.mqttUsername, this.mqttPassword, this.mqttProtocol, this.config.ca, this.config.rejectUnauthorized, this.config.cert, this.config.key, this.debugEnabled);
-        this.z2m.setLogDebug(this.debugEnabled);
+        this.z2m = new Zigbee2MQTT(this.mqttHost, this.mqttPort, this.mqttTopic, this.mqttUsername, this.mqttPassword, this.mqttProtocol, this.config.ca, this.config.rejectUnauthorized, this.config.cert, this.config.key, config.debug);
+        this.z2m.setLogDebug(config.debug);
         this.z2m.setDataPath(path.join(matterbridge.matterbridgePluginDirectory, 'matterbridge-zigbee2mqtt'));
         if (isValidString(this.mqttHost) && isValidNumber(this.mqttPort, 1, 65535)) {
             this.log.info(`Connecting to MQTT broker: ${this.mqttHost + ':' + this.mqttPort.toString()}`);
@@ -169,7 +170,7 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
                 for (const bridgedEntity of this.zigbeeEntities) {
                     if (bridgedEntity.isDevice && bridgedEntity.device)
                         await this.requestDeviceUpdate(bridgedEntity.device);
-                    bridgedEntity.configure();
+                    await bridgedEntity.configure();
                 }
             }
         });
@@ -191,7 +192,7 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
                 for (const bridgedEntity of this.zigbeeEntities) {
                     if (bridgedEntity.isGroup && bridgedEntity.group)
                         await this.requestGroupUpdate(bridgedEntity.group);
-                    bridgedEntity.configure();
+                    await bridgedEntity.configure();
                 }
             }
         });

package/dist/zigbee2mqtt.js

@@ -1,12 +1,9 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import * as util from 'node:util';
-import * as crypto from 'node:crypto';
+import crypto from 'node:crypto';
 import { EventEmitter } from 'node:events';
-import { mkdir } from 'node:fs/promises';
 import { connectAsync } from 'mqtt';
 import { AnsiLogger, rs, db, dn, gn, er, zb, hk, id, idn, ign, REVERSE, REVERSEOFF } from 'node-ansi-logger';
-const writeFile = util.promisify(fs.writeFile);
 export class Zigbee2MQTT extends EventEmitter {
     log;
     mqttHost;
@@ -28,9 +25,11 @@ export class Zigbee2MQTT extends EventEmitter {
     z2mPermitJoin;
     z2mPermitJoinTimeout;
     z2mVersion;
+    z2mBridge;
     z2mDevices;
     z2mGroups;
-    loggedEntries = 0;
+    loggedBridgePayloads = 0;
+    loggedPublishPayloads = 0;
     options = {
         clientId: 'matterbridge_' + crypto.randomBytes(8).toString('hex'),
         keepalive: 60,
@@ -106,6 +105,7 @@ export class Zigbee2MQTT extends EventEmitter {
         this.z2mPermitJoin = false;
         this.z2mPermitJoinTimeout = 0;
         this.z2mVersion = '';
+        this.z2mBridge = {};
         this.z2mDevices = [];
         this.z2mGroups = [];
         this.log.debug(`Created new instance with host: ${mqttHost} port: ${mqttPort} protocol ${protocolVersion} topic: ${mqttTopic} username: ${mqttUsername !== undefined && mqttUsername !== '' ? mqttUsername : 'undefined'} password: ${mqttPassword !== undefined && mqttPassword !== '' ? '*****' : 'undefined'}`);
@@ -118,7 +118,7 @@ export class Zigbee2MQTT extends EventEmitter {
     }
     async setDataPath(dataPath) {
         try {
-            await mkdir(dataPath, { recursive: true });
+            await fs.promises.mkdir(dataPath, { recursive: true });
             this.mqttDataPath = dataPath;
             this.log.debug(`Data directory ${this.mqttDataPath} created successfully.`);
         }
@@ -138,6 +138,13 @@ export class Zigbee2MQTT extends EventEmitter {
         catch (error) {
             this.log.debug(`Error deleting bridge-payloads.txt: ${error}`);
         }
+        try {
+            const filePath = path.join(this.mqttDataPath, 'bridge-publish-payloads.txt');
+            fs.unlinkSync(filePath);
+        }
+        catch (error) {
+            this.log.debug(`Error deleting bridge-publish-payloads.txt: ${error}`);
+        }
     }
     getUrl() {
         return this.mqttHost + ':' + this.mqttPort.toString();
@@ -305,6 +312,11 @@ export class Zigbee2MQTT extends EventEmitter {
                 this.log.debug(`Publish ${REVERSE}[${this.mqttPublishInflights}]${REVERSEOFF} success on topic: ${topic} message: ${message}`);
                 this.emit('mqtt_published');
                 this.mqttPublishInflights--;
+                if (this.log.logLevel === "debug" && this.loggedPublishPayloads < 10000) {
+                    const filePath = path.join(this.mqttDataPath, 'bridge-publish-payloads.txt');
+                    fs.appendFileSync(filePath, `${new Date().toLocaleString()} - ` + JSON.stringify({ topic, message }).replaceAll('\\"', '"') + '\n');
+                    this.loggedPublishPayloads++;
+                }
             }
             catch (error) {
                 this.mqttPublishInflights--;
@@ -325,7 +337,8 @@ export class Zigbee2MQTT extends EventEmitter {
             this.log.error('writeBufferJSON: parsing error:', error);
             return;
         }
-        writeFile(`${filePath}.json`, JSON.stringify(jsonData, null, 2))
+        fs.promises
+            .writeFile(`${filePath}.json`, JSON.stringify(jsonData, null, 2))
             .then(() => {
             this.log.debug(`Successfully wrote to ${filePath}.json`);
             return;
@@ -336,7 +349,8 @@ export class Zigbee2MQTT extends EventEmitter {
     }
     async writeFile(file, data) {
         const filePath = path.join(this.mqttDataPath, file);
-        writeFile(`${filePath}`, data)
+        fs.promises
+            .writeFile(`${filePath}`, data)
             .then(() => {
             this.log.debug(`Successfully wrote to ${filePath}`);
             return;
@@ -376,151 +390,38 @@ export class Zigbee2MQTT extends EventEmitter {
             this.log.debug(`Message bridge/state online => ${this.z2mIsOnline}`);
         }
         else if (topic.startsWith(this.mqttTopic + '/bridge/info')) {
-            const data = this.tryJsonParse(payload.toString());
-            this.z2mPermitJoin = data.permit_join ? data.permit_join : false;
-            this.z2mPermitJoinTimeout = data.permit_join_timeout ? data.permit_join_timeout : 0;
-            this.z2mVersion = data.version ? data.version : '';
-            this.z2mIsAvailabilityEnabled = data.config.availability ? true : false;
+            this.z2mBridge = this.tryJsonParse(payload.toString());
+            this.z2mPermitJoin = this.z2mBridge.permit_join;
+            this.z2mPermitJoinTimeout = this.z2mBridge.permit_join_timeout;
+            this.z2mVersion = this.z2mBridge.version;
+            this.z2mIsAvailabilityEnabled = this.z2mBridge.config.availability !== undefined;
             this.log.debug(`Message bridge/info availability => ${this.z2mIsAvailabilityEnabled}`);
             this.log.debug(`Message bridge/info version => ${this.z2mVersion}`);
             this.log.debug(`Message bridge/info permit_join => ${this.z2mPermitJoin} timeout => ${this.z2mPermitJoinTimeout}`);
-            this.log.debug(`Message bridge/info advanced.output => ${data.config.advanced.output}`);
-            this.log.debug(`Message bridge/info advanced.legacy_api => ${data.config.advanced.legacy_api}`);
-            this.log.debug(`Message bridge/info advanced.legacy_availability_payload => ${data.config.advanced.legacy_availability_payload}`);
-            if (data.config.advanced.output === 'attribute')
-                this.log.error(`Message bridge/info advanced.output must be 'json' or 'attribute_and_json'. Now is ${data.config.advanced.output}`);
-            if (data.config.advanced.legacy_api === true)
-                this.log.info(`Message bridge/info advanced.legacy_api is ${data.config.advanced.legacy_api}`);
-            if (data.config.advanced.legacy_availability_payload === true)
-                this.log.info(`Message bridge/info advanced.legacy_availability_payload is ${data.config.advanced.legacy_availability_payload}`);
-            this.emit('info', this.z2mVersion, this.z2mIsAvailabilityEnabled, this.z2mPermitJoin, this.z2mPermitJoinTimeout);
-            this.emit('bridge-info', data);
+            this.log.debug(`Message bridge/info advanced.output => ${this.z2mBridge.config.advanced.output}`);
+            this.log.debug(`Message bridge/info advanced.legacy_api => ${this.z2mBridge.config.advanced.legacy_api}`);
+            this.log.debug(`Message bridge/info advanced.legacy_availability_payload => ${this.z2mBridge.config.advanced.legacy_availability_payload}`);
+            if (this.z2mBridge.config.advanced.output === 'attribute')
+                this.log.error(`Message bridge/info advanced.output must be 'json' or 'attribute_and_json'. Now is ${this.z2mBridge.config.advanced.output}`);
+            if (this.z2mBridge.config.advanced.legacy_api === true)
+                this.log.info(`Message bridge/info advanced.legacy_api is ${this.z2mBridge.config.advanced.legacy_api}`);
+            if (this.z2mBridge.config.advanced.legacy_availability_payload === true)
+                this.log.info(`Message bridge/info advanced.legacy_availability_payload is ${this.z2mBridge.config.advanced.legacy_availability_payload}`);
+            this.emit('bridge-info', this.z2mBridge);
             if (this.log.logLevel === "debug")
                 this.writeBufferJSON('bridge-info', payload);
         }
         else if (topic.startsWith(this.mqttTopic + '/bridge/devices')) {
-            this.z2mDevices.splice(0, this.z2mDevices.length);
-            const devices = this.tryJsonParse(payload.toString());
-            const data = this.tryJsonParse(payload.toString());
             if (this.log.logLevel === "debug")
                 this.writeBufferJSON('bridge-devices', payload);
-            this.emit('bridge-devices', data);
-            let index = 1;
-            for (const device of devices) {
-                if (device.type === 'Coordinator' && device.supported === true && device.disabled === false && device.interview_completed === true && device.interviewing === false) {
-                    const z2m = {
-                        logName: 'Coordinator',
-                        index: 0,
-                        ieee_address: device.ieee_address,
-                        friendly_name: device.friendly_name,
-                        getPayload: undefined,
-                        description: '',
-                        manufacturer: '',
-                        model_id: '',
-                        vendor: 'zigbee2MQTT',
-                        model: 'coordinator',
-                        date_code: '',
-                        software_build_id: '',
-                        power_source: 'Mains (single phase)',
-                        isAvailabilityEnabled: false,
-                        isOnline: false,
-                        category: '',
-                        hasEndpoints: false,
-                        exposes: [],
-                        options: [],
-                        endpoints: [],
-                    };
-                    this.z2mDevices.push(z2m);
-                }
-                if (device.type !== 'Coordinator' && device.supported === true && device.disabled === false && device.interview_completed === true && device.interviewing === false) {
-                    const z2m = {
-                        logName: 'Dev#' + index.toString().padStart(2, '0'),
-                        index: index++,
-                        ieee_address: device.ieee_address,
-                        friendly_name: device.friendly_name,
-                        getPayload: undefined,
-                        description: device.definition.description || '',
-                        manufacturer: device.manufacturer || '',
-                        model_id: device.model_id || '',
-                        vendor: device.definition.vendor || '',
-                        model: device.definition.model || '',
-                        date_code: device.date_code || '',
-                        software_build_id: device.software_build_id || '',
-                        power_source: device.power_source,
-                        isAvailabilityEnabled: false,
-                        isOnline: false,
-                        category: '',
-                        hasEndpoints: false,
-                        exposes: [],
-                        options: [],
-                        endpoints: [],
-                    };
-                    for (const expose of device.definition.exposes) {
-                        if (!expose.property && !expose.name && expose.features && expose.type) {
-                            if (z2m.category === '') {
-                                z2m.category = expose.type;
-                            }
-                            for (const feature of expose.features) {
-                                feature.category = expose.type;
-                                z2m.exposes.push(feature);
-                                if (feature.endpoint) {
-                                    z2m.hasEndpoints = true;
-                                }
-                            }
-                        }
-                        else {
-                            expose.category = '';
-                            z2m.exposes.push(expose);
-                        }
-                    }
-                    for (const option of device.definition.options) {
-                        const feature = option;
-                        z2m.options.push(feature);
-                    }
-                    for (const key in device.endpoints) {
-                        const endpoint = device.endpoints[key];
-                        const endpointWithKey = {
-                            ...endpoint,
-                            endpoint: key,
-                        };
-                        z2m.endpoints.push(endpointWithKey);
-                    }
-                    this.z2mDevices.push(z2m);
-                }
-            }
-            this.log.debug(`Received ${this.z2mDevices.length} devices`);
-            this.emit('devices');
+            this.z2mDevices = this.tryJsonParse(payload.toString());
+            this.emit('bridge-devices', this.z2mDevices);
         }
         else if (topic.startsWith(this.mqttTopic + '/bridge/groups')) {
-            this.z2mGroups.splice(0, this.z2mGroups.length);
-            const groups = this.tryJsonParse(payload.toString());
-            const data = this.tryJsonParse(payload.toString());
             if (this.log.logLevel === "debug")
                 this.writeBufferJSON('bridge-groups', payload);
-            this.emit('bridge-groups', data);
-            let index = 1;
-            for (const group of groups) {
-                const z2m = {
-                    logName: 'Grp#' + index.toString().padStart(2, '0'),
-                    index: index++,
-                    id: group.id,
-                    friendly_name: group.friendly_name,
-                    getPayload: undefined,
-                    isAvailabilityEnabled: false,
-                    isOnline: false,
-                    members: [],
-                    scenes: [],
-                };
-                for (const member of group.members) {
-                    z2m.members.push(member);
-                }
-                for (const scene of group.scenes) {
-                    z2m.scenes.push(scene);
-                }
-                this.z2mGroups.push(z2m);
-            }
-            this.log.debug(`Received ${this.z2mGroups.length} groups`);
-            this.emit('groups');
+            this.z2mGroups = this.tryJsonParse(payload.toString());
+            this.emit('bridge-groups', this.z2mGroups);
         }
         else if (topic.startsWith(this.mqttTopic + '/bridge/extensions')) {
             const extensions = this.tryJsonParse(payload.toString());
@@ -610,43 +511,32 @@ export class Zigbee2MQTT extends EventEmitter {
                 }
                 return;
             }
-            if (this.log.logLevel === "debug" && this.loggedEntries < 1000) {
+            if (this.log.logLevel === "debug" && this.loggedBridgePayloads < 10000) {
                 const logEntry = {
                     entity,
                     service,
                     payload: payload.toString(),
                 };
                 const filePath = path.join(this.mqttDataPath, 'bridge-payloads.txt');
-                fs.appendFileSync(filePath, JSON.stringify(logEntry) + '\n');
-                this.loggedEntries++;
+                fs.appendFileSync(filePath, `${new Date().toLocaleString()} - ` + JSON.stringify(logEntry).replaceAll('\\"', '"') + '\n');
+                this.loggedBridgePayloads++;
             }
-            const foundDevice = this.z2mDevices.findIndex((device) => device.ieee_address === entity || device.friendly_name === entity);
-            if (foundDevice !== -1) {
+            const foundDevice = this.z2mDevices.find((device) => device.ieee_address === entity || device.friendly_name === entity);
+            if (foundDevice) {
                 this.handleDeviceMessage(foundDevice, entity, service, payload);
             }
             else {
-                const foundGroup = this.z2mGroups.findIndex((group) => group.friendly_name === entity);
-                if (foundGroup !== -1) {
+                const foundGroup = this.z2mGroups.find((group) => group.friendly_name === entity);
+                if (foundGroup) {
                     this.handleGroupMessage(foundGroup, entity, service, payload);
                 }
                 else {
-                    try {
-                        this.log.debug('Message for ***unknown*** entity:', entity, 'service:', service, 'payload:', payload);
-                    }
-                    catch {
-                        this.log.debug('Message for ***unknown*** entity:', entity, 'service:', service, 'payload: error');
-                    }
+                    this.log.debug('Message for ***unknown*** entity:', entity, 'service:', service, 'payload:', payload);
                 }
             }
         }
     }
-    getDevice(name) {
-        return this.z2mDevices.find((device) => device.ieee_address === name || device.friendly_name === name);
-    }
-    getGroup(name) {
-        return this.z2mGroups.find((group) => group.friendly_name === name);
-    }
-    handleDeviceMessage(deviceIndex, entity, service, payload) {
+    handleDeviceMessage(device, entity, service, payload) {
         if (payload.length === 0 || payload === null) {
             return;
         }
@@ -660,13 +550,10 @@ export class Zigbee2MQTT extends EventEmitter {
         }
         if (service === 'availability') {
             if (data.state === 'online') {
-                this.z2mDevices[deviceIndex].isAvailabilityEnabled = true;
-                this.z2mDevices[deviceIndex].isOnline = true;
                 this.emit('availability', entity, true);
                 this.emit('ONLINE-' + entity);
             }
             else if (data.state === 'offline') {
-                this.z2mDevices[deviceIndex].isOnline = false;
                 this.emit('availability', entity, false);
                 this.emit('OFFLINE-' + entity);
             }
@@ -682,7 +569,7 @@ export class Zigbee2MQTT extends EventEmitter {
         else {
         }
     }
-    handleGroupMessage(groupIndex, entity, service, payload) {
+    handleGroupMessage(group, entity, service, payload) {
         if (payload.length === 0 || payload === null) {
             return;
         }
@@ -697,13 +584,10 @@ export class Zigbee2MQTT extends EventEmitter {
         data['last_seen'] = new Date().toISOString();
         if (service === 'availability') {
             if (data.state === 'online') {
-                this.z2mGroups[groupIndex].isAvailabilityEnabled = true;
-                this.z2mGroups[groupIndex].isOnline = true;
                 this.emit('availability', entity, true);
                 this.emit('ONLINE-' + entity);
             }
             else if (data.state === 'offline') {
-                this.z2mGroups[groupIndex].isOnline = false;
                 this.emit('availability', entity, false);
                 this.emit('OFFLINE-' + entity);
             }
@@ -921,115 +805,4 @@ export class Zigbee2MQTT extends EventEmitter {
     emitPayload(entity, data) {
         this.emit('MESSAGE-' + entity, data);
     }
-    printDevice(device) {
-        this.log.debug(`Device - ${dn}${device.friendly_name}${rs}`);
-        this.log.debug(`IEEE Address: ${device.ieee_address}`);
-        this.log.debug(`Description: ${device.description}`);
-        this.log.debug(`Manufacturer: ${device.manufacturer}`);
-        this.log.debug(`Model ID: ${device.model_id}`);
-        this.log.debug(`Date Code: ${device.date_code}`);
-        this.log.debug(`Software Build ID: ${device.software_build_id}`);
-        this.log.debug(`Power Source: ${device.power_source}`);
-        this.log.debug(`Availability Enabled: ${device.isAvailabilityEnabled}`);
-        this.log.debug(`Online: ${device.isOnline}`);
-        this.log.debug(`Type: ${device.category}`);
-        const printFeatures = (features, featureType) => {
-            this.log.debug(`${featureType}:`);
-            features.forEach((feature) => {
-                this.log.debug(`  Name: ${zb}${feature.name}${rs}`);
-                this.log.debug(`  Description: ${feature.description}`);
-                this.log.debug(`  Property: ${zb}${feature.property}${rs}`);
-                this.log.debug(`  Type: ${feature.type}`);
-                this.log.debug(`  Access: ${feature.access}`);
-                if (feature.endpoint) {
-                    this.log.debug(`  Endpoint: ${feature.endpoint}`);
-                }
-                if (feature.unit) {
-                    this.log.debug(`  Unit: ${feature.unit}`);
-                }
-                if (feature.value_max) {
-                    this.log.debug(`  Value Max: ${feature.value_max}`);
-                }
-                if (feature.value_min) {
-                    this.log.debug(`  Value Min: ${feature.value_min}`);
-                }
-                if (feature.value_step) {
-                    this.log.debug(`  Value Step: ${feature.value_step}`);
-                }
-                if (feature.value_on) {
-                    this.log.debug(`  Value On: ${feature.value_on}`);
-                }
-                if (feature.value_off) {
-                    this.log.debug(`  Value Off: ${feature.value_off}`);
-                }
-                if (feature.value_toggle) {
-                    this.log.debug(`  Value Toggle: ${feature.value_toggle}`);
-                }
-                if (feature.values) {
-                    this.log.debug(`  Values: ${feature.values.join(', ')}`);
-                }
-                if (feature.presets) {
-                    this.log.debug(`  Presets: ${feature.presets.join(', ')}`);
-                }
-                this.log.debug('');
-            });
-        };
-        const printEndpoints = (endpoints) => {
-            endpoints.forEach((endpoint) => {
-                this.log.debug(`--Endpoint ${endpoint.endpoint}`);
-                endpoint.bindings.forEach((binding) => {
-                    this.log.debug(`----Bindings: ${binding.cluster}`, binding.target);
-                });
-                endpoint.clusters.input.forEach((input) => {
-                    this.log.debug(`----Clusters input: ${input}`);
-                });
-                endpoint.clusters.output.forEach((output) => {
-                    this.log.debug(`----Clusters output: ${output}`);
-                });
-                endpoint.configured_reportings.forEach((reporting) => {
-                    this.log.debug(`----Reportings: ${reporting.attribute} ${reporting.cluster} ${reporting.minimum_report_interval} ${reporting.maximum_report_interval}  ${reporting.reportable_change}`);
-                });
-                endpoint.scenes.forEach((scene) => {
-                    this.log.debug(`----Scenes: ID ${scene.id} Name ${scene.name}`);
-                });
-                this.log.debug('');
-            });
-        };
-        printFeatures(device.exposes, 'Exposes');
-        printFeatures(device.options, 'Options');
-        printEndpoints(device.endpoints);
-        this.log.debug('');
-    }
-    printDevices() {
-        this.z2mDevices.forEach((device) => {
-            this.printDevice(device);
-        });
-    }
-    printGroup(group) {
-        this.log.debug(`Group - ${dn}${group.friendly_name}${rs}`);
-        this.log.debug(`ID: ${group.id}`);
-        const printMembers = (members) => {
-            this.log.debug('Members:');
-            members.forEach((member) => {
-                this.log.debug(`--Endpoint ${member.endpoint}`);
-                this.log.debug(`--IEEE Address ${member.ieee_address}`);
-            });
-        };
-        printMembers(group.members);
-        const printScenes = (scenes) => {
-            this.log.debug('Scenes:');
-            scenes.forEach((scene) => {
-                this.log.debug(`--ID ${scene.id}`);
-                this.log.debug(`--Name ${scene.name}`);
-            });
-        };
-        printScenes(group.scenes);
-        this.log.debug(`Availability Enabled: ${group.isAvailabilityEnabled}`);
-        this.log.debug(`Online: ${group.isOnline}`);
-    }
-    printGroups() {
-        this.z2mGroups.forEach((group) => {
-            this.printGroup(group);
-        });
-    }
 }

package/matterbridge-zigbee2mqtt.config.json

@@ -0,0 +1,28 @@
+{
+  "name": "matterbridge-zigbee2mqtt",
+  "type": "DynamicPlatform",
+  "version": "2.9.0",
+  "host": "mqtt://localhost",
+  "port": 1883,
+  "protocolVersion": 5,
+  "username": "",
+  "password": "",
+  "ca": "",
+  "rejectUnauthorized": true,
+  "cert": "",
+  "key": "",
+  "topic": "zigbee2mqtt",
+  "zigbeeFrontend": "http://localhost:8080",
+  "whiteList": [],
+  "blackList": [],
+  "switchList": [],
+  "lightList": [],
+  "outletList": [],
+  "featureBlackList": [],
+  "deviceFeatureBlackList": {},
+  "scenesType": "outlet",
+  "scenesPrefix": true,
+  "postfix": "",
+  "debug": false,
+  "unregisterOnShutdown": false
+}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge-zigbee2mqtt",
-  "version": "2.8.1",
+  "version": "3.0.0-dev-20251102-bcdd456",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge-zigbee2mqtt",
-      "version": "2.8.1",
+      "version": "3.0.0-dev-20251102-bcdd456",
       "license": "Apache-2.0",
       "dependencies": {
         "moment": "2.30.1",
@@ -15,7 +15,7 @@
         "node-persist-manager": "2.0.0"
       },
       "engines": {
-        "node": ">=18.0.0 <19.0.0 || >=20.0.0 <21.0.0 || >=22.0.0 <23.0.0 || >=24.0.0 <25.0.0"
+        "node": ">=20.0.0 <21.0.0 || >=22.0.0 <23.0.0 || >=24.0.0 <25.0.0"
       },
       "funding": {
         "type": "buymeacoffee",
@@ -32,18 +32,18 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "24.6.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.6.1.tgz",
-      "integrity": "sha512-ljvjjs3DNXummeIaooB4cLBKg2U6SPI6Hjra/9rRIy7CpM0HpLtG9HptkMKAb4HYWy5S7HUvJEuWgr/y0U8SHw==",
+      "version": "24.9.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.2.tgz",
+      "integrity": "sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA==",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.13.0"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/readable-stream": {
-      "version": "4.0.21",
-      "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.21.tgz",
-      "integrity": "sha512-19eKVv9tugr03IgfXlA9UVUVRbW6IuqRO5B92Dl4a6pT7K8uaGrNS0GkxiZD0BOk6PLuXl5FhWl//eX/pzYdTQ==",
+      "version": "4.0.22",
+      "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.22.tgz",
+      "integrity": "sha512-/FFhJpfCLAPwAcN3mFycNUa77ddnr8jTgF5VmSNetaemWB2cIlfCA9t0YTM3JAT0wOcv8D4tjPo7pkDhK3EJIg==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -91,9 +91,9 @@
       "license": "MIT"
     },
     "node_modules/bl": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.3.tgz",
-      "integrity": "sha512-nHB8B5roHlGX5TFsWeiQJijdddZIOHuv1eL2cM2kHnG3qR91CYLsysGe+CvxQfEd23EKD0eJf4lto0frTbddKA==",
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.4.tgz",
+      "integrity": "sha512-ZV/9asSuknOExbM/zPPA8z00lc1ihPKWaStHkkQrxHNeYx+yY+TmF+v80dpv2G0mv3HVXBu7ryoAsxbFFhf4eg==",
       "license": "MIT",
       "dependencies": {
         "@types/readable-stream": "^4.0.0",
@@ -530,9 +530,9 @@
       "license": "MIT"
     },
     "node_modules/undici-types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.13.0.tgz",
-      "integrity": "sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
       "license": "MIT"
     },
     "node_modules/util-deprecate": {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "matterbridge-zigbee2mqtt",
-  "version": "2.8.1",
+  "version": "3.0.0-dev-20251102-bcdd456",
   "description": "Matterbridge zigbee2mqtt plugin",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",
   "type": "module",
-  "main": "dist/index.js",
+  "main": "dist/module.js",
   "homepage": "https://www.npmjs.com/package/matterbridge-zigbee2mqtt",
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
     "zigbee2mqtt"
   ],
   "engines": {
-    "node": ">=18.0.0 <19.0.0 || >=20.0.0 <21.0.0 || >=22.0.0 <23.0.0 || >=24.0.0 <25.0.0"
+    "node": ">=20.0.0 <21.0.0 || >=22.0.0 <23.0.0 || >=24.0.0 <25.0.0"
   },
   "dependencies": {
     "moment": "2.30.1",

package/dist/index.js

@@ -1,4 +0,0 @@
-import { ZigbeePlatform } from './platform.js';
-export default function initializePlugin(matterbridge, log, config) {
-    return new ZigbeePlatform(matterbridge, log, config);
-}

package/dist/jestHelpers.js

@@ -1,231 +0,0 @@
-import { rmSync } from 'node:fs';
-import { inspect } from 'node:util';
-import path from 'node:path';
-import { jest } from '@jest/globals';
-import { DeviceTypeId, Endpoint, Environment, MdnsService, ServerNode, ServerNodeStore, VendorId, LogFormat as MatterLogFormat, LogLevel as MatterLogLevel, Lifecycle, } from 'matterbridge/matter';
-import { RootEndpoint, AggregatorEndpoint } from 'matterbridge/matter/endpoints';
-import { AnsiLogger } from 'matterbridge/logger';
-export let loggerLogSpy;
-export let consoleLogSpy;
-export let consoleDebugSpy;
-export let consoleInfoSpy;
-export let consoleWarnSpy;
-export let consoleErrorSpy;
-export function setupTest(name, debug = false) {
-    expect(name).toBeDefined();
-    expect(typeof name).toBe('string');
-    expect(name.length).toBeGreaterThanOrEqual(4);
-    rmSync(path.join('jest', name), { recursive: true, force: true });
-    if (debug) {
-        loggerLogSpy = jest.spyOn(AnsiLogger.prototype, 'log');
-        consoleLogSpy = jest.spyOn(console, 'log');
-        consoleDebugSpy = jest.spyOn(console, 'debug');
-        consoleInfoSpy = jest.spyOn(console, 'info');
-        consoleWarnSpy = jest.spyOn(console, 'warn');
-        consoleErrorSpy = jest.spyOn(console, 'error');
-    }
-    else {
-        loggerLogSpy = jest.spyOn(AnsiLogger.prototype, 'log').mockImplementation(() => { });
-        consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => { });
-        consoleDebugSpy = jest.spyOn(console, 'debug').mockImplementation(() => { });
-        consoleInfoSpy = jest.spyOn(console, 'info').mockImplementation(() => { });
-        consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => { });
-        consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => { });
-    }
-}
-export function setDebug(debug) {
-    if (debug) {
-        loggerLogSpy.mockRestore();
-        consoleLogSpy.mockRestore();
-        consoleDebugSpy.mockRestore();
-        consoleInfoSpy.mockRestore();
-        consoleWarnSpy.mockRestore();
-        consoleErrorSpy.mockRestore();
-        loggerLogSpy = jest.spyOn(AnsiLogger.prototype, 'log');
-        consoleLogSpy = jest.spyOn(console, 'log');
-        consoleDebugSpy = jest.spyOn(console, 'debug');
-        consoleInfoSpy = jest.spyOn(console, 'info');
-        consoleWarnSpy = jest.spyOn(console, 'warn');
-        consoleErrorSpy = jest.spyOn(console, 'error');
-    }
-    else {
-        loggerLogSpy = jest.spyOn(AnsiLogger.prototype, 'log').mockImplementation(() => { });
-        consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => { });
-        consoleDebugSpy = jest.spyOn(console, 'debug').mockImplementation(() => { });
-        consoleInfoSpy = jest.spyOn(console, 'info').mockImplementation(() => { });
-        consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => { });
-        consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => { });
-    }
-}
-export function createTestEnvironment(homeDir) {
-    expect(homeDir).toBeDefined();
-    expect(typeof homeDir).toBe('string');
-    expect(homeDir.length).toBeGreaterThanOrEqual(4);
-    rmSync(homeDir, { recursive: true, force: true });
-    const environment = Environment.default;
-    environment.vars.set('log.level', MatterLogLevel.DEBUG);
-    environment.vars.set('log.format', MatterLogFormat.ANSI);
-    environment.vars.set('path.root', homeDir);
-    environment.vars.set('runtime.signals', false);
-    environment.vars.set('runtime.exitcode', false);
-    return environment;
-}
-export async function flushAsync(ticks = 3, microTurns = 10, pause = 100) {
-    for (let i = 0; i < ticks; i++)
-        await new Promise((resolve) => setImmediate(resolve));
-    for (let i = 0; i < microTurns; i++)
-        await Promise.resolve();
-    if (pause)
-        await new Promise((resolve) => setTimeout(resolve, pause));
-}
-export async function flushAllEndpointNumberPersistence(targetServer, rounds = 2) {
-    const nodeStore = targetServer.env.get(ServerNodeStore);
-    for (let i = 0; i < rounds; i++) {
-        await new Promise((resolve) => setImmediate(resolve));
-        await nodeStore.endpointStores.close();
-    }
-}
-function collectAllEndpoints(root) {
-    const list = [];
-    const walk = (ep) => {
-        list.push(ep);
-        if (ep.parts) {
-            for (const child of ep.parts) {
-                walk(child);
-            }
-        }
-    };
-    walk(root);
-    return list;
-}
-export async function assertAllEndpointNumbersPersisted(targetServer) {
-    const nodeStore = targetServer.env.get(ServerNodeStore);
-    await nodeStore.endpointStores.close();
-    const all = collectAllEndpoints(targetServer);
-    for (const ep of all) {
-        const store = nodeStore.storeForEndpoint(ep);
-        if (ep.maybeNumber === 0) {
-            expect(store.number ?? 0).toBe(0);
-        }
-        else {
-            expect(store.number).toBeGreaterThan(0);
-        }
-    }
-    return all.length;
-}
-export async function startServerNode(name, port) {
-    const server = await ServerNode.create({
-        id: name + 'ServerNode',
-        productDescription: {
-            name: name + 'ServerNode',
-            deviceType: DeviceTypeId(RootEndpoint.deviceType),
-            vendorId: VendorId(0xfff1),
-            productId: 0x8000,
-        },
-        basicInformation: {
-            vendorId: VendorId(0xfff1),
-            vendorName: 'Matterbridge',
-            productId: 0x8000,
-            productName: 'Matterbridge ' + name,
-            nodeLabel: name + 'ServerNode',
-            hardwareVersion: 1,
-            softwareVersion: 1,
-            reachable: true,
-        },
-        network: {
-            port,
-        },
-    });
-    expect(server).toBeDefined();
-    expect(server.lifecycle.isReady).toBeTruthy();
-    const aggregator = new Endpoint(AggregatorEndpoint, {
-        id: name + 'AggregatorNode',
-    });
-    expect(aggregator).toBeDefined();
-    await server.add(aggregator);
-    expect(server.parts.has(aggregator.id)).toBeTruthy();
-    expect(server.parts.has(aggregator)).toBeTruthy();
-    expect(aggregator.lifecycle.isReady).toBeTruthy();
-    expect(server.lifecycle.isOnline).toBeFalsy();
-    await new Promise((resolve) => {
-        server.lifecycle.online.on(async () => {
-            resolve();
-        });
-        server.start();
-    });
-    expect(server.lifecycle.isReady).toBeTruthy();
-    expect(server.lifecycle.isOnline).toBeTruthy();
-    expect(server.lifecycle.isCommissioned).toBeFalsy();
-    expect(server.lifecycle.isPartsReady).toBeTruthy();
-    expect(server.lifecycle.hasId).toBeTruthy();
-    expect(server.lifecycle.hasNumber).toBeTruthy();
-    expect(aggregator.lifecycle.isReady).toBeTruthy();
-    expect(aggregator.lifecycle.isInstalled).toBeTruthy();
-    expect(aggregator.lifecycle.isPartsReady).toBeTruthy();
-    expect(aggregator.lifecycle.hasId).toBeTruthy();
-    expect(aggregator.lifecycle.hasNumber).toBeTruthy();
-    await flushAsync(undefined, undefined, 200);
-    return [server, aggregator];
-}
-export async function stopServerNode(server) {
-    await flushAllEndpointNumberPersistence(server);
-    await assertAllEndpointNumbersPersisted(server);
-    expect(server).toBeDefined();
-    expect(server.lifecycle.isReady).toBeTruthy();
-    expect(server.lifecycle.isOnline).toBeTruthy();
-    await server.close();
-    expect(server.lifecycle.isReady).toBeTruthy();
-    expect(server.lifecycle.isOnline).toBeFalsy();
-    await server.env.get(MdnsService)[Symbol.asyncDispose]();
-    await flushAsync(undefined, undefined, 200);
-}
-export async function addDevice(owner, device, pause = 10) {
-    expect(owner).toBeDefined();
-    expect(device).toBeDefined();
-    expect(owner.lifecycle.isReady).toBeTruthy();
-    expect(owner.construction.status).toBe(Lifecycle.Status.Active);
-    expect(owner.lifecycle.isPartsReady).toBeTruthy();
-    try {
-        await owner.add(device);
-    }
-    catch (error) {
-        const errorMessage = error instanceof Error ? error.message : error;
-        const errorInspect = inspect(error, { depth: 10 });
-        console.error(`Error adding device ${device.maybeId}.${device.maybeNumber}: ${errorMessage}\nstack: ${errorInspect}`);
-        return false;
-    }
-    expect(owner.parts.has(device)).toBeTruthy();
-    expect(owner.lifecycle.isPartsReady).toBeTruthy();
-    expect(device.lifecycle.isReady).toBeTruthy();
-    expect(device.lifecycle.isInstalled).toBeTruthy();
-    expect(device.lifecycle.hasId).toBeTruthy();
-    expect(device.lifecycle.hasNumber).toBeTruthy();
-    expect(device.construction.status).toBe(Lifecycle.Status.Active);
-    await flushAsync(1, 1, pause);
-    return true;
-}
-export async function deleteDevice(owner, device, pause = 10) {
-    expect(owner).toBeDefined();
-    expect(device).toBeDefined();
-    expect(owner.lifecycle.isReady).toBeTruthy();
-    expect(owner.construction.status).toBe(Lifecycle.Status.Active);
-    expect(owner.lifecycle.isPartsReady).toBeTruthy();
-    try {
-        await device.delete();
-    }
-    catch (error) {
-        const errorMessage = error instanceof Error ? error.message : error;
-        const errorInspect = inspect(error, { depth: 10 });
-        console.error(`Error deleting device ${device.maybeId}.${device.maybeNumber}: ${errorMessage}\nstack: ${errorInspect}`);
-        return false;
-    }
-    expect(owner.parts.has(device)).toBeFalsy();
-    expect(owner.lifecycle.isPartsReady).toBeTruthy();
-    expect(device.lifecycle.isReady).toBeFalsy();
-    expect(device.lifecycle.isInstalled).toBeFalsy();
-    expect(device.lifecycle.hasId).toBeTruthy();
-    expect(device.lifecycle.hasNumber).toBeTruthy();
-    expect(device.construction.status).toBe(Lifecycle.Status.Destroyed);
-    await flushAsync(1, 1, pause);
-    return true;
-}