matterbridge 1.2.5 → 1.2.6

package/dist/matterbridge.js

@@ -31,7 +31,9 @@ import express from 'express';
 import os from 'os';
 import path from 'path';
 import { CommissioningController, CommissioningServer, MatterServer } from '@project-chip/matter-node.js';
-import { BasicInformationCluster, BooleanStateCluster, BridgedDeviceBasicInformationCluster, ClusterServer, GeneralCommissioning, PowerSourceCluster, ThreadNetworkDiagnosticsCluster } from '@project-chip/matter-node.js/cluster';
+import { BasicInformationCluster, BooleanStateCluster, 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster, ClusterServer, GeneralCommissioning, PowerSourceCluster, ThreadNetworkDiagnosticsCluster, getClusterNameById, } from '@project-chip/matter-node.js/cluster';
 import { DeviceTypeId, VendorId } from '@project-chip/matter-node.js/datatype';
 import { Aggregator, DeviceTypes, NodeStateInformation } from '@project-chip/matter-node.js/device';
 import { Format, Level, Logger } from '@project-chip/matter-node.js/log';
@@ -79,6 +81,7 @@ export class Matterbridge extends EventEmitter {
     matterbridgeLatestVersion = '';
     bridgeMode = '';
     debugEnabled = false;
+    port = 5540;
     log;
     hasCleanupStarted = false;
     registeredPlugins = [];
@@ -137,6 +140,8 @@ export class Matterbridge extends EventEmitter {
       - childbridge:           start Matterbridge in childbridge mode
       - frontend [port]:       start the frontend on the given port (default 3000)
       - debug:                 enable debug mode (default false)
+      - reset:                 remove the commissioning for Matterbridge (bridge mode). Shutdown Matterbridge before using it!
+      - factoryreset:          remove all commissioning information and reset all internal storages. Shutdown Matterbridge before using it!
       - list:                  list the registered plugins
       - add [plugin path]:     register the plugin from the given absolute or relative path
       - add [plugin name]:     register the globally installed plugin with the given name
@@ -145,9 +150,13 @@ export class Matterbridge extends EventEmitter {
       - enable [plugin path]:  enable the plugin from the given absolute or relative path
       - enable [plugin name]:  enable the globally installed plugin with the given name
       - disable [plugin path]: disable the plugin from the given absolute or relative path
-      - disable [plugin name]: disable the globally installed plugin with the given name\n`);
+      - disable [plugin name]: disable the globally installed plugin with the given name
+      - reset [plugin path]:   remove the commissioning for the plugin from the given absolute or relative path (childbridge mode). Shutdown Matterbridge before using it!
+      - reset [plugin name]:   remove the commissioning for the globally installed plugin (childbridge mode). Shutdown Matterbridge before using it!\n`);
             process.exit(0);
         }
+        // Set the first port to use
+        this.port = getIntParameter('port') ?? 5540;
         // Set Matterbridge logger
         if (hasParameter('debug'))
             this.debugEnabled = true;
@@ -225,6 +234,10 @@ export class Matterbridge extends EventEmitter {
         if (process.platform === 'win32' && command === 'npm') {
             command = command + '.cmd';
         }
+        if (process.platform === 'linux' && command === 'npm') {
+            args.unshift(command);
+            command = 'sudo';
+        }
         return new Promise((resolve, reject) => {
             const childProcess = spawn(command, args, {
                 stdio: 'inherit',
@@ -297,10 +310,33 @@ export class Matterbridge extends EventEmitter {
             this.emit('shutdown');
             process.exit(0);
         }
-        // Start the storage (we need it now for frontend and later for matterbridge)
+        if (hasParameter('factoryreset')) {
+            // Delete matter storage file
+            await fs.unlink(path.join(this.matterbridgeDirectory, 'matterbridge.json'));
+            // Delete node storage directory with its subdirectories
+            await fs.rmdir(path.join(this.matterbridgeDirectory, 'storage'), { recursive: true });
+            this.log.info('Factory reset done! Remove all paired devices from the controllers.');
+            this.emit('shutdown');
+            process.exit(0);
+        }
+        // Start the storage and create matterbridgeContext (we need it now for frontend and later for matterbridge)
         await this.startStorage('json', path.join(this.matterbridgeDirectory, 'matterbridge.json'));
-        this.log.debug(`Creating commissioning server context for ${plg}Matterbridge${db}`);
         this.matterbridgeContext = await this.createCommissioningServerContext('Matterbridge', 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge aggregator');
+        if (hasParameter('reset') && getParameter('reset') === undefined) {
+            this.log.info('Resetting Matterbridge commissioning information...');
+            await this.matterbridgeContext?.clearAll();
+            await this.stopStorage();
+            this.log.info('Reset done! Remove the device from the controller.');
+            this.emit('shutdown');
+            process.exit(0);
+        }
+        if (getParameter('reset') && getParameter('reset') !== undefined) {
+            this.log.debug(`Reset plugin ${getParameter('reset')}`);
+            await this.executeCommandLine(getParameter('reset'), 'reset');
+            await this.stopStorage();
+            this.emit('shutdown');
+            process.exit(0);
+        }
         // Initialize frontend
         await this.initializeFrontend(getIntParameter('frontend'));
         if (hasParameter('test')) {
@@ -311,9 +347,7 @@ export class Matterbridge extends EventEmitter {
         }
         if (hasParameter('controller')) {
             this.bridgeMode = 'controller';
-            this.log.info('Creating mattercontrollerContext: mattercontrollerContext');
-            this.mattercontrollerContext = this.storageManager?.createContext('mattercontrollerContext');
-            await this.startMatterbridge();
+            await this.startMattercontroller();
             return;
         }
         if (hasParameter('bridge')) {
@@ -464,6 +498,28 @@ export class Matterbridge extends EventEmitter {
                     this.log.warn(`Plugin ${plg}${packageJsonPath}${wr} not registerd in matterbridge`);
                 }
             }
+            else if (mode === 'reset') {
+                const plugin = this.registeredPlugins.find((registeredPlugin) => registeredPlugin.name === packageJson.name);
+                if (plugin) {
+                    plugin.loaded = undefined;
+                    plugin.started = undefined;
+                    plugin.configured = undefined;
+                    plugin.connected = undefined;
+                    plugin.paired = undefined;
+                    plugin.connected = undefined;
+                    if (!this.storageManager)
+                        this.log.error(`Plugin ${plg}${plugin.name}${er} storageManager not found`);
+                    const context = this.storageManager?.createContext(plugin.name);
+                    if (!context)
+                        this.log.error(`Plugin ${plg}${plugin.name}${er} context not found`);
+                    await context?.clearAll();
+                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    this.log.info(`Reset commissionig for plugin ${plg}${plugin.name}${nf} done! Remove the device from the controller.`);
+                }
+                else {
+                    this.log.warn(`Plugin ${plg}${packageJsonPath}${wr} not registerd in matterbridge`);
+                }
+            }
         }
         catch (err) {
             this.log.error(`Failed to load plugin from ${plg}${packageJsonPath}${er}: ${err}`);
@@ -524,7 +580,7 @@ export class Matterbridge extends EventEmitter {
                     await this.savePluginConfig(plugin);
                 }
                 else {
-                    this.log.warn(`Plugin ${plg}${plugin.name}${er} platform not found`);
+                    this.log.warn(`Plugin ${plg}${plugin.name}${wr} platform not found`);
                 }
             }
             // Set reachability to false
@@ -536,12 +592,34 @@ export class Matterbridge extends EventEmitter {
                 this.log.error(`Plugin ${plg}${registeredDevice.plugin}${er} not found`);
                 return;
               }
-              this.log.debug(`*-- device: ${dev}${registeredDevice.device.name}${db} plugin ${plg}${registeredDevice.plugin}${db} type ${GREEN}${plugin.type}${db}`);
-              if (this.bridgeMode === 'bridge') registeredDevice.device.setBridgedDeviceReachability(false);
-              if (this.bridgeMode === 'childbridge') plugin.commissioningServer?.setReachability(false);
-              if (this.bridgeMode === 'childbridge' && plugin.type === 'AccessoryPlatform') this.setReachableAttribute(registeredDevice.device, false);
-              if (this.bridgeMode === 'childbridge' && plugin.type === 'DynamicPlatform') registeredDevice.device.setBridgedDeviceReachability(false);
+              if (this.bridgeMode === 'bridge' && registeredDevice.device.number) {
+                this.log.debug(`*-- device: ${dev}${registeredDevice.device.name}${db} plugin ${plg}${registeredDevice.plugin}${db} type ${plugin.type}${db}`);
+                registeredDevice.device.setBridgedDeviceReachability(false);
+                registeredDevice.device.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.triggerReachableChangedEvent({ reachableNewValue: false });
+              }
+              if (this.bridgeMode === 'childbridge') {
+                if (plugin.type === 'DynamicPlatform' && registeredDevice.device.number) {
+                  this.log.debug(`*-- device: ${dev}${registeredDevice.device.name}${db} plugin ${plg}${registeredDevice.plugin}${db} type ${plugin.type}${db}`);
+                  registeredDevice.device.setBridgedDeviceReachability(false);
+                  registeredDevice.device.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.triggerReachableChangedEvent({ reachableNewValue: false });
+                }
+              }
             });
+            if (this.bridgeMode === 'bridge') {
+              this.log.debug('*Changing reachability to false for Matterbridge');
+              this.matterAggregator?.getClusterServerById(BasicInformation.Cluster.id)?.setReachableAttribute(false);
+              this.matterAggregator?.getClusterServerById(BasicInformation.Cluster.id)?.triggerReachableChangedEvent({ reachableNewValue: false });
+              this.commissioningServer?.setReachability(false);
+            }
+            if (this.bridgeMode === 'childbridge') {
+              for (const plugin of this.registeredPlugins) {
+                if (!plugin.enabled || plugin.error) continue;
+                this.log.debug(`*Changing reachability to false for plugin ${plg}${plugin.name}${db} type ${plugin.type}`);
+                plugin.aggregator?.getClusterServerById(BasicInformation.Cluster.id)?.setReachableAttribute(false);
+                plugin.aggregator?.getClusterServerById(BasicInformation.Cluster.id)?.triggerReachableChangedEvent({ reachableNewValue: false });
+                plugin.commissioningServer?.setReachability(false);
+              }
+            }
             */
             // Close the express server
             if (this.expressServer) {
@@ -717,8 +795,10 @@ export class Matterbridge extends EventEmitter {
             this.log.warn(`Removing bridged device ${dev}${device.deviceName}${wr} (${dev}${device.name}${wr}) plugin ${plg}${pluginName}${wr} not connected`);
             return;
         }
-        // Register and add the device to matterbridge aggregator in bridge mode
+        // Remove the device from matterbridge aggregator in bridge mode
         if (this.bridgeMode === 'bridge') {
+            device.setBridgedDeviceReachability(false);
+            device.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.triggerReachableChangedEvent({ reachableNewValue: false });
             this.matterAggregator.removeBridgedDevice(device);
             this.registeredDevices.forEach((registeredDevice, index) => {
                 if (registeredDevice.device === device) {
@@ -735,7 +815,7 @@ export class Matterbridge extends EventEmitter {
         // Only register the device in childbridge mode
         if (this.bridgeMode === 'childbridge') {
             if (plugin.type === 'AccessoryPlatform') {
-                this.log.warn(`Removing bridged device ${dev}${device.deviceName}${wr} (${dev}${device.name}${wr}) for plugin ${plg}${pluginName}${wr} error: AccessoryPlatform not supported in childbridge mode`);
+                this.log.warn(`Removing bridged device ${dev}${device.deviceName}${wr} (${dev}${device.name}${wr}) for plugin ${plg}${pluginName}${wr}: AccessoryPlatform not supported in childbridge mode`);
             }
             else if (plugin.type === 'DynamicPlatform') {
                 this.registeredDevices.forEach((registeredDevice, index) => {
@@ -744,6 +824,8 @@ export class Matterbridge extends EventEmitter {
                         return;
                     }
                 });
+                device.setBridgedDeviceReachability(false);
+                device.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.triggerReachableChangedEvent({ reachableNewValue: false });
                 plugin.aggregator.removeBridgedDevice(device);
             }
             this.log.info(`Removed bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
@@ -1158,20 +1240,23 @@ export class Matterbridge extends EventEmitter {
         }
     }
     /**
-     * Starts the Matterbridge based on the bridge mode.
-     * If the bridge mode is 'bridge', it creates a commissioning server, matter aggregator,
-     * and starts the matter server.
-     * If the bridge mode is 'childbridge', it starts the plugins, creates commissioning servers,
-     * and starts the matter server when all plugins are loaded and started.
+     * Starts the Matterbridge controller.
      * @private
      * @returns {Promise<void>} A promise that resolves when the Matterbridge is started.
      */
-    async startMatterbridge() {
+    async startMattercontroller() {
         if (!this.storageManager) {
             this.log.error('No storage manager initialized');
             await this.cleanup('No storage manager initialized');
             return;
         }
+        this.log.info('Creating context: mattercontrollerContext');
+        this.mattercontrollerContext = this.storageManager.createContext('mattercontrollerContext');
+        if (!this.mattercontrollerContext) {
+            this.log.error('No storage context mattercontrollerContext initialized');
+            await this.cleanup('No storage context mattercontrollerContext initialized');
+            return;
+        }
         this.log.debug('Starting matterbridge in mode', this.bridgeMode);
         this.createMatterServer(this.storageManager);
         if (!this.matterServer) {
@@ -1179,139 +1264,167 @@ export class Matterbridge extends EventEmitter {
             await this.cleanup('No matter server initialized');
             return;
         }
-        if (this.bridgeMode === 'controller') {
-            if (!this.mattercontrollerContext) {
-                this.log.error('No matter controller context initialized');
-                await this.cleanup('No matter controller context initialized');
-                return;
+        this.log.info('Creating matter commissioning controller');
+        this.commissioningController = new CommissioningController({
+            autoConnect: false,
+        });
+        this.log.info('Adding matter commissioning controller to matter server');
+        await this.matterServer.addCommissioningController(this.commissioningController);
+        this.log.info('Starting matter server');
+        await this.matterServer.start();
+        this.log.info('Matter server started');
+        if (hasParameter('pairingcode')) {
+            this.log.info('Pairing device with pairingcode:', getParameter('pairingcode'));
+            const pairingCode = getParameter('pairingcode');
+            const ip = this.mattercontrollerContext.has('ip') ? this.mattercontrollerContext.get('ip') : undefined;
+            const port = this.mattercontrollerContext.has('port') ? this.mattercontrollerContext.get('port') : undefined;
+            let longDiscriminator, setupPin, shortDiscriminator;
+            if (pairingCode !== undefined) {
+                const pairingCodeCodec = ManualPairingCodeCodec.decode(pairingCode);
+                shortDiscriminator = pairingCodeCodec.shortDiscriminator;
+                longDiscriminator = undefined;
+                setupPin = pairingCodeCodec.passcode;
+                this.log.info(`Data extracted from pairing code: ${Logger.toJSON(pairingCodeCodec)}`);
             }
-            this.log.info('Creating matter commissioning controller');
-            this.commissioningController = new CommissioningController({
-                autoConnect: false,
-            });
-            this.log.info('Adding matter commissioning controller to matter server');
-            await this.matterServer.addCommissioningController(this.commissioningController);
-            this.log.info('Starting matter server');
-            await this.matterServer.start();
-            this.log.info('Matter server started');
-            if (hasParameter('pairingcode')) {
-                const pairingCode = getParameter('pairingcode');
-                const ip = this.mattercontrollerContext.has('ip') ? this.mattercontrollerContext.get('ip') : undefined;
-                const port = this.mattercontrollerContext.has('port') ? this.mattercontrollerContext.get('port') : undefined;
-                let longDiscriminator, setupPin, shortDiscriminator;
-                if (pairingCode !== undefined) {
-                    const pairingCodeCodec = ManualPairingCodeCodec.decode(pairingCode);
-                    shortDiscriminator = pairingCodeCodec.shortDiscriminator;
-                    longDiscriminator = undefined;
-                    setupPin = pairingCodeCodec.passcode;
-                    this.log.info(`Data extracted from pairing code: ${Logger.toJSON(pairingCodeCodec)}`);
-                }
-                else {
-                    longDiscriminator = await this.mattercontrollerContext.get('longDiscriminator', 3840);
-                    if (longDiscriminator > 4095)
-                        throw new Error('Discriminator value must be less than 4096');
-                    setupPin = this.mattercontrollerContext.get('pin', 20202021);
-                }
-                if ((shortDiscriminator === undefined && longDiscriminator === undefined) || setupPin === undefined) {
-                    throw new Error('Please specify the longDiscriminator of the device to commission with -longDiscriminator or provide a valid passcode with -passcode');
-                }
-                const commissioningOptions = {
-                    regulatoryLocation: GeneralCommissioning.RegulatoryLocationType.IndoorOutdoor,
-                    regulatoryCountryCode: 'XX',
-                };
-                const options = {
-                    commissioning: commissioningOptions,
-                    discovery: {
-                        knownAddress: ip !== undefined && port !== undefined ? { ip, port, type: 'udp' } : undefined,
-                        identifierData: longDiscriminator !== undefined ? { longDiscriminator } : shortDiscriminator !== undefined ? { shortDiscriminator } : {},
-                    },
-                    passcode: setupPin,
-                };
-                //this.log.info(`Commissioning ... ${JSON.stringify(options)}`);
-                this.log.info('Commissioning ...', options);
-                const nodeId = await this.commissioningController.commissionNode(options);
-                this.mattercontrollerContext.set('nodeId', nodeId.nodeId);
-                this.log.info(`Commissioning successfully done with nodeId: ${nodeId.nodeId}`);
-                // eslint-disable-next-line no-console
-                this.log.info('ActiveSessionInformation:', this.commissioningController.getActiveSessionInformation());
-            } // (hasParameter('pairingcode'))
-            if (hasParameter('discover')) {
-                //const discover = await this.commissioningController.discoverCommissionableDevices({ productId: 0x8000, deviceType: 0xfff1 });
-                //console.log(discover);
+            else {
+                longDiscriminator = await this.mattercontrollerContext.get('longDiscriminator', 3840);
+                if (longDiscriminator > 4095)
+                    throw new Error('Discriminator value must be less than 4096');
+                setupPin = this.mattercontrollerContext.get('pin', 20202021);
+            }
+            if ((shortDiscriminator === undefined && longDiscriminator === undefined) || setupPin === undefined) {
+                throw new Error('Please specify the longDiscriminator of the device to commission with -longDiscriminator or provide a valid passcode with -passcode');
             }
+            const commissioningOptions = {
+                regulatoryLocation: GeneralCommissioning.RegulatoryLocationType.IndoorOutdoor,
+                regulatoryCountryCode: 'XX',
+            };
+            const options = {
+                commissioning: commissioningOptions,
+                discovery: {
+                    knownAddress: ip !== undefined && port !== undefined ? { ip, port, type: 'udp' } : undefined,
+                    identifierData: longDiscriminator !== undefined ? { longDiscriminator } : shortDiscriminator !== undefined ? { shortDiscriminator } : {},
+                },
+                passcode: setupPin,
+            };
+            this.log.info('Commissioning with options:', options);
+            const nodeId = await this.commissioningController.commissionNode(options);
+            this.log.info(`Commissioning successfully done with nodeId: ${nodeId.nodeId}`);
+            this.log.info('ActiveSessionInformation:', this.commissioningController.getActiveSessionInformation());
+        } // (hasParameter('pairingcode'))
+        if (hasParameter('unpairall')) {
+            this.log.info('***Commissioning controller unpairing all nodes...');
             const nodeIds = this.commissioningController.getCommissionedNodes();
-            this.log.info(`***Commissioning controller has ${nodeIds.length} nodes commisioned: ${this.commissioningController.isCommissioned()}`);
             for (const nodeId of nodeIds) {
-                this.log.info(`***Connecting to commissioned node: ${nodeId}`);
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const node = await this.commissioningController.connectNode(nodeId, {
-                    attributeChangedCallback: (peerNodeId, { path: { nodeId, clusterId, endpointId, attributeName }, value }) => this.log.info(`***mattributeChangedCallback ${peerNodeId}: Attribute ${nodeId}/${endpointId}/${clusterId}/${attributeName} changed to ${Logger.toJSON(value)}`),
-                    eventTriggeredCallback: (peerNodeId, { path: { nodeId, clusterId, endpointId, eventName }, events }) => this.log.info(`***eventTriggeredCallback ${peerNodeId}: Event ${nodeId}/${endpointId}/${clusterId}/${eventName} triggered with ${Logger.toJSON(events)}`),
-                    stateInformationCallback: (peerNodeId, info) => {
-                        switch (info) {
-                            case NodeStateInformation.Connected:
-                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} connected`);
-                                break;
-                            case NodeStateInformation.Disconnected:
-                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} disconnected`);
-                                break;
-                            case NodeStateInformation.Reconnecting:
-                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} reconnecting`);
-                                break;
-                            case NodeStateInformation.WaitingForDeviceDiscovery:
-                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} waiting for device discovery`);
-                                break;
-                            case NodeStateInformation.StructureChanged:
-                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} structure changed`);
-                                break;
-                            case NodeStateInformation.Decommissioned:
-                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} decommissioned`);
-                                break;
-                            default:
-                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} NodeStateInformation.${info}`);
-                                break;
-                        }
-                    },
-                });
-                node.logStructure();
-                // Get the interaction client
-                const interactionClient = await node.getInteractionClient();
-                let cluster;
-                let attributes;
-                // Log BasicInformationCluster
-                cluster = BasicInformationCluster;
-                attributes = await interactionClient.getMultipleAttributes({
-                    attributes: [{ clusterId: cluster.id }],
-                });
-                this.log.warn(`Cluster: ${cluster.name} attributes:`);
-                attributes.forEach((attribute) => {
-                    this.log.info(
-                    // eslint-disable-next-line max-len
-                    `- endpoint: ${attribute.path.endpointId} clusterId: ${attribute.path.clusterId} id: ${attribute.path.attributeId} name: ${attribute.path.attributeName}: ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`);
-                });
-                // Log PowerSourceCluster
-                cluster = PowerSourceCluster;
-                attributes = await interactionClient.getMultipleAttributes({
-                    attributes: [{ clusterId: cluster.id }],
-                });
-                this.log.warn(`Cluster: ${cluster.name} attributes:`);
-                attributes.forEach((attribute) => {
-                    this.log.info(
-                    // eslint-disable-next-line max-len
-                    `- endpoint: ${attribute.path.endpointId} clusterId: ${attribute.path.clusterId} id: ${attribute.path.attributeId} name: ${attribute.path.attributeName}: ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`);
-                });
-                // Log ThreadNetworkDiagnostics
-                cluster = ThreadNetworkDiagnosticsCluster;
-                attributes = await interactionClient.getMultipleAttributes({
-                    attributes: [{ clusterId: cluster.id }],
-                });
-                this.log.warn(`Cluster: ${cluster.name} attributes:`);
-                attributes.forEach((attribute) => {
-                    this.log.info(
-                    // eslint-disable-next-line max-len
-                    `- endpoint: ${attribute.path.endpointId} clusterId: ${attribute.path.clusterId} id: ${attribute.path.attributeId} name: ${attribute.path.attributeName}: ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`);
-                });
+                this.log.info('***Commissioning controller unpairing node:', nodeId);
+                await this.commissioningController.removeNode(nodeId);
             }
+            return;
+        }
+        if (hasParameter('discover')) {
+            //const discover = await this.commissioningController.discoverCommissionableDevices({ productId: 0x8000, deviceType: 0xfff1 });
+            //console.log(discover);
+        }
+        if (!this.commissioningController.isCommissioned()) {
+            this.log.info('***Commissioning controller is not commissioned: use matterbridge -controller -pairingcode [pairingcode] to commission a device');
+            return;
+        }
+        const nodeIds = this.commissioningController.getCommissionedNodes();
+        this.log.info(`***Commissioning controller is commissioned ${this.commissioningController.isCommissioned()} and has ${nodeIds.length} nodes commisioned: `);
+        for (const nodeId of nodeIds) {
+            this.log.info(`***Connecting to commissioned node: ${nodeId}`);
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            const node = await this.commissioningController.connectNode(nodeId, {
+                attributeChangedCallback: (peerNodeId, { path: { nodeId, clusterId, endpointId, attributeName }, value }) => this.log.info(`***Commissioning controller attributeChangedCallback ${peerNodeId}: attribute ${nodeId}/${endpointId}/${clusterId}/${attributeName} changed to ${Logger.toJSON(value)}`),
+                eventTriggeredCallback: (peerNodeId, { path: { nodeId, clusterId, endpointId, eventName }, events }) => this.log.info(`***Commissioning controller eventTriggeredCallback ${peerNodeId}: Event ${nodeId}/${endpointId}/${clusterId}/${eventName} triggered with ${Logger.toJSON(events)}`),
+                stateInformationCallback: (peerNodeId, info) => {
+                    switch (info) {
+                        case NodeStateInformation.Connected:
+                            this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} connected`);
+                            break;
+                        case NodeStateInformation.Disconnected:
+                            this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} disconnected`);
+                            break;
+                        case NodeStateInformation.Reconnecting:
+                            this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} reconnecting`);
+                            break;
+                        case NodeStateInformation.WaitingForDeviceDiscovery:
+                            this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} waiting for device discovery`);
+                            break;
+                        case NodeStateInformation.StructureChanged:
+                            this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} structure changed`);
+                            break;
+                        case NodeStateInformation.Decommissioned:
+                            this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} decommissioned`);
+                            break;
+                        default:
+                            this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} NodeStateInformation.${info}`);
+                            break;
+                    }
+                },
+            });
+            //node.logStructure();
+            // Get the interaction client
+            this.log.info('Getting the interaction client');
+            const interactionClient = await node.getInteractionClient();
+            let cluster;
+            let attributes;
+            // Log BasicInformationCluster
+            cluster = BasicInformationCluster;
+            attributes = await interactionClient.getMultipleAttributes({
+                attributes: [{ clusterId: cluster.id }],
+            });
+            this.log.warn(`Cluster: ${cluster.name} attributes:`);
+            attributes.forEach((attribute) => {
+                this.log.info(
+                // eslint-disable-next-line max-len
+                `- endpoint ${attribute.path.endpointId} cluster ${getClusterNameById(attribute.path.clusterId)} (${attribute.path.clusterId}) attribute ${attribute.path.attributeName} (${attribute.path.attributeId}): ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`);
+            });
+            // Log PowerSourceCluster
+            cluster = PowerSourceCluster;
+            attributes = await interactionClient.getMultipleAttributes({
+                attributes: [{ clusterId: cluster.id }],
+            });
+            this.log.warn(`Cluster: ${cluster.name} attributes:`);
+            attributes.forEach((attribute) => {
+                this.log.info(
+                // eslint-disable-next-line max-len
+                `- endpoint ${attribute.path.endpointId} cluster ${getClusterNameById(attribute.path.clusterId)} (${attribute.path.clusterId}) attribute ${attribute.path.attributeName} (${attribute.path.attributeId}): ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`);
+            });
+            // Log ThreadNetworkDiagnostics
+            cluster = ThreadNetworkDiagnosticsCluster;
+            attributes = await interactionClient.getMultipleAttributes({
+                attributes: [{ clusterId: cluster.id }],
+            });
+            this.log.warn(`Cluster: ${cluster.name} attributes:`);
+            attributes.forEach((attribute) => {
+                this.log.info(
+                // eslint-disable-next-line max-len
+                `- endpoint ${attribute.path.endpointId} cluster ${getClusterNameById(attribute.path.clusterId)} (${attribute.path.clusterId}) attribute ${attribute.path.attributeName} (${attribute.path.attributeId}): ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`);
+            });
+        }
+    }
+    /**
+     * Starts the Matterbridge based on the bridge mode.
+     * If the bridge mode is 'bridge', it creates a commissioning server, matter aggregator,
+     * and starts the matter server.
+     * If the bridge mode is 'childbridge', it starts the plugins, creates commissioning servers,
+     * and starts the matter server when all plugins are loaded and started.
+     * @private
+     * @returns {Promise<void>} A promise that resolves when the Matterbridge is started.
+     */
+    async startMatterbridge() {
+        if (!this.storageManager) {
+            this.log.error('No storage manager initialized');
+            await this.cleanup('No storage manager initialized');
+            return;
+        }
+        this.log.debug('Starting matterbridge in mode', this.bridgeMode);
+        this.createMatterServer(this.storageManager);
+        if (!this.matterServer) {
+            this.log.error('No matter server initialized');
+            await this.cleanup('No matter server initialized');
+            return;
         }
         if (this.bridgeMode === 'bridge') {
             // Plugins are loaded by loadPlugin on startup and plugin.loaded is set to true
@@ -1362,6 +1475,7 @@ export class Matterbridge extends EventEmitter {
                 await this.startMatterServer();
                 this.log.info('Matter server started');
                 await this.showCommissioningQRCode(this.commissioningServer, this.matterbridgeContext, this.nodeContext, 'Matterbridge');
+                //if (hasParameter('advertise')) await this.commissioningServer.advertise();
                 /*
                 setInterval(() => {
                   this.matterAggregator?.getBridgedDevices().forEach((device) => {
@@ -1445,6 +1559,7 @@ export class Matterbridge extends EventEmitter {
                 });
                 if (!allStarted)
                     return;
+                clearInterval(startMatterInterval);
                 this.log.info('Starting matter server...');
                 // Setting reachability to true
                 this.registeredPlugins.forEach((plugin) => {
@@ -1481,7 +1596,7 @@ export class Matterbridge extends EventEmitter {
                     await this.showCommissioningQRCode(plugin.commissioningServer, plugin.storageContext, plugin.nodeContext, plugin.name);
                 }
                 Logger.defaultLogLevel = this.debugEnabled ? Level.DEBUG : Level.INFO;
-                clearInterval(startMatterInterval);
+                //clearInterval(startMatterInterval);
             }, 1000);
         }
     }
@@ -1555,9 +1670,9 @@ export class Matterbridge extends EventEmitter {
         await storageContext.set('softwareVersionString', softwareVersionString ?? '1.0.0');
         await storageContext.set('hardwareVersion', hardwareVersion ?? 1);
         await storageContext.set('hardwareVersionString', hardwareVersionString ?? '1.0.0');
-        this.log.debug(`**Created commissioning server storage context for ${plg}${pluginName}${db}`);
-        this.log.debug(`**- softwareVersion: ${await storageContext.get('softwareVersion')} softwareVersionString: ${await storageContext.get('softwareVersionString')}`);
-        this.log.debug(`**- hardwareVersion: ${await storageContext.get('hardwareVersion')} hardwareVersionString: ${await storageContext.get('hardwareVersionString')}`);
+        this.log.debug(`Created commissioning server storage context for ${plg}${pluginName}${db}`);
+        this.log.debug(`- softwareVersion: ${await storageContext.get('softwareVersion')} softwareVersionString: ${await storageContext.get('softwareVersionString')}`);
+        this.log.debug(`- hardwareVersion: ${await storageContext.get('hardwareVersion')} hardwareVersionString: ${await storageContext.get('hardwareVersionString')}`);
         return storageContext;
     }
     /**
@@ -1572,7 +1687,7 @@ export class Matterbridge extends EventEmitter {
         if (!commissioningServer || !storageContext || !pluginName)
             return;
         if (!commissioningServer.isCommissioned()) {
-            this.log.info(`***The commissioning server for ${plg}${pluginName}${nf} is not commissioned. Pair it scanning the QR code ...`);
+            this.log.info(`***The commissioning server on port ${commissioningServer.getPort()} for ${plg}${pluginName}${nf} is not commissioned. Pair it scanning the QR code ...`);
             const { qrPairingCode, manualPairingCode } = commissioningServer.getPairingCode();
             storageContext.set('qrPairingCode', qrPairingCode);
             storageContext.set('manualPairingCode', manualPairingCode);
@@ -1591,7 +1706,7 @@ export class Matterbridge extends EventEmitter {
             await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
         }
         else {
-            this.log.info(`***The commissioning server for ${plg}${pluginName}${nf} is already commissioned. Waiting for controllers to connect ...`);
+            this.log.info(`***The commissioning server on port ${commissioningServer.getPort()} for ${plg}${pluginName}${nf} is already commissioned . Waiting for controllers to connect ...`);
             if (pluginName !== 'Matterbridge') {
                 const plugin = this.findPlugin(pluginName);
                 if (plugin) {
@@ -1641,7 +1756,7 @@ export class Matterbridge extends EventEmitter {
         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}`);
         const commissioningServer = new CommissioningServer({
-            port: undefined,
+            port: this.port++,
             passcode: undefined,
             discriminator: undefined,
             deviceName,
@@ -1728,9 +1843,7 @@ export class Matterbridge extends EventEmitter {
                     this.log.warn(`***Commissioning removed from fabric ${fabricIndex} for ${plg}${pluginName}${nf}. Resetting the commissioning server ...`);
                     await commissioningServer.factoryReset();
                     if (pluginName === 'Matterbridge') {
-                        this.matterbridgeContext?.delete(`${pluginName}.EndpointStructure`);
-                        this.matterbridgeContext?.delete(`${pluginName}.EventHandler`);
-                        this.matterbridgeContext?.delete(`${pluginName}.SessionManager`);
+                        await this.matterbridgeContext?.clearAll();
                     }
                     else {
                         for (const plugin of this.registeredPlugins) {
@@ -1738,9 +1851,7 @@ export class Matterbridge extends EventEmitter {
                                 await plugin.platform?.onShutdown('Commissioning removed by the controller');
                                 plugin.paired = false;
                                 plugin.connected = false;
-                                plugin.storageContext?.delete(`${pluginName}.EndpointStructure`);
-                                plugin.storageContext?.delete(`${pluginName}.EventHandler`);
-                                plugin.storageContext?.delete(`${pluginName}.SessionManager`);
+                                await plugin.storageContext?.clearAll();
                             }
                         }
                     }