matterbridge-zigbee2mqtt 3.1.0 → 3.2.0-dev-20260705-147850d

package/CHANGELOG.md

@@ -9,9 +9,11 @@
 ![Node.js CI](https://github.com/Luligu/matterbridge-zigbee2mqtt/actions/workflows/build.yml/badge.svg)
 ![CodeQL](https://github.com/Luligu/matterbridge-zigbee2mqtt/actions/workflows/codeql.yml/badge.svg)
 [![codecov](https://codecov.io/gh/Luligu/matterbridge-zigbee2mqtt/branch/main/graph/badge.svg)](https://codecov.io/gh/Luligu/matterbridge-zigbee2mqtt)
-[![styled with prettier](https://img.shields.io/badge/styled_with-Prettier-f8bc45.svg?logo=prettier)](https://prettier.io/)
-[![linted with eslint](https://img.shields.io/badge/linted_with-ES_Lint-4B32C3.svg?logo=eslint)](https://eslint.org/)
+[![tested with Vitest](https://img.shields.io/badge/tested_with-Vitest-6E9F18.svg?logo=vitest&logoColor=white)](https://vitest.dev)
+[![styled with Oxc](https://img.shields.io/badge/styled_with-Oxc-9BE4E0.svg?logo=oxc&logoColor=white)](https://oxc.rs/docs/guide/usage/formatter.html)
+[![linted with Oxc](https://img.shields.io/badge/linted_with-Oxc-9BE4E0.svg?logo=oxc&logoColor=white)](https://oxc.rs/docs/guide/usage/linter.html)
 [![TypeScript](https://img.shields.io/badge/TypeScript-3178C6?logo=typescript&logoColor=white)](https://www.typescriptlang.org/)
+[![TypeScript Native](https://img.shields.io/badge/TypeScript_Native-3178C6?logo=typescript&logoColor=white)](https://github.com/microsoft/typescript-go)
 [![ESM](https://img.shields.io/badge/ESM-Node.js-339933?logo=node.js&logoColor=white)](https://nodejs.org/)
 [![matterbridge.io](https://img.shields.io/badge/matterbridge.io-online-brightgreen)](https://matterbridge.io)
 
@@ -28,6 +30,24 @@ If you like this project and find it useful, please consider giving it a star on
 
 <a href="https://www.buymeacoffee.com/luligugithub"><img src="https://matterbridge.io/assets/bmc-button.svg" alt="Buy me a coffee" width="120"></a>
 
+## [3.2.0] - Dev branch
+
+### Breaking changes
+
+- [matterbridge]: Require matterbridge v.3.9.0.
+
+### Changed
+
+- [toolchain]: Migrate to the native toolchain (tsgo + oxlint + oxfmt + vitest). Replace ESLint/Prettier/Jest with oxlint/oxfmt and Vitest.
+- [vitest]: Move the tests from `src` to `vitest` and migrate them from Jest and `matterbridge/jestutils` to Vitest and `matterbridge/vitest-utils`.
+- [vitest]: Update the test assertions for matterbridge v.3.9.x: endpoint names now use the device type name (i.e. `OnOffLightSwitch` instead of `MA-onoffswitch`) and `onOffLightSwitch` includes the `Binding` cluster.
+- [package]: Update dependencies.
+- [package]: Apply style.
+- [package]: Bump `node-ansi-logger` to v.3.3.0.
+- [package]: Bump `node-persist-manager` to v.2.1.0.
+
+<a href="https://www.buymeacoffee.com/luligugithub"><img src="https://matterbridge.io/assets/bmc-button.svg" alt="Buy me a coffee" width="80"></a>
+
 ## [3.1.0] - 2026-06-07
 
 ### Breaking changes

package/README.md

@@ -9,9 +9,11 @@
 ![Node.js CI](https://github.com/Luligu/matterbridge-zigbee2mqtt/actions/workflows/build.yml/badge.svg)
 ![CodeQL](https://github.com/Luligu/matterbridge-zigbee2mqtt/actions/workflows/codeql.yml/badge.svg)
 [![codecov](https://codecov.io/gh/Luligu/matterbridge-zigbee2mqtt/branch/main/graph/badge.svg)](https://codecov.io/gh/Luligu/matterbridge-zigbee2mqtt)
-[![styled with prettier](https://img.shields.io/badge/styled_with-Prettier-f8bc45.svg?logo=prettier)](https://prettier.io/)
-[![linted with eslint](https://img.shields.io/badge/linted_with-ES_Lint-4B32C3.svg?logo=eslint)](https://eslint.org/)
+[![tested with Vitest](https://img.shields.io/badge/tested_with-Vitest-6E9F18.svg?logo=vitest&logoColor=white)](https://vitest.dev)
+[![styled with Oxc](https://img.shields.io/badge/styled_with-Oxc-9BE4E0.svg?logo=oxc&logoColor=white)](https://oxc.rs/docs/guide/usage/formatter.html)
+[![linted with Oxc](https://img.shields.io/badge/linted_with-Oxc-9BE4E0.svg?logo=oxc&logoColor=white)](https://oxc.rs/docs/guide/usage/linter.html)
 [![TypeScript](https://img.shields.io/badge/TypeScript-3178C6?logo=typescript&logoColor=white)](https://www.typescriptlang.org/)
+[![TypeScript Native](https://img.shields.io/badge/TypeScript_Native-3178C6?logo=typescript&logoColor=white)](https://github.com/microsoft/typescript-go)
 [![ESM](https://img.shields.io/badge/ESM-Node.js-339933?logo=node.js&logoColor=white)](https://nodejs.org/)
 [![matterbridge.io](https://img.shields.io/badge/matterbridge.io-online-brightgreen)](https://matterbridge.io)
 

package/dist/entity.js

@@ -1,7 +1,7 @@
 import EventEmitter from 'node:events';
 import fs from 'node:fs';
 import path from 'node:path';
-import { airQualitySensor, bridgedNode, colorTemperatureLight, colorTemperatureSwitch, contactSensor, coverDevice, dimmableLight, dimmableOutlet, dimmableSwitch, doorLockDevice, electricalSensor, extendedColorLight, genericSwitch, humiditySensor, lightSensor, MatterbridgeEndpoint, occupancySensor, onOffLight, onOffOutlet, onOffSwitch, powerSource, pressureSensor, rainSensor, smokeCoAlarm, temperatureSensor, thermostatDevice, waterLeakDetector, } from 'matterbridge';
+import { airQualitySensor, bridgedNode, colorDimmerSwitch, colorTemperatureLight, contactSensor, dimmableLight, dimmablePlugInUnit, dimmerSwitch, doorLock, electricalSensor, extendedColorLight, genericSwitch, humiditySensor, lightSensor, MatterbridgeEndpoint, occupancySensor, onOffLight, onOffLightSwitch, onOffPlugInUnit, powerSource, pressureSensor, rainSensor, smokeCoAlarm, temperatureSensor, thermostat, waterLeakDetector, windowCovering, } from 'matterbridge';
 import { AnsiLogger, CYAN, db, debugStringify, dn, gn, hk, idn, ign, nf, or, rs, YELLOW, zb } from 'matterbridge/logger';
 import { NumberTag, SwitchesTag } from 'matterbridge/matter';
 import { AirQuality, BooleanState, BridgedDeviceBasicInformation, CarbonDioxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurement, ColorControl, DoorLock, ElectricalEnergyMeasurement, ElectricalPowerMeasurement, FormaldehydeConcentrationMeasurement, Identify, IlluminanceMeasurement, LevelControl, OccupancySensing, OnOff, Pm1ConcentrationMeasurement, Pm10ConcentrationMeasurement, Pm25ConcentrationMeasurement, PowerSource, PressureMeasurement, RelativeHumidityMeasurement, SmokeCoAlarm, TemperatureMeasurement, Thermostat, TotalVolatileOrganicCompoundsConcentrationMeasurement, WindowCovering, } from 'matterbridge/matter/clusters';
@@ -20,7 +20,7 @@ export class ZigbeeEntity extends EventEmitter {
     en = '';
     ien = '';
     bridgedDevice;
-    eidn = `${or}`;
+    eidn = or;
     lastPayload = {};
     lastSeen = 0;
     ignoreFeatures = [];
@@ -42,14 +42,14 @@ export class ZigbeeEntity extends EventEmitter {
     constructor(platform, entity) {
         super();
         this.platform = platform;
-        if (entity.ieee_address !== undefined) {
+        if (this.isValidDevice(entity)) {
             this.device = entity;
             this.entityName = entity.friendly_name;
             this.isDevice = true;
             this.en = dn;
             this.ien = idn;
         }
-        if (entity.id !== undefined) {
+        if (this.isValidGroup(entity)) {
             this.group = entity;
             this.entityName = entity.friendly_name;
             this.isGroup = true;
@@ -122,8 +122,7 @@ export class ZigbeeEntity extends EventEmitter {
                         `endpoint: ${CYAN}${propertyMap.endpoint === '' ? 'main' : propertyMap.endpoint}${db}`);
                     let z2m;
                     z2m = z2ms.find((z2m) => z2m.type === propertyMap?.type && z2m.property === propertyMap?.name);
-                    if (!z2m)
-                        z2m = z2ms.find((z2m) => z2m.property === propertyMap?.name);
+                    z2m ??= z2ms.find((z2m) => z2m.property === propertyMap?.name);
                     if (z2m) {
                         if (z2m.valueLookup && propertyMap.values && propertyMap.values !== '' && typeof value === 'string' && !propertyMap.values.includes(value)) {
                             this.log.debug(`*Payload entry ${CYAN}${key}${db} value ${CYAN}${value}${db} not found in propertyMap values ${CYAN}${propertyMap.values}${db}`);
@@ -139,15 +138,15 @@ export class ZigbeeEntity extends EventEmitter {
                 }
                 else
                     this.log.debug(`*Payload entry ${CYAN}${key}${db} not found in propertyMap`);
-                if (key === 'action' && value !== '') {
-                    const propertyMap = this.propertyMap.get(('action_' + value));
+                if (key === 'action' && typeof value === 'string' && value !== '') {
+                    const propertyMap = this.propertyMap.get('action_' + value);
                     if (propertyMap) {
                         const child = this.bridgedDevice.getChildEndpointById(propertyMap.endpoint);
-                        if (child && child.maybeNumber)
+                        if (child?.maybeNumber)
                             fireAndForget(child.triggerSwitchEvent(propertyMap.action, this.log), this.log, `Error triggering switch event ${propertyMap.action} on ${propertyMap.endpoint}`);
                     }
                     else
-                        this.log.debug(`*Payload entry ${CYAN}${('action_' + value)}${db} not found in propertyMap`);
+                        this.log.debug(`*Payload entry ${CYAN}${'action_' + value}${db} not found in propertyMap`);
                 }
                 if (key === 'position' && this.isDevice && isValidNumber(value, 0, 100)) {
                     this.updateAttributeIfChanged(this.bridgedDevice, undefined, WindowCovering.id, 'currentPositionLiftPercent100ths', value * 100);
@@ -257,6 +256,12 @@ export class ZigbeeEntity extends EventEmitter {
         this.mutableDevice.clear();
         this.propertyMap.clear();
     }
+    isValidDevice(entity) {
+        return 'ieee_address' in entity;
+    }
+    isValidGroup(entity) {
+        return 'id' in entity;
+    }
     cachePublish(command = 'unknown', payload, transitionTime) {
         if (command === 'moveToColorTemperature') {
             delete this.cachePayload['color'];
@@ -286,17 +291,17 @@ export class ZigbeeEntity extends EventEmitter {
             }, this.noUpdateTimeoutTime).unref();
         }, this.cachePublishTimeoutTime).unref();
     }
-    setCachePublishAttributes(endpoint, postfix = undefined) {
+    setCachePublishAttributes(endpoint, postfix) {
         const brightness = endpoint.hasAttributeServer(LevelControl.id, 'currentLevel') ? Math.round((endpoint.getAttribute(LevelControl.id, 'currentLevel') / 254) * 255) : undefined;
         if (isValidNumber(brightness, 1, 255))
-            this.cachePayload['brightness' + (postfix || '')] = brightness;
+            this.cachePayload['brightness' + (postfix ?? '')] = brightness;
         const color_temp = endpoint.hasClusterServer(ColorControl.id) &&
             endpoint.hasAttributeServer(ColorControl.id, 'colorTemperatureMireds') &&
             endpoint.getAttribute(ColorControl.id, 'colorMode') === ColorControl.ColorMode.ColorTemperatureMireds
             ? endpoint.getAttribute(ColorControl.id, 'colorTemperatureMireds')
             : undefined;
         if (isValidNumber(color_temp))
-            this.cachePayload['color_temp' + (postfix || '')] = color_temp;
+            this.cachePayload['color_temp' + (postfix ?? '')] = color_temp;
         const hs_color = endpoint.hasClusterServer(ColorControl.id) &&
             endpoint.hasAttributeServer(ColorControl.id, 'currentHue') &&
             endpoint.hasAttributeServer(ColorControl.id, 'currentSaturation') &&
@@ -304,7 +309,7 @@ export class ZigbeeEntity extends EventEmitter {
             ? [Math.round((endpoint.getAttribute(ColorControl.id, 'currentHue') / 254) * 360), Math.round((endpoint.getAttribute(ColorControl.id, 'currentSaturation') / 254) * 100)]
             : undefined;
         if (isValidArray(hs_color, 2)) {
-            this.cachePayload['color' + (postfix || '')] = { h: hs_color[0], s: hs_color[1] };
+            this.cachePayload['color' + (postfix ?? '')] = { h: hs_color[0], s: hs_color[1] };
         }
         const xy_color = endpoint.hasClusterServer(ColorControl.id) &&
             endpoint.hasAttributeServer(ColorControl.id, 'currentX') &&
@@ -313,7 +318,7 @@ export class ZigbeeEntity extends EventEmitter {
             ? [endpoint.getAttribute(ColorControl.id, 'currentX') / 65535, endpoint.getAttribute(ColorControl.id, 'currentY') / 65535]
             : undefined;
         if (isValidArray(xy_color, 2))
-            this.cachePayload['color' + (postfix || '')] = { x: xy_color[0], y: xy_color[1] };
+            this.cachePayload['color' + (postfix ?? '')] = { x: xy_color[0], y: xy_color[1] };
         const lookupColorMode = [
             'CurrentHueAndCurrentSaturation',
             'CurrentXAndCurrentY',
@@ -470,11 +475,11 @@ export class ZigbeeEntity extends EventEmitter {
     addBridgedDeviceBasicInformation() {
         if (!this.bridgedDevice)
             throw new Error('No bridged device');
-        const softwareVersion = parseInt(this.platform.z2mBridgeInfo?.version || '1');
+        const softwareVersion = Number.parseInt(this.platform.z2mBridgeInfo?.version || '1');
         const softwareVersionString = `${this.platform.z2mBridgeInfo?.version} (commit ${this.platform.z2mBridgeInfo?.commit})`;
-        const hardwareVersion = parseInt(this.platform.matterbridge.matterbridgeVersion || '1');
+        const hardwareVersion = Number.parseInt(this.platform.matterbridge.matterbridgeVersion || '1');
         const hardwareVersionString = this.platform.matterbridge.matterbridgeVersion || 'unknown';
-        if (this.isDevice && this.device && this.device.friendly_name === 'Coordinator') {
+        if (this.isDevice && this.device?.friendly_name === 'Coordinator') {
             this.bridgedDevice.createDefaultBridgedDeviceBasicInformationClusterServer(this.device.friendly_name, this.serial, 0xfff1, 'zigbee2MQTT', 'Coordinator', softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString);
         }
         else if (this.isDevice && this.device) {
@@ -570,7 +575,7 @@ export class ZigbeeEntity extends EventEmitter {
                 return;
             }
         }
-        const localValue = deviceEndpoint.getAttribute(ClusterId(clusterId), attributeName, undefined);
+        const localValue = deviceEndpoint.getAttribute(ClusterId(clusterId), attributeName);
         if (typeof value === 'object' ? deepEqual(value, localValue) : value === localValue) {
             this.log.debug(`Skip update endpoint ${deviceEndpoint.name}:${deviceEndpoint.maybeNumber}${childEndpointName ? ' (' + childEndpointName + ')' : ''} ` +
                 `attribute ${getClusterNameById(ClusterId(clusterId))}.${attributeName} already ${typeof value === 'object' ? debugStringify(value) : value}`);
@@ -603,11 +608,11 @@ export class ZigbeeGroup extends ZigbeeEntity {
     }
     static async create(platform, group) {
         const zigbeeGroup = new ZigbeeGroup(platform, group);
-        if (zigbeeGroup.platform.postfix !== '') {
-            zigbeeGroup.serial = `group-${group.id}-${zigbeeGroup.platform.postfix}`.slice(0, 32);
+        if (zigbeeGroup.platform.postfix === '') {
+            zigbeeGroup.serial = `group-${group.id}`.slice(0, 32);
         }
         else {
-            zigbeeGroup.serial = `group-${group.id}`.slice(0, 32);
+            zigbeeGroup.serial = `group-${group.id}-${zigbeeGroup.platform.postfix}`.slice(0, 32);
         }
         platform.setSelectDevice(`group-${group.id}`, group.friendly_name, 'wifi');
         let useState = false;
@@ -623,7 +628,8 @@ export class ZigbeeGroup extends ZigbeeEntity {
         let isThermostat = false;
         if (group.members.length === 0) {
             zigbeeGroup.log.debug(`Group: ${gn}${group.friendly_name}${rs}${db} is a ${CYAN}virtual${db} group`);
-            zigbeeGroup.bridgedDevice = new MatterbridgeEndpoint([onOffSwitch, bridgedNode, powerSource], { id: group.friendly_name }, zigbeeGroup.log.logLevel === "debug");
+            zigbeeGroup.bridgedDevice = new MatterbridgeEndpoint([onOffLightSwitch, bridgedNode, powerSource], { id: group.friendly_name }, zigbeeGroup.log.logLevel === "debug");
+            zigbeeGroup.bridgedDevice.createDefaultOnOffClusterServer();
             isSwitch = true;
             zigbeeGroup.propertyMap.set('state', { name: 'state', type: 'switch', endpoint: '' });
         }
@@ -646,10 +652,10 @@ export class ZigbeeGroup extends ZigbeeEntity {
                                     isSwitch = true;
                                 if (expose.type === 'light')
                                     isLight = true;
-                                useState = useState === true || feature.name === 'state' ? true : false;
-                                useBrightness = useBrightness === true || feature.name === 'brightness' ? true : false;
-                                useColor = useColor === true || feature.property === 'color' ? true : false;
-                                useColorTemperature = useColorTemperature === true || feature.name === 'color_temp' ? true : false;
+                                useState = useState || feature.name === 'state' ? true : false;
+                                useBrightness = useBrightness || feature.name === 'brightness' ? true : false;
+                                useColor = useColor || feature.property === 'color' ? true : false;
+                                useColorTemperature = useColorTemperature || feature.name === 'color_temp' ? true : false;
                                 if (feature.value_min)
                                     minColorTemperature = Math.min(minColorTemperature, feature.value_min);
                                 if (feature.value_max)
@@ -668,7 +674,7 @@ export class ZigbeeGroup extends ZigbeeEntity {
                     }
                 });
                 device.definition?.options.forEach((option) => {
-                    useTransition = useTransition === true || option.name === 'transition' ? true : false;
+                    useTransition = useTransition || option.name === 'transition' ? true : false;
                 });
             });
             zigbeeGroup.log.debug(`Group ${gn}${group.friendly_name}${rs}${db} switch: ${CYAN}${isSwitch}${db} light: ${CYAN}${isLight}${db} cover: ${CYAN}${isCover}${db} thermostat: ${CYAN}${isThermostat}${db}`);
@@ -677,11 +683,11 @@ export class ZigbeeGroup extends ZigbeeEntity {
             if (useState) {
                 deviceType = onOffLight;
                 if (platform.switchList.includes(group.friendly_name))
-                    deviceType = onOffSwitch;
+                    deviceType = onOffLightSwitch;
                 else if (platform.lightList.includes(group.friendly_name))
                     deviceType = onOffLight;
                 else if (platform.outletList.includes(group.friendly_name))
-                    deviceType = onOffOutlet;
+                    deviceType = onOffPlugInUnit;
                 zigbeeGroup.propertyMap.set('state', { name: 'state', type: isLight ? 'light' : 'switch', endpoint: '' });
             }
             if (useBrightness) {
@@ -700,13 +706,13 @@ export class ZigbeeGroup extends ZigbeeEntity {
                 zigbeeGroup.propertyMap.set('color', { name: 'color', type: 'light', endpoint: '' });
             }
             if (isCover) {
-                deviceType = coverDevice;
+                deviceType = windowCovering;
                 zigbeeGroup.propertyMap.set('state', { name: 'state', type: 'cover', endpoint: '' });
                 zigbeeGroup.propertyMap.set('position', { name: 'position', type: 'cover', endpoint: '' });
                 zigbeeGroup.propertyMap.set('moving', { name: 'moving', type: 'cover', endpoint: '' });
             }
             if (isThermostat) {
-                deviceType = thermostatDevice;
+                deviceType = thermostat;
                 zigbeeGroup.propertyMap.set('local_temperature', { name: 'local_temperature', type: 'climate', endpoint: '' });
                 zigbeeGroup.propertyMap.set('current_heating_setpoint', { name: 'current_heating_setpoint', type: 'climate', endpoint: '' });
                 zigbeeGroup.propertyMap.set('current_cooling_setpoint', { name: 'current_cooling_setpoint', type: 'climate', endpoint: '' });
@@ -716,6 +722,8 @@ export class ZigbeeGroup extends ZigbeeEntity {
             if (!deviceType)
                 return zigbeeGroup;
             zigbeeGroup.bridgedDevice = new MatterbridgeEndpoint([deviceType, bridgedNode, powerSource], { id: group.friendly_name }, zigbeeGroup.log.logLevel === "debug");
+            if (deviceType.code === onOffLightSwitch.code)
+                zigbeeGroup.bridgedDevice.createDefaultOnOffClusterServer();
         }
         if (!platform.featureBlackList?.includes('scenes') && !platform.deviceFeatureBlackList[group.friendly_name]?.includes('scenes')) {
             for (const scene of group.scenes) {
@@ -729,7 +737,7 @@ export class ZigbeeGroup extends ZigbeeEntity {
         }
         zigbeeGroup.addBridgedDeviceBasicInformation();
         zigbeeGroup.addPowerSource();
-        zigbeeGroup.bridgedDevice.addRequiredClusterServers();
+        zigbeeGroup.bridgedDevice.addRequiredClusters();
         if (!zigbeeGroup.bridgedDevice || !zigbeeGroup.verifyMutableDevice(zigbeeGroup.bridgedDevice))
             return zigbeeGroup;
         zigbeeGroup.mutableDevice.clear();
@@ -855,34 +863,34 @@ export class ZigbeeGroup extends ZigbeeEntity {
     }
 }
 const z2ms = [
-    { type: 'switch', name: 'state', property: 'state', deviceType: onOffSwitch, cluster: OnOff.id, attribute: 'onOff', converter: (value) => { return value === 'ON' ? true : false; } },
-    { type: 'switch', name: 'brightness', property: 'brightness', deviceType: dimmableSwitch, cluster: LevelControl.id, attribute: 'currentLevel', converter: (value) => { return Math.max(1, Math.min(254, value)); } },
-    { type: 'switch', name: 'color_hs', property: 'color_hs', deviceType: colorTemperatureSwitch, cluster: ColorControl.id, attribute: 'colorMode' },
-    { type: 'switch', name: 'color_xy', property: 'color_xy', deviceType: colorTemperatureSwitch, cluster: ColorControl.id, attribute: 'colorMode' },
-    { type: 'switch', name: 'color_temp', property: 'color_temp', deviceType: colorTemperatureSwitch, cluster: ColorControl.id, attribute: 'colorMode' },
-    { type: 'outlet', name: 'state', property: 'state', deviceType: onOffOutlet, cluster: OnOff.id, attribute: 'onOff', converter: (value) => { return value === 'ON' ? true : false; } },
-    { type: 'outlet', name: 'brightness', property: 'brightness', deviceType: dimmableOutlet, cluster: LevelControl.id, attribute: 'currentLevel', converter: (value) => { return Math.max(1, Math.min(254, value)); } },
-    { type: 'light', name: 'state', property: 'state', deviceType: onOffLight, cluster: OnOff.id, attribute: 'onOff', converter: (value) => { return value === 'ON' ? true : false; } },
+    { type: 'switch', name: 'state', property: 'state', deviceType: onOffLightSwitch, cluster: OnOff.id, attribute: 'onOff', converter: (value) => { return value === 'ON'; } },
+    { type: 'switch', name: 'brightness', property: 'brightness', deviceType: dimmerSwitch, cluster: LevelControl.id, attribute: 'currentLevel', converter: (value) => { return Math.max(1, Math.min(254, value)); } },
+    { type: 'switch', name: 'color_hs', property: 'color_hs', deviceType: colorDimmerSwitch, cluster: ColorControl.id, attribute: 'colorMode' },
+    { type: 'switch', name: 'color_xy', property: 'color_xy', deviceType: colorDimmerSwitch, cluster: ColorControl.id, attribute: 'colorMode' },
+    { type: 'switch', name: 'color_temp', property: 'color_temp', deviceType: colorDimmerSwitch, cluster: ColorControl.id, attribute: 'colorMode' },
+    { type: 'outlet', name: 'state', property: 'state', deviceType: onOffPlugInUnit, cluster: OnOff.id, attribute: 'onOff', converter: (value) => { return value === 'ON'; } },
+    { type: 'outlet', name: 'brightness', property: 'brightness', deviceType: dimmablePlugInUnit, cluster: LevelControl.id, attribute: 'currentLevel', converter: (value) => { return Math.max(1, Math.min(254, value)); } },
+    { type: 'light', name: 'state', property: 'state', deviceType: onOffLight, cluster: OnOff.id, attribute: 'onOff', converter: (value) => { return value === 'ON'; } },
     { type: 'light', name: 'brightness', property: 'brightness', deviceType: dimmableLight, cluster: LevelControl.id, attribute: 'currentLevel', converter: (value) => { return Math.max(1, Math.min(254, value)); } },
     { type: 'light', name: 'color_hs', property: 'color_hs', deviceType: extendedColorLight, cluster: ColorControl.id, attribute: 'colorMode' },
     { type: 'light', name: 'color_xy', property: 'color_xy', deviceType: extendedColorLight, cluster: ColorControl.id, attribute: 'colorMode' },
     { type: 'light', name: 'color_temp', property: 'color_temp', deviceType: colorTemperatureLight, cluster: ColorControl.id, attribute: 'colorMode' },
-    { type: 'cover', name: 'state', property: 'state', deviceType: coverDevice, cluster: WindowCovering.id, attribute: 'targetPositionLiftPercent100ths' },
-    { type: 'cover', name: 'moving', property: 'moving', deviceType: coverDevice, cluster: WindowCovering.id, attribute: 'operationalStatus' },
-    { type: 'cover', name: 'position', property: 'position', deviceType: coverDevice, cluster: WindowCovering.id, attribute: 'currentPositionLiftPercent100ths' },
-    { type: 'lock', name: 'state', property: 'state', deviceType: doorLockDevice, cluster: DoorLock.id, attribute: 'lockState', converter: (value) => { return value === 'LOCK' ? DoorLock.LockState.Locked : DoorLock.LockState.Unlocked; } },
-    { type: 'climate', name: 'local_temperature', property: 'local_temperature', deviceType: thermostatDevice, cluster: Thermostat.id, attribute: 'localTemperature', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
-    { type: 'climate', name: 'current_heating_setpoint', property: 'current_heating_setpoint', deviceType: thermostatDevice, cluster: Thermostat.id, attribute: 'occupiedHeatingSetpoint' },
-    { type: 'climate', name: 'occupied_heating_setpoint', property: 'occupied_heating_setpoint', deviceType: thermostatDevice, cluster: Thermostat.id, attribute: 'occupiedHeatingSetpoint', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
-    { type: 'climate', name: 'occupied_cooling_setpoint', property: 'occupied_cooling_setpoint', deviceType: thermostatDevice, cluster: Thermostat.id, attribute: 'occupiedCoolingSetpoint', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
-    { type: 'climate', name: 'unoccupied_heating_setpoint', property: 'unoccupied_heating_setpoint', deviceType: thermostatDevice, cluster: Thermostat.id, attribute: 'occupiedHeatingSetpoint', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
-    { type: 'climate', name: 'unoccupied_cooling_setpoint', property: 'unoccupied_cooling_setpoint', deviceType: thermostatDevice, cluster: Thermostat.id, attribute: 'occupiedCoolingSetpoint', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
-    { type: 'climate', name: 'running_state', property: 'running_state', deviceType: thermostatDevice, cluster: Thermostat.id, attribute: 'thermostatRunningMode', valueLookup: ['idle', '', '', 'cool', 'heat'] },
-    { type: 'climate', name: 'system_mode', property: 'system_mode', deviceType: thermostatDevice, cluster: Thermostat.id, attribute: 'systemMode', valueLookup: ['off', 'auto', '', 'cool', 'heat', '', '', 'fan_only'] },
-    { type: '', name: 'min_temperature_limit', property: 'min_temperature_limit', deviceType: thermostatDevice, cluster: Thermostat.id, attribute: 'minHeatSetpointLimit', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
-    { type: '', name: 'max_temperature_limit', property: 'max_temperature_limit', deviceType: thermostatDevice, cluster: Thermostat.id, attribute: 'maxHeatSetpointLimit', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
-    { type: '', name: 'min_heat_setpoint_limit', property: 'min_heat_setpoint_limit', deviceType: thermostatDevice, cluster: Thermostat.id, attribute: 'minHeatSetpointLimit', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
-    { type: '', name: 'max_heat_setpoint_limit', property: 'max_heat_setpoint_limit', deviceType: thermostatDevice, cluster: Thermostat.id, attribute: 'maxHeatSetpointLimit', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
+    { type: 'cover', name: 'state', property: 'state', deviceType: windowCovering, cluster: WindowCovering.id, attribute: 'targetPositionLiftPercent100ths' },
+    { type: 'cover', name: 'moving', property: 'moving', deviceType: windowCovering, cluster: WindowCovering.id, attribute: 'operationalStatus' },
+    { type: 'cover', name: 'position', property: 'position', deviceType: windowCovering, cluster: WindowCovering.id, attribute: 'currentPositionLiftPercent100ths' },
+    { type: 'lock', name: 'state', property: 'state', deviceType: doorLock, cluster: DoorLock.id, attribute: 'lockState', converter: (value) => { return value === 'LOCK' ? DoorLock.LockState.Locked : DoorLock.LockState.Unlocked; } },
+    { type: 'climate', name: 'local_temperature', property: 'local_temperature', deviceType: thermostat, cluster: Thermostat.id, attribute: 'localTemperature', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
+    { type: 'climate', name: 'current_heating_setpoint', property: 'current_heating_setpoint', deviceType: thermostat, cluster: Thermostat.id, attribute: 'occupiedHeatingSetpoint' },
+    { type: 'climate', name: 'occupied_heating_setpoint', property: 'occupied_heating_setpoint', deviceType: thermostat, cluster: Thermostat.id, attribute: 'occupiedHeatingSetpoint', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
+    { type: 'climate', name: 'occupied_cooling_setpoint', property: 'occupied_cooling_setpoint', deviceType: thermostat, cluster: Thermostat.id, attribute: 'occupiedCoolingSetpoint', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
+    { type: 'climate', name: 'unoccupied_heating_setpoint', property: 'unoccupied_heating_setpoint', deviceType: thermostat, cluster: Thermostat.id, attribute: 'occupiedHeatingSetpoint', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
+    { type: 'climate', name: 'unoccupied_cooling_setpoint', property: 'unoccupied_cooling_setpoint', deviceType: thermostat, cluster: Thermostat.id, attribute: 'occupiedCoolingSetpoint', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
+    { type: 'climate', name: 'running_state', property: 'running_state', deviceType: thermostat, cluster: Thermostat.id, attribute: 'thermostatRunningMode', valueLookup: ['idle', '', '', 'cool', 'heat'] },
+    { type: 'climate', name: 'system_mode', property: 'system_mode', deviceType: thermostat, cluster: Thermostat.id, attribute: 'systemMode', valueLookup: ['off', 'auto', '', 'cool', 'heat', '', '', 'fan_only'] },
+    { type: '', name: 'min_temperature_limit', property: 'min_temperature_limit', deviceType: thermostat, cluster: Thermostat.id, attribute: 'minHeatSetpointLimit', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
+    { type: '', name: 'max_temperature_limit', property: 'max_temperature_limit', deviceType: thermostat, cluster: Thermostat.id, attribute: 'maxHeatSetpointLimit', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
+    { type: '', name: 'min_heat_setpoint_limit', property: 'min_heat_setpoint_limit', deviceType: thermostat, cluster: Thermostat.id, attribute: 'minHeatSetpointLimit', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
+    { type: '', name: 'max_heat_setpoint_limit', property: 'max_heat_setpoint_limit', deviceType: thermostat, cluster: Thermostat.id, attribute: 'maxHeatSetpointLimit', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
     { type: '', name: 'presence', property: 'presence', deviceType: occupancySensor, cluster: OccupancySensing.id, attribute: 'occupancy', converter: (value) => { return { occupied: value }; } },
     { type: '', name: 'occupancy', property: 'occupancy', deviceType: occupancySensor, cluster: OccupancySensing.id, attribute: 'occupancy', converter: (value) => { return { occupied: value }; } },
     { type: '', name: 'illuminance', property: 'illuminance', deviceType: lightSensor, cluster: IlluminanceMeasurement.id, attribute: 'measuredValue', converter: (value) => { return Math.round(Math.max(Math.min(10000 * Math.log10(value), 0xfffe), 0)); } },
@@ -920,7 +928,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
     }
     static async create(platform, device) {
         const zigbeeDevice = new ZigbeeDevice(platform, device);
-        zigbeeDevice.serial = `${device.ieee_address}`;
+        zigbeeDevice.serial = device.ieee_address;
         if (zigbeeDevice.platform.postfix !== '') {
             zigbeeDevice.serial = `${zigbeeDevice.serial}-${zigbeeDevice.platform.postfix}`.slice(0, 32);
         }
@@ -929,7 +937,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
             (device.model_id.startsWith('SLZB-') && device.manufacturer === 'SMLIGHT')) {
             zigbeeDevice.isRouter = true;
             platform.setSelectDevice(device.ieee_address, device.friendly_name, 'wifi');
-            zigbeeDevice.bridgedDevice = new MatterbridgeEndpoint([doorLockDevice, bridgedNode, powerSource], { id: device.friendly_name }, zigbeeDevice.log.logLevel === "debug");
+            zigbeeDevice.bridgedDevice = new MatterbridgeEndpoint([doorLock, bridgedNode, powerSource], { id: device.friendly_name }, zigbeeDevice.log.logLevel === "debug");
             zigbeeDevice.addBridgedDeviceBasicInformation();
             zigbeeDevice.addPowerSource();
             zigbeeDevice.bridgedDevice.addRequiredClusterServers();
@@ -984,8 +992,8 @@ export class ZigbeeDevice extends ZigbeeEntity {
                     descriptions.push(feature.description ?? '');
                     labels.push(feature.label ?? '');
                     units.push(feature.unit ?? '');
-                    value_mins.push(feature.value_min ?? NaN);
-                    value_maxs.push(feature.value_max ?? NaN);
+                    value_mins.push(feature.value_min ?? Number.NaN);
+                    value_maxs.push(feature.value_max ?? Number.NaN);
                     values.push(feature.values ? feature.values.join('|') : '');
                 });
             }
@@ -1002,8 +1010,8 @@ export class ZigbeeDevice extends ZigbeeEntity {
                 descriptions.push(expose.description ?? '');
                 labels.push(expose.label ?? '');
                 units.push(expose.unit ?? '');
-                value_mins.push(expose.value_min ?? NaN);
-                value_maxs.push(expose.value_max ?? NaN);
+                value_mins.push(expose.value_min ?? Number.NaN);
+                value_maxs.push(expose.value_max ?? Number.NaN);
                 values.push(expose.values ? expose.values.join('|') : '');
                 if (expose.name === 'action' && expose.values) {
                     zigbeeDevice.actions.push(...expose.values);
@@ -1019,8 +1027,8 @@ export class ZigbeeDevice extends ZigbeeEntity {
             descriptions.push(option.description ?? '');
             labels.push(option.label ?? '');
             units.push(option.unit ?? '');
-            value_mins.push(option.value_min ?? NaN);
-            value_maxs.push(option.value_max ?? NaN);
+            value_mins.push(option.value_min ?? Number.NaN);
+            value_maxs.push(option.value_max ?? Number.NaN);
             values.push(option.values ? option.values.join('|') : '');
         });
         if (platform.switchList.includes(device.friendly_name)) {
@@ -1077,14 +1085,14 @@ export class ZigbeeDevice extends ZigbeeEntity {
                 zigbeeDevice.log.debug(`Device ${zigbeeDevice.ien}${device.friendly_name}${rs}${db} endpoint: ${zb}${endpoint}${db} type: ${zb}${type}${db} property: ${zb}${name}${db} => deviceType: ${z2m.deviceType?.name} cluster: ${z2m.cluster} attribute: ${z2m.attribute}`);
                 zigbeeDevice.propertyMap.set(property, { name, type, endpoint, category, description, label, unit, value_min, value_max, values: value });
                 if (endpoint === '') {
-                    if (!zigbeeDevice.mutableDevice.has(endpoint)) {
-                        zigbeeDevice.mutableDevice.set(endpoint, { tagList: [], deviceTypes: [z2m.deviceType], clusterServersIds: [...z2m.deviceType.requiredServerClusters, ClusterId(z2m.cluster)], clusterServersOptions: [], clusterClientsIds: [], clusterClientsOptions: [] });
-                    }
-                    else {
+                    if (zigbeeDevice.mutableDevice.has(endpoint)) {
                         zigbeeDevice.mutableDevice.get(endpoint)?.deviceTypes.push(z2m.deviceType);
                         zigbeeDevice.mutableDevice.get(endpoint)?.clusterServersIds.push(...z2m.deviceType.requiredServerClusters);
                         zigbeeDevice.mutableDevice.get(endpoint)?.clusterServersIds.push(ClusterId(z2m.cluster));
                     }
+                    else {
+                        zigbeeDevice.mutableDevice.set(endpoint, { tagList: [], deviceTypes: [z2m.deviceType], clusterServersIds: [...z2m.deviceType.requiredServerClusters, ClusterId(z2m.cluster)], clusterServersOptions: [], clusterClientsIds: [], clusterClientsOptions: [] });
+                    }
                 }
                 else {
                     const tagList = [];
@@ -1101,13 +1109,13 @@ export class ZigbeeDevice extends ZigbeeEntity {
                     if (endpoint === 'l6')
                         tagList.push({ mfgCode: null, namespaceId: NumberTag.Six.namespaceId, tag: NumberTag.Six.tag, label: 'endpoint ' + endpoint });
                     tagList.push({ mfgCode: null, namespaceId: SwitchesTag.Custom.namespaceId, tag: SwitchesTag.Custom.tag, label: 'endpoint ' + endpoint });
-                    if (!zigbeeDevice.mutableDevice.has(endpoint)) {
-                        zigbeeDevice.mutableDevice.set(endpoint, { tagList, deviceTypes: [z2m.deviceType], clusterServersIds: [...z2m.deviceType.requiredServerClusters, ClusterId(z2m.cluster)], clusterServersOptions: [], clusterClientsIds: [], clusterClientsOptions: [] });
-                    }
-                    else {
+                    if (zigbeeDevice.mutableDevice.has(endpoint)) {
                         zigbeeDevice.mutableDevice.get(endpoint)?.deviceTypes.push(z2m.deviceType);
                         zigbeeDevice.mutableDevice.get(endpoint)?.clusterServersIds.push(...z2m.deviceType.requiredServerClusters, ClusterId(z2m.cluster));
                     }
+                    else {
+                        zigbeeDevice.mutableDevice.set(endpoint, { tagList, deviceTypes: [z2m.deviceType], clusterServersIds: [...z2m.deviceType.requiredServerClusters, ClusterId(z2m.cluster)], clusterServersOptions: [], clusterClientsIds: [], clusterClientsOptions: [] });
+                    }
                     if (zigbeeDevice.composedType === '')
                         zigbeeDevice.composedType = type;
                     zigbeeDevice.hasEndpoints = true;
@@ -1118,8 +1126,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
             if (name === 'action' && zigbeeDevice.actions.length) {
                 zigbeeDevice.log.info(`Device ${zigbeeDevice.ien}${device.friendly_name}${rs}${nf} has actions mapped to these switches on sub endpoints:`);
                 zigbeeDevice.log.info('   controller events      <=> zigbee2mqtt actions');
-                if (!zigbeeDevice.bridgedDevice)
-                    zigbeeDevice.bridgedDevice = new MatterbridgeEndpoint([bridgedNode], { id: device.friendly_name }, zigbeeDevice.log.logLevel === "debug");
+                zigbeeDevice.bridgedDevice ??= new MatterbridgeEndpoint([bridgedNode], { id: device.friendly_name }, zigbeeDevice.log.logLevel === "debug");
                 zigbeeDevice.hasEndpoints = true;
                 const switchMap = ['Single Press', 'Double Press', 'Long Press  '];
                 const triggerMap = ['Single', 'Double', 'Long'];
@@ -1189,12 +1196,12 @@ export class ZigbeeDevice extends ZigbeeEntity {
             device.deviceTypes.forEach((deviceType) => {
                 deviceTypesMap.set(deviceType.code, deviceType);
             });
-            if (deviceTypesMap.has(onOffSwitch.code) && deviceTypesMap.has(dimmableSwitch.code))
-                deviceTypesMap.delete(onOffSwitch.code);
-            if (deviceTypesMap.has(dimmableSwitch.code) && deviceTypesMap.has(colorTemperatureSwitch.code))
-                deviceTypesMap.delete(dimmableSwitch.code);
-            if (deviceTypesMap.has(onOffOutlet.code) && deviceTypesMap.has(dimmableOutlet.code))
-                deviceTypesMap.delete(onOffOutlet.code);
+            if (deviceTypesMap.has(onOffLightSwitch.code) && deviceTypesMap.has(dimmerSwitch.code))
+                deviceTypesMap.delete(onOffLightSwitch.code);
+            if (deviceTypesMap.has(dimmerSwitch.code) && deviceTypesMap.has(colorDimmerSwitch.code))
+                deviceTypesMap.delete(dimmerSwitch.code);
+            if (deviceTypesMap.has(onOffPlugInUnit.code) && deviceTypesMap.has(dimmablePlugInUnit.code))
+                deviceTypesMap.delete(onOffPlugInUnit.code);
             if (deviceTypesMap.has(onOffLight.code) && deviceTypesMap.has(dimmableLight.code))
                 deviceTypesMap.delete(onOffLight.code);
             if (deviceTypesMap.has(dimmableLight.code) && deviceTypesMap.has(colorTemperatureLight.code))
@@ -1264,12 +1271,12 @@ export class ZigbeeDevice extends ZigbeeEntity {
         if (mainEndpoint.clusterServersIds.includes(Thermostat.id)) {
             const system_mode = zigbeeDevice.propertyMap.get('system_mode');
             const system_mode_values = system_mode?.values;
-            const heat = zigbeeDevice.propertyMap.get('occupied_heating_setpoint') || zigbeeDevice.propertyMap.get('unoccupied_heating_setpoint');
-            const cool = zigbeeDevice.propertyMap.get('occupied_cooling_setpoint') || zigbeeDevice.propertyMap.get('unoccupied_cooling_setpoint');
-            const minHeating = heat && heat.value_min !== undefined && !isNaN(heat.value_min) ? heat.value_min : 0;
-            const maxHeating = heat && heat.value_max !== undefined && !isNaN(heat.value_max) ? heat.value_max : 50;
-            const minCooling = cool && cool.value_min !== undefined && !isNaN(cool.value_min) ? cool.value_min : 0;
-            const maxCooling = cool && cool.value_max !== undefined && !isNaN(cool.value_max) ? cool.value_max : 50;
+            const heat = zigbeeDevice.propertyMap.get('occupied_heating_setpoint') ?? zigbeeDevice.propertyMap.get('unoccupied_heating_setpoint');
+            const cool = zigbeeDevice.propertyMap.get('occupied_cooling_setpoint') ?? zigbeeDevice.propertyMap.get('unoccupied_cooling_setpoint');
+            const minHeating = heat?.value_min !== undefined && !Number.isNaN(heat.value_min) ? heat.value_min : 0;
+            const maxHeating = heat?.value_max !== undefined && !Number.isNaN(heat.value_max) ? heat.value_max : 50;
+            const minCooling = cool?.value_min !== undefined && !Number.isNaN(cool.value_min) ? cool.value_min : 0;
+            const maxCooling = cool?.value_max !== undefined && !Number.isNaN(cool.value_max) ? cool.value_max : 50;
             zigbeeDevice.log.debug(`Configuring device ${zigbeeDevice.ien}${device.friendly_name}${rs}${db} Thermostat cluster with heating ${CYAN}${heat ? 'supported' : '(un)occupied not supported'}${db} cooling ${CYAN}${cool ? 'supported' : '(un)occupied not supported'}${db} ` +
                 `system_mode ${CYAN}${system_mode_values ?? 'not supported'}${db} ` +
                 `minHeating ${CYAN}${minHeating}${db} maxHeating ${CYAN}${maxHeating}${db} minCooling ${CYAN}${minCooling}${db} maxCooling ${CYAN}${maxCooling}${db}`);
@@ -1414,7 +1421,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
             });
         }
         if (zigbeeDevice.bridgedDevice.hasClusterServer(Thermostat.id)) {
-            zigbeeDevice.bridgedDevice.addCommandHandler('setpointRaiseLower', ({ request: request }) => {
+            zigbeeDevice.bridgedDevice.addCommandHandler('setpointRaiseLower', ({ request }) => {
                 zigbeeDevice.log.debug(`Command setpointRaiseLower called for ${zigbeeDevice.ien}${device.friendly_name}${rs}${db} request:`, request);
                 if (request.mode === Thermostat.SetpointRaiseLowerMode.Heat || request.mode === Thermostat.SetpointRaiseLowerMode.Both) {
                     const t = zigbeeDevice.bridgedDevice?.getAttribute(Thermostat.id, 'occupiedHeatingSetpoint', zigbeeDevice.log);

package/dist/module.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import { MatterbridgeDynamicPlatform } from 'matterbridge';
 import { CYAN, db, debugStringify, dn, er, gn, nf, payloadStringify, rs, wr, zb } from 'matterbridge/logger';
 import { BridgedDeviceBasicInformation, DoorLock } from 'matterbridge/matter/clusters';
-import { fireAndForget, isValidNumber, isValidString, waiter } from 'matterbridge/utils';
+import { fireAndForget, getErrorMessage, isValidNumber, isValidString, waiter } from 'matterbridge/utils';
 import { ZigbeeDevice, ZigbeeGroup } from './entity.js';
 import { Zigbee2MQTT } from './zigbee2mqtt.js';
 export default function initializePlugin(matterbridge, log, config) {
@@ -41,8 +41,8 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
     constructor(matterbridge, log, config) {
         super(matterbridge, log, config);
         this.config = config;
-        if (typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.8.0')) {
-            throw new Error(`This plugin requires Matterbridge version >= "3.8.0". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend."`);
+        if (typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.9.0')) {
+            throw new Error(`This plugin requires Matterbridge version >= "3.9.0". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend."`);
         }
         this.shouldStart = false;
         this.shouldConfigure = false;
@@ -81,6 +81,8 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
             this.postfix = config.postfix;
         }
         this.postfix = this.postfix.trim().slice(0, 3);
+        this.config.debug ??= false;
+        this.config.unregisterOnShutdown ??= false;
         config.host = this.mqttHost;
         config.port = this.mqttPort;
         config.topic = this.mqttTopic;
@@ -93,10 +95,8 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
             delete config.deviceScenes;
         if (config.groupScenes !== undefined)
             delete config.groupScenes;
-        if (config.scenesType === undefined)
-            config.scenesType = 'outlet';
-        if (config.scenesPrefix === undefined)
-            config.scenesPrefix = true;
+        config.scenesType ??= 'outlet';
+        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.config.clientId, this.config.protocolVersion, this.config.ca, this.config.rejectUnauthorized, this.config.cert, this.config.key, config.debug);
@@ -142,9 +142,9 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
             this.log.info(`zigbee2MQTT version ${this.z2mBridgeInfo.version} zh version ${this.z2mBridgeInfo.zigbee_herdsman.version} zhc version ${this.z2mBridgeInfo.zigbee_herdsman_converters.version}`);
             if (this.z2mBridgeInfo.config.advanced.output === 'attribute')
                 this.log.error(`zigbee2MQTT advanced.output must be 'json' or 'attribute_and_json'. Now is ${this.z2mBridgeInfo.config.advanced.output}`);
-            if (this.z2mBridgeInfo.config.advanced.legacy_api === true)
+            if (this.z2mBridgeInfo.config.advanced.legacy_api)
                 this.log.info(`zigbee2MQTT advanced.legacy_api is ${this.z2mBridgeInfo.config.advanced.legacy_api}`);
-            if (this.z2mBridgeInfo.config.advanced.legacy_availability_payload === true)
+            if (this.z2mBridgeInfo.config.advanced.legacy_availability_payload)
                 this.log.info(`zigbee2MQTT advanced.legacy_availability_payload is ${this.z2mBridgeInfo.config.advanced.legacy_availability_payload}`);
             if (this.z2mBridgeInfo.config.frontend?.package)
                 this.log.info(`zigbee2MQTT frontend.package is ${this.z2mBridgeInfo.config.frontend?.package}`);
@@ -419,7 +419,7 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
         if (this.availabilityTimer)
             clearInterval(this.availabilityTimer);
         this.availabilityTimer = undefined;
-        if (this.config.unregisterOnShutdown === true)
+        if (this.config.unregisterOnShutdown)
             await this.unregisterAllDevices();
         this.bridgedDevices = [];
         this.zigbeeEntities = [];
@@ -437,7 +437,7 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
     requestDeviceUpdate(device) {
         this.log.debug(`Requesting update for ${device.friendly_name} model_id: ${device.model_id} manufacturer: ${device.manufacturer}`);
         const payload = {};
-        if (device.power_source === 'Battery' || !device.definition || !device.definition.exposes)
+        if (device.power_source === 'Battery' || !device.definition?.exposes)
             return;
         for (const feature of device.definition.exposes) {
             if (feature.features) {
@@ -485,7 +485,7 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
                 this.log.warn(`Device ${dn}${device.friendly_name}${wr} ID: ${device.ieee_address} not registered`);
         }
         catch (error) {
-            this.log.error(`Error registering device ${dn}${device.friendly_name}${er} ID: ${device.ieee_address}: ${error}`);
+            this.log.error(`Error registering device ${dn}${device.friendly_name}${er} ID: ${device.ieee_address}: ${getErrorMessage(error)}`);
         }
         return matterDevice;
     }
@@ -509,13 +509,13 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
                 this.log.warn(`Group ${gn}${group.friendly_name}${wr} ID: ${group.id} not registered`);
         }
         catch (error) {
-            this.log.error(`Error registering group ${gn}${group.friendly_name}${er} ID: ${group.id}: ${error}`);
+            this.log.error(`Error registering group ${gn}${group.friendly_name}${er} ID: ${group.id}: ${getErrorMessage(error)}`);
         }
         return matterGroup;
     }
     async unregisterZigbeeEntity(friendly_name) {
         const entity = this.zigbeeEntities.find((entity) => entity.entityName === friendly_name);
-        if (entity) {
+        if (entity?.bridgedDevice) {
             this.log.info(`Removing device: ${friendly_name}`);
             await this.unregisterDevice(entity.bridgedDevice);
             entity.destroy();

package/dist/zigbee2mqtt.js

@@ -2,6 +2,7 @@ import crypto from 'node:crypto';
 import { EventEmitter } from 'node:events';
 import fs from 'node:fs';
 import path from 'node:path';
+import { getErrorMessage, isErrnoException } from 'matterbridge/utils';
 import { connectAsync } from 'mqtt';
 import { AnsiLogger, db, dn, er, gn, hk, id, idn, ign, REVERSE, REVERSEOFF, rs, zb } from 'node-ansi-logger';
 export class Zigbee2MQTT extends EventEmitter {
@@ -55,10 +56,7 @@ export class Zigbee2MQTT extends EventEmitter {
         this.options.protocolVersion = protocolVersion;
         if (mqttHost.startsWith('mqtts://') || mqttHost.startsWith('wss://')) {
             this.log.debug('Using mqtts:// protocol for secure MQTT connection');
-            if (!ca) {
-                this.log.info('When using mqtts:// protocol, you must provide the ca certificate for SSL/TLS connections with self-signed certificates.');
-            }
-            else {
+            if (ca) {
                 try {
                     fs.accessSync(ca, fs.constants.R_OK);
                     this.options.ca = fs.readFileSync(ca);
@@ -68,7 +66,10 @@ export class Zigbee2MQTT extends EventEmitter {
                     this.log.error(`Error reading the CA certificate from ${ca}:`, error);
                 }
             }
-            this.options.rejectUnauthorized = rejectUnauthorized !== undefined ? rejectUnauthorized : true;
+            else {
+                this.log.info('When using mqtts:// protocol, you must provide the ca certificate for SSL/TLS connections with self-signed certificates.');
+            }
+            this.options.rejectUnauthorized = rejectUnauthorized;
             this.log.info(`TLS rejectUnauthorized is set to ${this.options.rejectUnauthorized}`);
             if (cert && key) {
                 try {
@@ -121,7 +122,7 @@ export class Zigbee2MQTT extends EventEmitter {
         this.z2mPermitJoin = false;
         this.z2mPermitJoinTimeout = 0;
         this.z2mVersion = '';
-        this.z2mBridge = {};
+        this.z2mBridge = undefined;
         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'}`);
@@ -138,13 +139,12 @@ export class Zigbee2MQTT extends EventEmitter {
             this.mqttDataPath = dataPath;
             this.log.debug(`Data directory ${this.mqttDataPath} created successfully.`);
         }
-        catch (e) {
-            const error = e;
-            if (error.code === 'EEXIST') {
+        catch (error) {
+            if (isErrnoException(error) && error.code === 'EEXIST') {
                 this.log.debug('Data directory already exists');
             }
             else {
-                this.log.error('Error creating data directory:', error);
+                this.log.error(`Error creating data directory: ${getErrorMessage(error)}`);
             }
         }
         try {
@@ -152,21 +152,21 @@ export class Zigbee2MQTT extends EventEmitter {
             fs.unlinkSync(filePath);
         }
         catch (error) {
-            this.log.debug(`Error deleting bridge-payloads.txt: ${error}`);
+            this.log.debug(`Error deleting bridge-payloads.txt: ${getErrorMessage(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}`);
+            this.log.debug(`Error deleting bridge-publish-payloads.txt: ${getErrorMessage(error)}`);
         }
         try {
             const filePath = path.join(this.mqttDataPath, 'matter-commands.txt');
             fs.unlinkSync(filePath);
         }
         catch (error) {
-            this.log.debug(`Error deleting matter-commands.txt: ${error}`);
+            this.log.debug(`Error deleting matter-commands.txt: ${getErrorMessage(error)}`);
         }
     }
     getUrl() {
@@ -229,13 +229,13 @@ export class Zigbee2MQTT extends EventEmitter {
             this.mqttKeepaliveInterval = setInterval(() => {
                 this.log.debug('Publishing keepalive MQTT message');
                 this.mqttClient?.publishAsync(`clients/${this.options.clientId}/heartbeat`, 'alive', { qos: 2 }).catch((error) => {
-                    this.log.error('Error publishing keepalive MQTT message:', error);
+                    this.log.error(`Error publishing keepalive MQTT message: ${getErrorMessage(error)}`);
                 });
             }, (this.options.keepalive ?? 60) * 1000).unref();
             return;
         })
             .catch((error) => {
-            this.log.error(`Error connecting to ${this.getUrl()}: ${error.message}`);
+            this.log.error(`Error connecting to ${this.getUrl()}: ${getErrorMessage(error)}`);
             this.emit('mqtt_error', error);
         });
     }
@@ -262,7 +262,7 @@ export class Zigbee2MQTT extends EventEmitter {
                 return;
             })
                 .catch((error) => {
-                this.log.error(`Error closing connection: ${error.message}`);
+                this.log.error(`Error closing connection: ${getErrorMessage(error)}`);
             });
         }
     }
@@ -277,7 +277,7 @@ export class Zigbee2MQTT extends EventEmitter {
                 return;
             })
                 .catch((error) => {
-                this.log.error(`Subscribe error: ${error} on topic: ${topic}`);
+                this.log.error(`Subscribe error: ${getErrorMessage(error)} on topic: ${topic}`);
             });
         }
         else {
@@ -303,7 +303,7 @@ export class Zigbee2MQTT extends EventEmitter {
                     })
                         .catch((error) => {
                         this.mqttPublishInflights--;
-                        this.log.error(`****Publish ${REVERSE}[${this.mqttPublishQueue.length}-${this.mqttPublishInflights}]${REVERSEOFF} error: ${error} on topic: ${topic} message: ${message} inflights: ${this.mqttPublishInflights}`);
+                        this.log.error(`****Publish ${REVERSE}[${this.mqttPublishQueue.length}-${this.mqttPublishInflights}]${REVERSEOFF} error: ${getErrorMessage(error)} on topic: ${topic} message: ${message} inflights: ${this.mqttPublishInflights}`);
                     })
                         .finally(() => {
                         this.mqttPublishQueue.splice(0, 1);
@@ -342,7 +342,7 @@ export class Zigbee2MQTT extends EventEmitter {
                 }
             })
                 .catch((error) => {
-                this.log.error(`****Publish ${REVERSE}[${this.mqttPublishInflights}]${REVERSEOFF} error: ${error} on topic: ${topic} message: ${message}`);
+                this.log.error(`****Publish ${REVERSE}[${this.mqttPublishInflights}]${REVERSEOFF} error: ${getErrorMessage(error)} on topic: ${topic} message: ${message}`);
             })
                 .finally(() => {
                 this.mqttPublishInflights--;
@@ -375,7 +375,7 @@ export class Zigbee2MQTT extends EventEmitter {
     writeFile(file, data) {
         const filePath = path.join(this.mqttDataPath, file);
         fs.promises
-            .writeFile(`${filePath}`, data)
+            .writeFile(filePath, data)
             .then(() => {
             this.log.debug(`Successfully wrote to ${filePath}`);
             return;
@@ -428,9 +428,9 @@ export class Zigbee2MQTT extends EventEmitter {
             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)
+            if (this.z2mBridge.config.advanced.legacy_api)
                 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)
+            if (this.z2mBridge.config.advanced.legacy_availability_payload)
                 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")
@@ -761,7 +761,7 @@ export class Zigbee2MQTT extends EventEmitter {
     handleResponseGroupAddMember(payload) {
         const json = this.tryJsonParse(payload.toString());
         this.log.debug(`handleResponseGroupAddMembers() add to group friendly_name ${json.data.group} device ieee_address ${json.data.device} status ${json.status}`);
-        if (json.status === 'ok' && json.data.device && json.data.device.includes('/')) {
+        if (json.status === 'ok' && json.data.device?.includes('/')) {
             this.emit('group_add_member', json.data.group, json.data.device.split('/')[0], json.status);
         }
     }
@@ -801,6 +801,7 @@ export class Zigbee2MQTT extends EventEmitter {
                 this.log.debug(`handleEvent() type: device_interview name: ${json.data.friendly_name} address: ${json.data.ieee_address} status: ${json.data.status} supported: ${json.data.supported}`);
                 this.emit('device_interview', json.data.friendly_name, json.data.ieee_address, json.data.status, json.data.supported);
                 break;
+            default:
         }
     }
     readConfig(filename) {

package/npm-shrinkwrap.json

@@ -1,18 +1,18 @@
 {
   "name": "matterbridge-zigbee2mqtt",
-  "version": "3.1.0",
+  "version": "3.2.0-dev-20260705-147850d",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge-zigbee2mqtt",
-      "version": "3.1.0",
+      "version": "3.2.0-dev-20260705-147850d",
       "license": "Apache-2.0",
       "dependencies": {
         "moment": "2.30.1",
         "mqtt": "5.15.1",
-        "node-ansi-logger": "3.2.1",
-        "node-persist-manager": "2.0.2"
+        "node-ansi-logger": "3.3.0",
+        "node-persist-manager": "2.1.0"
       },
       "engines": {
         "node": ">=20.19.0 <21.0.0 || >=22.13.0 <23.0.0 || >=24.0.0 <25.0.0 || >=26.0.0 <27.0.0"
@@ -32,18 +32,18 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.9.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.2.tgz",
-      "integrity": "sha512-G05zqtJhcDLb8uslf5EjCxXg9G1KQxiV8OS0R26IC//Eoyitzqe8z37I7cqvnZlrlSfgocQRfSn/AHBZJJFyGw==",
+      "version": "26.1.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.0.tgz",
+      "integrity": "sha512-O0A1G3xPGy4w7AgQdAQYUlQ+BKk2Oovw8eRpofyp5KdBZULnbe+WqaOVNrm705SHphCiG4XHsACrSmPu1f+Kgw==",
       "license": "MIT",
       "dependencies": {
-        "undici-types": ">=7.24.0 <7.24.7"
+        "undici-types": "~8.3.0"
       }
     },
     "node_modules/@types/readable-stream": {
-      "version": "4.0.23",
-      "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.23.tgz",
-      "integrity": "sha512-wwXrtQvbMHxCbBgjHaMGEmImFTQxxpfMOR/ZoQnXxB1woqkUbdLGFDgauo00Py9IudiaqSeiBiulSV9i6XIPig==",
+      "version": "4.0.24",
+      "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.24.tgz",
+      "integrity": "sha512-NRvUNC/JFGPJvqdAfEve8oginbM6V08u5NzLWpG8MwA2kTPOLnqk+wpwuPT+mp3aUsxyuT6m2gnrPuHYCruzEg==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -103,15 +103,15 @@
       }
     },
     "node_modules/broker-factory": {
-      "version": "3.1.14",
-      "resolved": "https://registry.npmjs.org/broker-factory/-/broker-factory-3.1.14.tgz",
-      "integrity": "sha512-L45k5HMbPIrMid0nTOZ/UPXG/c0aRuQKVrSDFIb1zOkvfiyHgYmIjc3cSiN1KwQIvRDOtKE0tfb3I9EZ3CmpQQ==",
+      "version": "3.1.15",
+      "resolved": "https://registry.npmjs.org/broker-factory/-/broker-factory-3.1.15.tgz",
+      "integrity": "sha512-ko+aWvgNuP49meGrdjUu7rC+Y+Wai3cCPxP3xWwHsHfehFjOh5ZQM2yC4gEB2UddeZ/YXhm0K1eG/L6fxym2Og==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.29.2",
+        "@babel/runtime": "^7.29.7",
         "fast-unique-numbers": "^9.0.27",
         "tslib": "^2.8.1",
-        "worker-factory": "^7.0.49"
+        "worker-factory": "^7.0.50"
       }
     },
     "node_modules/buffer": {
@@ -352,13 +352,13 @@
       "license": "MIT"
     },
     "node_modules/node-ansi-logger": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-ansi-logger/-/node-ansi-logger-3.2.1.tgz",
-      "integrity": "sha512-R5YptDlGVfVqACSiOtfmAwV+N/ytj8crwXStrs9d9kdAXYT4xF1J1H5qfhGbXsot06OHSha76Y2Fq66sIzMq2A==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/node-ansi-logger/-/node-ansi-logger-3.3.0.tgz",
+      "integrity": "sha512-ZW77lbZkA8h3r2HA2rcE5RjTIcwRDNB072RkZVyimGQpmEorJT8ajZ7UDhkHGoh0JRrCJL0iUKBE8q4oU8MHMg==",
       "hasShrinkwrap": true,
       "license": "Apache-2.0",
       "engines": {
-        "node": ">=20.19.0 <21.0.0 || >=22.13.0 <23.0.0 || >=24.0.0 <25.0.0"
+        "node": ">=20.19.0 <21.0.0 || >=22.13.0 <23.0.0 || >=24.0.0 <25.0.0 || >=26.0.0 <27.0.0"
       },
       "funding": {
         "type": "buymeacoffee",
@@ -366,16 +366,16 @@
       }
     },
     "node_modules/node-persist-manager": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node-persist-manager/-/node-persist-manager-2.0.2.tgz",
-      "integrity": "sha512-FGDdNOH4c6Xqb2LwTZ55GT0UaoqaOiWJ+hWt+O7w1+9QIUQh2NsaXPtGaTiibvCi6cX823JTFQPJK2NRseLTvw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/node-persist-manager/-/node-persist-manager-2.1.0.tgz",
+      "integrity": "sha512-LJze/Fcd8LijM4OMPnp0AQ+Z1e9mFMkjOEDw08xHA2HSRd2+N5s0uyH5ogYmXPC68f0sc4GrdKMpAcsHuO3PKA==",
       "hasShrinkwrap": true,
       "license": "Apache-2.0",
       "dependencies": {
         "node-persist": "4.0.4"
       },
       "engines": {
-        "node": ">=20.19.0 <21.0.0 || >=22.13.0 <23.0.0 || >=24.0.0 <25.0.0"
+        "node": ">=20.19.0 <21.0.0 || >=22.13.0 <23.0.0 || >=24.0.0 <25.0.0 || >=26.0.0 <27.0.0"
       },
       "funding": {
         "type": "buymeacoffee",
@@ -543,9 +543,9 @@
       "license": "MIT"
     },
     "node_modules/undici-types": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz",
-      "integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz",
+      "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==",
       "license": "MIT"
     },
     "node_modules/util-deprecate": {
@@ -555,50 +555,50 @@
       "license": "MIT"
     },
     "node_modules/worker-factory": {
-      "version": "7.0.49",
-      "resolved": "https://registry.npmjs.org/worker-factory/-/worker-factory-7.0.49.tgz",
-      "integrity": "sha512-lW7tpgy6aUv2dFsQhv1yv+XFzdkCf/leoKRTGMPVK5/die6RrUjqgJHJf556qO+ZfytNG6wPXc17E8zzsOLUDw==",
+      "version": "7.0.50",
+      "resolved": "https://registry.npmjs.org/worker-factory/-/worker-factory-7.0.50.tgz",
+      "integrity": "sha512-hhwc0G+sFwM4qBuhJIUBn2p1Jf8v/FwmLUANBf/Q+Lt2uI8mfIZQhXaZQACodQD4R7Zp6cn/6702bIvNn2puJQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.29.2",
+        "@babel/runtime": "^7.29.7",
         "fast-unique-numbers": "^9.0.27",
         "tslib": "^2.8.1"
       }
     },
     "node_modules/worker-timers": {
-      "version": "8.0.31",
-      "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-8.0.31.tgz",
-      "integrity": "sha512-ngkq5S6JuZyztom8tDgBzorLo9byhBMko/sXfgiUD945AuzKGg1GCgDMCC3NaYkicLpGKXutONM36wEX8UbBCA==",
+      "version": "8.0.33",
+      "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-8.0.33.tgz",
+      "integrity": "sha512-RQVlKkek80v8M6SHvdMKiywaXFmX3XTpYTXTw0r62PdXB06t74XNxcTuG8wsQwnjorAQymNQyyQ0rzv7PykEMQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.29.2",
+        "@babel/runtime": "^7.29.7",
         "tslib": "^2.8.1",
-        "worker-timers-broker": "^8.0.16",
-        "worker-timers-worker": "^9.0.14"
+        "worker-timers-broker": "^8.0.18",
+        "worker-timers-worker": "^9.0.15"
       }
     },
     "node_modules/worker-timers-broker": {
-      "version": "8.0.16",
-      "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-8.0.16.tgz",
-      "integrity": "sha512-JyP3AvUGyPGbBGW7XiUewm2+0pN/aYo1QpVf5kdXAfkDZcN3p7NbWrG6XnyDEpDIvfHk/+LCnOW/NsuiU9riYA==",
+      "version": "8.0.18",
+      "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-8.0.18.tgz",
+      "integrity": "sha512-FrjzDVX1wKfZN0gRbCFqv8VHuTncG4sbI/WGEg4tSSQeIsnwqg4YBYWMAHYLJtUDEYYmiK65UKFrVMVk2irDSg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.29.2",
-        "broker-factory": "^3.1.14",
+        "@babel/runtime": "^7.29.7",
+        "broker-factory": "^3.1.15",
         "fast-unique-numbers": "^9.0.27",
         "tslib": "^2.8.1",
-        "worker-timers-worker": "^9.0.14"
+        "worker-timers-worker": "^9.0.15"
       }
     },
     "node_modules/worker-timers-worker": {
-      "version": "9.0.14",
-      "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-9.0.14.tgz",
-      "integrity": "sha512-/qF06C60sXmSLfUl7WglvrDIbspmPOM8UrG63Dnn4bi2x4/DfqHS/+dxF5B+MdHnYO5tVuZYLHdAodrKdabTIg==",
+      "version": "9.0.15",
+      "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-9.0.15.tgz",
+      "integrity": "sha512-KKUe7lZ/Aignr51H6hOUik8LwTnIgojH/1lwhli8A8qIEIyewogZTpNpMW5B6BF7nmwBOkUoTYgf1H3QShcjSA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.29.2",
+        "@babel/runtime": "^7.29.7",
         "tslib": "^2.8.1",
-        "worker-factory": "^7.0.49"
+        "worker-factory": "^7.0.50"
       }
     },
     "node_modules/ws": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge-zigbee2mqtt",
-  "version": "3.1.0",
+  "version": "3.2.0-dev-20260705-147850d",
   "description": "Matterbridge zigbee2mqtt plugin",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",
@@ -68,7 +68,7 @@
   "dependencies": {
     "moment": "2.30.1",
     "mqtt": "5.15.1",
-    "node-ansi-logger": "3.2.1",
-    "node-persist-manager": "2.0.2"
+    "node-ansi-logger": "3.3.0",
+    "node-persist-manager": "2.1.0"
   }
 }