matterbridge 1.1.11 → 1.2.0

package/dist/matterbridge.js

@@ -4,7 +4,7 @@
  * @file matterbridge.ts
  * @author Luca Liguori
  * @date 2023-12-29
- * @version 1.1.1
+ * @version 1.2.0
  *
  * Copyright 2023, 2024 Luca Liguori.
  *
@@ -102,7 +102,9 @@ export class Matterbridge extends EventEmitter {
     /**
      * Loads an instance of the Matterbridge class.
      * If an instance already exists, return that instance.
-     * @returns The loaded instance of the Matterbridge class.
+     *
+     * @param initialize - Whether to initialize the Matterbridge instance after loading.
+     * @returns The loaded Matterbridge instance.
      */
     static async loadInstance(initialize = false) {
         if (!Matterbridge.instance) {
@@ -129,10 +131,6 @@ export class Matterbridge extends EventEmitter {
      * @returns A Promise that resolves when the initialization is complete.
      */
     async initialize() {
-        /*
-        const wtf = await import('wtfnode');
-        wtf.dump();
-        */
         // Display the help
         if (hasParameter('help')) {
             // eslint-disable-next-line no-console
@@ -163,7 +161,7 @@ export class Matterbridge extends EventEmitter {
         await this.logNodeAndSystemInfo();
         this.log.info(
         // eslint-disable-next-line max-len
-        `Matterbridge version ${this.matterbridgeVersion} mode ${hasParameter('bridge') ? 'bridge' : ''}${hasParameter('childbridge') ? 'childbridge' : ''} running on ${this.systemInformation.osType} ${this.systemInformation.osRelease} ${this.systemInformation.osPlatform} ${this.systemInformation.osArch}`);
+        `Matterbridge version ${this.matterbridgeVersion} mode ${hasParameter('bridge') ? 'bridge' : ''}${hasParameter('childbridge') ? 'childbridge' : ''}${hasParameter('controller') ? 'controller' : ''} running on ${this.systemInformation.osType} ${this.systemInformation.osRelease} ${this.systemInformation.osPlatform} ${this.systemInformation.osArch}`);
         // check node version and throw error
         requireMinNodeVersion(18);
         // register SIGINT SIGTERM signal handlers
@@ -282,12 +280,14 @@ export class Matterbridge extends EventEmitter {
             this.bridgeMode = 'childbridge';
             MatterbridgeDevice.bridgeMode = 'childbridge';
             await this.testStartMatterBridge(); // No await do it asyncronously
+            return;
         }
         if (hasParameter('controller')) {
             this.bridgeMode = 'controller';
             this.log.info('Creating mattercontrollerContext: mattercontrollerContext');
             this.mattercontrollerContext = this.storageManager?.createContext('mattercontrollerContext');
             await this.startMatterBridge();
+            return;
         }
         if (hasParameter('bridge')) {
             this.bridgeMode = 'bridge';
@@ -306,6 +306,7 @@ export class Matterbridge extends EventEmitter {
                 this.loadPlugin(plugin); // No await do it asyncronously
             }
             await this.startMatterBridge();
+            return;
         }
         if (hasParameter('childbridge')) {
             this.bridgeMode = 'childbridge';
@@ -324,8 +325,14 @@ export class Matterbridge extends EventEmitter {
                 this.loadPlugin(plugin, true, 'Matterbridge is starting'); // No await do it asyncronously
             }
             await this.startMatterBridge();
+            return;
         }
     }
+    /**
+     * Resolves the name of a plugin by loading and parsing its package.json file.
+     * @param pluginPath - The path to the plugin or the path to the plugin's package.json file.
+     * @returns The path to the resolved package.json file, or null if the package.json file is not found or does not contain a name.
+     */
     async resolvePluginName(pluginPath) {
         if (!pluginPath.endsWith('package.json'))
             pluginPath = path.join(pluginPath, 'package.json');
@@ -451,14 +458,14 @@ export class Matterbridge extends EventEmitter {
      * Restarts the process by spawning a new process and exiting the current process.
      */
     async restartProcess() {
-        //this.log.info('Restarting still not implemented');
-        //return;
         await this.cleanup('restarting...', true);
         this.hasCleanupStarted = false;
     }
     /**
-     * Performs cleanup operations before shutting down Matterbridge.
-     * @param message - The reason for the cleanup.
+     * Cleans up the Matterbridge instance.
+     * @param message - The cleanup message.
+     * @param restart - Indicates whether to restart the instance after cleanup. Default is `false`.
+     * @returns A promise that resolves when the cleanup is completed.
      */
     async cleanup(message, restart = false) {
         if (!this.hasCleanupStarted) {
@@ -468,8 +475,10 @@ export class Matterbridge extends EventEmitter {
             process.removeAllListeners('SIGTERM');
             // Calling the shutdown functions with a reason
             for (const plugin of this.registeredPlugins) {
-                if (plugin.platform)
+                if (plugin.platform) {
                     await plugin.platform.onShutdown('Matterbridge is closing: ' + message);
+                    await this.savePluginConfig(plugin);
+                }
             }
             // Set reachability to false
             /*
@@ -565,14 +574,14 @@ export class Matterbridge extends EventEmitter {
      */
     async addDevice(pluginName, device) {
         if (this.bridgeMode === 'bridge' && !this.matterAggregator) {
-            this.log.error(`Adding device ${dev}${device.name}-${device.deviceName}${er} for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
+            this.log.error(`Adding device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
             return;
         }
-        this.log.debug(`Adding device ${dev}${device.name}-${device.deviceName}${db} for plugin ${plg}${pluginName}${db}`);
+        this.log.debug(`Adding device ${dev}${device.deviceName}${db} (${dev}${device.name}${db}) for plugin ${plg}${pluginName}${db}`);
         // Check if the plugin is registered
         const plugin = this.registeredPlugins.find((plugin) => plugin.name === pluginName);
         if (!plugin) {
-            this.log.error(`Error adding device ${dev}${device.name}-${device.deviceName}${er} plugin ${plg}${pluginName}${er} not found`);
+            this.log.error(`Error adding device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) plugin ${plg}${pluginName}${er} not found`);
             return;
         }
         // Register and add the device to matterbridge aggregator in bridge mode
@@ -583,14 +592,14 @@ export class Matterbridge extends EventEmitter {
                 plugin.registeredDevices++;
             if (plugin.addedDevices !== undefined)
                 plugin.addedDevices++;
-            this.log.info(`Added and registered device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${nf}`);
+            this.log.info(`Added and registered device (${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
         }
         // Only register the device in childbridge mode
         if (this.bridgeMode === 'childbridge') {
             this.registeredDevices.push({ plugin: pluginName, device, added: false });
             if (plugin.registeredDevices !== undefined)
                 plugin.registeredDevices++;
-            this.log.info(`Registered device ${dev}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${nf}`);
+            this.log.info(`Registered device ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
         }
     }
     /**
@@ -601,14 +610,14 @@ export class Matterbridge extends EventEmitter {
      */
     async addBridgedDevice(pluginName, device) {
         if (this.bridgeMode === 'bridge' && !this.matterAggregator) {
-            this.log.error(`Adding bridged device ${dev}${device.name}-${device.deviceName}${er} for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
+            this.log.error(`Adding bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
             return;
         }
-        this.log.debug(`Adding bridged device ${db}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${db}`);
+        this.log.debug(`Adding bridged device ${dev}${device.deviceName}${db} (${dev}${device.name}${db}) for plugin ${plg}${pluginName}${db}`);
         // Check if the plugin is registered
         const plugin = this.registeredPlugins.find((plugin) => plugin.name === pluginName);
         if (!plugin) {
-            this.log.error(`Error adding bridged device ${dev}${device.name}-${device.deviceName}${er} plugin ${plg}${pluginName}${er} not found`);
+            this.log.error(`Error adding bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) plugin ${plg}${pluginName}${er} not found`);
             return;
         }
         // Register and add the device to matterbridge aggregator in bridge mode
@@ -619,34 +628,40 @@ export class Matterbridge extends EventEmitter {
                 plugin.registeredDevices++;
             if (plugin.addedDevices !== undefined)
                 plugin.addedDevices++;
-            this.log.info(`Added and registered bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${nf}`);
+            this.log.info(`Added and registered bridged device (${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
         }
         // Only register the device in childbridge mode
         if (this.bridgeMode === 'childbridge') {
             this.registeredDevices.push({ plugin: pluginName, device, added: false });
             if (plugin.registeredDevices !== undefined)
                 plugin.registeredDevices++;
-            this.log.info(`Registered bridged device ${dev}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${nf}`);
+            this.log.info(`Registered bridged device ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
         }
     }
+    /**
+     * Removes a bridged device from the Matterbridge.
+     * @param pluginName - The name of the plugin.
+     * @param device - The device to be removed.
+     * @returns A Promise that resolves when the device is successfully removed.
+     */
     async removeBridgedDevice(pluginName, device) {
         if (this.bridgeMode === 'bridge' && !this.matterAggregator) {
-            this.log.error(`Removing bridged device ${dev}${device.name}-${device.deviceName}${er} for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
+            this.log.error(`Removing bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
             return;
         }
-        this.log.debug(`Removing bridged device ${db}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${db}`);
+        this.log.debug(`Removing bridged device ${dev}${device.deviceName}${db} (${dev}${device.name}${db}) for plugin ${plg}${pluginName}${db}`);
         // Check if the plugin is registered
         const plugin = this.findPlugin(pluginName);
         if (!plugin) {
-            this.log.error(`Error removing bridged device ${dev}${device.name}-${device.deviceName}${er} plugin ${plg}${pluginName}${er} not found`);
+            this.log.error(`Error removing bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) plugin ${plg}${pluginName}${er} not found`);
             return;
         }
         if (this.bridgeMode === 'childbridge' && !plugin.aggregator) {
-            this.log.error(`Error removing bridged device ${dev}${device.name}-${device.deviceName}${er} plugin ${plg}${pluginName}${er} aggregator not found`);
+            this.log.error(`Error removing bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) plugin ${plg}${pluginName}${er} aggregator not found`);
             return;
         }
         if (this.bridgeMode === 'childbridge' && !plugin.connected) {
-            this.log.error(`Error removing bridged device ${dev}${device.name}-${device.deviceName}${er} plugin ${plg}${pluginName}${er} not connected`);
+            this.log.warn(`Not 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
@@ -662,12 +677,12 @@ export class Matterbridge extends EventEmitter {
                 plugin.registeredDevices--;
             if (plugin.addedDevices !== undefined)
                 plugin.addedDevices--;
-            this.log.info(`Rmoved bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${nf}`);
+            this.log.info(`Removed bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
         }
         // Only register the device in childbridge mode
         if (this.bridgeMode === 'childbridge') {
             if (plugin.type === 'AccessoryPlatform') {
-                this.log.warn(`Removing bridged device ${dev}${device.name}-${device.deviceName}${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} error: AccessoryPlatform not supported in childbridge mode`);
             }
             else if (plugin.type === 'DynamicPlatform') {
                 this.registeredDevices.forEach((registeredDevice, index) => {
@@ -678,11 +693,11 @@ export class Matterbridge extends EventEmitter {
                 });
                 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}`);
             if (plugin.registeredDevices !== undefined)
                 plugin.registeredDevices--;
             if (plugin.addedDevices !== undefined)
                 plugin.addedDevices--;
-            this.log.info(`Removed bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${nf}`);
         }
     }
     /**
@@ -826,6 +841,92 @@ export class Matterbridge extends EventEmitter {
         }
         */
     }
+    /**
+     * Loads the configuration for a plugin.
+     * If the configuration file exists, it reads the file and returns the parsed JSON data.
+     * If the configuration file does not exist, it creates a new file with default configuration and returns it.
+     * If any error occurs during file access or creation, it logs an error and rejects the promise with the error.
+     *
+     * @param plugin - The plugin for which to load the configuration.
+     * @returns A promise that resolves to the loaded or created configuration.
+     */
+    async loadPluginConfig(plugin) {
+        const configFile = path.join(this.matterbridgeDirectory, `${plugin.name}.config.json`);
+        try {
+            await fs.access(configFile);
+            const data = await fs.readFile(configFile, 'utf8');
+            this.log.debug(`Config file found: ${configFile}.\nConfig:${rs}\n`, JSON.parse(data));
+            return JSON.parse(data);
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                const nodeErr = err;
+                if (nodeErr.code === 'ENOENT') {
+                    try {
+                        await this.writeFile(configFile, JSON.stringify({ name: plugin.name, type: plugin.type }, null, 2));
+                        this.log.debug(`Created config file: ${configFile}.\nConfig:${rs}\n`, { name: plugin.name, type: plugin.type });
+                        return { name: plugin.name, type: plugin.type };
+                    }
+                    catch (err) {
+                        this.log.error(`Error creating config file ${configFile}: ${err}`);
+                        return Promise.reject(err);
+                    }
+                }
+                else {
+                    this.log.error(`Error accessing config file ${configFile}: ${err}`);
+                    return Promise.reject(err);
+                }
+            }
+            return Promise.reject(err);
+        }
+    }
+    /**
+     * Saves the configuration of a registered plugin.
+     * @param {RegisteredPlugin} plugin - The plugin whose configuration needs to be saved.
+     * @returns {Promise<void>} - A promise that resolves when the configuration is successfully saved.
+     * @throws {Error} - If the plugin's configuration is not found or if there is an error while saving the configuration.
+     */
+    async savePluginConfig(plugin) {
+        if (!plugin.platform?.config) {
+            this.log.error(`Error saving plugin ${plg}${plugin.name}${er} config: config not found`);
+            return Promise.reject(new Error(`Error saving plugin ${plg}${plugin.name}${er} config: config not found`));
+        }
+        const configFile = path.join(this.matterbridgeDirectory, `${plugin.name}.config.json`);
+        try {
+            await this.writeFile(configFile, JSON.stringify(plugin.platform.config, null, 2));
+            this.log.debug(`Saved config file: ${configFile}.\nConfig:${rs}\n`, plugin.platform.config);
+        }
+        catch (err) {
+            this.log.error(`Error saving plugin ${plg}${plugin.name}${er} config: ${err}`);
+            return Promise.reject(err);
+        }
+    }
+    /**
+     * Writes data to a file.
+     *
+     * @param {string} filePath - The path of the file to write to.
+     * @param {string} data - The data to write to the file.
+     * @returns {Promise<void>} - A promise that resolves when the data is successfully written to the file.
+     */
+    async writeFile(filePath, data) {
+        // Write the data to a file
+        await fs
+            .writeFile(`${filePath}`, data, 'utf8')
+            .then(() => {
+            this.log.debug(`Successfully wrote to ${filePath}`);
+        })
+            .catch((error) => {
+            this.log.error(`Error writing to ${filePath}:`, error);
+        });
+    }
+    /**
+     * Starts a plugin.
+     *
+     * @param {RegisteredPlugin} plugin - The plugin to start.
+     * @param {string} [message] - Optional message to pass to the plugin's onStart method.
+     * @param {boolean} [configure=false] - Indicates whether to configure the plugin after starting.
+     * @returns {Promise<void>} A promise that resolves when the plugin is started successfully, or rejects with an error if starting the plugin fails.
+     */
     async startPlugin(plugin, message, configure = false) {
         if (!plugin.loaded || !plugin.platform) {
             this.log.error(`Plugin ${plg}${plugin.name}${er} not loaded or no platform`);
@@ -856,6 +957,12 @@ export class Matterbridge extends EventEmitter {
             return Promise.reject(new Error(`Failed to start plugin ${plg}${plugin.name}${er}: ${err}`));
         }
     }
+    /**
+     * Configures a plugin.
+     *
+     * @param {RegisteredPlugin} plugin - The plugin to configure.
+     * @returns {Promise<void>} A promise that resolves when the plugin is configured successfully, or rejects with an error if configuration fails.
+     */
     async configurePlugin(plugin) {
         if (!plugin.loaded || !plugin.started || !plugin.platform) {
             this.log.error(`Plugin ${plg}${plugin.name}${er} not loaded or not started or not platform`);
@@ -884,6 +991,14 @@ export class Matterbridge extends EventEmitter {
             return Promise.reject(new Error(`Failed to configure plugin ${plg}${plugin.name}${er}: ${err}`));
         }
     }
+    /**
+     * Loads a plugin and returns the corresponding MatterbridgePlatform instance.
+     * @param plugin - The plugin to load.
+     * @param start - Optional flag indicating whether to start the plugin after loading. Default is false.
+     * @param message - Optional message to pass to the plugin when starting.
+     * @returns A Promise that resolves to the loaded MatterbridgePlatform instance.
+     * @throws An error if the plugin is not enabled, already loaded, or fails to load.
+     */
     async loadPlugin(plugin, start = false, message = '') {
         if (!plugin.enabled) {
             this.log.error(`Plugin ${plg}${plugin.name}${er} not enabled`);
@@ -906,8 +1021,10 @@ export class Matterbridge extends EventEmitter {
             this.log.debug(`Imported plugin ${plg}${plugin.name}${db} from ${pluginUrl.href}`);
             // Call the default export function of the plugin, passing this MatterBridge instance
             if (pluginInstance.default) {
-                const platform = pluginInstance.default(this, new AnsiLogger({ logName: plugin.description, logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logDebug: this.debugEnabled }));
+                const config = await this.loadPluginConfig(plugin);
+                const platform = pluginInstance.default(this, new AnsiLogger({ logName: plugin.description, logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logDebug: this.debugEnabled }), config);
                 platform.name = packageJson.name;
+                platform.config = config;
                 plugin.name = packageJson.name;
                 plugin.description = packageJson.description;
                 plugin.version = packageJson.version;
@@ -966,8 +1083,8 @@ export class Matterbridge extends EventEmitter {
             await this.matterServer.start();
             this.log.info('Matter server started');
             if (hasParameter('discover')) {
-                const discover = await this.commissioningController.discoverCommissionableDevices({ productId: 0x8000, deviceType: 0xfff1 });
-                console.log(discover);
+                //const discover = await this.commissioningController.discoverCommissionableDevices({ productId: 0x8000, deviceType: 0xfff1 });
+                //console.log(discover);
             }
             this.log.info(`Commissioning controller is already commisioned: ${this.commissioningController.isCommissioned()}`);
             const nodes = this.commissioningController.getCommissionedNodes();
@@ -979,11 +1096,17 @@ export class Matterbridge extends EventEmitter {
             // Plugins are loaded by loadPlugin on startup and plugin.loaded is set to true
             // Plugins are started and configured by callback when Matterbridge is commissioned
             this.log.debug(`Creating commissioning server context for ${plg}Matterbridge${db}`);
-            this.matterbridgeContext = this.createCommissioningServerContext('Matterbridge', 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge aggregator');
+            this.matterbridgeContext = this.createCommissioningServerContext('Matterbridge', 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge Aggregator');
             if (!this.matterbridgeContext) {
                 this.log.error(`Error creating storage context for ${plg}Matterbridge${er}`);
                 return;
             }
+            if (!this.nodeContext) {
+                this.log.error(`Node storage context undefined for ${plg}Matterbridge${er}`);
+                return;
+            }
+            this.matterbridgeContext.set('softwareVersion', 1);
+            this.matterbridgeContext.set('softwareVersionString', this.matterbridgeVersion);
             this.log.debug(`Creating commissioning server for ${plg}Matterbridge${db}`);
             this.commissioningServer = this.createCommisioningServer(this.matterbridgeContext, 'Matterbridge');
             this.log.debug(`Creating matter aggregator for ${plg}Matterbridge${db}`);
@@ -995,7 +1118,7 @@ export class Matterbridge extends EventEmitter {
             this.log.debug('Starting matter server...');
             await this.startMatterServer();
             this.log.info('Matter server started');
-            this.showCommissioningQRCode(this.commissioningServer, this.matterbridgeContext, 'Matterbridge');
+            await this.showCommissioningQRCode(this.commissioningServer, this.matterbridgeContext, this.nodeContext, 'Matterbridge');
         }
         if (this.bridgeMode === 'childbridge') {
             // Plugins are loaded and started by loadPlugin on startup
@@ -1033,7 +1156,9 @@ export class Matterbridge extends EventEmitter {
                         await this.matterServer.addCommissioningServer(plugin.commissioningServer, { uniqueStorageKey: plugin.name });
                     }
                     if (plugin.type === 'DynamicPlatform') {
-                        plugin.storageContext = this.createCommissioningServerContext(plugin.name, 'Matterbridge Dynamic Platform', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Dynamic Platform');
+                        plugin.storageContext = this.createCommissioningServerContext(plugin.name, 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge Dynamic Platform');
+                        plugin.storageContext.set('softwareVersion', 1);
+                        plugin.storageContext.set('softwareVersionString', this.matterbridgeVersion);
                         plugin.commissioningServer = this.createCommisioningServer(plugin.storageContext, plugin.name);
                         this.log.debug(`Creating aggregator for plugin ${plg}${plugin.name}${db}`);
                         plugin.aggregator = this.createMatterAggregator(plugin.storageContext); // Generate serialNumber and uniqueId
@@ -1079,13 +1204,31 @@ export class Matterbridge extends EventEmitter {
                 await this.startMatterServer();
                 this.log.info('Matter server started');
                 for (const plugin of this.registeredPlugins) {
-                    this.showCommissioningQRCode(plugin.commissioningServer, plugin.storageContext, plugin.name);
+                    if (!plugin.enabled)
+                        continue;
+                    if (!plugin.commissioningServer) {
+                        this.log.error(`Commissioning server not found for plugin ${plg}${plugin.name}${er}`);
+                        continue;
+                    }
+                    if (!plugin.storageContext) {
+                        this.log.error(`Storage context not found for plugin ${plg}${plugin.name}${er}`);
+                        continue;
+                    }
+                    if (!plugin.nodeContext) {
+                        this.log.error(`Node storage context not found for plugin ${plg}${plugin.name}${er}`);
+                        continue;
+                    }
+                    await this.showCommissioningQRCode(plugin.commissioningServer, plugin.storageContext, plugin.nodeContext, plugin.name);
                 }
                 Logger.defaultLogLevel = this.debugEnabled ? Level.DEBUG : Level.INFO;
                 clearInterval(startMatterInterval);
             }, 1000);
         }
     }
+    /**
+     * Starts the Matter server.
+     * If the Matter server is not initialized, it logs an error and performs cleanup.
+     */
     async startMatterServer() {
         if (!this.matterServer) {
             this.log.error('No matter server initialized');
@@ -1155,17 +1298,14 @@ export class Matterbridge extends EventEmitter {
         return storageContext;
     }
     /**
-     * Shows the commissioning QR code for a given commissioning server, storage context, and name.
-     * If any of the parameters are missing, the method returns early.
-     * If the commissioning server is not commissioned, it logs the QR code and pairing code.
-     * If the commissioning server is already commissioned, it waits for controllers to connect.
-     * If the bridge mode is 'childbridge', it sets the 'paired' property of the plugin to true.
-     *
-     * @param commissioningServer - The commissioning server to show the QR code for.
-     * @param storageContext - The storage context to store the pairing codes.
-     * @param pluginName - The name of the commissioning server.
+     * Shows the commissioning QR code for a given plugin.
+     * @param {CommissioningServer} commissioningServer - The commissioning server instance.
+     * @param {StorageContext} storageContext - The storage context instance.
+     * @param {NodeStorage} nodeContext - The node storage instance.
+     * @param {string} pluginName - The name of the plugin.
+     * @returns {Promise<void>} - A promise that resolves when the QR code is shown.
      */
-    async showCommissioningQRCode(commissioningServer, storageContext, pluginName) {
+    async showCommissioningQRCode(commissioningServer, storageContext, nodeContext, pluginName) {
         if (!commissioningServer || !storageContext || !pluginName)
             return;
         if (!commissioningServer.isCommissioned()) {
@@ -1173,41 +1313,29 @@ export class Matterbridge extends EventEmitter {
             const { qrPairingCode, manualPairingCode } = commissioningServer.getPairingCode();
             storageContext.set('qrPairingCode', qrPairingCode);
             storageContext.set('manualPairingCode', manualPairingCode);
+            await nodeContext.set('qrPairingCode', qrPairingCode);
+            await nodeContext.set('manualPairingCode', manualPairingCode);
             const QrCode = new QrCodeSchema();
-            this.log.info(`Pairing code:\n\n${QrCode.encode(qrPairingCode)}\nManual pairing code: ${manualPairingCode}\n`);
-            if (this.bridgeMode === 'bridge') {
-                await this.nodeContext?.set('qrPairingCode', qrPairingCode);
-                await this.nodeContext?.set('manualPairingCode', manualPairingCode);
-            }
-            if (this.bridgeMode === 'childbridge') {
+            this.log.info(`Pairing code:\n\n${QrCode.encode(qrPairingCode)}\n${plg}${pluginName}${nf}\n\nqrPairingCode: ${qrPairingCode}\n\nManual pairing code: ${manualPairingCode}\n`);
+            if (pluginName !== 'Matterbridge') {
                 const plugin = this.findPlugin(pluginName);
                 if (plugin) {
-                    await plugin.nodeContext?.set('qrPairingCode', qrPairingCode);
-                    await plugin.nodeContext?.set('manualPairingCode', manualPairingCode);
-                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    plugin.qrPairingCode = qrPairingCode;
+                    plugin.manualPairingCode = manualPairingCode;
                     plugin.paired = false;
                 }
             }
+            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 ...`);
-            if (this.bridgeMode === 'bridge') {
-                const qrPairingCode = storageContext.get('qrPairingCode', '');
-                const manualPairingCode = storageContext.get('manualPairingCode', '');
-                await this.nodeContext?.set('qrPairingCode', qrPairingCode);
-                await this.nodeContext?.set('manualPairingCode', manualPairingCode);
-            }
-            if (this.bridgeMode === 'childbridge') {
+            if (pluginName !== 'Matterbridge') {
                 const plugin = this.findPlugin(pluginName);
-                if (plugin && plugin.storageContext && plugin.nodeContext) {
-                    plugin.qrPairingCode = plugin.storageContext.get('qrPairingCode', '');
-                    plugin.manualPairingCode = plugin.storageContext.get('manualPairingCode', '');
-                    await plugin.nodeContext.set('qrPairingCode', plugin.qrPairingCode);
-                    await plugin.nodeContext.set('manualPairingCode', plugin.manualPairingCode);
-                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                if (plugin) {
                     plugin.paired = true;
                 }
             }
+            await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
         }
     }
     /**
@@ -1228,11 +1356,11 @@ export class Matterbridge extends EventEmitter {
      * Creates a matter commissioning server.
      *
      * @param {StorageContext} context - The storage context.
-     * @param {string} name - The name of the commissioning server.
+     * @param {string} pluginName - The name of the commissioning server.
      * @returns {CommissioningServer} The created commissioning server.
      */
-    createCommisioningServer(context, name) {
-        this.log.debug(`Creating matter commissioning server for plugin ${plg}${name}${db}`);
+    createCommisioningServer(context, pluginName) {
+        this.log.debug(`Creating matter commissioning server for plugin ${plg}${pluginName}${db}`);
         const deviceName = context.get('deviceName');
         const deviceType = context.get('deviceType');
         const vendorId = context.get('vendorId');
@@ -1241,9 +1369,14 @@ export class Matterbridge extends EventEmitter {
         const productName = context.get('productName'); // Home app = Model
         const serialNumber = context.get('serialNumber');
         const uniqueId = context.get('uniqueId');
-        this.log.debug(
-        // eslint-disable-next-line max-len
-        `Creating matter commissioning server for plugin ${plg}${name}${db} with deviceName ${deviceName} deviceType ${deviceType}(0x${deviceType.toString(16).padStart(4, '0')}) uniqueId ${uniqueId} serialNumber ${serialNumber}`);
+        const softwareVersion = context.get('softwareVersion', 1);
+        const softwareVersionString = context.get('softwareVersionString', '1.0.0'); // Home app = Firmware Revision
+        const hardwareVersion = context.get('hardwareVersion', 1);
+        const hardwareVersionString = context.get('hardwareVersionString', '1.0.0');
+        this.log.debug(`Creating matter commissioning server for plugin ${plg}${pluginName}${db} with deviceName ${deviceName} deviceType ${deviceType}(0x${deviceType.toString(16).padStart(4, '0')})`);
+        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}`);
         const commissioningServer = new CommissioningServer({
             port: undefined,
             passcode: undefined,
@@ -1257,10 +1390,10 @@ export class Matterbridge extends EventEmitter {
                 productName,
                 nodeLabel: productName,
                 productLabel: productName,
-                softwareVersion: context.get('softwareVersion', 1),
-                softwareVersionString: context.get('softwareVersionString', '1.0.0'), // Home app = Firmware Revision
-                hardwareVersion: context.get('hardwareVersion', 1),
-                hardwareVersionString: context.get('hardwareVersionString', '1.0.0'),
+                softwareVersion,
+                softwareVersionString, // Home app = Firmware Revision
+                hardwareVersion,
+                hardwareVersionString,
                 uniqueId,
                 serialNumber,
                 reachable: true,
@@ -1269,15 +1402,15 @@ export class Matterbridge extends EventEmitter {
                 const info = commissioningServer.getActiveSessionInformation(fabricIndex);
                 let connected = false;
                 info.forEach((session) => {
-                    this.log.debug(`***Active session changed on fabric ${fabricIndex} ${session.fabric?.rootVendorId}/${session.fabric?.label} for ${plg}${name}${nf}`, debugStringify(session));
+                    this.log.debug(`***Active session changed on fabric ${fabricIndex} ${session.fabric?.rootVendorId}/${session.fabric?.label} for ${plg}${pluginName}${nf}`, debugStringify(session));
                     if (session.isPeerActive === true && session.secure === true && session.numberOfActiveSubscriptions >= 1) {
-                        this.log.info(`***Controller ${session.fabric?.rootVendorId}/${session.fabric?.label} connected to ${plg}${name}${nf}`);
+                        this.log.info(`***Controller ${session.fabric?.rootVendorId}/${session.fabric?.label} connected to ${plg}${pluginName}${nf}`);
                         connected = true;
                     }
                 });
                 if (connected) {
                     if (this.bridgeMode === 'childbridge') {
-                        const plugin = this.findPlugin(name);
+                        const plugin = this.findPlugin(pluginName);
                         if (plugin) {
                             plugin.paired = true;
                             plugin.connected = true;
@@ -1290,16 +1423,15 @@ export class Matterbridge extends EventEmitter {
                                 if (!plugin.enabled)
                                     continue;
                                 this.startPlugin(plugin, 'Matterbridge is commissioned and controllers are connected', true); // No await do it asyncronously with also configurePlugin
-                                //this.configurePlugin(plugin); // No await do it asyncronously
                             }
                             Logger.defaultLogLevel = this.debugEnabled ? Level.DEBUG : Level.INFO;
                         }
                         if (this.bridgeMode === 'childbridge') {
                             //Logger.defaultLogLevel = Level.INFO;
-                            const plugin = this.findPlugin(name);
+                            const plugin = this.findPlugin(pluginName);
                             if (plugin && plugin.type === 'DynamicPlatform' && plugin.configured !== true) {
                                 for (const registeredDevice of this.registeredDevices) {
-                                    if (registeredDevice.plugin === name) {
+                                    if (registeredDevice.plugin === pluginName) {
                                         this.log.info(`Adding bridged device ${dev}${registeredDevice.device.name}-${registeredDevice.device.deviceName}${nf} to aggregator for plugin ${plg}${plugin.name}${db}`);
                                         if (!plugin.aggregator) {
                                             this.log.error(`****Aggregator not found for plugin ${plg}${plugin.name}${er}`);
@@ -1316,7 +1448,7 @@ export class Matterbridge extends EventEmitter {
                                 }
                             }
                             for (const plugin of this.registeredPlugins) {
-                                if (plugin.name === name && plugin.platform && plugin.configured !== true) {
+                                if (plugin.name === pluginName && plugin.platform && plugin.configured !== true) {
                                     this.configurePlugin(plugin); // No await do it asyncronously
                                 }
                             }
@@ -1326,12 +1458,29 @@ export class Matterbridge extends EventEmitter {
                     }, 2000);
                 }
             },
-            commissioningChangedCallback: (fabricIndex) => {
+            commissioningChangedCallback: async (fabricIndex) => {
                 const info = commissioningServer.getCommissionedFabricInformation(fabricIndex);
-                this.log.debug(`***Commissioning changed on fabric ${fabricIndex} for ${plg}${name}${nf}`, debugStringify(info));
+                this.log.debug(`***Commissioning changed on fabric ${fabricIndex} for ${plg}${pluginName}${nf}`, debugStringify(info));
                 if (info.length === 0) {
-                    this.log.warn(`***Commissioning removed from fabric ${fabricIndex} for ${plg}${name}${nf}. Resetting the commissioning server ...`);
-                    commissioningServer.factoryReset(); // TODO delete from storage also "matterbridge-eve-weather.EndpointStructure"
+                    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`);
+                    }
+                    else {
+                        for (const plugin of this.registeredPlugins) {
+                            if (plugin.name === pluginName) {
+                                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`);
+                            }
+                        }
+                    }
                 }
             },
         });
@@ -1563,6 +1712,11 @@ export class Matterbridge extends EventEmitter {
         const cmdArgs = process.argv.slice(2).join(' ');
         this.log.debug(`Command Line Arguments: ${cmdArgs}`);
     }
+    /**
+     * Retrieves an array of base registered plugins.
+     *
+     * @returns {BaseRegisteredPlugin[]} An array of base registered plugins.
+     */
     getBaseRegisteredPlugins() {
         const baseRegisteredPlugins = this.registeredPlugins.map((plugin) => ({
             path: plugin.path,
@@ -1583,6 +1737,10 @@ export class Matterbridge extends EventEmitter {
         }));
         return baseRegisteredPlugins;
     }
+    /**
+     * Retrieves an array of base registered devices from the registered plugins.
+     * @returns {BaseRegisteredPlugin[]} An array of base registered devices.
+     */
     getBaseRegisteredDevices() {
         const baseRegisteredPlugins = this.registeredPlugins.map((plugin) => ({
             path: plugin.path,
@@ -1614,6 +1772,7 @@ export class Matterbridge extends EventEmitter {
         this.expressApp.get('/api/qr-code', (req, res) => {
             this.log.debug('The frontend sent /api/qr-code');
             if (!this.matterbridgeContext) {
+                this.log.error('/api/qr-code matterbridgeContext not found');
                 res.json([]);
                 return;
             }