matterbridge-zigbee2mqtt 2.0.9 → 2.0.10

package/CHANGELOG.md

@@ -2,8 +2,21 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.0.10] - 2024-04-22
+
+### Added
+
+- [z2m]: Added a check for not changed mqtt messages.
+- [extension]: Finalized implementation of zigbee2MQTT internal extension v. 1.0.0.
+
+### Changed
+
+- [z2m]: Changed vendorName and productName with the values from device definition if present.
+
 ## [2.0.9] - 2024-04-19
 
+### Added
+ 
 - [extension]: Implementation of zigbee2MQTT internal extension.
 
 ## [2.0.8] - 2024-04-16

package/dist/entity.d.ts

@@ -25,7 +25,7 @@ import { DeviceTypeDefinition, MatterbridgeDevice, ClusterId, Endpoint, AtLeastO
 import { AnsiLogger } from 'node-ansi-logger';
 import { ZigbeePlatform } from './platform.js';
 import { BridgeDevice, BridgeGroup } from './zigbee2mqttTypes.js';
-import { Payload } from './payloadTypes.js';
+import { Payload, PayloadValue } from './payloadTypes.js';
 import EventEmitter from 'events';
 export declare class ZigbeeEntity extends EventEmitter {
     log: AnsiLogger;
@@ -39,8 +39,9 @@ export declare class ZigbeeEntity extends EventEmitter {
     protected ien: string;
     bridgedDevice: BridgedBaseDevice | undefined;
     eidn: string;
+    private lastPayload;
     constructor(platform: ZigbeePlatform, entity: BridgeDevice | BridgeGroup);
-    protected updateAttributeIfChanged(endpoint: Endpoint, endpointName: string | undefined, clusterId: number, attributeName: string, value: any): void;
+    protected updateAttributeIfChanged(endpoint: Endpoint, endpointName: string | undefined, clusterId: number, attributeName: string, value: PayloadValue, lookup?: string[]): void;
     protected publishCommand(command: string, entityName: string, payload: Payload): void;
 }
 export declare class ZigbeeGroup extends ZigbeeEntity {
@@ -54,6 +55,7 @@ export interface ZigbeeToMatter {
     cluster: number;
     attribute: string;
     converter?: (value: any) => any;
+    valueLookup?: string[];
 }
 export declare const z2ms: ZigbeeToMatter[];
 export declare class ZigbeeDevice extends ZigbeeEntity {
@@ -89,7 +91,7 @@ export declare class BridgedBaseDevice extends MatterbridgeDevice {
      */
     protected addDeviceClusterClient(includeClientList?: ClusterId[]): void;
     addDeviceTypeAndClusterServer(deviceType: DeviceTypeDefinition | undefined, serverList: ClusterId[]): void;
-    addChildDeviceTypeAndClusterServer(endpointName: string, state: string, deviceType: DeviceTypeDefinition | undefined, includeServerList: ClusterId[]): Endpoint;
+    addChildDeviceTypeAndClusterServer(endpointName: string, deviceType: DeviceTypeDefinition | undefined, includeServerList: ClusterId[]): Endpoint;
     getChildPayload(endpointNumber: EndpointNumber | undefined, key: string, value: string): Payload;
     configure(): void;
 }

package/dist/entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../src/entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../src/entity.ts"],"names":[],"mappings":"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"}

package/dist/entity.js

@@ -20,12 +20,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. *
  */
-import { DeviceTypes, logEndpoint, AirQuality, MatterbridgeDevice, airQualitySensor, colorTemperatureSwitch, dimmableSwitch, onOffSwitch, Identify, Groups, Scenes, OnOff, LevelControl, ColorControl, ColorControlCluster, Switch, TemperatureMeasurement, BooleanState, RelativeHumidityMeasurement, PressureMeasurement, OccupancySensing, IlluminanceMeasurement, PowerSource, ClusterId, TvocMeasurement, WindowCovering, DoorLock, BridgedDeviceBasicInformation, ThermostatCluster, Thermostat, TimeSync, Endpoint, FixedLabelCluster, SwitchCluster, ElectricalMeasurement, EveHistory, getClusterNameById, FlowMeasurement, } from 'matterbridge';
+import { DeviceTypes, AirQuality, MatterbridgeDevice, airQualitySensor, colorTemperatureSwitch, dimmableSwitch, onOffSwitch, Identify, Groups, Scenes, OnOff, LevelControl, ColorControl, ColorControlCluster, Switch, TemperatureMeasurement, BooleanState, RelativeHumidityMeasurement, PressureMeasurement, OccupancySensing, IlluminanceMeasurement, PowerSource, ClusterId, TvocMeasurement, WindowCovering, DoorLock, BridgedDeviceBasicInformation, ThermostatCluster, Thermostat, TimeSync, Endpoint, FixedLabelCluster, SwitchCluster, ElectricalMeasurement, EveHistory, getClusterNameById, FlowMeasurement, } from 'matterbridge';
 import { AnsiLogger, gn, dn, ign, idn, rs, db, wr, debugStringify, hk, zb, or } from 'node-ansi-logger';
 import * as color from './colorUtils.js';
 import EventEmitter from 'events';
 import { hostname } from 'os';
-import { deepEqual } from './utils.js';
+import { deepCopy, deepEqual } from './utils.js';
 export class ZigbeeEntity extends EventEmitter {
     log;
     platform;
@@ -38,6 +38,7 @@ export class ZigbeeEntity extends EventEmitter {
     ien = '';
     bridgedDevice;
     eidn = `${or}`;
+    lastPayload = {};
     constructor(platform, entity) {
         super();
         this.platform = platform;
@@ -58,18 +59,20 @@ export class ZigbeeEntity extends EventEmitter {
         this.log = new AnsiLogger({ logName: this.accessoryName, logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logDebug: platform.debugEnabled });
         this.log.debug(`Created MatterEntity: ${this.accessoryName}`);
         this.platform.z2m.on('MESSAGE-' + this.accessoryName, (payload) => {
+            if (deepEqual(this.lastPayload, payload, ['last_seen', 'linkquality']))
+                return;
+            this.lastPayload = deepCopy(payload);
+            const debugEnabled = this.platform.debugEnabled;
+            this.log.setLogDebug(true);
             if (this.bridgedDevice === undefined) {
-                this.log.debug(`***Skipping (no device) MQTT message for accessory ${this.ien}${this.accessoryName}${rs}${db} payload: ${debugStringify(payload)}`);
+                this.log.debug(`*Skipping (no device) ${platform.z2mDevicesRegistered ? 'MQTT message' : 'State update'} for accessory ${this.ien}${this.accessoryName}${rs}${db} payload: ${debugStringify(payload)}`);
                 return;
             }
             if (this.bridgedDevice.noUpdate) {
-                this.log.debug(`***Skipping (no update) MQTT message for accessory ${this.ien}${this.accessoryName}${rs}${db} payload: ${debugStringify(payload)}`);
+                this.log.debug(`*Skipping (no update) ${platform.z2mDevicesRegistered ? 'MQTT message' : 'State update'} for accessory ${this.ien}${this.accessoryName}${rs}${db} payload: ${debugStringify(payload)}`);
                 return;
             }
-            const debugEnabled = this.platform.debugEnabled;
-            this.log.setLogDebug(true);
-            this.log.debug(`MQTT message for accessory ${this.ien}${this.accessoryName}${rs}${db} payload: ${debugStringify(payload)}`);
-            //this.log.debug(`MQTT message for accessory ${this.ien}${this.accessoryName}${rs}${db} device: ${this.isDevice} group: ${this.isGroup} power_source: ${this.device?.power_source}`);
+            this.log.debug(`${platform.z2mDevicesRegistered ? 'MQTT message' : 'State update'} for device ${this.ien}${this.accessoryName}${rs}${db} payload: ${debugStringify(payload)}`);
             /* Multi endpoint section */
             if (this.bridgedDevice.hasEndpoints && !this.bridgedDevice.noUpdate) {
                 const childs = this.bridgedDevice.getChildEndpoints();
@@ -100,9 +103,9 @@ export class ZigbeeEntity extends EventEmitter {
                             z2m = z2ms.find((z2m) => z2m.property + '_' + endpointName.value === key);
                         }
                         if (z2m) {
-                            if (z2m.converter) {
+                            if (z2m.converter || z2m.valueLookup) {
                                 // this.log.debug(`*Endpoint ${this.eidn}${child.number}${db} type ${zb}${endpointType?.value}${db} found converter for ${key} => ${z2m.type}-${z2m.name}-${z2m.property} ${hk}${getClusterNameById(ClusterId(z2m.cluster))}${db}.${hk}${z2m.attribute}${db}`);
-                                this.updateAttributeIfChanged(child, endpointName.value, z2m.cluster, z2m.attribute, z2m.converter(value));
+                                this.updateAttributeIfChanged(child, endpointName.value, z2m.cluster, z2m.attribute, z2m.converter ? z2m.converter(value) : value, z2m.valueLookup);
                                 return;
                             }
                         }
@@ -122,7 +125,7 @@ export class ZigbeeEntity extends EventEmitter {
                 //if (key === 'illuminance') console.log('illuminance', this.device?.definition?.model);
                 if (key === 'illuminance' && this.isDevice && this.device?.definition?.model === 'ZG-204ZL') {
                     key = 'illuminance_lux';
-                    value = Math.pow(10, value / 10000);
+                    value = Math.pow(10, typeof value === 'number' ? value / 10000 : 0);
                 }
                 if (key === 'illuminance' && this.isDevice && this.device?.definition?.model === 'RTCGQ14LM') {
                     key = 'illuminance_lux';
@@ -134,26 +137,24 @@ export class ZigbeeEntity extends EventEmitter {
                 let z2m;
                 z2m = z2ms.find((z2m) => z2m.type === endpointType?.value && z2m.property === key);
                 if (z2m) {
-                    // eslint-disable-next-line max-len
-                    /*
-                    this.log.debug(
-                      `*Endpoint ${this.eidn}${this.bridgedDevice.number}${db} type ${zb}${endpointType?.value}${db} found converter for type ${z2m.type} property ${key} => ${z2m.type}-${z2m.name}-${z2m.property} ${hk}${getClusterNameById(ClusterId(z2m.cluster))}${db}.${hk}${z2m.attribute}${db}`,
-                    );
-                    */
+                    //this.log.debug(
+                    //`***Endpoint ${this.eidn}${this.bridgedDevice.number}${db} type ${zb}${endpointType?.value}${db} found converter for type ${z2m.type} property ${key} => ${z2m.type}-${z2m.name}-${z2m.property} ${hk}${getClusterNameById(ClusterId(z2m.cluster))}${db}.${hk}${z2m.attribute}${db}`,
+                    //);
                 }
                 else {
                     z2m = z2ms.find((z2m) => z2m.property === key);
+                    //if (z2m) this.log.debug(`***Endpoint ${this.eidn}${this.bridgedDevice.number}${db} type ${zb}${endpointType?.value}${db} found converter for ${key} => ${z2m.type}-${z2m.name}-${z2m.property} ${hk}${getClusterNameById(ClusterId(z2m.cluster))}${db}.${hk}${z2m.attribute}${db}`);
                 }
                 if (z2m) {
-                    if (z2m.converter) {
-                        // this.log.debug(`*Endpoint ${this.eidn}${this.bridgedDevice.number}${db} type ${zb}${endpointType?.value}${db} found converter for ${key} => ${z2m.type}-${z2m.name}-${z2m.property} ${hk}${getClusterNameById(ClusterId(z2m.cluster))}${db}.${hk}${z2m.attribute}${db}`);
-                        this.updateAttributeIfChanged(this.bridgedDevice, undefined, z2m.cluster, z2m.attribute, z2m.converter(value));
+                    if (z2m.converter || z2m.valueLookup) {
+                        // if (z2m.converter) this.log.debug(`***converter for ${key} ${value} => ${z2m.converter(value)}`);
+                        this.updateAttributeIfChanged(this.bridgedDevice, undefined, z2m.cluster, z2m.attribute, z2m.converter ? z2m.converter(value) : value, z2m.valueLookup);
                         return;
                     }
                 }
                 /* WindowCovering */
                 if (key === 'position') {
-                    this.updateAttributeIfChanged(this.bridgedDevice, undefined, WindowCovering.Cluster.id, 'currentPositionLiftPercent100ths', 10000 - value * 100);
+                    this.updateAttributeIfChanged(this.bridgedDevice, undefined, WindowCovering.Cluster.id, 'currentPositionLiftPercent100ths', typeof value === 'number' ? 10000 - value * 100 : 0);
                 }
                 if (key === 'moving') {
                     const status = value === 'UP' ? WindowCovering.MovementStatus.Opening : value === 'DOWN' ? WindowCovering.MovementStatus.Closing : WindowCovering.MovementStatus.Stopped;
@@ -163,16 +164,15 @@ export class ZigbeeEntity extends EventEmitter {
                         this.updateAttributeIfChanged(this.bridgedDevice, undefined, WindowCovering.Cluster.id, 'currentPositionLiftPercent100ths', position);
                     }
                 }
-                /* OnOff */
-                /* LevelControl */
                 /* ColorControl ColorTemperatureMired */
                 if (key === 'color_temp' && 'color_mode' in payload && payload['color_mode'] === 'color_temp') {
-                    this.updateAttributeIfChanged(this.bridgedDevice, undefined, ColorControl.Cluster.id, 'colorTemperatureMireds', Math.max(147, Math.min(500, value)));
+                    this.updateAttributeIfChanged(this.bridgedDevice, undefined, ColorControl.Cluster.id, 'colorTemperatureMireds', Math.max(147, Math.min(500, typeof value === 'number' ? value : 0)));
                     this.updateAttributeIfChanged(this.bridgedDevice, undefined, ColorControl.Cluster.id, 'colorMode', ColorControl.ColorMode.ColorTemperatureMireds);
                 }
-                /* ColorControl Hue and Saturation */
+                /* ColorControl CurrenHue and CurrenSaturation */
                 if (key === 'color' && 'color_mode' in payload && payload['color_mode'] === 'xy') {
-                    const hsl = color.xyToHsl(value.x, value.y);
+                    const { x, y } = value;
+                    const hsl = color.xyToHsl(x, y);
                     this.updateAttributeIfChanged(this.bridgedDevice, undefined, ColorControl.Cluster.id, 'currentHue', Math.round((hsl.h / 360) * 254));
                     this.updateAttributeIfChanged(this.bridgedDevice, undefined, ColorControl.Cluster.id, 'currentSaturation', Math.round((hsl.s / 100) * 254));
                     this.updateAttributeIfChanged(this.bridgedDevice, undefined, ColorControl.Cluster.id, 'colorMode', ColorControl.ColorMode.CurrentHueAndCurrentSaturation);
@@ -208,93 +208,76 @@ export class ZigbeeEntity extends EventEmitter {
                         this.log.debug(`*Set accessory ${hk}Switch.currentPosition: ${position}`);
                     }
                     if (value === 'release') {
-                        this.bridgedDevice?.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.triggerReachableChangedEvent({ reachableNewValue: true });
+                        // this.bridgedDevice?.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.triggerReachableChangedEvent({ reachableNewValue: true });
                     }
                 }
-                /* Thermostat */
-                if (key === 'local_temperature') {
-                    this.updateAttributeIfChanged(this.bridgedDevice, undefined, Thermostat.Cluster.id, 'localTemperature', Math.max(-5000, Math.min(5000, value * 100)));
-                }
-                if (key === 'current_heating_setpoint') {
-                    this.updateAttributeIfChanged(this.bridgedDevice, undefined, Thermostat.Cluster.id, 'occupiedHeatingSetpoint', Math.max(-5000, Math.min(5000, value * 100)));
-                }
-                if (key === 'current_cooling_setpoint') {
-                    this.updateAttributeIfChanged(this.bridgedDevice, undefined, Thermostat.Cluster.id, 'occupiedCoolingSetpoint', Math.max(-5000, Math.min(5000, value * 100)));
-                }
-                if (key === 'running_state') {
-                    //const state = value === 'idle' ? Thermostat.ThermostatRunningMode.Off : value === 'heat' ? Thermostat.ThermostatRunningMode.Heat : Thermostat.ThermostatRunningMode.Cool;
-                    //this.bridgedDevice.getClusterServerById(Thermostat.Cluster.id)?.setThermostatRunningModeAttribute(state);
-                    //this.log.debug(`Get accessory ${hk}Thermostat.thermostatRunningMode: ${state} (${value})`);
-                }
-                if (key === 'system_mode') {
-                    const state = value === 'off' ? Thermostat.SystemMode.Off : value === 'heat' ? Thermostat.SystemMode.Heat : Thermostat.SystemMode.Cool;
-                    this.updateAttributeIfChanged(this.bridgedDevice, undefined, Thermostat.Cluster.id, 'systemMode', state);
-                }
-                if (key === 'air_quality') {
-                    // excellent, good, moderate, poor, unhealthy, out_of_range unknown
-                    const airQuality = value === 'unhealthy'
-                        ? AirQuality.AirQualityType.VeryPoor
-                        : value === 'poor'
-                            ? AirQuality.AirQualityType.Poor
-                            : value === 'moderate'
-                                ? AirQuality.AirQualityType.Moderate
-                                : value === 'good'
-                                    ? AirQuality.AirQualityType.Fair
-                                    : value === 'excellent'
-                                        ? AirQuality.AirQualityType.Good
-                                        : AirQuality.AirQualityType.Unknown;
-                    this.bridgedDevice.getClusterServerById(AirQuality.Cluster.id)?.setAirQualityAttribute(airQuality);
-                    this.log.debug(`Set accessory ${hk}AirQuality.airQuality: ${airQuality}`);
-                }
             });
             this.log.setLogDebug(debugEnabled);
         });
         this.platform.z2m.on('ONLINE-' + this.accessoryName, () => {
-            this.log.info(`ONLINE message for accessory ${this.ien}${this.accessoryName}${rs}`);
+            this.log.info(`ONLINE message for device ${this.ien}${this.accessoryName}${rs}`);
             if (this.bridgedDevice?.number !== undefined) {
                 this.bridgedDevice?.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.setReachableAttribute(true);
                 this.bridgedDevice?.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.triggerReachableChangedEvent({ reachableNewValue: true });
-                this.log.info(`${db}Set accessory ${hk}BridgedDeviceBasicInformation.reachable: true`);
+                this.log.info(`${db}Set accessory attribute ${hk}BridgedDeviceBasicInformation.reachable: true`);
+                this.log.info(`${db}Trigger accessory event ${hk}ReachableChangedEvent: true`);
             }
         });
         this.platform.z2m.on('OFFLINE-' + this.accessoryName, () => {
-            this.log.warn(`OFFLINE message for accessory ${this.ien}${this.accessoryName}${wr}`);
+            this.log.warn(`OFFLINE message for device ${this.ien}${this.accessoryName}${wr}`);
             if (this.bridgedDevice?.number !== undefined) {
                 this.bridgedDevice?.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.setReachableAttribute(false);
                 this.bridgedDevice?.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.triggerReachableChangedEvent({ reachableNewValue: false });
-                this.log.info(`${db}Set accessory ${hk}BridgedDeviceBasicInformation.reachable: false`);
+                this.log.info(`${db}Set accessory attribute ${hk}BridgedDeviceBasicInformation.reachable: false`);
+                this.log.info(`${db}Trigger accessory event ${hk}ReachableChangedEvent: false`);
             }
         });
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    updateAttributeIfChanged(endpoint, endpointName, clusterId, attributeName, value) {
+    updateAttributeIfChanged(endpoint, endpointName, clusterId, attributeName, value, lookup) {
         const cluster = endpoint.getClusterServerById(ClusterId(clusterId));
         if (cluster === undefined) {
             this.log.debug(`Update endpoint ${this.eidn}${endpoint.number}${db}${endpointName ? ' (' + zb + endpointName + db + ')' : ''} cluster ${hk}${clusterId}${db}-${hk}${getClusterNameById(ClusterId(clusterId))}${db} not found: is z2m converter exposing all features?`);
             return;
         }
         if (!cluster.isAttributeSupportedByName(attributeName)) {
-            this.log.debug(`Update endpoint ${this.eidn}${endpoint.number}${db}${endpointName ? ' (' + zb + endpointName + db + ')' : ''} error attribute ${hk}${clusterId}${db}-${hk}${getClusterNameById(ClusterId(clusterId))}${db}-${hk}${attributeName}${db} not found`);
+            this.log.debug(`***Update endpoint ${this.eidn}${endpoint.number}${db}${endpointName ? ' (' + zb + endpointName + db + ')' : ''} error attribute ${hk}${clusterId}${db}-${hk}${getClusterNameById(ClusterId(clusterId))}${db}-${hk}${attributeName}${db} not found`);
             return;
         }
+        if (lookup !== undefined) {
+            if (typeof value === 'string' && lookup.indexOf(value) !== -1)
+                value = lookup.indexOf(value);
+            else {
+                this.log.debug(`Update endpoint ${this.eidn}${endpoint.number}${db}${endpointName ? ' (' + zb + endpointName + db + ')' : ''} ` +
+                    `attribute ${hk}${getClusterNameById(ClusterId(clusterId))}${db}-${hk}${attributeName}${db} value ${zb}${typeof value === 'object' ? debugStringify(value) : value}${db} not found in lookup ${debugStringify(lookup)}`);
+                return;
+            }
+        }
         const localValue = cluster.attributes[attributeName].getLocal();
         if (typeof value === 'object' ? deepEqual(value, localValue) : value === localValue) {
-            /*
-            this.log.debug(
-              `Skip update endpoint ${this.eidn}${endpoint.number}${db}${endpointName ? ' (' + zb + endpointName + db + ')' : ''} ` + `attribute ${hk}${getClusterNameById(ClusterId(clusterId))}${db}-${hk}${attributeName}${db} already ${zb}${typeof value === 'object' ? debugStringify(value) : value}${db}`,
-            );
-            */
+            //this.log.debug(
+            //`Skip update endpoint ${this.eidn}${endpoint.number}${db}${endpointName ? ' (' + zb + endpointName + db + ')' : ''} ` + `attribute ${hk}${getClusterNameById(ClusterId(clusterId))}${db}-${hk}${attributeName}${db} already ${zb}${typeof value === 'object' ? debugStringify(value) : value}${db}`,
+            //);
             return;
         }
-        cluster.attributes[attributeName].setLocal(value);
         this.log.debug(`Update endpoint ${this.eidn}${endpoint.number}${db}${endpointName ? ' (' + zb + endpointName + db + ')' : ''} ` +
             `attribute ${hk}${getClusterNameById(ClusterId(clusterId))}${db}-${hk}${attributeName}${db} from ${zb}${typeof localValue === 'object' ? debugStringify(localValue) : localValue}${db} to ${zb}${typeof value === 'object' ? debugStringify(value) : value}${db}`);
+        try {
+            cluster.attributes[attributeName].setLocal(value);
+        }
+        catch (error) {
+            this.log.error(`Error setting attribute ${attributeName} to ${value}: ${error}`);
+        }
     }
+    // this.publishCommand('permit_join: false', 'bridge/request/permit_join', { value: false });
     publishCommand(command, entityName, payload) {
         this.log.debug(`executeCommand ${command} called for ${this.ien}${entityName}${rs}${db} payload: ${debugStringify(payload)}`);
-        const topic = entityName.includes('bridge/request') ? entityName : this.platform.z2m.mqttTopic + '/' + entityName + '/set';
-        this.platform.z2m.publish(topic, JSON.stringify(payload));
-        this.log.info(`MQTT publish topic: ${topic} payload: ${debugStringify(payload)} for ${this.en}${entityName}`);
+        if (entityName.startsWith('bridge/request')) {
+            this.platform.publish(entityName, '', JSON.stringify(payload));
+        }
+        else {
+            this.platform.publish(entityName, 'set', JSON.stringify(payload));
+        }
     }
 }
 export class ZigbeeGroup extends ZigbeeEntity {
@@ -305,7 +288,7 @@ export class ZigbeeGroup extends ZigbeeEntity {
         // Command handlers
         this.bridgedDevice.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
             this.log.warn(`Command identify called for ${this.ien}${group.friendly_name}${rs}${db} identifyTime:${identifyTime}`);
-            logEndpoint(this.bridgedDevice);
+            // logEndpoint(this.bridgedDevice!);
         });
         this.bridgedDevice.addCommandHandler('on', async ({ attributes: { onOff } }) => {
             this.log.debug(`Command on called for ${this.ien}${group.friendly_name}${rs}${db} attribute: ${onOff.getLocal()}`);
@@ -334,7 +317,11 @@ export const z2ms = [
     { type: 'light', name: 'color_xy', property: 'color_xy', deviceType: DeviceTypes.COLOR_TEMPERATURE_LIGHT, cluster: ColorControl.Cluster.id, attribute: 'colorMode' },
     { type: 'cover', name: 'state', property: 'state', deviceType: DeviceTypes.WINDOW_COVERING, cluster: WindowCovering.Cluster.id, attribute: 'currentPositionLiftPercent100ths' },
     { type: 'lock', name: 'state', property: 'state', deviceType: DeviceTypes.DOOR_LOCK, cluster: DoorLock.Cluster.id, attribute: 'lockState', converter: (value) => { return value === 'LOCK' ? DoorLock.LockState.Locked : DoorLock.LockState.Unlocked; } },
-    { type: 'climate', name: 'current_heating_setpoint', property: 'current_heating_setpoint', deviceType: DeviceTypes.THERMOSTAT, cluster: Thermostat.Cluster.id, attribute: 'occupiedHeatingSetpoint' },
+    { type: 'climate', name: 'local_temperature', property: 'local_temperature', deviceType: DeviceTypes.THERMOSTAT, cluster: Thermostat.Cluster.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: DeviceTypes.THERMOSTAT, cluster: Thermostat.Cluster.id, attribute: 'occupiedHeatingSetpoint', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
+    { type: 'climate', name: 'current_cooling_setpoint', property: 'current_cooling_setpoint', deviceType: DeviceTypes.THERMOSTAT, cluster: Thermostat.Cluster.id, attribute: 'occupiedCoolingSetpoint', converter: (value) => { return Math.max(-5000, Math.min(5000, value * 100)); } },
+    { type: 'climate', name: 'running_state', property: 'running_state', deviceType: DeviceTypes.THERMOSTAT, cluster: Thermostat.Cluster.id, attribute: 'thermostatRunningMode', valueLookup: ['idle', '', '', 'cool', 'heat'] },
+    { type: 'climate', name: 'system_mode', property: 'system_mode', deviceType: DeviceTypes.THERMOSTAT, cluster: Thermostat.Cluster.id, attribute: 'systemMode', valueLookup: ['off', 'auto', '', 'cool', 'heat'] },
     { type: '', name: 'presence', property: 'presence', deviceType: DeviceTypes.OCCUPANCY_SENSOR, cluster: OccupancySensing.Cluster.id, attribute: 'occupancy', converter: (value) => { return { occupied: value }; } },
     { type: '', name: 'occupancy', property: 'occupancy', deviceType: DeviceTypes.OCCUPANCY_SENSOR, cluster: OccupancySensing.Cluster.id, attribute: 'occupancy', converter: (value) => { return { occupied: value }; } },
     { type: '', name: 'illuminance', property: 'illuminance', deviceType: DeviceTypes.LIGHT_SENSOR, cluster: IlluminanceMeasurement.Cluster.id, attribute: 'measuredValue' },
@@ -347,7 +334,7 @@ export const z2ms = [
     { type: '', name: 'temperature', property: 'temperature', deviceType: DeviceTypes.TEMPERATURE_SENSOR, cluster: TemperatureMeasurement.Cluster.id, attribute: 'measuredValue', converter: (value) => { return Math.round(value * 100); } },
     { type: '', name: 'humidity', property: 'humidity', deviceType: DeviceTypes.HUMIDITY_SENSOR, cluster: RelativeHumidityMeasurement.Cluster.id, attribute: 'measuredValue', converter: (value) => { return Math.round(value * 100); } },
     { type: '', name: 'pressure', property: 'pressure', deviceType: DeviceTypes.PRESSURE_SENSOR, 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' },
+    { 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: TvocMeasurement.Cluster.id, attribute: 'measuredValue', converter: (value) => { return Math.min(65535, value); } },
     { type: '', name: 'action', property: 'action', deviceType: DeviceTypes.GENERIC_SWITCH, cluster: Switch.Cluster.id, attribute: 'currentPosition' },
     { type: '', name: 'cpu_temperature', property: 'temperature', deviceType: DeviceTypes.TEMPERATURE_SENSOR, cluster: TemperatureMeasurement.Cluster.id, attribute: 'measuredValue', converter: (value) => { return Math.round(value * 100); } },
@@ -367,14 +354,16 @@ export class ZigbeeDevice extends ZigbeeEntity {
         super(platform, device);
         if (device.friendly_name === 'Coordinator') {
             this.bridgedDevice = new BridgedBaseDevice(this, [DeviceTypes.DOOR_LOCK], [Identify.Cluster.id, DoorLock.Cluster.id]);
+            this.bridgedDevice.addFixedLabel('type', 'lock');
             this.bridgedDevice.isRouter = true;
         }
         else if (device.model_id === 'ti.router' && device.manufacturer === 'TexasInstruments') {
             this.bridgedDevice = new BridgedBaseDevice(this, [DeviceTypes.DOOR_LOCK], [Identify.Cluster.id, DoorLock.Cluster.id]);
+            this.bridgedDevice.addFixedLabel('type', 'lock');
             this.bridgedDevice.isRouter = true;
         }
         const debugEnabled = this.platform.debugEnabled;
-        this.log.setLogDebug(true);
+        // this.log.setLogDebug(true);
         // Get types and properties
         const types = [];
         const endpoints = [];
@@ -414,7 +403,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
             }
         });
         device.definition?.options.forEach((option) => {
-            //this.log.debug(option);
+            // this.log.debug(option);
             if (option.name)
                 names.push(option.name);
             properties.push(option.property);
@@ -425,27 +414,27 @@ export class ZigbeeDevice extends ZigbeeEntity {
                 endpoints.push('');
         });
         if (platform.switchList.includes(device.friendly_name)) {
-            this.log.debug(`Changed ${device.friendly_name} to switch`);
+            // this.log.debug(`Changed ${device.friendly_name} to switch`);
             types.forEach((type, index) => {
                 types[index] = type === 'light' ? 'switch' : type;
             });
         }
         if (platform.lightList.includes(device.friendly_name)) {
-            this.log.debug(`Changed ${device.friendly_name} to light`);
+            // this.log.debug(`Changed ${device.friendly_name} to light`);
             types.forEach((type, index) => {
                 types[index] = type === 'switch' ? 'light' : type;
             });
         }
         if (platform.outletList.includes(device.friendly_name)) {
-            this.log.debug(`Changed ${device.friendly_name} to outlet`);
+            // this.log.debug(`Changed ${device.friendly_name} to outlet`);
             types.forEach((type, index) => {
                 types[index] = type === 'switch' || type === 'light' ? 'outlet' : type;
             });
         }
-        this.log.debug(`*Device ${this.ien}${device.friendly_name}${rs}${db} - types[${types.length}]: ${debugStringify(types)}`);
-        this.log.debug(`*Device ${this.ien}${device.friendly_name}${rs}${db} - endpoints[${endpoints.length}]: ${debugStringify(endpoints)}`);
-        this.log.debug(`*Device ${this.ien}${device.friendly_name}${rs}${db} - names[${names.length}]: ${debugStringify(names)}`);
-        this.log.debug(`*Device ${this.ien}${device.friendly_name}${rs}${db} - properties[${properties.length}]: ${debugStringify(properties)}`);
+        // this.log.debug(`*Device ${this.ien}${device.friendly_name}${rs}${db} - types[${types.length}]: ${debugStringify(types)}`);
+        // this.log.debug(`*Device ${this.ien}${device.friendly_name}${rs}${db} - endpoints[${endpoints.length}]: ${debugStringify(endpoints)}`);
+        // this.log.debug(`*Device ${this.ien}${device.friendly_name}${rs}${db} - names[${names.length}]: ${debugStringify(names)}`);
+        // this.log.debug(`*Device ${this.ien}${device.friendly_name}${rs}${db} - properties[${properties.length}]: ${debugStringify(properties)}`);
         names.forEach((name, index) => {
             if (platform.featureBlackList.includes(name))
                 return;
@@ -453,7 +442,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
             const endpoint = endpoints[index];
             const z2m = z2ms.find((z2m) => z2m.type === type && z2m.name === name);
             if (z2m) {
-                this.log.debug(`*Device ${this.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}`);
+                this.log.debug(`Device ${this.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}`);
                 if (endpoint === '') {
                     if (!this.bridgedDevice)
                         this.bridgedDevice = new BridgedBaseDevice(this, [z2m.deviceType ?? DeviceTypes.BRIDGED_DEVICE_WITH_POWERSOURCE_INFO], z2m.deviceType ? [...z2m.deviceType.requiredServerClusters, ClusterId(z2m.cluster)] : [ClusterId(z2m.cluster)]);
@@ -465,7 +454,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
                 else {
                     if (!this.bridgedDevice)
                         this.bridgedDevice = new BridgedBaseDevice(this, [DeviceTypes.BRIDGED_DEVICE_WITH_POWERSOURCE_INFO]);
-                    const childEndpoint = this.bridgedDevice.addChildDeviceTypeAndClusterServer(endpoint, z2m.property, z2m.deviceType, z2m.deviceType ? [...z2m.deviceType.requiredServerClusters, ClusterId(z2m.cluster)] : [ClusterId(z2m.cluster)]);
+                    const childEndpoint = this.bridgedDevice.addChildDeviceTypeAndClusterServer(endpoint, z2m.deviceType, z2m.deviceType ? [...z2m.deviceType.requiredServerClusters, ClusterId(z2m.cluster)] : [ClusterId(z2m.cluster)]);
                     if (type !== '')
                         childEndpoint.addFixedLabel('type', type);
                     //childEndpoint.addClusterServer(this.bridgedDevice.getDefaultBasicInformationClusterServer(device.friendly_name + ' ' + endpoint, device.ieee_address, 0xfff1, '', 0x0001, 'sub'));
@@ -601,7 +590,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
                 if (!this.bridgedDevice?.isRouter)
                     this.publishCommand('lockDoor', device.friendly_name, { state: 'LOCK' });
                 else
-                    this.publishCommand('permit_join: false', 'zigbee2mqtt/bridge/request/permit_join', { value: false });
+                    this.publishCommand('permit_join: false', 'bridge/request/permit_join', { value: false });
             });
             this.bridgedDevice.addCommandHandler('unlockDoor', async ({ request: request, attributes: attributes }) => {
                 this.log.info(`Command unlockDoor called for ${this.ien}${device.friendly_name}${rs}${db}`, request);
@@ -609,7 +598,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
                 if (!this.bridgedDevice?.isRouter)
                     this.publishCommand('unlockDoor', device.friendly_name, { state: 'UNLOCK' });
                 else
-                    this.publishCommand('permit_join: true', 'zigbee2mqtt/bridge/request/permit_join', { value: true });
+                    this.publishCommand('permit_join: true', 'bridge/request/permit_join', { value: true });
             });
         }
         if (this.bridgedDevice.hasClusterServer(Thermostat.Complete)) {
@@ -678,18 +667,20 @@ export class BridgedBaseDevice extends MatterbridgeDevice {
             this.addDeviceType(deviceType);
             this.log.debug(`new BridgedBaseDevice ${entity.isDevice ? entity.device?.friendly_name : entity.group?.friendly_name} deviceType: ${hk}${deviceType.name}${db}`);
         });
-        this.addDeviceType(DeviceTypes.BRIDGED_DEVICE_WITH_POWERSOURCE_INFO);
+        // Log all server clusters in the includelist
         includeServerList.forEach((clusterId) => {
             this.log.debug(`- with cluster: ${hk}${clusterId}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
         });
-        // Add all other server clusters in the includelist
+        // Add all server clusters in the includelist
         this.addDeviceClusterServer(includeServerList);
-        // Add BridgedDeviceBasicInformationCluster
+        // Add BridgedDevice with PowerSourceInformation device type
+        this.addDeviceType(DeviceTypes.BRIDGED_DEVICE_WITH_POWERSOURCE_INFO);
+        // Add BridgedDeviceBasicInformation cluster
         if (entity.isDevice && entity.device && entity.device.friendly_name === 'Coordinator') {
             this.addBridgedDeviceBasicInformationCluster(entity.device.friendly_name, 'zigbee2MQTT', 'Coordinator', entity.device.ieee_address);
         }
         else if (entity.isDevice && entity.device) {
-            this.addBridgedDeviceBasicInformationCluster(entity.device.friendly_name, entity.device.manufacturer, entity.device.model_id, entity.device.ieee_address);
+            this.addBridgedDeviceBasicInformationCluster(entity.device.friendly_name, entity.device.definition ? entity.device.definition.vendor : entity.device.manufacturer, entity.device.definition ? entity.device.definition.model : entity.device.model_id, entity.device.ieee_address);
         }
         else if (entity.isGroup && entity.group) {
             this.addBridgedDeviceBasicInformationCluster(entity.group.friendly_name, 'zigbee2MQTT', 'Group', `group-${entity.group.id}`);
@@ -811,12 +802,16 @@ export class BridgedBaseDevice extends MatterbridgeDevice {
         /* Not implemented since not supported by matter.js */
     }
     addDeviceTypeAndClusterServer(deviceType, serverList) {
-        this.log.debug(`addDeviceTypeAndClusterServer deviceType: ${deviceType?.name} serverList: ${serverList}`);
+        this.log.debug(`addDeviceTypeAndClusterServer ${deviceType ? 'deviceType: ' + hk + deviceType.name + db : ''}`);
         if (deviceType)
             this.addDeviceType(deviceType);
+        // Log all server clusters in the serverList
+        serverList.forEach((clusterId) => {
+            this.log.debug(`- with cluster: ${hk}${clusterId}${db}-${hk}${getClusterNameById(clusterId)}${db}`);
+        });
         this.addDeviceClusterServer(serverList);
     }
-    addChildDeviceTypeAndClusterServer(endpointName, state, deviceType, includeServerList) {
+    addChildDeviceTypeAndClusterServer(endpointName, deviceType, includeServerList) {
         this.hasEndpoints = true;
         /* Look for existing child endpoint */
         let child = undefined;