matterbridge 1.6.6-dev.6 → 1.6.6-dev.7

package/CHANGELOG.md

@@ -20,6 +20,8 @@ Tamer (https://github.com/tammeryousef1006) has created the Matterbridge Discord
 
 - [frontend]: Add the possibility to install a specific version or the dev of any plugin (i.e. you can install matterbridge-hass@dev or matterbridge-hass@0.0.3).
   It is also possible to use the install plugin to install a specific version of matterbridge (i.e. you can install matterbridge@dev or matterbridge@1.6.5)
+- [frontend]: Add the possibility to set the matter discriminator for commissioning (you can always override passing **-discriminator [DISCRIMINATOR]** on the command line).
+- [frontend]: Add the possibility to set the matter passcode for commissioning (you can always override passing **-passcode [PASSCODE]** on the command line).
 - [frontend]: Add the possibility to set the matter port for commissioning (you can always override passing **-port [PORT]** on the command line).
 - [deviceTypes]: Add device type airConditioner (not supported by the Apple Home).
 - [docker]: Add matterbridge-hass to docker dev.
@@ -27,6 +29,7 @@ Tamer (https://github.com/tammeryousef1006) has created the Matterbridge Discord
 
 ### Changed
 
+- [package]: Update matter.js to 0.11.9-alpha.0-20241206-22f23333.
 - [plugin]: Removed check on package types since we are moving to production plugins.
 - [package]: Set required node version to 18, 20 and 22.
 - [package]: Update dependencies.

package/dist/matterbridge.js

@@ -69,6 +69,8 @@ export class Matterbridge extends EventEmitter {
         matteripv4address: undefined,
         matteripv6address: undefined,
         matterPort: 5540,
+        matterDiscriminator: undefined,
+        matterPasscode: undefined,
         restartRequired: false,
         refreshRequired: false,
     };
@@ -199,8 +201,8 @@ export class Matterbridge extends EventEmitter {
             throw new Error('Fatal error creating node storage manager and context for matterbridge');
         }
         this.port = getIntParameter('port') ?? (await this.nodeContext.get('matterport', 5540)) ?? 5540;
-        this.passcode = getIntParameter('passcode');
-        this.discriminator = getIntParameter('discriminator');
+        this.passcode = getIntParameter('passcode') ?? (await this.nodeContext.get('matterpasscode'));
+        this.discriminator = getIntParameter('discriminator') ?? (await this.nodeContext.get('matterdiscriminator'));
         if (hasParameter('logger')) {
             const level = getParameter('logger');
             if (level === 'debug') {
@@ -1647,7 +1649,7 @@ export class Matterbridge extends EventEmitter {
         this.log.debug(`Creating matter commissioning server for plugin ${plg}${pluginName}${db} with uniqueId ${uniqueId} serialNumber ${serialNumber}`);
         this.log.debug(`Creating matter commissioning server for plugin ${plg}${pluginName}${db} with softwareVersion ${softwareVersion} softwareVersionString ${softwareVersionString}`);
         this.log.debug(`Creating matter commissioning server for plugin ${plg}${pluginName}${db} with hardwareVersion ${hardwareVersion} hardwareVersionString ${hardwareVersionString}`);
-        this.log.debug(`Creating matter commissioning server for plugin ${plg}${pluginName}${db} with nodeLabel '${productName}' port ${CYAN}${this.port}${db} passcode ${CYAN}${this.passcode}${db} discriminator ${CYAN}${this.discriminator}${db}`);
+        this.log.debug(`Creating matter commissioning server for plugin ${plg}${pluginName}${db} with nodeLabel '${productName}' port ${CYAN}${this.port}${db} discriminator ${CYAN}${this.discriminator}${db} passcode ${CYAN}${this.passcode}${db} `);
         if (this.ipv4address) {
             const networkInterfaces = os.networkInterfaces();
             const availableAddresses = Object.values(networkInterfaces)
@@ -2313,7 +2315,9 @@ export class Matterbridge extends EventEmitter {
             this.matterbridgeInformation.mattermdnsinterface = (await this.nodeContext?.get('mattermdnsinterface', '')) || '';
             this.matterbridgeInformation.matteripv4address = (await this.nodeContext?.get('matteripv4address', '')) || '';
             this.matterbridgeInformation.matteripv6address = (await this.nodeContext?.get('matteripv6address', '')) || '';
-            this.matterbridgeInformation.matterPort = (await this.nodeContext?.get('matterport', 5540)) || 5540;
+            this.matterbridgeInformation.matterPort = (await this.nodeContext?.get('matterport', 5540)) ?? 5540;
+            this.matterbridgeInformation.matterDiscriminator = await this.nodeContext?.get('matterdiscriminator');
+            this.matterbridgeInformation.matterPasscode = await this.nodeContext?.get('matterpasscode');
             this.matterbridgeInformation.matterbridgePaired = this.matterbridgePaired;
             this.matterbridgeInformation.matterbridgeConnected = this.matterbridgeConnected;
             this.matterbridgeInformation.matterbridgeQrPairingCode = this.matterbridgeQrPairingCode;
@@ -2634,11 +2638,27 @@ export class Matterbridge extends EventEmitter {
             if (command === 'setmatterport') {
                 const port = Math.min(Math.max(parseInt(param), 5540), 5560);
                 this.matterbridgeInformation.matterPort = port;
-                this.log.debug(`Set matter.js port to ${port}`);
+                this.log.debug(`Set matter commissioning port to ${CYAN}${port}${db}`);
                 await this.nodeContext?.set('matterport', port);
                 res.json({ message: 'Command received' });
                 return;
             }
+            if (command === 'setmatterdiscriminator') {
+                const discriminator = Math.min(Math.max(parseInt(param), 1000), 4095);
+                this.matterbridgeInformation.matterDiscriminator = discriminator;
+                this.log.debug(`Set matter commissioning discriminator to ${CYAN}${discriminator}${db}`);
+                await this.nodeContext?.set('matterdiscriminator', discriminator);
+                res.json({ message: 'Command received' });
+                return;
+            }
+            if (command === 'setmatterpasscode') {
+                const passcode = Math.min(Math.max(parseInt(param), 10000000), 90000000);
+                this.matterbridgeInformation.matterPasscode = passcode;
+                this.log.debug(`Set matter commissioning passcode to ${CYAN}${passcode}${db}`);
+                await this.nodeContext?.set('matterpasscode', passcode);
+                res.json({ message: 'Command received' });
+                return;
+            }
             if (command === 'setmblogfile') {
                 this.log.debug('Matterbridge file log:', param);
                 this.matterbridgeInformation.fileLogger = param === 'true';

package/dist/matterbridgeEdge.js

@@ -9,7 +9,7 @@ import { copyDirectory, getParameter, hasParameter } from './utils/utils.js';
 import { DeviceTypeId, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, VendorId, EndpointServer } from '@matter/main';
 import { ServerNode, Endpoint as EndpointNode, Environment, StorageService } from '@matter/main';
 import { BasicInformationCluster } from '@matter/main/clusters';
-import { FabricAction, MdnsService } from '@matter/main/protocol';
+import { FabricAction, MdnsService, PaseClient } from '@matter/main/protocol';
 import { GenericSwitchDevice } from '@matter/main/devices';
 import { AggregatorEndpoint } from '@matter/main/endpoints';
 import { BridgedDeviceBasicInformationServer, SwitchServer } from '@matter/main/behaviors';
@@ -49,8 +49,8 @@ export class MatterbridgeEdge extends Matterbridge {
         if (this.mdnsInterface)
             this.environment.vars.set('mdns.networkInterface', this.mdnsInterface);
         this.port = 5540;
-        this.passcode = 20242025;
-        this.discriminator = 3840;
+        this.passcode = PaseClient.generateRandomPasscode();
+        this.discriminator = PaseClient.generateRandomDiscriminator();
     }
     async startMatterStorage(storageType, storageName) {
         this.log.info(`Starting matter node storage...`);

package/dist/matterbridgeWebsocket.js

@@ -81,7 +81,9 @@ export async function wsMessageHandler(client, message) {
             this.matterbridgeInformation.mattermdnsinterface = (await this.nodeContext?.get('mattermdnsinterface', '')) || '';
             this.matterbridgeInformation.matteripv4address = (await this.nodeContext?.get('matteripv4address', '')) || '';
             this.matterbridgeInformation.matteripv6address = (await this.nodeContext?.get('matteripv6address', '')) || '';
-            this.matterbridgeInformation.matterPort = (await this.nodeContext?.get('matterport', 5540)) || 5540;
+            this.matterbridgeInformation.matterPort = (await this.nodeContext?.get('matterport', 5540)) ?? 5540;
+            this.matterbridgeInformation.matterDiscriminator = await this.nodeContext?.get('matterdiscriminator');
+            this.matterbridgeInformation.matterPasscode = await this.nodeContext?.get('matterpasscode');
             this.matterbridgeInformation.matterbridgePaired = this.matterbridgePaired;
             this.matterbridgeInformation.matterbridgeConnected = this.matterbridgeConnected;
             this.matterbridgeInformation.matterbridgeQrPairingCode = this.matterbridgeQrPairingCode;

package/frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.823e08b6.css",
-    "main.js": "./static/js/main.1bf53a29.js",
+    "main.js": "./static/js/main.cb537856.js",
     "static/js/453.abd36b29.chunk.js": "./static/js/453.abd36b29.chunk.js",
     "static/media/roboto-latin-700-normal.woff2": "./static/media/roboto-latin-700-normal.4535474e1cf8598695ad.woff2",
     "static/media/roboto-latin-500-normal.woff2": "./static/media/roboto-latin-500-normal.7077203b1982951ecf76.woff2",
@@ -61,11 +61,11 @@
     "static/media/roboto-greek-ext-400-normal.woff": "./static/media/roboto-greek-ext-400-normal.16eb83b4a3b1ea994243.woff",
     "index.html": "./index.html",
     "main.823e08b6.css.map": "./static/css/main.823e08b6.css.map",
-    "main.1bf53a29.js.map": "./static/js/main.1bf53a29.js.map",
+    "main.cb537856.js.map": "./static/js/main.cb537856.js.map",
     "453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.823e08b6.css",
-    "static/js/main.1bf53a29.js"
+    "static/js/main.cb537856.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.1bf53a29.js"></script><link href="./static/css/main.823e08b6.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.cb537856.js"></script><link href="./static/css/main.823e08b6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>