matterbridge-zigbee2mqtt 2.8.1 → 2.9.0-dev-20251101-be5ef3b

package/CHANGELOG.md

@@ -8,6 +8,34 @@ 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>
 
+## [2.9.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.1.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

@@ -326,8 +326,9 @@ export class ZigbeeEntity extends EventEmitter {
             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) {
@@ -335,16 +336,18 @@ export class ZigbeeEntity extends EventEmitter {
             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) {
@@ -353,25 +356,27 @@ export class ZigbeeEntity extends EventEmitter {
             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);
+            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 : '');
+                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,12 +386,13 @@ 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.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)}.`);
         }
     }
@@ -397,7 +403,8 @@ export class ZigbeeEntity extends EventEmitter {
             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'];
@@ -406,7 +413,8 @@ export class ZigbeeEntity extends EventEmitter {
             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'];
@@ -415,7 +423,8 @@ export class ZigbeeEntity extends EventEmitter {
             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'];
@@ -424,7 +433,8 @@ export class ZigbeeEntity extends EventEmitter {
             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 = [];
@@ -39,8 +42,8 @@ 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;
@@ -81,8 +84,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,6 +99,7 @@ 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.log.debug(`Config:\n${rs}${JSON.stringify(config, null, 2)}${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.setDataPath(path.join(matterbridge.matterbridgePluginDirectory, 'matterbridge-zigbee2mqtt'));

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": "2.9.0-dev-20251101-be5ef3b",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge-zigbee2mqtt",
-      "version": "2.8.1",
+      "version": "2.9.0-dev-20251101-be5ef3b",
       "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": "2.9.0-dev-20251101-be5ef3b",
   "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;
-}