matterbridge 1.1.11 → 1.1.12

package/CHANGELOG.md

@@ -2,13 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.1.11] - 2024-03-15
+## [1.1.12] - 2024-03-22
+
+### Added
+
+- [platform]: Added async loadConfig() and async saveConfig() to store plugin config.
+- [platform]: Added a config: Config (JSON) property to platforms to store plugin config.
+
+### Changed
+
+- [dependencies]: Updated dependencies.
+
+## [1.1.11] - 2024-03-19
 
 ### Added
 
 - [frontend]: Frontend got updated to 0.8.3.
 
-## [1.1.10] - 2024-03-15
+## [1.1.10] - 2024-03-17
 
 ### Added
 
@@ -17,7 +28,7 @@ All notable changes to this project will be documented in this file.
 - [frontend]: Enable and disable plugin are now available. Restart Matteerbridge after.
 - [frontend]: Frontend got updated to 0.8.2.
 
-## [1.1.9] - 2024-03-15
+## [1.1.9] - 2024-03-16
 
 ### Added
 

package/README.md

@@ -96,9 +96,11 @@ Devices page:
 
 ### Accessory platform example
 
-This an example of an accessory platform plugin.
+This an example of an accessory platform plugin. 
 
-Accessory platform plugins only expose one device.
+It exposes a cover device that continouosly moves position and shows how to use the command handlers (you can control the device).
+
+An Accessory platform plugin only exposes one device.
 
 [See the plugin homepage here](https://github.com/Luligu/matterbridge-example-accessory-platform)
 
@@ -106,7 +108,11 @@ Accessory platform plugins only expose one device.
 
 This an example of a dynamic platform plugin.
 
-Dynamic platform plugins expose as many devices as you need (the limit for the Home app is 150 accessories for bridge).
+It exposes a switch with onOff, a light with onOff-levelControl-colorControl, an outlet with onOff and a cover device.
+
+All these devices continouosly change state and position. The plugin also shows how to use all the command handlers (you can control all the devices).
+
+A Dynamic platform plugin exposes as many devices as you need (the limit for the Home app is 150 accessories for bridge).
 
 Matterbridge can run as many plugins as you want.
 
@@ -124,10 +130,40 @@ Matterbridge can run as many plugins as you want.
 
 [Room plugin with history](https://github.com/Luligu/matterbridge-eve-room)
 
-## How to install a plugin
+## How to install and register a production-level plugin (from npm)
+
+To install i.e. https://github.com/Luligu/matterbridge-zigbee2mqtt
+
+On windows:
+```
+cd $HOME\Matterbridge
+npm install -g matterbridge-zigbee2mqtt
+matterbridge -add matterbridge-zigbee2mqtt
+```
+
+On linux:
+```
+cd ~/Matterbridge
+sudo npm install -g matterbridge-zigbee2mqtt
+matterbridge -add matterbridge-zigbee2mqtt
+```
+
+## How to install and register a plugin for development (from git)
 
 To install i.e. https://github.com/Luligu/matterbridge-example-accessory-platform
 
+On windows:
+```
+cd $HOME\Matterbridge
+```
+
+On linux:
+```
+cd ~/Matterbridge
+```
+
+then
+
 ```
 git clone https://github.com/Luligu/matterbridge-example-accessory-platform
 cd matterbridge-example-accessory-platform
@@ -139,28 +175,28 @@ Then add the plugin to Matterbridge
 matterbridge -add .\
 ```
 
-### How to add a plugin to Matterbridge
+## How to add a plugin to Matterbridge
 
 ```
-matterbridge -add .\
+matterbridge -add [plugin path]
 ```
 
-### How to remove a plugin from Matterbridge
+## How to remove a plugin from Matterbridge
 
 ```
-matterbridge -remove .\
+matterbridge -remove [plugin path]
 ```
 
-### How to disable a registerd plugin 
+## How to disable a registered plugin 
 
 ```
-matterbridge -disable .\
+matterbridge -disable [plugin path]
 ```
 
-### How to enable a registerd plugin 
+## How to enable a registered plugin 
 
 ```
-matterbridge -enable .\
+matterbridge -enable [plugin path]
 ```
 
 ## How to create your plugin
@@ -178,6 +214,15 @@ Add your plugin logic in platform.ts.
 
 ## MatterbridgeDynamicPlatform and MatterbridgeAccessoryPlatform api
 
+### name: string
+The plugin name.
+
+### type: string
+The plugin platform type.
+
+### config: object
+The plugin config (loaded before onStart() is called and save after onShutdown() is called).
+
 ### async onStart(reason?: string)
 The method onStart() is where you have to create your MatterbridgeDevice and add all needed clusters and command handlers. 
 
@@ -204,7 +249,7 @@ You can unregister one or more device.
 ### async unregisterAllDevices()
 You can unregister all devices you added.
 
-It can me be useful to call this method from onShutdown if you don't want to keep all the devices.
+It can be useful to call this method from onShutdown() if you don't want to keep all the devices during development.
 
 ## MatterbridgeDevice api
 

package/dist/matterbridge.d.ts

@@ -243,7 +243,7 @@ export declare 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.
      */
     private createCommisioningServer;

package/dist/matterbridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"matterbridge.d.ts","sourceRoot":"","sources":["../src/matterbridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"matterbridge.d.ts","sourceRoot":"","sources":["../src/matterbridge.ts"],"names":[],"mappings":"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"}

package/dist/matterbridge.js

@@ -470,6 +470,8 @@ export class Matterbridge extends EventEmitter {
             for (const plugin of this.registeredPlugins) {
                 if (plugin.platform)
                     await plugin.platform.onShutdown('Matterbridge is closing: ' + message);
+                if (plugin.platform)
+                    await plugin.platform.saveConfig();
             }
             // Set reachability to false
             /*
@@ -565,14 +567,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 +585,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 +603,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,36 +621,38 @@ 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}`);
         }
     }
     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`);
-            return;
+          this.log.error(`Error removing bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) plugin ${plg}${pluginName}${er} not connected`);
+          return;
         }
+        */
         // Register and add the device to matterbridge aggregator in bridge mode
         if (this.bridgeMode === 'bridge') {
             this.matterAggregator.removeBridgedDevice(device);
@@ -662,12 +666,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 +682,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}`);
         }
     }
     /**
@@ -918,6 +922,7 @@ export class Matterbridge extends EventEmitter {
                 plugin.registeredDevices = 0;
                 plugin.addedDevices = 0;
                 await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                await platform.loadConfig();
                 this.log.info(`Loaded plugin ${plg}${plugin.name}${db} type ${typ}${platform.type}${db} (entrypoint ${UNDERLINE}${pluginEntry}${UNDERLINEOFF})`);
                 if (start)
                     this.startPlugin(plugin, message); // No await do it asyncronously
@@ -966,8 +971,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 +984,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 +1006,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 +1044,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,7 +1092,21 @@ 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);
@@ -1165,7 +1192,7 @@ export class Matterbridge extends EventEmitter {
      * @param storageContext - The storage context to store the pairing codes.
      * @param pluginName - The name of the commissioning server.
      */
-    async showCommissioningQRCode(commissioningServer, storageContext, pluginName) {
+    async showCommissioningQRCode(commissioningServer, storageContext, nodeContext, pluginName) {
         if (!commissioningServer || !storageContext || !pluginName)
             return;
         if (!commissioningServer.isCommissioned()) {
@@ -1173,41 +1200,27 @@ 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.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 +1241,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 +1254,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 +1275,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 +1287,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 +1308,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 +1333,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 +1343,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`);
+                            }
+                        }
+                    }
                 }
             },
         });