matterbridge 2.2.5-dev.4 → 2.2.6-dev.1

package/dist/frontend.js

@@ -556,31 +556,34 @@ export class Frontend {
                 return;
             }
             if (command === 'setmdnsinterface') {
-                param = param.slice(1, -1);
-                this.matterbridge.matterbridgeInformation.mattermdnsinterface = param;
-                this.log.debug('Matter.js mdns interface:', param === '' ? 'All interfaces' : param);
-                await this.matterbridge.nodeContext?.set('mattermdnsinterface', param);
+                if (param === 'json' && isValidString(req.body.value)) {
+                    this.matterbridge.matterbridgeInformation.mattermdnsinterface = req.body.value;
+                    this.log.debug(`Matter.js mdns interface: ${req.body.value === '' ? 'all interfaces' : req.body.value}`);
+                    await this.matterbridge.nodeContext?.set('mattermdnsinterface', req.body.value);
+                }
                 res.json({ message: 'Command received' });
                 return;
             }
             if (command === 'setipv4address') {
-                param = param.slice(1, -1);
-                this.matterbridge.matterbridgeInformation.matteripv4address = param;
-                this.log.debug('Matter.js ipv4 address:', param === '' ? 'All ipv4 addresses' : param);
-                await this.matterbridge.nodeContext?.set('matteripv4address', param);
+                if (param === 'json' && isValidString(req.body.value)) {
+                    this.log.debug(`Matter.js ipv4 address: ${req.body.value === '' ? 'all ipv4 addresses' : req.body.value}`);
+                    this.matterbridge.matterbridgeInformation.matteripv4address = req.body.value;
+                    await this.matterbridge.nodeContext?.set('matteripv4address', req.body.value);
+                }
                 res.json({ message: 'Command received' });
                 return;
             }
             if (command === 'setipv6address') {
-                param = param.slice(1, -1);
-                this.matterbridge.matterbridgeInformation.matteripv6address = param;
-                this.log.debug('Matter.js ipv6 address:', param === '' ? 'All ipv6 addresses' : param);
-                await this.matterbridge.nodeContext?.set('matteripv6address', param);
+                if (param === 'json' && isValidString(req.body.value)) {
+                    this.log.debug(`Matter.js ipv6 address: ${req.body.value === '' ? 'all ipv6 addresses' : req.body.value}`);
+                    this.matterbridge.matterbridgeInformation.matteripv6address = req.body.value;
+                    await this.matterbridge.nodeContext?.set('matteripv6address', req.body.value);
+                }
                 res.json({ message: 'Command received' });
                 return;
             }
             if (command === 'setmatterport') {
-                const port = Math.min(Math.max(parseInt(param), 5540), 5560);
+                const port = Math.min(Math.max(parseInt(req.body.value), 5540), 5560);
                 this.matterbridge.matterbridgeInformation.matterPort = port;
                 this.log.debug(`Set matter commissioning port to ${CYAN}${port}${db}`);
                 await this.matterbridge.nodeContext?.set('matterport', port);
@@ -588,7 +591,7 @@ export class Frontend {
                 return;
             }
             if (command === 'setmatterdiscriminator') {
-                const discriminator = Math.min(Math.max(parseInt(param), 1000), 4095);
+                const discriminator = Math.min(Math.max(parseInt(req.body.value), 1000), 4095);
                 this.matterbridge.matterbridgeInformation.matterDiscriminator = discriminator;
                 this.log.debug(`Set matter commissioning discriminator to ${CYAN}${discriminator}${db}`);
                 await this.matterbridge.nodeContext?.set('matterdiscriminator', discriminator);
@@ -596,7 +599,7 @@ export class Frontend {
                 return;
             }
             if (command === 'setmatterpasscode') {
-                const passcode = Math.min(Math.max(parseInt(param), 10000000), 90000000);
+                const passcode = Math.min(Math.max(parseInt(req.body.value), 10000000), 90000000);
                 this.matterbridge.matterbridgeInformation.matterPasscode = passcode;
                 this.log.debug(`Set matter commissioning passcode to ${CYAN}${passcode}${db}`);
                 await this.matterbridge.nodeContext?.set('matterpasscode', passcode);

package/dist/matterbridge.js

@@ -338,6 +338,17 @@ export class Matterbridge extends EventEmitter {
             });
         }
         this.log.debug(`Matter logLevel: ${Logger.defaultLogLevel} fileLoger: ${this.matterbridgeInformation.matterFileLogger}.`);
+        const networkInterfaces = os.networkInterfaces();
+        const availableAddresses = Object.entries(networkInterfaces);
+        const availableInterfaces = Object.keys(networkInterfaces);
+        for (const [ifaceName, ifaces] of availableAddresses) {
+            if (ifaces && ifaces.length > 0) {
+                this.log.debug(`Network interface: ${CYAN}${ifaceName}${db}:`);
+                ifaces.forEach((iface) => {
+                    this.log.debug(`- ${CYAN}${iface.family}${db} address ${CYAN}${iface.address}${db} netmask ${CYAN}${iface.netmask}${db} mac ${CYAN}${iface.mac}${db} scopeid ${CYAN}${iface.scopeid}${db} ${iface.internal ? 'internal' : 'external'}`);
+                });
+            }
+        }
         if (hasParameter('mdnsinterface')) {
             this.mdnsInterface = getParameter('mdnsinterface');
         }
@@ -347,14 +358,12 @@ export class Matterbridge extends EventEmitter {
                 this.mdnsInterface = undefined;
         }
         if (this.mdnsInterface) {
-            const networkInterfaces = os.networkInterfaces();
-            const availableInterfaces = Object.keys(networkInterfaces);
             if (!availableInterfaces.includes(this.mdnsInterface)) {
                 this.log.error(`Invalid mdnsInterface: ${this.mdnsInterface}. Available interfaces are: ${availableInterfaces.join(', ')}. Using all available interfaces.`);
                 this.mdnsInterface = undefined;
             }
             else {
-                this.log.info(`Using mdnsInterface '${this.mdnsInterface}' for the Matter server MdnsBroadcaster.`);
+                this.log.info(`Using mdnsInterface ${CYAN}${this.mdnsInterface}${nf} for the Matter MdnsBroadcaster.`);
             }
         }
         if (this.mdnsInterface)
@@ -367,6 +376,20 @@ export class Matterbridge extends EventEmitter {
             if (this.ipv4address === '')
                 this.ipv4address = undefined;
         }
+        if (this.ipv4address) {
+            let isValid = false;
+            for (const [ifaceName, ifaces] of availableAddresses) {
+                if (ifaces && ifaces.find((iface) => iface.address === this.ipv4address)) {
+                    this.log.info(`Using ipv4address ${CYAN}${this.ipv4address}${nf} on interface ${CYAN}${ifaceName}${nf} for the Matter server node.`);
+                    isValid = true;
+                    break;
+                }
+            }
+            if (!isValid) {
+                this.log.error(`Invalid ipv4address: ${this.ipv4address}. Using all available addresses.`);
+                this.ipv4address = undefined;
+            }
+        }
         if (hasParameter('ipv6address')) {
             this.ipv6address = getParameter('ipv6address');
         }
@@ -375,6 +398,25 @@ export class Matterbridge extends EventEmitter {
             if (this.ipv6address === '')
                 this.ipv6address = undefined;
         }
+        if (this.ipv6address) {
+            let isValid = false;
+            for (const [ifaceName, ifaces] of availableAddresses) {
+                if (ifaces && ifaces.find((iface) => (iface.scopeid === undefined || iface.scopeid === 0) && iface.address === this.ipv6address)) {
+                    this.log.info(`Using ipv6address ${CYAN}${this.ipv6address}${nf} on interface ${CYAN}${ifaceName}${nf} for the Matter server node.`);
+                    isValid = true;
+                    break;
+                }
+                if (ifaces && ifaces.find((iface) => iface.scopeid && iface.scopeid > 0 && iface.address + '%' + (process.platform === 'win32' ? iface.scopeid : ifaceName) === this.ipv6address)) {
+                    this.log.info(`Using ipv6address ${CYAN}${this.ipv6address}${nf} on interface ${CYAN}${ifaceName}${nf} for the Matter server node.`);
+                    isValid = true;
+                    break;
+                }
+            }
+            if (!isValid) {
+                this.log.error(`Invalid ipv6address: ${this.ipv6address}. Using all available addresses.`);
+                this.ipv6address = undefined;
+            }
+        }
         this.plugins = new PluginManager(this);
         await this.plugins.loadFromStorage();
         this.plugins.logLevel = this.log.logLevel;

package/dist/matterbridgeEndpoint.js

@@ -4,7 +4,7 @@ import { isValidNumber, isValidObject } from './utils/export.js';
 import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeSwitchServer, } from './matterbridgeBehaviors.js';
 import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, capitalizeFirstLetter, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getDefaultOccupancySensingClusterServer, lowercaseFirstLetter, updateAttribute, getClusterId, getAttributeId, setAttribute, getAttribute, checkNotLatinCharacters, generateUniqueId, subscribeAttribute, } from './matterbridgeEndpointHelpers.js';
 import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, VendorId } from '@matter/main';
-import { getClusterNameById, MeasurementType } from '@matter/main/types';
+import { ClusterType, getClusterNameById, MeasurementType } from '@matter/main/types';
 import { Descriptor } from '@matter/main/clusters/descriptor';
 import { PowerSource } from '@matter/main/clusters/power-source';
 import { BridgedDeviceBasicInformation } from '@matter/main/clusters/bridged-device-basic-information';
@@ -518,7 +518,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         return this;
     }
     createOnOffClusterServer(onOff = false) {
-        this.behaviors.require(MatterbridgeOnOffServer, {
+        this.behaviors.require(MatterbridgeOnOffServer.for(ClusterType(OnOff.Base)), {
             onOff,
         });
         return this;

package/frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.ea7910e9.css",
-    "main.js": "./static/js/main.839276c2.js",
+    "main.js": "./static/js/main.a45801ac.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.ea7910e9.css.map": "./static/css/main.ea7910e9.css.map",
-    "main.839276c2.js.map": "./static/js/main.839276c2.js.map",
+    "main.a45801ac.js.map": "./static/js/main.a45801ac.js.map",
     "453.d855a71b.chunk.js.map": "./static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.ea7910e9.css",
-    "static/js/main.839276c2.js"
+    "static/js/main.a45801ac.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.839276c2.js"></script><link href="./static/css/main.ea7910e9.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.a45801ac.js"></script><link href="./static/css/main.ea7910e9.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>