matterbridge 3.0.3-dev-20250517-bcc5d13 → 3.0.3-dev-20250518-a216d52

package/CHANGELOG.md

@@ -12,6 +12,9 @@ If you like this project and find it useful, please consider giving it a star on
 
 ### Added
 
+- [virtual] Added virtual devices configuration mode in the Matterbridge Settings: 'Disabled', 'Light', 'Outlet', 'Switch', 'Mounted_switch'. Switch is not supported by Alexa. Mounted Switch is not supported by Apple.
+- [deviceTypes] Add waterHeater device type.
+
 ### Changed
 
 - [package]: Updated dependencies.

package/dist/frontend.js

@@ -1431,6 +1431,15 @@ export class Frontend {
                         }
                         client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true }));
                         break;
+                    case 'setvirtualmode':
+                        if (isValidString(data.params.value, 1) && ['disabled', 'light', 'outlet', 'switch', 'mounted_switch'].includes(data.params.value)) {
+                            this.matterbridge.matterbridgeInformation.virtualMode = data.params.value;
+                            this.log.debug(`Set matterbridge virtual mode to ${CYAN}${data.params.value}${db}`);
+                            await this.matterbridge.nodeContext?.set('virtualmode', data.params.value);
+                            this.wssSendRestartRequired();
+                        }
+                        client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true }));
+                        break;
                     default:
                         this.log.warn(`Unknown parameter ${data.params.name} in /api/config`);
                         client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: `Unknown parameter ${data.params.name} in /api/config` }));

package/dist/helpers.js

@@ -4,9 +4,27 @@ import { BridgedDeviceBasicInformationServer } from '@matter/node/behaviors/brid
 import { OnOffBaseServer } from '@matter/node/behaviors/on-off';
 import { OnOffPlugInUnitDevice } from '@matter/node/devices/on-off-plug-in-unit';
 import { hasParameter } from './utils/commandLine.js';
-export async function addVirtualDevice(aggregatorEndpoint, name, callback) {
-    const device = new Endpoint(OnOffPlugInUnitDevice.with(BridgedDeviceBasicInformationServer), {
-        id: name.replaceAll(' ', ''),
+import { MountedOnOffControlDevice } from '@matter/node/devices/mounted-on-off-control';
+import { OnOffLightDevice } from '@matter/node/devices/on-off-light';
+import { OnOffLightSwitchDevice } from '@matter/node/devices/on-off-light-switch';
+export async function addVirtualDevice(aggregatorEndpoint, name, type, callback) {
+    let deviceType;
+    switch (type) {
+        case 'light':
+            deviceType = OnOffLightDevice.with(BridgedDeviceBasicInformationServer);
+            break;
+        case 'outlet':
+            deviceType = OnOffPlugInUnitDevice.with(BridgedDeviceBasicInformationServer);
+            break;
+        case 'switch':
+            deviceType = OnOffLightSwitchDevice.with(BridgedDeviceBasicInformationServer, OnOffBaseServer);
+            break;
+        case 'mounted_switch':
+            deviceType = MountedOnOffControlDevice.with(BridgedDeviceBasicInformationServer);
+            break;
+    }
+    const device = new Endpoint(deviceType, {
+        id: name.replaceAll(' ', '') + ':' + type,
         bridgedDeviceBasicInformation: { nodeLabel: name },
         onOff: { onOff: false, startUpOnOff: OnOff.StartUpOnOff.Off },
     });
@@ -21,15 +39,15 @@ export async function addVirtualDevice(aggregatorEndpoint, name, callback) {
     return device;
 }
 export async function addVirtualDevices(matterbridge, aggregatorEndpoint) {
-    if (!hasParameter('novirtual') && matterbridge.bridgeMode === 'bridge' && aggregatorEndpoint) {
+    if (matterbridge.matterbridgeInformation.virtualMode !== 'disabled' && matterbridge.bridgeMode === 'bridge' && aggregatorEndpoint) {
         matterbridge.log.notice(`Creating virtual devices for Matterbridge server node...`);
-        await addVirtualDevice(aggregatorEndpoint, 'Restart Matterbridge', async () => {
+        await addVirtualDevice(aggregatorEndpoint, 'Restart Matterbridge', matterbridge.matterbridgeInformation.virtualMode, async () => {
             if (matterbridge.restartMode === '')
                 await matterbridge.restartProcess();
             else
                 await matterbridge.shutdownProcess();
         });
-        await addVirtualDevice(aggregatorEndpoint, 'Update Matterbridge', async () => {
+        await addVirtualDevice(aggregatorEndpoint, 'Update Matterbridge', matterbridge.matterbridgeInformation.virtualMode, async () => {
             if (hasParameter('shelly')) {
                 const { getShelly } = await import('./shelly.js');
                 getShelly('/api/updates/sys/perform', 10 * 1000)
@@ -52,7 +70,7 @@ export async function addVirtualDevices(matterbridge, aggregatorEndpoint) {
             }
         });
         if (hasParameter('shelly')) {
-            await addVirtualDevice(aggregatorEndpoint, 'Reboot Matterbridge', async () => {
+            await addVirtualDevice(aggregatorEndpoint, 'Reboot Matterbridge', matterbridge.matterbridgeInformation.virtualMode, async () => {
                 const { postShelly } = await import('./shelly.js');
                 postShelly('/api/system/reboot', {}, 60 * 1000)
                     .then(() => {

package/dist/matterbridge.js

@@ -60,6 +60,7 @@ export class Matterbridge extends EventEmitter {
         matterbridgeAdvertise: false,
         bridgeMode: '',
         restartMode: '',
+        virtualMode: 'outlet',
         readOnly: hasParameter('readonly') || hasParameter('shelly'),
         shellyBoard: hasParameter('shelly'),
         shellySysUpdate: false,
@@ -474,6 +475,14 @@ export class Matterbridge extends EventEmitter {
                 await this.nodeContext.remove('matteripv6address');
             }
         }
+        if (hasParameter('novirtual')) {
+            this.matterbridgeInformation.virtualMode = 'disabled';
+            await this.nodeContext.set('virtualmode', 'disabled');
+        }
+        else {
+            this.matterbridgeInformation.virtualMode = (await this.nodeContext.get('virtualmode', 'outlet'));
+        }
+        this.log.debug(`Virtual mode ${this.matterbridgeInformation.virtualMode}.`);
         this.plugins = new PluginManager(this);
         await this.plugins.loadFromStorage();
         this.plugins.logLevel = this.log.logLevel;

package/dist/matterbridgeDeviceTypes.js

@@ -64,6 +64,8 @@ import { RefrigeratorAlarm } from '@matter/main/clusters/refrigerator-alarm';
 import { RefrigeratorAndTemperatureControlledCabinetMode } from '@matter/main/clusters/refrigerator-and-temperature-controlled-cabinet-mode';
 import { ServiceArea } from '@matter/main/clusters/service-area';
 import { TemperatureControl } from '@matter/main/clusters/temperature-control';
+import { OtaSoftwareUpdateRequestor } from '@matter/main/clusters/ota-software-update-requestor';
+import { EnergyEvse, EnergyEvseMode, OtaSoftwareUpdateProvider, WaterHeaterManagement, WaterHeaterMode } from '@matter/main/clusters';
 export var DeviceClasses;
 (function (DeviceClasses) {
     DeviceClasses["Node"] = "Node";
@@ -95,6 +97,26 @@ export const powerSource = DeviceTypeDefinition({
     requiredServerClusters: [PowerSource.Cluster.id],
     optionalServerClusters: [],
 });
+export const OTARequestor = DeviceTypeDefinition({
+    name: 'MA-OTARequestor',
+    code: 0x0012,
+    deviceClass: DeviceClasses.Utility,
+    revision: 1,
+    requiredServerClusters: [OtaSoftwareUpdateRequestor.Cluster.id],
+    optionalServerClusters: [],
+    requiredClientClusters: [OtaSoftwareUpdateProvider.Cluster.id],
+    optionalClientClusters: [],
+});
+export const OTAProvider = DeviceTypeDefinition({
+    name: 'MA-OTAProvider',
+    code: 0x0014,
+    deviceClass: DeviceClasses.Utility,
+    revision: 1,
+    requiredServerClusters: [OtaSoftwareUpdateProvider.Cluster.id],
+    optionalServerClusters: [],
+    requiredClientClusters: [OtaSoftwareUpdateRequestor.Cluster.id],
+    optionalClientClusters: [],
+});
 export const bridgedNode = DeviceTypeDefinition({
     name: 'MA-bridgedNode',
     code: 0x0013,
@@ -116,8 +138,8 @@ export const deviceEnergyManagement = DeviceTypeDefinition({
     code: 0x050d,
     deviceClass: DeviceClasses.Utility,
     revision: 2,
-    requiredServerClusters: [DeviceEnergyManagement.Cluster.id, DeviceEnergyManagementMode.Cluster.id],
-    optionalServerClusters: [],
+    requiredServerClusters: [DeviceEnergyManagement.Cluster.id],
+    optionalServerClusters: [DeviceEnergyManagementMode.Cluster.id],
 });
 export const onOffLight = DeviceTypeDefinition({
     name: 'MA-onofflight',
@@ -501,3 +523,43 @@ export const microwaveOven = DeviceTypeDefinition({
     requiredServerClusters: [OperationalState.Cluster.id, MicrowaveOvenMode.Cluster.id, MicrowaveOvenControl.Cluster.id],
     optionalServerClusters: [Identify.Cluster.id, FanControl.Cluster.id],
 });
+export const evse = DeviceTypeDefinition({
+    name: 'MA-evse',
+    code: 0x050c,
+    deviceClass: DeviceClasses.Simple,
+    revision: 2,
+    requiredServerClusters: [EnergyEvse.Cluster.id, EnergyEvseMode.Cluster.id],
+    optionalServerClusters: [Identify.Cluster.id, TemperatureMeasurement.Cluster.id],
+});
+export const waterHeater = DeviceTypeDefinition({
+    name: 'MA-waterheater',
+    code: 0x050f,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [Thermostat.Cluster.id, WaterHeaterManagement.Cluster.id, WaterHeaterMode.Cluster.id],
+    optionalServerClusters: [Identify.Cluster.id],
+});
+export const solarPower = DeviceTypeDefinition({
+    name: 'MA-solarpower',
+    code: 0x0017,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [],
+    optionalServerClusters: [Identify.Cluster.id],
+});
+export const batteryStorage = DeviceTypeDefinition({
+    name: 'MA-batterystorage',
+    code: 0x0018,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [],
+    optionalServerClusters: [Identify.Cluster.id],
+});
+export const heatPump = DeviceTypeDefinition({
+    name: 'MA-heatpump',
+    code: 0x0309,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [],
+    optionalServerClusters: [Identify.Cluster.id, Thermostat.Cluster.id],
+});

package/frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.944b63c3.css",
-    "main.js": "./static/js/main.f6e0f736.js",
+    "main.js": "./static/js/main.2486c3e3.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.f6e0f736.js.map": "./static/js/main.f6e0f736.js.map",
+    "main.2486c3e3.js.map": "./static/js/main.2486c3e3.js.map",
     "453.d855a71b.chunk.js.map": "./static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.944b63c3.css",
-    "static/js/main.f6e0f736.js"
+    "static/js/main.2486c3e3.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.f6e0f736.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.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>