npm - matterbridge-zigbee2mqtt - Versions diffs - 1.0.8 → 1.0.9 - Mend

matterbridge-zigbee2mqtt 1.0.8 → 1.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/README.md CHANGED Viewed

@@ -26,20 +26,21 @@ See the guidelines on [zigbee2mqtt](https://github.com/Koenkk/zigbee2mqtt/blob/m
 ### If you want to use the plugin
-On linux:
+On windows:
 ```
-cd ~/Matterbridge
-sudo npm install -g matterbridge-zigbee2mqtt
+cd $HOME\Matterbridge
+npm install -g matterbridge-zigbee2mqtt
 matterbridge -add matterbridge-zigbee2mqtt
 ```
-On windows:
+On linux:
 ```
-cd $HOME\Matterbridge
-npm install -g matterbridge-zigbee2mqtt
+cd ~/Matterbridge
+sudo npm install -g matterbridge-zigbee2mqtt
 matterbridge -add matterbridge-zigbee2mqtt
 ```
 ### If you want to contribute to the plugin
 On linux:

package/dist/entity.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../src/entity.ts"],"names":[],"mappings":";AAMA,OAAO,EAGL,oBAAoB,EAMpB,kBAAkB,EAgClB,SAAS,EAMV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,UAAU,~~EAAoE~~,MAAM,kBAAkB,CAAC;~~AAChH~~,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,OAAO,YAAY,MAAM,QAAQ,CAAC;AAGlC,qBAAa,YAAa,SAAQ,YAAY;IAC5C,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC;IAC1B,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC;IAC5B,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IACjC,KAAK,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,SAAS,CAAC,aAAa,EAAE,MAAM,CAAM;IAC9B,QAAQ,EAAE,OAAO,CAAS;IAC1B,OAAO,EAAE,OAAO,CAAS;IAChC,SAAS,CAAC,EAAE,SAAM;IAClB,SAAS,CAAC,GAAG,SAAM;IACZ,aAAa,EAAE,iBAAiB,GAAG,SAAS,CAAC;gBAExC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,GAAG,WAAW;~~IA8HxE~~,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;CAM/E;AAED,qBAAa,WAAY,SAAQ,YAAY;gBAC/B,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW;CAwBzD;AAwCD,qBAAa,YAAa,SAAQ,YAAY;gBAChC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY;CAsK3D;AAED,qBAAa,iBAAkB,SAAQ,kBAAkB;IAEhD,YAAY,UAAS;gBAEhB,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,GAAE,SAAS,EAAO,EAAE,iBAAiB,CAAC,EAAE,SAAS,EAAE;IAyBxI;;;;;;OAMG;IACH,SAAS,CAAC,uCAAuC,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAInI;;;;;;OAMG;IAEH,SAAS,CAAC,sBAAsB,CAAC,iBAAiB,GAAE,SAAS,EAAO;IAmDpE;;;;;;OAMG;IAGH,SAAS,CAAC,sBAAsB,CAAC,iBAAiB,GAAE,SAAS,EAAO;IAI7D,6BAA6B,CAAC,UAAU,EAAE,oBAAoB,EAAE,UAAU,EAAE,SAAS,EAAE;CAI/F"}
1	+ {"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../src/entity.ts"],"names":[],"mappings":";AAMA,OAAO,EAGL,oBAAoB,EAMpB,kBAAkB,EAgClB,SAAS,EAMV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,UAAU,EAAsH,MAAM,kBAAkB,CAAC;AAClK,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,OAAO,YAAY,MAAM,QAAQ,CAAC;AAGlC,qBAAa,YAAa,SAAQ,YAAY;IAC5C,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC;IAC1B,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC;IAC5B,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IACjC,KAAK,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,SAAS,CAAC,aAAa,EAAE,MAAM,CAAM;IAC9B,QAAQ,EAAE,OAAO,CAAS;IAC1B,OAAO,EAAE,OAAO,CAAS;IAChC,SAAS,CAAC,EAAE,SAAM;IAClB,SAAS,CAAC,GAAG,SAAM;IACZ,aAAa,EAAE,iBAAiB,GAAG,SAAS,CAAC;gBAExC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,GAAG,WAAW;IAqIxE,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;CAM/E;AAED,qBAAa,WAAY,SAAQ,YAAY;gBAC/B,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW;CAwBzD;AAwCD,qBAAa,YAAa,SAAQ,YAAY;gBAChC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY;CAsK3D;AAED,qBAAa,iBAAkB,SAAQ,kBAAkB;IAEhD,YAAY,UAAS;gBAEhB,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,GAAE,SAAS,EAAO,EAAE,iBAAiB,CAAC,EAAE,SAAS,EAAE;IAyBxI;;;;;;OAMG;IACH,SAAS,CAAC,uCAAuC,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAInI;;;;;;OAMG;IAEH,SAAS,CAAC,sBAAsB,CAAC,iBAAiB,GAAE,SAAS,EAAO;IAmDpE;;;;;;OAMG;IAGH,SAAS,CAAC,sBAAsB,CAAC,iBAAiB,GAAE,SAAS,EAAO;IAI7D,6BAA6B,CAAC,UAAU,EAAE,oBAAoB,EAAE,UAAU,EAAE,SAAS,EAAE;CAI/F"}

package/dist/entity.js CHANGED Viewed

@@ -4,7 +4,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 // matter.js imports
 import { DeviceTypes, logEndpoint, AirQuality, MatterbridgeDevice, airQualitySensor, colorTemperatureSwitch, dimmableSwitch, onOffSwitch, BridgedDeviceBasicInformation, Identify, Groups, Scenes, OnOff, LevelControl, ColorControl, ColorControlCluster, Switch, TemperatureMeasurement, BooleanState, RelativeHumidityMeasurement, PressureMeasurement, OccupancySensing, IlluminanceMeasurement, PowerSource, ClusterId, TvocMeasurement, WindowCovering, WindowCoveringCluster, OnOffCluster, LevelControlCluster, } from 'matterbridge';
-import { AnsiLogger, gn, dn, ign, idn, rs, db, nf, wr, stringify } from 'node-ansi-logger';
+import { AnsiLogger, gn, dn, ign, idn, rs, db, nf, wr, stringify, debugStringify } from 'node-ansi-logger';
 import * as color from './colorUtils.js';
 import EventEmitter from 'events';
 import { hostname } from 'os';
@@ -36,12 +36,15 @@ export class ZigbeeEntity extends EventEmitter {
             this.en = gn;
             this.ien = ign;
         }
-        this.log = new AnsiLogger({ logName: this.accessoryName, logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */ });
+        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 (this.bridgedDevice === undefined)
                 return;
-            this.log.debug(`MQTT message for accessory ${this.ien}${this.accessoryName}${rs}${db} payload: ${stringify(payload, true, 255, 247)}`);
+            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.setLogDebug(debugEnabled);
             Object.entries(payload).forEach(([key, value], index) => {
                 if (this.bridgedDevice === undefined)
                     return;
@@ -77,6 +80,10 @@ export class ZigbeeEntity extends EventEmitter {
                     this.bridgedDevice.getClusterServerById(ColorControl.Cluster.id)?.setColorModeAttribute(ColorControl.ColorMode.CurrentHueAndCurrentSaturation);
                     this.log.debug(`Setting accessory ${this.ien}${this.accessoryName}${rs}${db} colorXY: X:${value.x} Y:${value.y}`);
                 }
+                if (key === 'battery') {
+                    this.bridgedDevice.getClusterServerById(PowerSource.Cluster.id)?.setBatPercentRemainingAttribute(Math.round(value * 2));
+                    this.log.debug(`Setting accessory ${this.ien}${this.accessoryName}${rs}${db} batPercentRemaining: ${Math.round(value * 2)}`);
+                }
                 if (key === 'temperature') {
                     this.bridgedDevice.getClusterServerById(TemperatureMeasurement.Cluster.id)?.setMeasuredValueAttribute(Math.round(value * 100));
                     this.log.debug(`Setting accessory ${this.ien}${this.accessoryName}${rs}${db} measuredValue: ${Math.round(value * 100)}`);
@@ -249,12 +256,12 @@ export class ZigbeeDevice extends ZigbeeEntity {
         }
         if (types.length === 0)
             types.push('');
-        this.log.info(`**Device ${this.ien}${device.friendly_name}${rs}${nf} endpoints: ${endpoints.length} \ntypes: ${types.join(' ')} \nproperties: ${properties.join(' ')} \nnames: ${names.join(' ')}`);
+        this.log.debug(`**Device ${this.ien}${device.friendly_name}${rs}${nf} endpoints: ${endpoints.length} \ntypes: ${types.join(' ')} \nproperties: ${properties.join(' ')} \nnames: ${names.join(' ')}`);
         [...types].forEach((type) => {
             [...names].forEach((name) => {
                 const z2m = z2ms.find((z2m) => z2m.type === type && z2m.property === name);
                 if (z2m) {
-                    this.log.info(`***Device ${this.ien}${device.friendly_name}${rs}${nf} type: ${type} property: ${name} => deviceType: ${z2m.deviceType.name} cluster: ${z2m.cluster} attribute: ${z2m.attribute}`);
+                    this.log.debug(`***Device ${this.ien}${device.friendly_name}${rs}${nf} type: ${type} property: ${name} => deviceType: ${z2m.deviceType.name} cluster: ${z2m.cluster} attribute: ${z2m.attribute}`);
                     const requiredServerClusters = [];
                     if (z2m.deviceType.requiredServerClusters.includes(Groups.Cluster.id))
                         requiredServerClusters.push(Groups.Cluster.id);
@@ -269,12 +276,12 @@ export class ZigbeeDevice extends ZigbeeEntity {
             });
             types.splice(types.indexOf(type), 1);
         });
-        this.log.info(`****Device ${this.ien}${device.friendly_name}${rs}${nf} endpoints: ${endpoints.length} \ntypes: ${types.join(' ')} \nproperties: ${properties.join(' ')} \nnames: ${names.join(' ')}`);
+        this.log.debug(`****Device ${this.ien}${device.friendly_name}${rs}${nf} endpoints: ${endpoints.length} \ntypes: ${types.join(' ')} \nproperties: ${properties.join(' ')} \nnames: ${names.join(' ')}`);
         if (!this.bridgedDevice)
             return;
         // Command handlers
         this.bridgedDevice.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
-            this.log.warn(`Command identify called for ${this.ien}${device.friendly_name}${rs}${db} identifyTime:${identifyTime}`);
+            this.log.debug(`Command identify called for ${this.ien}${device.friendly_name}${rs}${db} identifyTime:${identifyTime}`);
             logEndpoint(this.bridgedDevice);
         });
         if (this.bridgedDevice.hasClusterServer(OnOffCluster)) {
@@ -408,7 +415,7 @@ export class BridgedBaseDevice extends MatterbridgeDevice {
      * @param deviceSerial Serial of the device
      */
     addBridgedDeviceBasicInformationCluster(deviceName, vendorName, productName, deviceSerial) {
-        this.createDefaultBridgedDeviceBasicInformationClusterServer(deviceName, (deviceSerial + '_' + hostname).slice(0, 32), 0xfff1, vendorName, productName);
+        this.createDefaultBridgedDeviceBasicInformationClusterServer(deviceName.slice(0, 32), (deviceSerial + '_' + hostname).slice(0, 32), 0xfff1, vendorName, productName);
     }
     /**
      * Adds mandatory clusters to the device

package/dist/entity.js.map CHANGED Viewed

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

package/dist/platform.d.ts CHANGED Viewed

@@ -7,6 +7,7 @@ export declare class ZigbeePlatform extends MatterbridgeDynamicPlatform {
     private bridgedEntities;
     private whiteList;
     private blackList;
+    debugEnabled: boolean;
     z2m: Zigbee2MQTT;
     z2mStarted: boolean;
     z2mDevicesRegistered: boolean;

package/dist/platform.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsB,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAwC,MAAM,kBAAkB,CAAC;AAGpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAA4B,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAI9E,qBAAa,cAAe,SAAQ,2BAA2B;IAE7D,OAAO,CAAC,cAAc,CAA2B;IACjD,OAAO,CAAC,eAAe,CAAsB;IAC7C,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,SAAS,CAAgB;IAG1B,GAAG,EAAE,WAAW,CAAC;IACjB,UAAU,UAAS;IACnB,oBAAoB,UAAS;IAC7B,mBAAmB,UAAS;IACnC,OAAO,CAAC,aAAa,CAAyB;IAC9C,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,eAAe,CAA4B;gBAEvC,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE,UAAU;~~IAUxC~~,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM;~~IAsDvB~~,WAAW;IAcX,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM;YAO3B,mBAAmB;YAqBnB,kBAAkB;IASzB,sBAAsB,CAAC,UAAU,EAAE,MAAM;YAYlC,oBAAoB;IAcrB,mBAAmB,CAAC,KAAK,EAAE,WAAW;IActC,aAAa;IAgBnB,kBAAkB,CAAC,SAAS,EAAE,OAAO;CAM7C"}
1	+ {"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsB,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAwC,MAAM,kBAAkB,CAAC;AAGpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAA4B,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAI9E,qBAAa,cAAe,SAAQ,2BAA2B;IAE7D,OAAO,CAAC,cAAc,CAA2B;IACjD,OAAO,CAAC,eAAe,CAAsB;IAC7C,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,SAAS,CAAgB;IAG1B,YAAY,EAAE,OAAO,CAAC;IACtB,GAAG,EAAE,WAAW,CAAC;IACjB,UAAU,UAAS;IACnB,oBAAoB,UAAS;IAC7B,mBAAmB,UAAS;IACnC,OAAO,CAAC,aAAa,CAAyB;IAC9C,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,eAAe,CAA4B;gBAEvC,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE,UAAU;IAaxC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM;IA2DvB,WAAW;IAcX,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM;YAO3B,mBAAmB;YAqBnB,kBAAkB;IASzB,sBAAsB,CAAC,UAAU,EAAE,MAAM;YAYlC,oBAAoB;IAcrB,mBAAmB,CAAC,KAAK,EAAE,WAAW;IActC,aAAa;IAgBnB,kBAAkB,CAAC,SAAS,EAAE,OAAO;CAM7C"}

package/dist/platform.js CHANGED Viewed

@@ -10,6 +10,7 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
     whiteList = []; //['At home', 'Climate sensor', 'Light sensor', 'Contact sensor', 'Motion sensor', 'Mini luminance motion sensor', 'Vibration sensor', 'Leak sensor'];
     blackList = [];
     // zigbee2Mqtt
+    debugEnabled;
     z2m;
     z2mStarted = false;
     z2mDevicesRegistered = false;
@@ -19,13 +20,21 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
     z2mBridgeGroups;
     constructor(matterbridge, log) {
         super(matterbridge, log);
+        this.debugEnabled = matterbridge.debugEnabled;
+        this.log.info('Loaded config.json:\n', this.config);
         //this.z2m = new Zigbee2MQTT('raspberrypi.local', 1883, 'zigbee2mqtt');
         this.z2m = new Zigbee2MQTT('localhost', 1883, 'zigbee2mqtt');
         this.z2m.setDataPath(path.join(matterbridge.matterbridgePluginDirectory, 'matterbridge-zigbee2mqtt'));
-        this.log.debug('Created ZigbeePlatform');
+        this.log.debug('Created zigbee2mqtt dynamic platform');
     }
     async onStart(reason) {
-        this.log.debug('Starting platform: ' + reason);
+        this.log.debug('Starting zigbee2mqtt dynamic platform: ' + reason);
+        //if (this.config.host) this.z2m.mqttHost = this.config.host as string;
+        if (this.config.port)
+            this.z2m.mqttPort = this.config.host;
+        if (this.config.topic)
+            this.z2m.mqttTopic = this.config.topic;
+        this.log.info('Loaded config.json:\n', this.config);
         this.z2m.start();
         this.z2mStarted = true;
         this.z2m.on('mqtt_connect', () => {
@@ -86,9 +95,9 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
         }
     }
     async onShutdown(reason) {
-        this.log.debug('Shutting down platform: ' + reason);
+        this.log.debug('Shutting down zigbee2mqtt platform: ' + reason);
         //this.updateAvailability(false);
-        //await this.unregisterAll();
+        await this.unregisterAllDevices();
         this.z2m.stop();
     }
     async requestDeviceUpdate(device) {

package/dist/platform.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAc,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpF,OAAO,EAAE,YAAY,EAAgB,WAAW,EAAqB,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,MAAM,OAAO,cAAe,SAAQ,2BAA2B;IAC7D,WAAW;IACH,cAAc,GAAwB,EAAE,CAAC;IACzC,eAAe,GAAmB,EAAE,CAAC;IACrC,SAAS,GAAa,EAAE,CAAC,CAAC,sJAAsJ;IAChL,SAAS,GAAa,EAAE,CAAC;IAEjC,cAAc;IACP,GAAG,CAAc;IACjB,UAAU,GAAG,KAAK,CAAC;IACnB,oBAAoB,GAAG,KAAK,CAAC;IAC7B,mBAAmB,GAAG,KAAK,CAAC;IAC3B,aAAa,CAAyB;IACtC,gBAAgB,CAA6B;IAC7C,eAAe,CAA4B;IAEnD,YAAY,YAA0B,EAAE,GAAe;QACrD,KAAK,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QAEzB,uEAAuE;QACvE,IAAI,CAAC,GAAG,GAAG,IAAI,WAAW,CAAC,WAAW,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QAC7D,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,2BAA2B,EAAE,0BAA0B,CAAC,CAAC,CAAC;QAEtG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,~~wBAAwB~~,CAAC,CAAC;~~IAC3C~~,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,MAAe;QACpC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,~~qBAAqB~~,GAAG,MAAM,CAAC,CAAC;~~QAE/C~~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~~0BAA0B~~,GAAG,MAAM,CAAC,CAAC;~~QACpD~~,iCAAiC;QACjC,~~6BAA6B~~;~~QAC7B~~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"}
1	+ {"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAc,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpF,OAAO,EAAE,YAAY,EAAgB,WAAW,EAAqB,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,MAAM,OAAO,cAAe,SAAQ,2BAA2B;IAC7D,WAAW;IACH,cAAc,GAAwB,EAAE,CAAC;IACzC,eAAe,GAAmB,EAAE,CAAC;IACrC,SAAS,GAAa,EAAE,CAAC,CAAC,sJAAsJ;IAChL,SAAS,GAAa,EAAE,CAAC;IAEjC,cAAc;IACP,YAAY,CAAU;IACtB,GAAG,CAAc;IACjB,UAAU,GAAG,KAAK,CAAC;IACnB,oBAAoB,GAAG,KAAK,CAAC;IAC7B,mBAAmB,GAAG,KAAK,CAAC;IAC3B,aAAa,CAAyB;IACtC,gBAAgB,CAA6B;IAC7C,eAAe,CAA4B;IAEnD,YAAY,YAA0B,EAAE,GAAe;QACrD,KAAK,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QAEzB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC;QAE9C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACpD,uEAAuE;QACvE,IAAI,CAAC,GAAG,GAAG,IAAI,WAAW,CAAC,WAAW,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QAC7D,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,2BAA2B,EAAE,0BAA0B,CAAC,CAAC,CAAC;QAEtG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACzD,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,MAAe;QACpC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yCAAyC,GAAG,MAAM,CAAC,CAAC;QAEnE,uEAAuE;QACvE,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAc,CAAC;QACrE,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,KAAe,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEpD,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;YAC/B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wCAAwC,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YACjG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACzB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YACvC,iCAAiC;YACjC,gCAAgC;QAClC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YACxC,iCAAiC;QACnC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,UAAsB,EAAE,EAAE;YACpD,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC;YAChC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yCAAyC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QACxF,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,OAAuB,EAAE,EAAE;YACxD,sCAAsC;YACtC,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;YAChC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,OAAO,CAAC,MAAM,YAAY,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACtH,IAAI,IAAI,CAAC,oBAAoB;gBAAE,OAAO;YACtC,6DAA6D;YAC7D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE;gBAC3E,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;YACjC,uCAAuC;QACzC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,MAAqB,EAAE,EAAE;YACrD,sCAAsC;YACtC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC;YAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,MAAM,CAAC,MAAM,WAAW,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACnH,IAAI,IAAI,CAAC,mBAAmB;gBAAE,OAAO;YACrC,6DAA6D;YAC7D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE;gBACzE,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;YAChC,uCAAuC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAEQ,KAAK,CAAC,WAAW;QACxB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACvC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC3C,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzC,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;IACH,CAAC;IAEQ,KAAK,CAAC,UAAU,CAAC,MAAe;QACvC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,GAAG,MAAM,CAAC,CAAC;QAChE,iCAAiC;QACjC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,MAAoB;QACpD,MAAM,OAAO,GAAY,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO;YAAE,OAAO;QAC7D,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YAChD,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACrB,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;oBAC1C,IAAI,UAAU,CAAC,MAAM,GAAG,KAAK,EAAE,CAAC;wBAC9B,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;oBACpC,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,OAAO,CAAC,MAAM,GAAG,KAAK,EAAE,CAAC;gBAC3B,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YACjC,CAAC;QACH,CAAC;QACD,IAAI,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,GAAG,GAAG,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC;YACvE,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,KAAkB;QACjD,MAAM,OAAO,GAAY,EAAE,CAAC;QAC5B,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QACtB,IAAI,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,GAAG,GAAG,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;YACtE,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAEM,sBAAsB,CAAC,UAAkB;QAC9C,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE,CAAC;YACrF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,UAAU,GAAG,EAAE,2BAA2B,CAAC,CAAC;YAC3E,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE,CAAC;YACpF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,UAAU,GAAG,EAAE,uBAAuB,CAAC,CAAC;YACvE,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,MAAoB;QACrD,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YACvD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,MAAM,CAAC,aAAa,GAAG,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,YAAY,GAAG,EAAE,EAAE,CAAC,CAAC;QAC5G,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACpD,IAAI,YAAY,CAAC,aAAa,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,aAA8C,CAAC,CAAC;YACvF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACrD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACxC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,MAAM,CAAC,aAAa,GAAG,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,YAAY,GAAG,EAAE,EAAE,CAAC,CAAC;QAC7G,CAAC;;YAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,aAAa,GAAG,EAAE,QAAQ,MAAM,CAAC,YAAY,iBAAiB,CAAC,CAAC;IAC7G,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,KAAkB;QACjD,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;YACtD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,KAAK,CAAC,aAAa,GAAG,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC/F,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACjD,IAAI,WAAW,CAAC,aAAa,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,aAA8C,CAAC,CAAC;YACtF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YACpD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACvC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,KAAK,CAAC,aAAa,GAAG,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAChG,CAAC;;YAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,KAAK,CAAC,aAAa,GAAG,EAAE,QAAQ,KAAK,CAAC,EAAE,iBAAiB,CAAC,CAAC;IAChG,CAAC;IAEM,KAAK,CAAC,aAAa;QACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,eAAe,CAAC,MAAM,cAAc,CAAC,CAAC;QAC1E;;;;;UAKE;QACF,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC9B,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACjD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,aAAa,CAAC,aAAa,EAAE,UAAU,IAAI,aAAa,CAAC,aAAa,EAAE,EAAE,KAAK,aAAa,CAAC,aAAa,EAAE,IAAI,GAAG,CAAC,CAAC;YACxI,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,aAA8C,CAAC,CAAC;QAC5F,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IAEM,kBAAkB,CAAC,SAAkB;QAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,cAAc,CAAC,MAAM,cAAc,CAAC,CAAC;QACrF,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YAChD,aAAa,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;CACF"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge-zigbee2mqtt",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Matterbridge zigbee2mqtt plugin",
   "author": "https://github.com/Luligu",
   "license": "MIT",
@@ -9,7 +9,7 @@
   "types": "dist/index.d.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Luligu/matterbridge-zigbee2mqtt"
+    "url": "git+https://github.com/Luligu/matterbridge-zigbee2mqtt.git"
   },
   "bugs": {
     "url": "https://github.com/Luligu/matterbridge-zigbee2mqtt/issues"
@@ -18,7 +18,9 @@
     "matterbridge",
     "homebridge",
     "matter",
-    "matter.js"
+    "matter.js",
+    "zigbee2mqtt",
+    "zigbee"
   ],
   "engines": {
     "node": "^18.19.0 || ^20.11.0"

package/src/entity.ts CHANGED Viewed

@@ -53,7 +53,7 @@ import {
   LevelControlCluster,
 } from 'matterbridge';
-import { AnsiLogger, TimestampFormat, gn, dn, ign, idn, rs, db, nf, wr, er, stringify } from 'node-ansi-logger';
+import { AnsiLogger, TimestampFormat, gn, dn, ign, idn, rs, db, nf, wr, er, stringify, payloadStringify, colorStringify, debugStringify } from 'node-ansi-logger';
 import { ZigbeePlatform } from './platform.js';
 import { BridgeDevice, BridgeGroup } from './zigbee2mqttTypes.js';
 import { Payload } from './payloadTypes.js';
@@ -90,12 +90,15 @@ export class ZigbeeEntity extends EventEmitter {
       this.en = gn;
       this.ien = ign;
     }
-    this.log = new AnsiLogger({ logName: this.accessoryName, logTimestampFormat: TimestampFormat.TIME_MILLIS });
+    this.log = new AnsiLogger({ logName: this.accessoryName, logTimestampFormat: TimestampFormat.TIME_MILLIS, logDebug: platform.debugEnabled });
     this.log.debug(`Created MatterEntity: ${this.accessoryName}`);
     this.platform.z2m.on('MESSAGE-' + this.accessoryName, (payload: object) => {
       if (this.bridgedDevice === undefined) return;
-      this.log.debug(`MQTT message for accessory ${this.ien}${this.accessoryName}${rs}${db} payload: ${stringify(payload, true, 255, 247)}`);
+      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.setLogDebug(debugEnabled);
       Object.entries(payload).forEach(([key, value], index) => {
         if (this.bridgedDevice === undefined) return;
         if (key === 'position') {
@@ -130,6 +133,10 @@ export class ZigbeeEntity extends EventEmitter {
           this.bridgedDevice.getClusterServerById(ColorControl.Cluster.id)?.setColorModeAttribute(ColorControl.ColorMode.CurrentHueAndCurrentSaturation);
           this.log.debug(`Setting accessory ${this.ien}${this.accessoryName}${rs}${db} colorXY: X:${value.x} Y:${value.y}`);
         }
+        if (key === 'battery') {
+          this.bridgedDevice.getClusterServerById(PowerSource.Cluster.id)?.setBatPercentRemainingAttribute(Math.round(value * 2));
+          this.log.debug(`Setting accessory ${this.ien}${this.accessoryName}${rs}${db} batPercentRemaining: ${Math.round(value * 2)}`);
+        }
         if (key === 'temperature') {
           this.bridgedDevice.getClusterServerById(TemperatureMeasurement.Cluster.id)?.setMeasuredValueAttribute(Math.round(value * 100));
           this.log.debug(`Setting accessory ${this.ien}${this.accessoryName}${rs}${db} measuredValue: ${Math.round(value * 100)}`);
@@ -247,28 +254,28 @@ interface ZigbeeToMatter {
 /* eslint-disable */
 // prettier-ignore
 const z2ms: ZigbeeToMatter[] = [
-  { type: 'switch', name: 'state',        property: 'state',      deviceType: onOffSwitch, cluster: OnOff.Cluster.id, attribute: OnOff.Cluster.attributes.onOff.id },
-  { type: 'switch', name: 'brightness',   property: 'brightness', deviceType: dimmableSwitch, cluster: LevelControl.Cluster.id, attribute: LevelControl.Cluster.attributes.currentLevel.id },
-  { type: 'switch', name: 'color_xy',     property: 'color_xy',   deviceType: colorTemperatureSwitch, cluster: ColorControl.Cluster.id, attribute: ColorControl.Cluster.attributes.colorMode.id },
-  { type: 'outlet', name: 'state',        property: 'state',      deviceType: DeviceTypes.ON_OFF_LIGHT, cluster: OnOff.Cluster.id, attribute: OnOff.Cluster.attributes.onOff.id },
-  { type: 'outlet', name: 'brightness',   property: 'brightness', deviceType: DeviceTypes.DIMMABLE_PLUGIN_UNIT, cluster: LevelControl.Cluster.id, attribute: LevelControl.Cluster.attributes.currentLevel.id },
-  { type: 'light',  name: 'state',        property: 'state',      deviceType: DeviceTypes.ON_OFF_LIGHT, cluster: OnOff.Cluster.id, attribute: OnOff.Cluster.attributes.onOff.id },
-  { type: 'light',  name: 'brightness',   property: 'brightness', deviceType: DeviceTypes.DIMMABLE_LIGHT, cluster: LevelControl.Cluster.id, attribute: LevelControl.Cluster.attributes.currentLevel.id },
-  { type: 'light',  name: 'color_xy',     property: 'color_xy',   deviceType: DeviceTypes.COLOR_TEMPERATURE_LIGHT, cluster: ColorControl.Cluster.id, attribute: ColorControl.Cluster.attributes.colorMode.id },
-  { type: 'cover',  name: 'state',        property: 'state',      deviceType: DeviceTypes.WINDOW_COVERING, cluster: WindowCovering.Cluster.id, attribute: WindowCovering.Complete.attributes.currentPositionLiftPercent100ths.id },
-  { type: '',       name: 'occupancy',    property: 'occupancy',  deviceType: DeviceTypes.OCCUPANCY_SENSOR, cluster: OccupancySensing.Cluster.id, attribute: OccupancySensing.Cluster.attributes.occupancy.id },
-  { type: '',       name: 'illuminance',  property: 'illuminance', deviceType: DeviceTypes.LIGHT_SENSOR, cluster: IlluminanceMeasurement.Cluster.id, attribute: IlluminanceMeasurement.Cluster.attributes.measuredValue.id },
-  { type: '',       name: 'contact',      property: 'contact',    deviceType: DeviceTypes.CONTACT_SENSOR, cluster: BooleanState.Cluster.id, attribute: BooleanState.Cluster.attributes.stateValue.id },
-  { type: '',       name: 'water_leak',   property: 'water_leak', deviceType: DeviceTypes.CONTACT_SENSOR, cluster: BooleanState.Cluster.id, attribute: BooleanState.Cluster.attributes.stateValue.id },
-  { type: '',       name: 'vibration',    property: 'vibration',  deviceType: DeviceTypes.CONTACT_SENSOR, cluster: BooleanState.Cluster.id, attribute: BooleanState.Cluster.attributes.stateValue.id },
-  { type: '',       name: 'smoke',        property: 'smoke',      deviceType: DeviceTypes.CONTACT_SENSOR, cluster: BooleanState.Cluster.id, attribute: BooleanState.Cluster.attributes.stateValue.id },
+  { type: 'switch', name: 'state',          property: 'state',      deviceType: onOffSwitch,                cluster: OnOff.Cluster.id, attribute: OnOff.Cluster.attributes.onOff.id },
+  { type: 'switch', name: 'brightness',     property: 'brightness', deviceType: dimmableSwitch,             cluster: LevelControl.Cluster.id, attribute: LevelControl.Cluster.attributes.currentLevel.id },
+  { type: 'switch', name: 'color_xy',       property: 'color_xy',   deviceType: colorTemperatureSwitch,     cluster: ColorControl.Cluster.id, attribute: ColorControl.Cluster.attributes.colorMode.id },
+  { type: 'outlet', name: 'state',          property: 'state',      deviceType: DeviceTypes.ON_OFF_LIGHT,   cluster: OnOff.Cluster.id, attribute: OnOff.Cluster.attributes.onOff.id },
+  { type: 'outlet', name: 'brightness',     property: 'brightness', deviceType: DeviceTypes.DIMMABLE_PLUGIN_UNIT, cluster: LevelControl.Cluster.id, attribute: LevelControl.Cluster.attributes.currentLevel.id },
+  { type: 'light',  name: 'state',          property: 'state',      deviceType: DeviceTypes.ON_OFF_LIGHT,   cluster: OnOff.Cluster.id, attribute: OnOff.Cluster.attributes.onOff.id },
+  { type: 'light',  name: 'brightness',     property: 'brightness', deviceType: DeviceTypes.DIMMABLE_LIGHT, cluster: LevelControl.Cluster.id, attribute: LevelControl.Cluster.attributes.currentLevel.id },
+  { type: 'light',  name: 'color_xy',       property: 'color_xy',   deviceType: DeviceTypes.COLOR_TEMPERATURE_LIGHT, cluster: ColorControl.Cluster.id, attribute: ColorControl.Cluster.attributes.colorMode.id },
+  { type: 'cover',  name: 'state',          property: 'state',      deviceType: DeviceTypes.WINDOW_COVERING, cluster: WindowCovering.Cluster.id, attribute: WindowCovering.Complete.attributes.currentPositionLiftPercent100ths.id },
+  { type: '',       name: 'occupancy',      property: 'occupancy',  deviceType: DeviceTypes.OCCUPANCY_SENSOR, cluster: OccupancySensing.Cluster.id, attribute: OccupancySensing.Cluster.attributes.occupancy.id },
+  { type: '',       name: 'illuminance',    property: 'illuminance', deviceType: DeviceTypes.LIGHT_SENSOR,  cluster: IlluminanceMeasurement.Cluster.id, attribute: IlluminanceMeasurement.Cluster.attributes.measuredValue.id },
+  { type: '',       name: 'contact',        property: 'contact',    deviceType: DeviceTypes.CONTACT_SENSOR, cluster: BooleanState.Cluster.id, attribute: BooleanState.Cluster.attributes.stateValue.id },
+  { type: '',       name: 'water_leak',     property: 'water_leak', deviceType: DeviceTypes.CONTACT_SENSOR, cluster: BooleanState.Cluster.id, attribute: BooleanState.Cluster.attributes.stateValue.id },
+  { type: '',       name: 'vibration',      property: 'vibration',  deviceType: DeviceTypes.CONTACT_SENSOR, cluster: BooleanState.Cluster.id, attribute: BooleanState.Cluster.attributes.stateValue.id },
+  { type: '',       name: 'smoke',          property: 'smoke',      deviceType: DeviceTypes.CONTACT_SENSOR, cluster: BooleanState.Cluster.id, attribute: BooleanState.Cluster.attributes.stateValue.id },
   { type: '',       name: 'carbon_monoxide', property: 'carbon_monoxide', deviceType: DeviceTypes.CONTACT_SENSOR, cluster: BooleanState.Cluster.id, attribute: BooleanState.Cluster.attributes.stateValue.id },
-  { type: '',       name: 'temperature',  property: 'temperature', deviceType: DeviceTypes.TEMPERATURE_SENSOR, cluster: TemperatureMeasurement.Cluster.id, attribute: TemperatureMeasurement.Cluster.attributes.measuredValue.id },
-  { type: '',       name: 'humidity',     property: 'humidity',   deviceType: DeviceTypes.HUMIDITY_SENSOR, cluster: RelativeHumidityMeasurement.Cluster.id, attribute: RelativeHumidityMeasurement.Cluster.attributes.measuredValue.id },
-  { type: '',       name: 'pressure',     property: 'pressure',   deviceType: DeviceTypes.PRESSURE_SENSOR, cluster: PressureMeasurement.Cluster.id, attribute: PressureMeasurement.Cluster.attributes.measuredValue.id },
-  { type: '',       name: 'air_quality',  property: 'air_quality', deviceType: airQualitySensor, cluster: AirQuality.Cluster.id, attribute: AirQuality.Cluster.attributes.airQuality.id },
-  { type: '',       name: 'voc',          property: 'voc',        deviceType: airQualitySensor, cluster: TvocMeasurement.Cluster.id, attribute: TvocMeasurement.Cluster.attributes.measuredValue.id },
-  { type: '',       name: 'action',       property: 'action',     deviceType: DeviceTypes.GENERIC_SWITCH, cluster: Switch.Cluster.id, attribute: Switch.Cluster.attributes.currentPosition.id },
+  { type: '',       name: 'temperature',    property: 'temperature', deviceType: DeviceTypes.TEMPERATURE_SENSOR, cluster: TemperatureMeasurement.Cluster.id, attribute: TemperatureMeasurement.Cluster.attributes.measuredValue.id },
+  { type: '',       name: 'humidity',       property: 'humidity',   deviceType: DeviceTypes.HUMIDITY_SENSOR, cluster: RelativeHumidityMeasurement.Cluster.id, attribute: RelativeHumidityMeasurement.Cluster.attributes.measuredValue.id },
+  { type: '',       name: 'pressure',       property: 'pressure',   deviceType: DeviceTypes.PRESSURE_SENSOR, cluster: PressureMeasurement.Cluster.id, attribute: PressureMeasurement.Cluster.attributes.measuredValue.id },
+  { type: '',       name: 'air_quality',    property: 'air_quality', deviceType: airQualitySensor,          cluster: AirQuality.Cluster.id, attribute: AirQuality.Cluster.attributes.airQuality.id },
+  { type: '',       name: 'voc',            property: 'voc',        deviceType: airQualitySensor,           cluster: TvocMeasurement.Cluster.id, attribute: TvocMeasurement.Cluster.attributes.measuredValue.id },
+  { type: '',       name: 'action',         property: 'action',     deviceType: DeviceTypes.GENERIC_SWITCH, cluster: Switch.Cluster.id, attribute: Switch.Cluster.attributes.currentPosition.id },
 ];
 /* eslint-enable */
@@ -316,13 +323,13 @@ export class ZigbeeDevice extends ZigbeeEntity {
       });
     }
     if (types.length === 0) types.push('');
-    this.log.info(`**Device ${this.ien}${device.friendly_name}${rs}${nf} endpoints: ${endpoints.length} \ntypes: ${types.join(' ')} \nproperties: ${properties.join(' ')} \nnames: ${names.join(' ')}`);
+    this.log.debug(`**Device ${this.ien}${device.friendly_name}${rs}${nf} endpoints: ${endpoints.length} \ntypes: ${types.join(' ')} \nproperties: ${properties.join(' ')} \nnames: ${names.join(' ')}`);
     [...types].forEach((type) => {
       [...names].forEach((name) => {
         const z2m = z2ms.find((z2m) => z2m.type === type && z2m.property === name);
         if (z2m) {
-          this.log.info(`***Device ${this.ien}${device.friendly_name}${rs}${nf} type: ${type} property: ${name} => deviceType: ${z2m.deviceType.name} cluster: ${z2m.cluster} attribute: ${z2m.attribute}`);
+          this.log.debug(`***Device ${this.ien}${device.friendly_name}${rs}${nf} type: ${type} property: ${name} => deviceType: ${z2m.deviceType.name} cluster: ${z2m.cluster} attribute: ${z2m.attribute}`);
           const requiredServerClusters: ClusterId[] = [];
           if (z2m.deviceType.requiredServerClusters.includes(Groups.Cluster.id)) requiredServerClusters.push(Groups.Cluster.id);
           if (z2m.deviceType.requiredServerClusters.includes(Scenes.Cluster.id)) requiredServerClusters.push(Scenes.Cluster.id);
@@ -333,13 +340,13 @@ export class ZigbeeDevice extends ZigbeeEntity {
       });
       types.splice(types.indexOf(type), 1);
     });
-    this.log.info(`****Device ${this.ien}${device.friendly_name}${rs}${nf} endpoints: ${endpoints.length} \ntypes: ${types.join(' ')} \nproperties: ${properties.join(' ')} \nnames: ${names.join(' ')}`);
+    this.log.debug(`****Device ${this.ien}${device.friendly_name}${rs}${nf} endpoints: ${endpoints.length} \ntypes: ${types.join(' ')} \nproperties: ${properties.join(' ')} \nnames: ${names.join(' ')}`);
     if (!this.bridgedDevice) return;
     // Command handlers
     this.bridgedDevice.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
-      this.log.warn(`Command identify called for ${this.ien}${device.friendly_name}${rs}${db} identifyTime:${identifyTime}`);
+      this.log.debug(`Command identify called for ${this.ien}${device.friendly_name}${rs}${db} identifyTime:${identifyTime}`);
       logEndpoint(this.bridgedDevice!);
     });
     if (this.bridgedDevice.hasClusterServer(OnOffCluster)) {
@@ -478,7 +485,7 @@ export class BridgedBaseDevice extends MatterbridgeDevice {
    * @param deviceSerial Serial of the device
    */
   protected addBridgedDeviceBasicInformationCluster(deviceName: string, vendorName: string, productName: string, deviceSerial: string) {
-    this.createDefaultBridgedDeviceBasicInformationClusterServer(deviceName, (deviceSerial + '_' + hostname).slice(0, 32), 0xfff1, vendorName, productName);
+    this.createDefaultBridgedDeviceBasicInformationClusterServer(deviceName.slice(0, 32), (deviceSerial + '_' + hostname).slice(0, 32), 0xfff1, vendorName, productName);
   }
   /**

package/src/platform.ts CHANGED Viewed

@@ -15,6 +15,7 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
   private blackList: string[] = [];
   // zigbee2Mqtt
+  public debugEnabled: boolean;
   public z2m: Zigbee2MQTT;
   public z2mStarted = false;
   public z2mDevicesRegistered = false;
@@ -26,15 +27,23 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
   constructor(matterbridge: Matterbridge, log: AnsiLogger) {
     super(matterbridge, log);
+    this.debugEnabled = matterbridge.debugEnabled;
+    this.log.info('Loaded config.json:\n', this.config);
     //this.z2m = new Zigbee2MQTT('raspberrypi.local', 1883, 'zigbee2mqtt');
     this.z2m = new Zigbee2MQTT('localhost', 1883, 'zigbee2mqtt');
     this.z2m.setDataPath(path.join(matterbridge.matterbridgePluginDirectory, 'matterbridge-zigbee2mqtt'));
-    this.log.debug('Created ZigbeePlatform');
+    this.log.debug('Created zigbee2mqtt dynamic platform');
   }
   override async onStart(reason?: string) {
-    this.log.debug('Starting platform: ' + reason);
+    this.log.debug('Starting zigbee2mqtt dynamic platform: ' + reason);
+    //if (this.config.host) this.z2m.mqttHost = this.config.host as string;
+    if (this.config.port) this.z2m.mqttPort = this.config.host as number;
+    if (this.config.topic) this.z2m.mqttTopic = this.config.topic as string;
+    this.log.info('Loaded config.json:\n', this.config);
     this.z2m.start();
     this.z2mStarted = true;
@@ -102,9 +111,9 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
   }
   override async onShutdown(reason?: string) {
-    this.log.debug('Shutting down platform: ' + reason);
+    this.log.debug('Shutting down zigbee2mqtt platform: ' + reason);
     //this.updateAvailability(false);
-    //await this.unregisterAll();
+    await this.unregisterAllDevices();
     this.z2m.stop();
   }