@matterbridge/core 3.5.6-dev-20260222-9aca698 → 3.5.6-dev-20260223-7c65d78

package/dist/jestutils/jestHelpers.js

@@ -255,7 +255,7 @@ export async function createMatterbridgeEnvironment(name) {
     matterbridge = await Matterbridge.loadInstance(false);
     expect(matterbridge).toBeDefined();
     expect(matterbridge).toBeInstanceOf(Matterbridge);
-    matterbridge.matterbridgeVersion = '3.5.5';
+    matterbridge.matterbridgeVersion = '3.5.6';
     matterbridge.bridgeMode = 'bridge';
     matterbridge.rootDirectory = path.join('jest', name);
     matterbridge.homeDirectory = path.join('jest', name);

package/dist/matterbridge.d.ts

@@ -102,6 +102,11 @@ export declare class Matterbridge extends EventEmitter<MatterbridgeEvents> {
     aggregatorDeviceType: DeviceTypeId;
     aggregatorSerialNumber: string | undefined;
     aggregatorUniqueId: string | undefined;
+    controllerNode: ServerNode<ServerNode.RootEndpoint> | undefined;
+    controllerVendorId: VendorId;
+    controllerVendorName: string;
+    controllerProductId: number;
+    controllerProductName: string;
     advertisingNodes: Map<string, number>;
     private readonly server;
     private readonly verbose;

package/dist/matterbridge.js

@@ -21,6 +21,7 @@ import { NodeStorageManager } from 'node-persist-manager';
 import { DeviceManager } from './deviceManager.js';
 import { Frontend } from './frontend.js';
 import { addVirtualDevice, addVirtualDevices } from './helpers.js';
+import { ManualPairingCodeCodec } from './matter/types.js';
 import { bridge } from './matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
 import { PluginManager } from './pluginManager.js';
@@ -121,6 +122,11 @@ export class Matterbridge extends EventEmitter {
     aggregatorDeviceType = DeviceTypeId(getIntParameter('deviceType') ?? bridge.code);
     aggregatorSerialNumber = getParameter('serialNumber');
     aggregatorUniqueId = getParameter('uniqueId');
+    controllerNode;
+    controllerVendorId = VendorId(getIntParameter('vendorId') ?? 0xfff1);
+    controllerVendorName = getParameter('vendorName') ?? 'Matterbridge';
+    controllerProductId = getIntParameter('productId') ?? 0x8000;
+    controllerProductName = getParameter('productName') ?? 'Matterbridge controller';
     advertisingNodes = new Map();
     server;
     verbose = hasParameter('verbose');
@@ -534,6 +540,7 @@ export class Matterbridge extends EventEmitter {
         await this.plugins.loadFromStorage();
         this.devices.logLevel = this.log.logLevel;
         for (const plugin of this.plugins) {
+            this.log.debug(`Parsing plugin ${plg}${plugin.name}${db} from path ${CYAN}${plugin.path}${db} with version ${CYAN}${plugin.version}${db} and type ${CYAN}${plugin.type}${db}.`);
             if (!fs.existsSync(plugin.path) &&
                 !hasParameter('add') &&
                 !hasParameter('remove') &&
@@ -1121,6 +1128,12 @@ export class Matterbridge extends EventEmitter {
                 }
             }
             this.log.notice('Stopped matter server nodes');
+            if (this.controllerNode) {
+                this.log.notice(`Stopping matter controller...`);
+                await this.stopServerNode(this.controllerNode);
+                this.controllerNode = undefined;
+                this.log.notice('Stopped matter controller');
+            }
             if (message === 'shutting down with reset...') {
                 this.log.info('Resetting Matterbridge commissioning information...');
                 await this.matterStorageManager?.createContext('events')?.clearAll();
@@ -1455,6 +1468,95 @@ export class Matterbridge extends EventEmitter {
         }, Number(process.env['MATTERBRIDGE_START_MATTER_INTERVAL_MS']) || this.startMatterIntervalMs);
     }
     async startController() {
+        if (!this.matterStorageManager) {
+            this.log.error('No storage manager initialized');
+            await this.cleanup('No storage manager initialized');
+            return;
+        }
+        if (!this.matterStorageService) {
+            this.log.error('No storage service initialized');
+            await this.cleanup('No storage service initialized');
+            return;
+        }
+        this.matterStorageManager = await this.matterStorageService.open('MatterbridgeController');
+        this.log.info('Matter node storage manager "MatterbridgeController" created');
+        this.log.info('Creating context controllerContext...');
+        this.controllerContext = this.matterStorageManager.createContext('controllerContext');
+        if (!this.controllerContext) {
+            this.log.error('No storage context controllerContext initialized');
+            await this.cleanup('No storage context controllerContext initialized');
+            return;
+        }
+        const { randomBytes } = await import('node:crypto');
+        const storeId = 'MatterbridgeController';
+        const random = randomBytes(8).toString('hex');
+        await this.controllerContext.set('storeId', storeId);
+        await this.controllerContext.set('vendorId', this.controllerVendorId);
+        await this.controllerContext.set('vendorName', this.controllerVendorName.slice(0, 32));
+        await this.controllerContext.set('productId', this.controllerProductId);
+        await this.controllerContext.set('productName', this.controllerProductName.slice(0, 32));
+        await this.controllerContext.set('productLabel', this.controllerProductName.slice(0, 32));
+        await this.controllerContext.set('nodeLabel', storeId.slice(0, 32));
+        await this.controllerContext.set('serialNumber', await this.controllerContext.get('serialNumber', 'SN' + random));
+        await this.controllerContext.set('uniqueId', await this.controllerContext.get('uniqueId', 'UI' + random));
+        await this.controllerContext.set('softwareVersion', isValidNumber(parseVersionString(this.matterbridgeVersion), 0, UINT32_MAX) ? parseVersionString(this.matterbridgeVersion) : 1);
+        await this.controllerContext.set('softwareVersionString', isValidString(this.matterbridgeVersion, 5, 64) ? this.matterbridgeVersion : '1.0.0');
+        await this.controllerContext.set('hardwareVersion', isValidNumber(parseVersionString(this.systemInformation.osRelease), 0, UINT16_MAX) ? parseVersionString(this.systemInformation.osRelease) : 1);
+        await this.controllerContext.set('hardwareVersionString', isValidString(this.systemInformation.osRelease, 5, 64) ? this.systemInformation.osRelease : '1.0.0');
+        this.log.info('Creating matter commissioning controller...');
+        this.controllerNode = await ServerNode.create({
+            id: storeId,
+            environment: this.environment,
+            network: {
+                listeningAddressIpv4: this.ipv4Address,
+                listeningAddressIpv6: this.ipv6Address,
+                port: this.port,
+            },
+            basicInformation: {
+                nodeLabel: await this.controllerContext.get('nodeLabel'),
+                vendorId: VendorId(await this.controllerContext.get('vendorId')),
+                vendorName: await this.controllerContext.get('vendorName'),
+                productId: await this.controllerContext.get('productId'),
+                productName: await this.controllerContext.get('productName'),
+                productLabel: await this.controllerContext.get('productLabel'),
+                serialNumber: await this.controllerContext.get('serialNumber'),
+                uniqueId: await this.controllerContext.get('uniqueId'),
+                softwareVersion: await this.controllerContext.get('softwareVersion'),
+                softwareVersionString: await this.controllerContext.get('softwareVersionString'),
+                hardwareVersion: await this.controllerContext.get('hardwareVersion'),
+                hardwareVersionString: await this.controllerContext.get('hardwareVersionString'),
+                reachable: true,
+            },
+        });
+        this.log.info(`Starting matter commissioning controller: ${this.controllerNode.peers.size} peer nodes...`);
+        if (hasParameter('pair')) {
+            let options;
+            if (hasParameter('pairingcode')) {
+                const pairingCode = getParameter('pairingcode');
+                this.log.info(`Pairing device with pairingcode: ${pairingCode}`);
+                const pairingData = ManualPairingCodeCodec.decode(pairingCode);
+                this.log.info(`Data extracted from pairing code: ${Logger.toJSON(pairingData)}`);
+                options = { id: 'device', pairingCode };
+            }
+            else {
+                const discriminator = getIntParameter('discriminator');
+                const passcode = getIntParameter('passcode') ?? 0;
+                options = { id: 'device', discriminator, passcode };
+            }
+            this.log.info('Commissioning with options:', options);
+            const nodeId = this.controllerNode.peers.commission(options);
+            this.log.info(`Commissioning successfully done with nodeId: ${nodeId}`);
+        }
+        if (hasParameter('unpairall')) {
+            this.log.info('Matter commissioning controller decommissioning all nodes...');
+            const nodeIds = this.controllerNode.peers;
+            for (const nodeId of nodeIds) {
+                this.log.info('Matter commissioning controller decommissioning node:', nodeId.id);
+                await nodeId.decommission();
+            }
+            this.log.info('Matter commissioning controller decommissioned all nodes');
+            return;
+        }
     }
     async startMatterStorage() {
         this.log.info(`Starting matter node storage...`);
@@ -1651,7 +1753,7 @@ export class Matterbridge extends EventEmitter {
             id: serverNode.id,
             online: serverNode.lifecycle.isOnline,
             commissioned: serverNode.state.commissioning.commissioned,
-            advertising: advertiseTime > Date.now() - 15 * 60 * 1000,
+            advertising: true,
             advertiseTime,
             windowStatus: serverNode.state.administratorCommissioning.windowStatus,
             qrPairingCode: serverNode.state.commissioning.pairingCodes.qrPairingCode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.5.6-dev-20260222-9aca698",
+  "version": "3.5.6-dev-20260223-7c65d78",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -121,11 +121,11 @@
     "CHANGELOG.md"
   ],
   "dependencies": {
-    "@matter/main": "0.16.8",
-    "@matterbridge/dgram": "3.5.6-dev-20260222-9aca698",
-    "@matterbridge/thread": "3.5.6-dev-20260222-9aca698",
-    "@matterbridge/types": "3.5.6-dev-20260222-9aca698",
-    "@matterbridge/utils": "3.5.6-dev-20260222-9aca698",
+    "@matter/main": "0.16.10",
+    "@matterbridge/dgram": "3.5.6-dev-20260223-7c65d78",
+    "@matterbridge/thread": "3.5.6-dev-20260223-7c65d78",
+    "@matterbridge/types": "3.5.6-dev-20260223-7c65d78",
+    "@matterbridge/utils": "3.5.6-dev-20260223-7c65d78",
     "archiver": "7.0.1",
     "express": "5.2.1",
     "glob": "13.0.6",