matterbridge-zigbee2mqtt 2.4.4-dev.2 → 2.4.5-dev.1

package/CHANGELOG.md

@@ -4,11 +4,26 @@ If you like this project and find it useful, please consider giving it a star on
 
 All notable changes to this project will be documented in this file.
 
-## [2.4.4-dev.2] - 2025-02-01
+## [2.4.5] - 2025-02-04
+
+### Changed
+
+- [package]: Updated dependencies.
 
 ### Fixed
 
+- [endpoint]: Fix thermostat bug.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
+## [2.4.4] - 2025-02-02
+
+### Changed
+
 - [plugin]: Requires Matterbridge 2.1.0.
+- [package]: Updated package.
 - [package]: Updated dependencies.
 
 <a href="https://www.buymeacoffee.com/luligugithub">
@@ -17,7 +32,7 @@ All notable changes to this project will be documented in this file.
 
 ## [2.4.3] - 2025-01-20
 
-### Fixed
+### Changed
 
 - [plugin]: Requires Matterbridge 1.7.3.
 - [package]: Updated dependencies.

package/dist/entity.js

@@ -5,12 +5,8 @@ import * as color from 'matterbridge/utils';
 import { SwitchesTag, NumberTag } from 'matterbridge/matter';
 import { getClusterNameById, ClusterId } from 'matterbridge/matter/types';
 import { ElectricalEnergyMeasurement, ElectricalPowerMeasurement, OnOffCluster, LevelControlCluster, WindowCoveringCluster, DoorLockCluster, BridgedDeviceBasicInformation, OnOff, LevelControl, ColorControl, ColorControlCluster, TemperatureMeasurement, BooleanState, RelativeHumidityMeasurement, PressureMeasurement, OccupancySensing, IlluminanceMeasurement, PowerSource, WindowCovering, DoorLock, ThermostatCluster, Thermostat, AirQuality, TotalVolatileOrganicCompoundsConcentrationMeasurement, CarbonDioxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurement, FormaldehydeConcentrationMeasurement, Pm1ConcentrationMeasurement, Pm25ConcentrationMeasurement, Pm10ConcentrationMeasurement, } from 'matterbridge/matter/clusters';
-import { PowerSourceBehavior } from 'matterbridge/matter/behaviors';
 import EventEmitter from 'events';
 import { hostname } from 'os';
-function require(type, options) {
-    return { clusterId: ClusterId(1), options };
-}
 export class ZigbeeEntity extends EventEmitter {
     log;
     serial = '';
@@ -327,7 +323,6 @@ export class ZigbeeGroup extends ZigbeeEntity {
         else {
             zigbeeGroup.serial = `group-${group.id}`.slice(0, 32);
         }
-        zigbeeGroup.log.warn(`***Group ${zigbeeGroup.en}${group.friendly_name}${db} adds select device ${group.id} (${group.friendly_name})`);
         if (!platform.selectDevice.get(`group-${group.id}`)) {
             platform.selectDevice.set(`group-${group.id}`, { serial: `group-${group.id}`, name: group.friendly_name, icon: 'wifi', entities: [] });
         }
@@ -891,14 +886,32 @@ export class ZigbeeDevice extends ZigbeeEntity {
         zigbeeDevice.addBridgedDeviceBasicInformation();
         zigbeeDevice.addPowerSource();
         mainEndpoint.clusterServersIds.splice(mainEndpoint.clusterServersIds.indexOf(PowerSource.Cluster.id), 1);
-        const options = require(PowerSourceBehavior.with(PowerSource.Feature.Wired), {
-            wiredCurrentType: PowerSource.WiredCurrentType.Ac,
-            description: 'AC Power',
-            status: PowerSource.PowerSourceStatus.Active,
-            order: 0,
-            endpointList: [],
-        });
-        mainEndpoint.clusterServersOptions.push(options);
+        for (const [endpoint, device] of zigbeeDevice.mutableDevice) {
+            const deviceClusterServersIdMap = new Map();
+            device.clusterServersIds.forEach((clusterServer) => {
+                deviceClusterServersIdMap.set(clusterServer, clusterServer);
+            });
+            const deviceClusterServersObjMap = new Map();
+            device.clusterServersOptions.forEach((clusterServer) => {
+                deviceClusterServersIdMap.delete(clusterServer.clusterId);
+                deviceClusterServersObjMap.set(clusterServer.clusterId, clusterServer);
+            });
+            device.clusterServersIds = Array.from(deviceClusterServersIdMap.values());
+            device.clusterServersOptions = Array.from(deviceClusterServersObjMap.values());
+            const deviceClusterClientsIdMap = new Map();
+            device.clusterClientsIds.forEach((clusterClient) => {
+                deviceClusterClientsIdMap.set(clusterClient, clusterClient);
+            });
+            const deviceClusterClientsObjMap = new Map();
+            device.clusterClientsOptions.forEach((clusterClient) => {
+                deviceClusterClientsIdMap.delete(clusterClient.clusterId);
+                deviceClusterClientsObjMap.set(clusterClient.clusterId, clusterClient);
+            });
+            device.clusterClientsIds = Array.from(deviceClusterClientsIdMap.values());
+            device.clusterClientsOptions = Array.from(deviceClusterClientsObjMap.values());
+            zigbeeDevice.log.debug(`Device ${zigbeeDevice.ien}${zigbeeDevice.device?.friendly_name}${rs}${db} endpoint: ${ign}${endpoint === '' ? 'main' : endpoint}${rs}${db} => ` +
+                `${nf}tagList: ${debugStringify(device.tagList)} deviceTypes: ${debugStringify(device.deviceTypes)} clusterServersIds: ${debugStringify(device.clusterServersIds)}`);
+        }
         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')}`);
             if (!names.includes('color_hs') && !names.includes('color_xy')) {
@@ -930,32 +943,6 @@ export class ZigbeeDevice extends ZigbeeEntity {
                 mainEndpoint.clusterServersIds.splice(mainEndpoint.clusterServersIds.indexOf(Thermostat.Cluster.id), 1);
             }
         }
-        for (const [endpoint, device] of zigbeeDevice.mutableDevice) {
-            const deviceClusterServersIdMap = new Map();
-            device.clusterServersIds.forEach((clusterServer) => {
-                deviceClusterServersIdMap.set(clusterServer, clusterServer);
-            });
-            const deviceClusterServersObjMap = new Map();
-            device.clusterServersOptions.forEach((clusterServer) => {
-                deviceClusterServersIdMap.delete(clusterServer.clusterId);
-                deviceClusterServersObjMap.set(clusterServer.clusterId, clusterServer);
-            });
-            device.clusterServersIds = Array.from(deviceClusterServersIdMap.values());
-            device.clusterServersOptions = Array.from(deviceClusterServersObjMap.values());
-            const deviceClusterClientsIdMap = new Map();
-            device.clusterClientsIds.forEach((clusterClient) => {
-                deviceClusterClientsIdMap.set(clusterClient, clusterClient);
-            });
-            const deviceClusterClientsObjMap = new Map();
-            device.clusterClientsOptions.forEach((clusterClient) => {
-                deviceClusterClientsIdMap.delete(clusterClient.clusterId);
-                deviceClusterClientsObjMap.set(clusterClient.clusterId, clusterClient);
-            });
-            device.clusterClientsIds = Array.from(deviceClusterClientsIdMap.values());
-            device.clusterClientsOptions = Array.from(deviceClusterClientsObjMap.values());
-            zigbeeDevice.log.debug(`Device ${zigbeeDevice.ien}${zigbeeDevice.device?.friendly_name}${rs}${db} endpoint: ${ign}${endpoint === '' ? 'main' : endpoint}${rs}${db} => ` +
-                `${nf}tagList: ${debugStringify(device.tagList)} deviceTypes: ${debugStringify(device.deviceTypes)} clusterServersIds: ${debugStringify(device.clusterServersIds)}`);
-        }
         zigbeeDevice.bridgedDevice.addClusterServers(mainEndpoint.clusterServersIds);
         zigbeeDevice.bridgedDevice.addRequiredClusterServers();
         if (zigbeeDevice.composedType !== '')

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge-zigbee2mqtt",
-  "version": "2.4.4-dev.2",
+  "version": "2.4.5-dev.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge-zigbee2mqtt",
-      "version": "2.4.4-dev.2",
+      "version": "2.4.5-dev.1",
       "license": "Apache-2.0",
       "dependencies": {
         "moment": "2.30.1",
@@ -35,9 +35,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.10.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.10.tgz",
-      "integrity": "sha512-X47y/mPNzxviAGY5TcYPtYL8JsY3kAq2n8fMmKoRCxq/c4v4pyGNCzM2R6+M5/umG4ZfHuT+sgqDYqWc9rJ6ww==",
+      "version": "22.13.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz",
+      "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.20.0"

package/package.json

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