matterbridge-zigbee2mqtt 2.3.1-dev.1 → 2.3.1-dev.2

package/dist/entity.js

@@ -443,7 +443,7 @@ export class ZigbeeGroup extends ZigbeeEntity {
             return zigbeeGroup;
         zigbeeGroup.logPropertyMap();
         if (isSwitch || isLight) {
-            if (isSwitch)
+            if (isSwitch && !isLight)
                 await zigbeeGroup.bridgedDevice.addFixedLabel('type', 'switch');
             if (isLight)
                 await zigbeeGroup.bridgedDevice.addFixedLabel('type', 'light');
@@ -898,7 +898,9 @@ export class ZigbeeDevice extends ZigbeeEntity {
         mainEndpoint.clusterServersObjs.push(zigbeeDevice.getPowerSource());
         if (mainEndpoint.clusterServersIds.includes(ColorControl.Cluster.id)) {
             zigbeeDevice.log.debug(`Configuring device ${zigbeeDevice.ien}${device.friendly_name}${rs}${db} ColorControlCluster cluster with HS: ${names.includes('color_hs')} XY: ${names.includes('color_xy')} CT: ${names.includes('color_temp')}`);
-            zigbeeDevice.bridgedDevice.configureColorControlCluster(names.includes('color_hs') || names.includes('color_xy'), false, names.includes('color_temp'));
+            if (!names.includes('color_hs') && !names.includes('color_xy')) {
+                mainEndpoint.clusterServersObjs.push(zigbeeDevice.bridgedDevice.getCtColorControlClusterServer());
+            }
         }
         if (mainEndpoint.clusterServersIds.includes(Thermostat.Cluster.id)) {
             const heat = zigbeeDevice.propertyMap.get('occupied_heating_setpoint') || zigbeeDevice.propertyMap.get('current_heating_setpoint');
@@ -1070,7 +1072,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
             });
         }
         if (zigbeeDevice.bridgedDevice.getClusterServerById(ColorControlCluster.id) && zigbeeDevice.bridgedDevice.getClusterServer(ColorControlCluster)?.isAttributeSupportedByName('colorTemperatureMireds')) {
-            zigbeeDevice.bridgedDevice.addCommandHandler('moveToColorTemperature', async ({ request: request }) => {
+            zigbeeDevice.bridgedDevice.addCommandHandler('moveToColorTemperature', async ({ request }) => {
                 zigbeeDevice.log.debug(`Command moveToColorTemperature called for ${zigbeeDevice.ien}${device.friendly_name}${rs}${db} request: ${request.colorTemperatureMireds}`);
                 await zigbeeDevice.bridgedDevice?.setAttribute(ColorControlCluster.id, 'colorMode', ColorControl.ColorMode.ColorTemperatureMireds, zigbeeDevice.log);
                 const payload = { color_temp: request.colorTemperatureMireds };
@@ -1079,10 +1081,20 @@ export class ZigbeeDevice extends ZigbeeEntity {
                 zigbeeDevice.publishCommand('moveToColorTemperature', device.friendly_name, payload);
             });
         }
+        if (zigbeeDevice.bridgedDevice.getClusterServerById(ColorControlCluster.id) && zigbeeDevice.bridgedDevice.getClusterServer(ColorControlCluster)?.isAttributeSupportedByName('currentX')) {
+            zigbeeDevice.bridgedDevice.addCommandHandler('moveToColor', async ({ request }) => {
+                zigbeeDevice.log.debug(`Command moveToColor called for ${zigbeeDevice.ien}${device.friendly_name}${rs}${db} request: X: ${request.colorX} Y: ${request.colorY}`);
+                await zigbeeDevice.bridgedDevice?.setAttribute(ColorControlCluster.id, 'colorMode', ColorControl.ColorMode.CurrentXAndCurrentY, zigbeeDevice.log);
+                const payload = { color: { x: request.colorX / 65536, y: request.colorY / 65536 } };
+                if (zigbeeDevice.transition && request.transitionTime && request.transitionTime / 10 >= 1)
+                    payload['transition'] = Math.round(request.transitionTime / 10);
+                zigbeeDevice.publishCommand('moveToColor', device.friendly_name, payload);
+            });
+        }
         if (zigbeeDevice.bridgedDevice.getClusterServerById(ColorControlCluster.id) && zigbeeDevice.bridgedDevice.getClusterServer(ColorControlCluster)?.isAttributeSupportedByName('currentHue')) {
             let lastRequestedHue = 0;
             let lastRequestedSaturation = 0;
-            zigbeeDevice.bridgedDevice.addCommandHandler('moveToHue', async ({ request: request }) => {
+            zigbeeDevice.bridgedDevice.addCommandHandler('moveToHue', async ({ request }) => {
                 zigbeeDevice.log.debug(`Command moveToHue called for ${zigbeeDevice.ien}${device.friendly_name}${rs}${db} request: ${request.hue}`);
                 await zigbeeDevice.bridgedDevice?.setAttribute(ColorControlCluster.id, 'colorMode', ColorControl.ColorMode.CurrentHueAndCurrentSaturation, zigbeeDevice.log);
                 lastRequestedHue = request.hue;
@@ -1095,7 +1107,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
                     zigbeeDevice.publishCommand('moveToHue', device.friendly_name, payload);
                 }, 500);
             });
-            zigbeeDevice.bridgedDevice.addCommandHandler('moveToSaturation', async ({ request: request }) => {
+            zigbeeDevice.bridgedDevice.addCommandHandler('moveToSaturation', async ({ request }) => {
                 zigbeeDevice.log.debug(`Command moveToSaturation called for ${zigbeeDevice.ien}${device.friendly_name}${rs}${db} request: ${request.saturation}`);
                 await zigbeeDevice.bridgedDevice?.setAttribute(ColorControlCluster.id, 'colorMode', ColorControl.ColorMode.CurrentHueAndCurrentSaturation, zigbeeDevice.log);
                 lastRequestedSaturation = request.saturation;
@@ -1108,7 +1120,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
                     zigbeeDevice.publishCommand('moveToSaturation', device.friendly_name, payload);
                 }, 500);
             });
-            zigbeeDevice.bridgedDevice.addCommandHandler('moveToHueAndSaturation', async ({ request: request }) => {
+            zigbeeDevice.bridgedDevice.addCommandHandler('moveToHueAndSaturation', async ({ request }) => {
                 zigbeeDevice.log.debug(`Command moveToHueAndSaturation called for ${zigbeeDevice.ien}${device.friendly_name}${rs}${db} request: ${request.hue}-${request.saturation}`);
                 await zigbeeDevice.bridgedDevice?.setAttribute(ColorControlCluster.id, 'colorMode', ColorControl.ColorMode.CurrentHueAndCurrentSaturation, zigbeeDevice.log);
                 const rgb = color.hslColorToRgbColor((request.hue / 254) * 360, (request.saturation / 254) * 100, 50);

package/dist/platform.js

@@ -38,8 +38,8 @@ export class ZigbeePlatform extends MatterbridgeDynamicPlatform {
     availabilityTimer;
     constructor(matterbridge, log, config) {
         super(matterbridge, log, config);
-        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('1.6.5')) {
-            throw new Error(`This plugin requires Matterbridge version >= "1.6.5". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend."`);
+        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('1.6.6')) {
+            throw new Error(`This plugin requires Matterbridge version >= "1.6.6". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend."`);
         }
         this.debugEnabled = config.debug;
         this.shouldStart = false;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge-zigbee2mqtt",
-  "version": "2.3.1-dev.1",
+  "version": "2.3.1-dev.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge-zigbee2mqtt",
-      "version": "2.3.1-dev.1",
+      "version": "2.3.1-dev.2",
       "license": "Apache-2.0",
       "dependencies": {
         "moment": "2.30.1",
@@ -35,9 +35,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.1.tgz",
-      "integrity": "sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==",
+      "version": "22.10.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz",
+      "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.20.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge-zigbee2mqtt",
-  "version": "2.3.1-dev.1",
+  "version": "2.3.1-dev.2",
   "description": "Matterbridge zigbee2mqtt plugin",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",