matterbridge 3.1.1-dev-20250630-ea4c889 → 3.1.1-dev-20250703-80c685d

package/CHANGELOG.md

@@ -8,11 +8,12 @@ If you like this project and find it useful, please consider giving it a star on
   <img src="bmc-button.svg" alt="Buy me a coffee" width="120">
 </a>
 
-## [3.1.1] - 2025-07-??
+## [3.1.1] - 2025-07-01
 
 ### Development Breaking Changes
 
-- [devices]: The single devices (i.e. Rvc, Evse etc...) are only exported from matterbridge/devices. Please update your imports to use the new export path. Refer to the [documentation](README-DEV.md) for details on imports.
+- [devices]: The single devices (i.e. Rvc, Evse etc...) are only exported from `matterbridge/devices`. Please update your imports to use the new export path. Refer to the [documentation](README-DEV.md) for details on imports.
+- [MatterbridgeEndpoint]: Added the mode property: `server` will make the device indipendent from its plugin. It has its own server node: QRCode, Fabrics and Sessions are visible in the Devices section of the Home page. This a workaround for the Rvc Apple issue. So the Rvc (like any other device) can be paired directly to the controller and is a native Matter device and is not bridged.
 
 ### Added
 
@@ -25,6 +26,9 @@ If you like this project and find it useful, please consider giving it a star on
 ### Changed
 
 - [package]: Updated dependencies.
+- [frontend]: Added all esa devices.
+- [frontend]: New default values: select on the home page and icon view on devices page.
+- [matter.js]: Bumped `matter.js` to 0.15.1 (https://github.com/project-chip/matter.js/discussions/2220). Great job matter.js!
 
 <a href="https://www.buymeacoffee.com/luligugithub">
   <img src="bmc-button.svg" alt="Buy me a coffee" width="80">

package/README-DOCKER.md

@@ -120,11 +120,11 @@ docker compose down
 
 ### Update with docker compose
 
-This will pull the new matterbridge image and restart the matterbridge container.
+This will pull the new matterbridge image and restart only the matterbridge container.
 
 ```bash
 docker compose pull matterbridge
-docker compose up -d --no-deps matterbridge
+docker compose up -d --no-deps --force-recreate matterbridge
 ```
 
 ### Inspect the container

package/README.md

@@ -69,15 +69,18 @@ https://matter-smarthome.de/en/interview/an-alternative-to-the-official-matter-s
 To run Matterbridge, you need either a [Node.js](https://nodejs.org/en) environment or [Docker](https://docs.docker.com/get-started/get-docker/) installed on your system.
 
 If you don't have Node.js already install, please use this method to install it on a debian device: https://github.com/nodesource/distributions.
-The supported versions of node are 18, 20 and 22. Please install node 22 LTS.
-Node 23 is not supported.
+The supported versions of node are 18, 20 and 22. Please install Node.js 22 LTS.
+Node.js 23, like all odd-numbered versions, is not supported.
 Nvm is not a good choice and should not be used for production.
 
 If you don't have Docker already install, please use this method to install it on a debian device: https://docs.docker.com/desktop/setup/install/linux/debian/.
+After follow the guidelines for the [Docker configurations](README-DOCKER.md).
+
+I suggest using Docker for its simplicity.
 
 Since as stated in the Matter specifications "Matter aims to build a universal IPv6-based communication protocol for smart home devices", ipv6 should be enabled in the network.
 
-Avoid using VLAN and firewall blocking the communications between the controller and Matterbridge.
+Avoid using VLAN and firewall blocking the communications between the controllers and Matterbridge.
 
 ## Installation
 

package/dist/devices/batteryStorage.js

@@ -5,7 +5,7 @@ import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { deviceEnergyManagement, electricalSensor, batteryStorage, powerSource } from '../matterbridgeDeviceTypes.js';
 export class BatteryStorage extends MatterbridgeEndpoint {
     constructor(name, serial, batPercentRemaining = 100, batChargeLevel = PowerSource.BatChargeLevel.Ok, voltage = null, current = null, power = null, energyImported = null, energyExported = null, absMinPower = 0, absMaxPower = 0) {
-        super([batteryStorage, powerSource, electricalSensor, deviceEnergyManagement], { id: `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}` }, true);
+        super([batteryStorage, electricalSensor, deviceEnergyManagement], { id: `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}` }, true);
         this.createDefaultIdentifyClusterServer()
             .createDefaultBasicInformationClusterServer(name, serial, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge Solar Power')
             .createDefaultPowerTopologyClusterServer()

package/dist/devices/evse.js

@@ -7,14 +7,14 @@ import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
 import { deviceEnergyManagement, electricalSensor, evse, powerSource } from '../matterbridgeDeviceTypes.js';
 export class Evse extends MatterbridgeEndpoint {
-    constructor(name, serial, currentMode, supportedModes, state, supplyState, faultState, absMinPower, absMaxPower) {
+    constructor(name, serial, currentMode, supportedModes, state, supplyState, faultState, voltage = null, current = null, power = null, energy = null, absMinPower, absMaxPower) {
         super([evse, powerSource, electricalSensor, deviceEnergyManagement], { uniqueStorageKey: `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}` }, true);
         this.createDefaultIdentifyClusterServer()
-            .createDefaultBasicInformationClusterServer(name, serial, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge EVSE')
+            .createDefaultBasicInformationClusterServer(name, serial, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge Evse')
             .createDefaultPowerSourceWiredClusterServer()
             .createDefaultPowerTopologyClusterServer()
-            .createDefaultElectricalPowerMeasurementClusterServer()
-            .createDefaultElectricalEnergyMeasurementClusterServer()
+            .createDefaultElectricalPowerMeasurementClusterServer(voltage, current, power)
+            .createDefaultElectricalEnergyMeasurementClusterServer(energy, 0)
             .createDefaultDeviceEnergyManagementClusterServer(DeviceEnergyManagement.EsaType.Evse, false, DeviceEnergyManagement.EsaState.Online, absMinPower, absMaxPower)
             .createDefaultDeviceEnergyManagementModeClusterServer()
             .createDefaultEnergyEvseClusterServer(state, supplyState, faultState)
@@ -23,16 +23,17 @@ export class Evse extends MatterbridgeEndpoint {
     }
     createDefaultEnergyEvseClusterServer(state, supplyState, faultState) {
         this.behaviors.require(MatterbridgeEnergyEvseServer, {
-            state: state ?? EnergyEvse.State.NotPluggedIn,
-            supplyState: supplyState ?? EnergyEvse.SupplyState.ChargingEnabled,
-            faultState: faultState ?? EnergyEvse.FaultState.NoError,
-            chargingEnabledUntil: 0,
-            circuitCapacity: 0,
-            minimumChargeCurrent: 6000,
-            maximumChargeCurrent: 0,
+            state: state !== undefined ? state : EnergyEvse.State.NotPluggedIn,
+            supplyState: supplyState !== undefined ? supplyState : EnergyEvse.SupplyState.ChargingEnabled,
+            faultState: faultState !== undefined ? faultState : EnergyEvse.FaultState.NoError,
+            chargingEnabledUntil: null,
+            circuitCapacity: 32_000,
+            minimumChargeCurrent: 6_000,
+            maximumChargeCurrent: 32_000,
+            userMaximumChargeCurrent: 32_000,
             sessionId: null,
-            sessionDuration: 0,
-            sessionEnergyCharged: 0,
+            sessionDuration: null,
+            sessionEnergyCharged: null,
         });
         return this;
     }

package/dist/devices/waterHeater.js

@@ -1,20 +1,26 @@
 import { ModeBase } from '@matter/main/clusters/mode-base';
 import { WaterHeaterManagement } from '@matter/main/clusters/water-heater-management';
 import { WaterHeaterMode } from '@matter/main/clusters/water-heater-mode';
+import { DeviceEnergyManagement } from '@matter/main/clusters/device-energy-management';
 import { WaterHeaterManagementServer } from '@matter/main/behaviors/water-heater-management';
 import { WaterHeaterModeServer } from '@matter/main/behaviors/water-heater-mode';
 import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
 import { electricalSensor, powerSource, waterHeater } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export class WaterHeater extends MatterbridgeEndpoint {
-    constructor(name, serial, waterTemperature = 50, targetWaterTemperature = 55, minHeatSetpointLimit = 20, maxHeatSetpointLimit = 80, heaterTypes = { immersionElement1: true }, tankPercentage = 90) {
+    constructor(name, serial, waterTemperature = 50, targetWaterTemperature = 55, minHeatSetpointLimit = 20, maxHeatSetpointLimit = 80, heaterTypes = { immersionElement1: true }, tankPercentage = 90, voltage = null, current = null, power = null, energy = null, absMinPower = 0, absMaxPower = 0) {
         super([waterHeater, powerSource, electricalSensor], { uniqueStorageKey: `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}` }, true);
         this.createDefaultIdentifyClusterServer()
             .createDefaultBasicInformationClusterServer(name, serial, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge Water Heater')
             .createDefaultPowerSourceWiredClusterServer()
             .createDefaultHeatingThermostatClusterServer(waterTemperature, targetWaterTemperature, minHeatSetpointLimit, maxHeatSetpointLimit)
             .createDefaultWaterHeaterManagementClusterServer(heaterTypes, {}, tankPercentage)
-            .createDefaultWaterHeaterModeClusterServer();
+            .createDefaultWaterHeaterModeClusterServer()
+            .createDefaultPowerTopologyClusterServer()
+            .createDefaultElectricalPowerMeasurementClusterServer(voltage, current, power)
+            .createDefaultElectricalEnergyMeasurementClusterServer(energy)
+            .createDefaultDeviceEnergyManagementClusterServer(DeviceEnergyManagement.EsaType.WaterHeating, true, DeviceEnergyManagement.EsaState.Online, absMinPower, absMaxPower)
+            .createDefaultDeviceEnergyManagementModeClusterServer();
     }
     createDefaultWaterHeaterManagementClusterServer(heaterTypes, heatDemand, tankPercentage, boostState) {
         this.behaviors.require(MatterbridgeWaterHeaterManagementServer.with(WaterHeaterManagement.Feature.TankPercent), {

package/dist/frontend.js

@@ -566,6 +566,8 @@ export class Frontend {
             return false;
         if (device.hasClusterServer(BridgedDeviceBasicInformation.Cluster.id))
             return device.getAttribute(BridgedDeviceBasicInformation.Cluster.id, 'reachable');
+        if (device.mode === 'server' && device.serverNode && device.serverNode.state.basicInformation.reachable !== undefined)
+            return device.serverNode.state.basicInformation.reachable;
         if (this.matterbridge.bridgeMode === 'childbridge')
             return true;
         return false;
@@ -592,6 +594,17 @@ export class Frontend {
                 return powerSource(child);
         }
     }
+    getMatterDataFromDevice(device) {
+        if (device.mode === 'server' && device.serverNode && device.serverContext) {
+            return {
+                commissioned: device.serverNode.state.commissioning.commissioned,
+                qrPairingCode: device.serverNode.state.commissioning.pairingCodes.qrPairingCode,
+                manualPairingCode: device.serverNode.state.commissioning.pairingCodes.manualPairingCode,
+                fabricInformations: this.matterbridge.sanitizeFabricInformations(Object.values(device.serverNode.state.commissioning.fabrics)),
+                sessionInformations: this.matterbridge.sanitizeSessionInformation(Object.values(device.serverNode.state.sessions.sessions)),
+            };
+        }
+    }
     getClusterTextFromDevice(device) {
         if (!device.lifecycle.isReady || device.construction.status !== Lifecycle.Status.Active)
             return '';
@@ -766,12 +779,11 @@ export class Frontend {
     }
     async getDevices(pluginName) {
         const devices = [];
-        this.matterbridge.devices.forEach(async (device) => {
+        for (const device of this.matterbridge.devices.array()) {
             if (pluginName && pluginName !== device.plugin)
-                return;
+                continue;
             if (!device.plugin || !device.deviceType || !device.name || !device.deviceName || !device.serialNumber || !device.uniqueId || !device.lifecycle.isReady)
-                return;
-            const cluster = this.getClusterTextFromDevice(device);
+                continue;
             devices.push({
                 pluginName: device.plugin,
                 type: device.name + ' (0x' + device.deviceType.toString(16).padStart(4, '0') + ')',
@@ -783,9 +795,10 @@ export class Frontend {
                 uniqueId: device.uniqueId,
                 reachable: this.getReachability(device),
                 powerSource: this.getPowerSource(device),
-                cluster: cluster,
+                matter: this.getMatterDataFromDevice(device),
+                cluster: this.getClusterTextFromDevice(device),
             });
-        });
+        }
         return devices;
     }
     getClusters(pluginName, endpointNumber) {

package/dist/matterbridge.js

@@ -1849,8 +1849,8 @@ export class Matterbridge extends EventEmitter {
             };
         });
     }
-    sanitizeSessionInformation(session) {
-        return session
+    sanitizeSessionInformation(sessions) {
+        return sessions
             .filter((session) => session.isPeerActive)
             .map((session) => {
             return {

package/dist/matterbridgeEndpoint.js

@@ -215,8 +215,8 @@ export class MatterbridgeEndpoint extends Endpoint {
         this.commandHandler.addHandler(command, handler);
         return this;
     }
-    async executeCommandHandler(command, request) {
-        await this.commandHandler.executeHandler(command, { request });
+    async executeCommandHandler(command, request, cluster, attributes, endpoint) {
+        await this.commandHandler.executeHandler(command, { request, cluster, attributes, endpoint });
     }
     async invokeBehaviorCommand(cluster, command, params) {
         await invokeBehaviorCommand(this, cluster, command, params);
@@ -1116,8 +1116,8 @@ export class MatterbridgeEndpoint extends Endpoint {
                 accuracyRanges: [{ rangeMin: Number.MIN_SAFE_INTEGER, rangeMax: Number.MAX_SAFE_INTEGER, fixedMax: 1 }],
             },
             cumulativeEnergyReset: null,
-            cumulativeEnergyImported: energyImported ? { energy: energyImported } : null,
-            cumulativeEnergyExported: energyExported ? { energy: energyExported } : null,
+            cumulativeEnergyImported: energyImported !== null && energyImported >= 0 ? { energy: energyImported } : null,
+            cumulativeEnergyExported: energyExported !== null && energyExported >= 0 ? { energy: energyExported } : null,
         });
         return this;
     }

package/frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.944b63c3.css",
-    "main.js": "./static/js/main.2486c3e3.js",
+    "main.js": "./static/js/main.1d25e0d8.js",
     "static/js/453.d855a71b.chunk.js": "./static/js/453.d855a71b.chunk.js",
     "static/media/roboto-latin-700-normal.woff2": "./static/media/roboto-latin-700-normal.c4d6cab43bec89049809.woff2",
     "static/media/roboto-latin-500-normal.woff2": "./static/media/roboto-latin-500-normal.599f66a60bdf974e578e.woff2",
@@ -77,11 +77,11 @@
     "static/media/roboto-greek-ext-300-normal.woff": "./static/media/roboto-greek-ext-300-normal.60729cafbded24073dfb.woff",
     "index.html": "./index.html",
     "main.944b63c3.css.map": "./static/css/main.944b63c3.css.map",
-    "main.2486c3e3.js.map": "./static/js/main.2486c3e3.js.map",
+    "main.1d25e0d8.js.map": "./static/js/main.1d25e0d8.js.map",
     "453.d855a71b.chunk.js.map": "./static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.944b63c3.css",
-    "static/js/main.2486c3e3.js"
+    "static/js/main.1d25e0d8.js"
   ]
 }

package/frontend/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.2486c3e3.js"></script><link href="./static/css/main.944b63c3.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.1d25e0d8.js"></script><link href="./static/css/main.944b63c3.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>