matterbridge 3.0.2-dev-20250508-7214e17 → 3.0.2-dev-20250510-ae61aa7

package/CHANGELOG.md

@@ -8,15 +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>
 
-### Home Assistant
-
-If you want to run Matterbridge in Home Assistant please use the official add-on https://github.com/Luligu/matterbridge-home-assistant-addon that also has Ingress and side panel.
-It is also available the official Matterbridge Home Assistant plugin https://github.com/Luligu/matterbridge-hass.
-
 ## [3.0.2] - 2025-05-??
 
 ### Added
 
+- [virtual] Added virtual devices Restart Matterbridge and Update Matterbridge.
+
 ### Changed
 
 - [package]: Updated dependencies.
@@ -42,6 +39,7 @@ It is also available the official Matterbridge Home Assistant plugin https://git
 - [frontend]: Moved all settings from express to web socket.
 - [endpoint]: Added OperationalState cluster helper and behavior.
 - [behaviors]: Added Jest test on MatterbridgeBehaviors.
+- [docker]: Further optimized the dockerfile for the image with tag latest.
 
 ### Changed
 

package/README.md

@@ -33,7 +33,7 @@ No complex setup just copy paste the installation scripts.
 
 Matterbridge is light weight and run also on slow Linux machine with 512MB of memory.
 
-It runs perfectly on Windows too.
+It runs perfectly on macOS and Windows too.
 
 If you like this project and find it useful, please consider giving it a star on GitHub at https://github.com/Luligu/matterbridge and sponsoring it.
 

package/dist/frontend.js

@@ -8,7 +8,7 @@ import express from 'express';
 import WebSocket, { WebSocketServer } from 'ws';
 import multer from 'multer';
 import { AnsiLogger, stringify, debugStringify, CYAN, db, er, nf, rs, UNDERLINE, UNDERLINEOFF, wr, YELLOW, nt } from './logger/export.js';
-import { createZip, deepCopy, isValidArray, isValidNumber, isValidObject, isValidString, isValidBoolean } from './utils/export.js';
+import { createZip, isValidArray, isValidNumber, isValidObject, isValidString, isValidBoolean } from './utils/export.js';
 import { plg } from './matterbridgeTypes.js';
 import { hasParameter } from './utils/export.js';
 import { BridgedDeviceBasicInformation, PowerSource } from '@matter/main/clusters';
@@ -33,11 +33,6 @@ export class Frontend {
     httpServer;
     httpsServer;
     webSocketServer;
-    prevCpus = deepCopy(os.cpus());
-    lastCpuUsage = 0;
-    memoryData = [];
-    memoryInterval;
-    memoryTimeout;
     constructor(matterbridge) {
         this.matterbridge = matterbridge;
         this.log = new AnsiLogger({ logName: 'Frontend', logTimestampFormat: 4, logLevel: hasParameter('debug') ? "debug" : "info" });
@@ -452,13 +447,27 @@ export class Frontend {
     }
     async stop() {
         if (this.httpServer) {
-            this.httpServer.close();
+            this.httpServer.close((error) => {
+                if (error) {
+                    this.log.error(`Error closing http server: ${error}`);
+                }
+                else {
+                    this.log.debug('Http server closed successfully');
+                }
+            });
             this.httpServer.removeAllListeners();
             this.httpServer = undefined;
             this.log.debug('Frontend http server closed successfully');
         }
         if (this.httpsServer) {
-            this.httpsServer.close();
+            this.httpsServer.close((error) => {
+                if (error) {
+                    this.log.error(`Error closing https server: ${error}`);
+                }
+                else {
+                    this.log.debug('Https server closed successfully');
+                }
+            });
             this.httpsServer.removeAllListeners();
             this.httpsServer = undefined;
             this.log.debug('Frontend https server closed successfully');
@@ -1203,7 +1212,7 @@ export class Frontend {
             }
             else if (data.method === '/api/action') {
                 if (!isValidString(data.params.plugin, 5) || !isValidString(data.params.action, 1)) {
-                    client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter command in /api/action' }));
+                    client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter in /api/action' }));
                     return;
                 }
                 const plugin = this.matterbridge.plugins.get(data.params.plugin);
@@ -1446,10 +1455,10 @@ export class Frontend {
                         }
                         if (isValidArray(config.blackList, 1)) {
                             if (select === 'serial' && config.blackList.includes(data.params.serial)) {
-                                config.blackList = config.blackList.filter((serial) => serial !== data.params.serial);
+                                config.blackList = config.blackList.filter((item) => item !== data.params.serial);
                             }
                             else if (select === 'name' && config.blackList.includes(data.params.name)) {
-                                config.blackList = config.blackList.filter((name) => name !== data.params.name);
+                                config.blackList = config.blackList.filter((item) => item !== data.params.name);
                             }
                         }
                         if (plugin.platform)
@@ -1484,10 +1493,10 @@ export class Frontend {
                         }
                         if (isValidArray(config.whiteList, 1)) {
                             if (select === 'serial' && config.whiteList.includes(data.params.serial)) {
-                                config.whiteList = config.whiteList.filter((serial) => serial !== data.params.serial);
+                                config.whiteList = config.whiteList.filter((item) => item !== data.params.serial);
                             }
                             else if (select === 'name' && config.whiteList.includes(data.params.name)) {
-                                config.whiteList = config.whiteList.filter((name) => name !== data.params.name);
+                                config.whiteList = config.whiteList.filter((item) => item !== data.params.name);
                             }
                         }
                         if (isValidArray(config.blackList)) {

package/dist/matterbridge.js

@@ -12,10 +12,12 @@ import { DeviceManager } from './deviceManager.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
 import { bridge } from './matterbridgeDeviceTypes.js';
 import { Frontend } from './frontend.js';
-import { DeviceTypeId, Endpoint as EndpointNode, Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, VendorId, StorageService, Environment, ServerNode, UINT32_MAX, UINT16_MAX, } from '@matter/main';
+import { DeviceTypeId, Endpoint as EndpointNode, Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, VendorId, StorageService, Environment, ServerNode, UINT32_MAX, UINT16_MAX, Endpoint, } from '@matter/main';
 import { DeviceCommissioner, FabricAction, MdnsService, PaseClient } from '@matter/main/protocol';
+import { OnOffPlugInUnitDevice } from '@matter/main/devices/on-off-plug-in-unit';
 import { AggregatorEndpoint } from '@matter/main/endpoints';
 import { BasicInformationServer } from '@matter/main/behaviors/basic-information';
+import { OnOffBaseServer } from '@matter/main/behaviors/on-off';
 import { BridgedDeviceBasicInformationServer } from '@matter/main/behaviors/bridged-device-basic-information';
 const plg = '\u001B[38;5;33m';
 const dev = '\u001B[38;5;79m';
@@ -1519,6 +1521,30 @@ export class Matterbridge extends EventEmitter {
         serverNode.lifecycle.decommissioned.on(() => this.log.notice(`Server node for ${storeId} was fully decommissioned successfully!`));
         serverNode.lifecycle.online.on(async () => {
             this.log.notice(`Server node for ${storeId} is online`);
+            if (!hasParameter('novirtual') && this.bridgeMode === 'bridge') {
+                this.log.notice(`Creating virtual devices for server node ${storeId}`);
+                const virtualRestart = new Endpoint(OnOffPlugInUnitDevice.with(BridgedDeviceBasicInformationServer), { id: 'Restart Matterbridge', bridgedDeviceBasicInformation: { nodeLabel: 'Restart' } });
+                virtualRestart.events.onOff.onOff$Changed.on(async (value) => {
+                    if (value) {
+                        await virtualRestart.setStateOf(OnOffBaseServer, { onOff: false });
+                        if (this.restartMode === '')
+                            this.restartProcess();
+                        else
+                            this.shutdownProcess();
+                    }
+                });
+                await this.aggregatorNode?.add(virtualRestart);
+                await virtualRestart.setStateOf(OnOffBaseServer, { onOff: false });
+                const virtualUpdate = new Endpoint(OnOffPlugInUnitDevice.with(BridgedDeviceBasicInformationServer), { id: 'Update Matterbridge', bridgedDeviceBasicInformation: { nodeLabel: 'Update' } });
+                virtualUpdate.events.onOff.onOff$Changed.on(async (value) => {
+                    if (value) {
+                        await virtualUpdate.setStateOf(OnOffBaseServer, { onOff: false });
+                        this.updateProcess();
+                    }
+                });
+                await this.aggregatorNode?.add(virtualUpdate);
+                await virtualUpdate.setStateOf(OnOffBaseServer, { onOff: false });
+            }
             if (!serverNode.lifecycle.isCommissioned) {
                 this.log.notice(`Server node for ${storeId} is not commissioned. Pair to commission ...`);
                 const { qrPairingCode, manualPairingCode } = serverNode.state.commissioning.pairingCodes;

package/dist/matterbridgeBehaviors.js

@@ -11,6 +11,7 @@ import { OperationalState } from '@matter/main/clusters/operational-state';
 import { ModeBase } from '@matter/main/clusters/mode-base';
 import { RvcRunMode } from '@matter/main/clusters/rvc-run-mode';
 import { RvcOperationalState } from '@matter/main/clusters/rvc-operational-state';
+import { ServiceArea } from '@matter/main/clusters/service-area';
 import { IdentifyServer } from '@matter/main/behaviors/identify';
 import { OnOffServer } from '@matter/main/behaviors/on-off';
 import { LevelControlServer } from '@matter/main/behaviors/level-control';
@@ -28,7 +29,6 @@ import { RvcRunModeServer } from '@matter/main/behaviors/rvc-run-mode';
 import { RvcCleanModeServer } from '@matter/main/behaviors/rvc-clean-mode';
 import { RvcOperationalStateServer } from '@matter/main/behaviors/rvc-operational-state';
 import { ServiceAreaServer } from '@matter/main/behaviors/service-area';
-import { ServiceArea } from '@matter/main/clusters/service-area';
 export class MatterbridgeServerDevice {
     log;
     commandHandler;

package/dist/matterbridgeEndpoint.js

@@ -2,7 +2,7 @@ import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, zb } fr
 import { bridgedNode } from './matterbridgeDeviceTypes.js';
 import { isValidNumber, isValidObject, isValidString } from './utils/export.js';
 import { MatterbridgeServer, MatterbridgeServerDevice, MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeSwitchServer, MatterbridgeOperationalStateServer, } from './matterbridgeBehaviors.js';
-import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, capitalizeFirstLetter, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getDefaultOperationalStateClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getDefaultOccupancySensingClusterServer, lowercaseFirstLetter, updateAttribute, getClusterId, getAttributeId, setAttribute, getAttribute, checkNotLatinCharacters, generateUniqueId, subscribeAttribute, } from './matterbridgeEndpointHelpers.js';
+import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, capitalizeFirstLetter, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getDefaultOperationalStateClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getDefaultOccupancySensingClusterServer, lowercaseFirstLetter, updateAttribute, getClusterId, getAttributeId, setAttribute, getAttribute, checkNotLatinCharacters, generateUniqueId, subscribeAttribute, invokeBehaviorCommand, } from './matterbridgeEndpointHelpers.js';
 import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, UINT16_MAX, UINT32_MAX, VendorId } from '@matter/main';
 import { getClusterNameById, MeasurementType } from '@matter/main/types';
 import { Descriptor } from '@matter/main/clusters/descriptor';
@@ -216,6 +216,9 @@ export class MatterbridgeEndpoint extends Endpoint {
     async executeCommandHandler(command, request) {
         await this.commandHandler.executeHandler(command, { request });
     }
+    async invokeBehaviorCommand(cluster, command, params) {
+        await invokeBehaviorCommand(this, cluster, command, params);
+    }
     addRequiredClusterServers() {
         addRequiredClusterServers(this);
         return this;

package/dist/matterbridgeEndpointHelpers.js

@@ -224,6 +224,21 @@ export function getBehavior(endpoint, cluster) {
     }
     return behavior;
 }
+export async function invokeBehaviorCommand(endpoint, cluster, command, params) {
+    const behaviorId = getBehavior(endpoint, cluster)?.id;
+    if (!behaviorId) {
+        endpoint.log.error(`invokeBehaviorCommand error: command ${hk}${command}${er} not found on endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er}`);
+        return;
+    }
+    await endpoint.act((agent) => {
+        const behavior = agent[behaviorId];
+        if (!(command in behavior) || typeof behavior[command] !== 'function') {
+            endpoint.log.error(`invokeBehaviorCommand error: command ${hk}${command}${er} not found on agent for endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er}`);
+            return;
+        }
+        behavior[command](params);
+    });
+}
 export function addRequiredClusterServers(endpoint) {
     const requiredServerList = [];
     endpoint.log.debug(`addRequiredClusterServers for ${CYAN}${endpoint.maybeId}${db}`);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.0.2-dev-20250508-7214e17",
+  "version": "3.0.2-dev-20250510-ae61aa7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.0.2-dev-20250508-7214e17",
+      "version": "3.0.2-dev-20250510-ae61aa7",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.13.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.0.2-dev-20250508-7214e17",
+  "version": "3.0.2-dev-20250510-ae61aa7",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",