matterbridge 2.1.0-dev.1 → 2.1.0-dev.10

package/CHANGELOG.md

@@ -16,24 +16,26 @@ Tamer (https://github.com/tammeryousef1006) has created the Matterbridge Discord
 ### Breaking Changes
 
 Starting from v. 2.0.0 Matterbridge is running only in mode edge (no parameter needed and no badge in the frontend).
-The legacy old api have been removed.
+With this release v. 2.1.0, the legacy old api of matter.js have been completely removed from Matterbridge and from all plugins.
+For this reason there is no compatibility for old versions of the plugins.
+You need to update all plugins you use and Matterbridge in the same moment. 
+I suggest to first update all plugins without restarting and then to update Matterbridge so when it restarts, all versions will be the latest.
 
-The frontend has a new dark and light mode. The dark mode is now the default mode.
-It is possible to change the mode (Classic, Dark or Light) in Settings, Matterbridge settings.
-
-## [2.1.0.dev.1] - 2025-01-26
+## [2.1.0.dev.10] - 2025-01-31
 
 ### Added
 
 - [matterbridge]: Add MatterbridgeModeSelectServer.
+- [matterbridge]: Add MatterbridgeSwitchServer.
 - [frontend]: Add api/advertise to turn on matter advertising in bridge mode.
 - [frontend]: Frontend v.2.4.0.
 
 ### Changed
 
+- [package]: Removed legacy imports.
 - [package]: Update dependencies.
 - [package]: Update matter.js to 0.12.0.
-- [package]: Removed legacy imports.
+- [package]: Update matter.js to 0.12.1.
 
 ### Fixed
 

package/dist/frontend.js

@@ -226,7 +226,13 @@ export class Frontend {
         });
         this.expressApp.get('/api/advertise', express.json(), async (req, res) => {
             const pairingCodes = await this.matterbridge.advertiseServerNode(this.matterbridge.serverNode);
-            res.json(pairingCodes);
+            if (pairingCodes) {
+                const { manualPairingCode, qrPairingCode } = pairingCodes;
+                res.json({ manualPairingCode, qrPairingCode: 'https://project-chip.github.io/connectedhomeip/qrcode.html?data=' + qrPairingCode });
+            }
+            else {
+                res.status(500).json({ error: 'Failed to generate pairing codes' });
+            }
         });
         this.expressApp.get('/api/settings', express.json(), async (req, res) => {
             this.log.debug('The frontend sent /api/settings');
@@ -830,77 +836,83 @@ export class Frontend {
                 return '';
         };
         let attributes = '';
-        Object.entries(device.state).forEach(([clusterName, clusterAttributes]) => {
-            Object.entries(clusterAttributes).forEach(([attributeName, attributeValue]) => {
-                if (typeof attributeValue === 'undefined')
-                    return;
-                if (clusterName === 'onOff' && attributeName === 'onOff')
-                    attributes += `OnOff: ${attributeValue} `;
-                if (clusterName === 'switch' && attributeName === 'currentPosition')
-                    attributes += `Position: ${attributeValue} `;
-                if (clusterName === 'windowCovering' && attributeName === 'currentPositionLiftPercent100ths')
-                    attributes += `Cover position: ${attributeValue / 100}% `;
-                if (clusterName === 'doorLock' && attributeName === 'lockState')
-                    attributes += `State: ${attributeValue === 1 ? 'Locked' : 'Not locked'} `;
-                if (clusterName === 'thermostat' && attributeName === 'localTemperature')
-                    attributes += `Temperature: ${attributeValue / 100}°C `;
-                if (clusterName === 'thermostat' && attributeName === 'occupiedHeatingSetpoint')
-                    attributes += `Heat to: ${attributeValue / 100}°C `;
-                if (clusterName === 'thermostat' && attributeName === 'occupiedCoolingSetpoint')
-                    attributes += `Cool to: ${attributeValue / 100}°C `;
-                if (clusterName === 'pumpConfigurationAndControl' && attributeName === 'operationMode')
-                    attributes += `Mode: ${attributeValue} `;
-                if (clusterName === 'valveConfigurationAndControl' && attributeName === 'currentState')
-                    attributes += `State: ${attributeValue} `;
-                if (clusterName === 'levelControl' && attributeName === 'currentLevel')
-                    attributes += `Level: ${attributeValue}% `;
-                if (clusterName === 'colorControl' && attributeName === 'colorMode')
-                    attributes += `Mode: ${['HS', 'XY', 'CT'][attributeValue]} `;
-                if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 0 && attributeName === 'currentHue')
-                    attributes += `Hue: ${Math.round(attributeValue)} `;
-                if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 0 && attributeName === 'currentSaturation')
-                    attributes += `Saturation: ${Math.round(attributeValue)} `;
-                if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 1 && attributeName === 'currentX')
-                    attributes += `X: ${Math.round(attributeValue)} `;
-                if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 1 && attributeName === 'currentY')
-                    attributes += `Y: ${Math.round(attributeValue)} `;
-                if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 2 && attributeName === 'colorTemperatureMireds')
-                    attributes += `ColorTemp: ${Math.round(attributeValue)} `;
-                if (clusterName === 'booleanState' && attributeName === 'stateValue')
-                    attributes += `Contact: ${attributeValue} `;
-                if (clusterName === 'booleanStateConfiguration' && attributeName === 'alarmsActive')
-                    attributes += `Active alarms: ${stringify(attributeValue)} `;
-                if (clusterName === 'smokeCoAlarm' && attributeName === 'smokeState')
-                    attributes += `Smoke: ${attributeValue} `;
-                if (clusterName === 'smokeCoAlarm' && attributeName === 'coState')
-                    attributes += `Co: ${attributeValue} `;
-                if (clusterName === 'fanControl' && attributeName === 'fanMode')
-                    attributes += `Mode: ${attributeValue} `;
-                if (clusterName === 'fanControl' && attributeName === 'percentCurrent')
-                    attributes += `Percent: ${attributeValue} `;
-                if (clusterName === 'fanControl' && attributeName === 'speedCurrent')
-                    attributes += `Speed: ${attributeValue} `;
-                if (clusterName === 'occupancySensing' && attributeName === 'occupancy')
-                    attributes += `Occupancy: ${attributeValue.occupied} `;
-                if (clusterName === 'illuminanceMeasurement' && attributeName === 'measuredValue')
-                    attributes += `Illuminance: ${attributeValue} `;
-                if (clusterName === 'airQuality' && attributeName === 'airQuality')
-                    attributes += `Air quality: ${attributeValue} `;
-                if (clusterName === 'tvocMeasurement' && attributeName === 'measuredValue')
-                    attributes += `Voc: ${attributeValue} `;
-                if (clusterName === 'temperatureMeasurement' && attributeName === 'measuredValue')
-                    attributes += `Temperature: ${attributeValue / 100}°C `;
-                if (clusterName === 'relativeHumidityMeasurement' && attributeName === 'measuredValue')
-                    attributes += `Humidity: ${attributeValue / 100}% `;
-                if (clusterName === 'pressureMeasurement' && attributeName === 'measuredValue')
-                    attributes += `Pressure: ${attributeValue} `;
-                if (clusterName === 'flowMeasurement' && attributeName === 'measuredValue')
-                    attributes += `Flow: ${attributeValue} `;
-                if (clusterName === 'fixedLabel' && attributeName === 'labelList')
-                    attributes += `${getFixedLabel(device)} `;
-                if (clusterName === 'userLabel' && attributeName === 'labelList')
-                    attributes += `${getUserLabel(device)} `;
-            });
+        device.forEachAttribute((clusterName, clusterId, attributeName, attributeId, attributeValue) => {
+            if (typeof attributeValue === 'undefined')
+                return;
+            if (clusterName === 'onOff' && attributeName === 'onOff')
+                attributes += `OnOff: ${attributeValue} `;
+            if (clusterName === 'switch' && attributeName === 'currentPosition')
+                attributes += `Position: ${attributeValue} `;
+            if (clusterName === 'windowCovering' && attributeName === 'currentPositionLiftPercent100ths' && isValidNumber(attributeValue, 0, 10000))
+                attributes += `Cover position: ${attributeValue / 100}% `;
+            if (clusterName === 'doorLock' && attributeName === 'lockState')
+                attributes += `State: ${attributeValue === 1 ? 'Locked' : 'Not locked'} `;
+            if (clusterName === 'thermostat' && attributeName === 'localTemperature' && isValidNumber(attributeValue))
+                attributes += `Temperature: ${attributeValue / 100}°C `;
+            if (clusterName === 'thermostat' && attributeName === 'occupiedHeatingSetpoint' && isValidNumber(attributeValue))
+                attributes += `Heat to: ${attributeValue / 100}°C `;
+            if (clusterName === 'thermostat' && attributeName === 'occupiedCoolingSetpoint' && isValidNumber(attributeValue))
+                attributes += `Cool to: ${attributeValue / 100}°C `;
+            if (clusterName === 'pumpConfigurationAndControl' && attributeName === 'operationMode')
+                attributes += `Mode: ${attributeValue} `;
+            if (clusterName === 'valveConfigurationAndControl' && attributeName === 'currentState')
+                attributes += `State: ${attributeValue} `;
+            if (clusterName === 'levelControl' && attributeName === 'currentLevel')
+                attributes += `Level: ${attributeValue} `;
+            if (clusterName === 'colorControl' && attributeName === 'colorMode' && isValidNumber(attributeValue, 0, 2))
+                attributes += `Mode: ${['HS', 'XY', 'CT'][attributeValue]} `;
+            if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 0 && attributeName === 'currentHue' && isValidNumber(attributeValue))
+                attributes += `Hue: ${Math.round(attributeValue)} `;
+            if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 0 && attributeName === 'currentSaturation' && isValidNumber(attributeValue))
+                attributes += `Saturation: ${Math.round(attributeValue)} `;
+            if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 1 && attributeName === 'currentX' && isValidNumber(attributeValue))
+                attributes += `X: ${Math.round(attributeValue / 655.36) / 100} `;
+            if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 1 && attributeName === 'currentY' && isValidNumber(attributeValue))
+                attributes += `Y: ${Math.round(attributeValue / 655.36) / 100} `;
+            if (clusterName === 'colorControl' && getAttribute(device, 'colorControl', 'colorMode') === 2 && attributeName === 'colorTemperatureMireds' && isValidNumber(attributeValue))
+                attributes += `ColorTemp: ${Math.round(attributeValue)} `;
+            if (clusterName === 'booleanState' && attributeName === 'stateValue')
+                attributes += `Contact: ${attributeValue} `;
+            if (clusterName === 'booleanStateConfiguration' && attributeName === 'alarmsActive' && isValidObject(attributeValue))
+                attributes += `Active alarms: ${stringify(attributeValue)} `;
+            if (clusterName === 'smokeCoAlarm' && attributeName === 'smokeState')
+                attributes += `Smoke: ${attributeValue} `;
+            if (clusterName === 'smokeCoAlarm' && attributeName === 'coState')
+                attributes += `Co: ${attributeValue} `;
+            if (clusterName === 'fanControl' && attributeName === 'fanMode')
+                attributes += `Mode: ${attributeValue} `;
+            if (clusterName === 'fanControl' && attributeName === 'percentCurrent')
+                attributes += `Percent: ${attributeValue} `;
+            if (clusterName === 'fanControl' && attributeName === 'speedCurrent')
+                attributes += `Speed: ${attributeValue} `;
+            if (clusterName === 'occupancySensing' && attributeName === 'occupancy' && isValidObject(attributeValue, 1))
+                attributes += `Occupancy: ${attributeValue.occupied} `;
+            if (clusterName === 'illuminanceMeasurement' && attributeName === 'measuredValue' && isValidNumber(attributeValue))
+                attributes += `Illuminance: ${Math.round(Math.max(Math.pow(10, attributeValue / 10000), 0))} `;
+            if (clusterName === 'airQuality' && attributeName === 'airQuality')
+                attributes += `Air quality: ${attributeValue} `;
+            if (clusterName === 'totalVolatileOrganicCompoundsConcentrationMeasurement' && attributeName === 'measuredValue')
+                attributes += `Voc: ${attributeValue} `;
+            if (clusterName === 'pm1ConcentrationMeasurement' && attributeName === 'measuredValue')
+                attributes += `Pm1: ${attributeValue} `;
+            if (clusterName === 'pm25ConcentrationMeasurement' && attributeName === 'measuredValue')
+                attributes += `Pm2.5: ${attributeValue} `;
+            if (clusterName === 'pm10ConcentrationMeasurement' && attributeName === 'measuredValue')
+                attributes += `Pm10: ${attributeValue} `;
+            if (clusterName === 'formaldehydeConcentrationMeasurement' && attributeName === 'measuredValue')
+                attributes += `CH₂O: ${attributeValue} `;
+            if (clusterName === 'temperatureMeasurement' && attributeName === 'measuredValue' && isValidNumber(attributeValue))
+                attributes += `Temperature: ${attributeValue / 100}°C `;
+            if (clusterName === 'relativeHumidityMeasurement' && attributeName === 'measuredValue' && isValidNumber(attributeValue))
+                attributes += `Humidity: ${attributeValue / 100}% `;
+            if (clusterName === 'pressureMeasurement' && attributeName === 'measuredValue')
+                attributes += `Pressure: ${attributeValue} `;
+            if (clusterName === 'flowMeasurement' && attributeName === 'measuredValue')
+                attributes += `Flow: ${attributeValue} `;
+            if (clusterName === 'fixedLabel' && attributeName === 'labelList')
+                attributes += `${getFixedLabel(device)} `;
+            if (clusterName === 'userLabel' && attributeName === 'labelList')
+                attributes += `${getUserLabel(device)} `;
         });
         return attributes.trimStart().trimEnd();
     }
@@ -1066,8 +1078,11 @@ export class Frontend {
                     const clusterServers = endpointServer.getAllClusterServers();
                     clusterServers.forEach((clusterServer) => {
                         Object.entries(clusterServer.attributes).forEach(([key, value]) => {
-                            if (clusterServer.name === 'EveHistory')
-                                return;
+                            if (clusterServer.name === 'EveHistory') {
+                                if (['configDataGet', 'configDataSet', 'historyStatus', 'historyEntries', 'historyRequest', 'historySetTime', 'rLoc'].includes(key)) {
+                                    return;
+                                }
+                            }
                             if (clusterServer.name === 'Descriptor' && key === 'deviceTypeList') {
                                 value.getLocal().forEach((deviceType) => {
                                     deviceTypes.push(deviceType.deviceType);

package/dist/index.js

@@ -5,6 +5,7 @@ export * from '@matter/main/types';
 export * from './matterbridge.js';
 export * from './matterbridgeTypes.js';
 export * from './matterbridgeEndpoint.js';
+export * from './matterbridgeEndpointHelpers.js';
 export * from './matterbridgeBehaviors.js';
 export * from './matterbridgeDeviceTypes.js';
 export * from './matterbridgePlatform.js';

package/dist/matter/behaviors.js

@@ -0,0 +1 @@
+export * from '@matter/node/behaviors';

package/dist/matter/clusters.js

@@ -0,0 +1 @@
+export * from '@matter/types/clusters';

package/dist/matter/devices.js

@@ -0,0 +1 @@
+export * from '@matter/node/devices';

package/dist/matter/endpoints.js

@@ -0,0 +1 @@
+export { AggregatorEndpoint, ElectricalSensorEndpoint, PowerSourceEndpoint, BridgedNodeEndpoint, RootEndpoint, DeviceEnergyManagementEndpoint, OtaProviderEndpoint, OtaRequestorEndpoint } from '@matter/node/endpoints';

package/dist/matter/export.js

@@ -1,6 +1,3 @@
 export * from '@matter/main';
-export { AggregatorEndpoint } from '@matter/main/endpoints';
-export * from '@matter/main/devices';
-export * from '@matter/main/behaviors';
-export { FabricAction, MdnsService, PaseClient } from '@matter/main/protocol';
+export { SemanticNamespace, ClosureTag, CompassDirectionTag, CompassLocationTag, DirectionTag, ElectricalMeasurementTag, LaundryTag, LevelTag, LocationTag, NumberTag, PositionTag, PowerSourceTag, RefrigeratorTag, RoomAirConditionerTag, SwitchesTag, } from '@matter/main';
 export { AttributeElement, ClusterElement, ClusterModel, CommandElement, EventElement, FieldElement } from '@matter/main/model';

package/dist/matter/types.js

@@ -0,0 +1,2 @@
+export * from '@matter/types';
+export { ClusterRegistry } from '@matter/types';

package/dist/matterbridge.js

@@ -7,7 +7,7 @@ import path from 'path';
 import { randomBytes } from 'crypto';
 import { NodeStorageManager } from './storage/export.js';
 import { AnsiLogger, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, CYAN, nt } from './logger/export.js';
-import { logInterfaces, wait, waiter, copyDirectory, getParameter, getIntParameter, hasParameter } from './utils/utils.js';
+import { logInterfaces, copyDirectory, getParameter, getIntParameter, hasParameter } from './utils/utils.js';
 import { PluginManager } from './pluginManager.js';
 import { DeviceManager } from './deviceManager.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
@@ -140,10 +140,6 @@ export class Matterbridge extends EventEmitter {
     }
     async destroyInstance() {
         await this.cleanup('destroying instance...', false);
-        await waiter('destroying instance...', () => {
-            return this.initialized === false && this.execRunningCount <= 0 ? true : false;
-        }, false, 60000, 100, false);
-        await wait(1000, 'Wait for the global node_modules and matterbridge version', false);
     }
     async initialize() {
         if (hasParameter('service'))
@@ -1021,15 +1017,6 @@ export class Matterbridge extends EventEmitter {
             catch (error) {
             }
             if (this.nodeStorage && this.nodeContext) {
-                this.log.info('Saving registered devices...');
-                const serializedRegisteredDevices = [];
-                this.devices.forEach(async (device) => {
-                    const serializedMatterbridgeDevice = MatterbridgeEndpoint.serialize(device);
-                    if (serializedMatterbridgeDevice)
-                        serializedRegisteredDevices.push(serializedMatterbridgeDevice);
-                });
-                await this.nodeContext.set('devices', serializedRegisteredDevices);
-                this.log.info(`Saved registered devices (${serializedRegisteredDevices?.length})`);
                 this.log.debug(`Closing node storage context for ${plg}Matterbridge${db}...`);
                 await this.nodeContext.close();
                 this.nodeContext = undefined;

package/dist/matterbridgeBehaviors.js

@@ -18,6 +18,7 @@ import { ThermostatServer } from '@matter/main/behaviors/thermostat';
 import { ValveConfigurationAndControlServer } from '@matter/main/behaviors/valve-configuration-and-control';
 import { ModeSelectServer } from '@matter/main/behaviors/mode-select';
 import { SmokeCoAlarmServer } from '@matter/main/behaviors/smoke-co-alarm';
+import { SwitchServer } from '@matter/main/behaviors/switch';
 export class MatterbridgeBehaviorDevice {
     log;
     commandHandler;
@@ -338,3 +339,7 @@ export class MatterbridgeBooleanStateConfigurationServer extends BooleanStateCon
         super.enableDisableAlarm({ alarmsToEnableDisable });
     }
 }
+export class MatterbridgeSwitchServer extends SwitchServer {
+    initialize() {
+    }
+}