matterbridge 1.2.2 → 1.2.4

package/dist/matterbridge.js

@@ -31,7 +31,7 @@ import express from 'express';
 import os from 'os';
 import path from 'path';
 import { CommissioningController, CommissioningServer, MatterServer } from '@project-chip/matter-node.js';
-import { BasicInformationCluster, BridgedDeviceBasicInformationCluster, ClusterServer, GeneralCommissioning, PowerSourceCluster, ThreadNetworkDiagnosticsCluster, } from '@project-chip/matter-node.js/cluster';
+import { BasicInformationCluster, BooleanStateCluster, BridgedDeviceBasicInformationCluster, ClusterServer, GeneralCommissioning, PowerSourceCluster, ThreadNetworkDiagnosticsCluster } 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';
@@ -297,7 +297,7 @@ export class Matterbridge extends EventEmitter {
         // Start the storage (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 = this.createCommissioningServerContext('Matterbridge', 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge aggregator');
+        this.matterbridgeContext = await this.createCommissioningServerContext('Matterbridge', 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge aggregator');
         // Initialize frontend
         await this.initializeFrontend(getIntParameter('frontend'));
         if (hasParameter('test')) {
@@ -310,7 +310,7 @@ export class Matterbridge extends EventEmitter {
             this.bridgeMode = 'controller';
             this.log.info('Creating mattercontrollerContext: mattercontrollerContext');
             this.mattercontrollerContext = this.storageManager?.createContext('mattercontrollerContext');
-            await this.startMatterBridge();
+            await this.startMatterbridge();
             return;
         }
         if (hasParameter('bridge')) {
@@ -329,7 +329,7 @@ export class Matterbridge extends EventEmitter {
                 plugin.manualPairingCode = undefined;
                 this.loadPlugin(plugin); // No await do it asyncronously
             }
-            await this.startMatterBridge();
+            await this.startMatterbridge();
             return;
         }
         if (hasParameter('childbridge')) {
@@ -348,7 +348,7 @@ export class Matterbridge extends EventEmitter {
                 plugin.manualPairingCode = (await plugin.nodeContext?.get('manualPairingCode', undefined)) ?? undefined;
                 this.loadPlugin(plugin, true, 'Matterbridge is starting'); // No await do it asyncronously
             }
-            await this.startMatterBridge();
+            await this.startMatterbridge();
             return;
         }
     }
@@ -825,50 +825,98 @@ export class Matterbridge extends EventEmitter {
         this.mattercontrollerContext = undefined;
     }
     async testStartMatterBridge() {
-        /*
-        this.log.error('****Start forEach registeredPlugin');
-        this.registeredPlugins
-          .filter((plugin) => plugin.enabled === true)
-          .forEach(async (plugin) => {
-            plugin.loaded = false;
-            plugin.started = false;
-            plugin.configured = false;
-            plugin.connected = undefined;
-            this.log.error(`****Starting registeredPlugin ${plugin.name}`);
-            this.loadPlugin(plugin, true, 'Matterbridge is starting');
-          });
-        this.log.error('****Stop forEach registeredPlugin');
-        */
-        /*
-        for (const plugin of this.registeredPlugins) {
-          if (!plugin.enabled) continue;
-          // No await do it asyncronously
-          this.loadPlugin(plugin)
-            .then(() => {
-              // No await do it asyncronously
-              this.startPlugin(plugin)
-                .then(() => {})
-                .catch((err) => {
-                  this.log.error(`Failed to start plugin ${plg}${plugin.name}${er}: ${err}`);
-                });
-            })
-            .catch((err) => {
-              this.log.error(`Failed to load plugin ${plg}${plugin.name}${er}: ${err}`);
-            });
+        // 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
+        if (!this.storageManager) {
+            this.log.error('No storage manager initialized');
+            await this.cleanup('No storage manager initialized');
+            return;
         }
-        for (const plugin of this.registeredPlugins) {
-          if (!plugin.enabled) continue;
-          // Start the interval to check if the plugin is loaded and started
-          let times = 0;
-          const interval = setInterval(() => {
-            times++;
-            this.log.info(`Waiting ${times} secs for plugin ${plg}${plugin.name}${db} to load (${plugin.loaded}) and start (${plugin.started}) and send devices ...`);
-            if (!plugin.loaded || !plugin.started) return;
-            this.log.info(`Plugin ${plg}${plugin.name}${db} sent ${plugin.registeredDevices} devices`);
-            clearInterval(interval);
-          }, 1000);
+        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;
         }
-        */
+        this.log.debug('***Starting startMatterbridge interval for Matterbridge');
+        let failCount = 0;
+        const startInterval = setInterval(async () => {
+            for (const plugin of this.registeredPlugins) {
+                if (!plugin.enabled)
+                    continue;
+                if (!plugin.loaded) {
+                    this.log.info(`***Waiting (failSafeCount=${failCount}/30) in startMatterbridge interval for plugin ${plg}${plugin.name}${db} loaded: ${plugin.loaded}...`);
+                    failCount++;
+                    if (failCount > 30) {
+                        this.log.error(`***Failed to load plugin ${plg}${plugin.name}${er}`);
+                        plugin.error = true;
+                    }
+                    else {
+                        return;
+                    }
+                }
+            }
+            clearInterval(startInterval);
+            this.log.debug('***Cleared startMatterbridge interval for Matterbridge');
+            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 (!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;
+            }
+            await this.matterbridgeContext.set('softwareVersion', 1);
+            await this.matterbridgeContext.set('softwareVersionString', this.matterbridgeVersion);
+            this.log.debug(`Creating commissioning server for ${plg}Matterbridge${db}`);
+            this.commissioningServer = await this.createCommisioningServer(this.matterbridgeContext, 'Matterbridge');
+            this.log.debug(`Creating matter aggregator for ${plg}Matterbridge${db}`);
+            this.matterAggregator = await this.createMatterAggregator(this.matterbridgeContext);
+            this.log.debug('Adding matterbridge aggregator to commissioning server');
+            this.commissioningServer.addDevice(this.matterAggregator);
+            const device = new MatterbridgeDevice(DeviceTypes.CONTACT_SENSOR);
+            device.createDefaultIdentifyClusterServer();
+            //device.createDefaultBasicInformationClusterServer('Boolean test', '0x89930475', 0x8000, 'Matterbridge', 77, 'Boolean');
+            device.createDefaultBridgedDeviceBasicInformationClusterServer('Boolean test', '0x89930475', 0x8000, 'Matterbridge', 'Boolean');
+            device.createDefaultBooleanStateClusterServer(true);
+            device.createDefaultPowerSourceReplaceableBatteryClusterServer(75);
+            device.createDefaultPowerSourceConfigurationClusterServer(1);
+            //this.commissioningServer.addDevice(device);
+            //this.matterAggregator.addBridgedDevice(device);
+            this.log.debug('Adding matterbridge commissioning server to matter server');
+            await this.matterServer?.addCommissioningServer(this.commissioningServer, { uniqueStorageKey: 'Matterbridge' });
+            this.log.debug(`Setting reachability to true for ${plg}Matterbridge${db}`);
+            this.commissioningServer.setReachability(true);
+            this.log.debug('Starting matter server...');
+            await this.startMatterServer();
+            this.log.info('Matter server started');
+            await this.showCommissioningQRCode(this.commissioningServer, this.matterbridgeContext, this.nodeContext, 'Matterbridge');
+            //2024-03-31 21:54:12.065 DEBUG  InteractionServer    Received subscribe request from udp://fe80::14b6:bb16:5d3a:1293%9:51251 on session secure/48170 (keepSubscriptions=true, isFabricFiltered=false)
+            //2024-03-31 21:54:12.066 DEBUG  InteractionServer    Subscribe to attributes:*/*/*, events:!*/*/*
+            /*
+            2024-03-31 21:52:22.669 DEBUG  SubscriptionHandler  Sending subscription update message for ID 2529153003 with 1 attributes and 1 events
+            2024-03-31 21:52:22.669 DEBUG  MessageExchange      New exchange protocol: 1 id: 30278 session: secure/24489 peerSessionId: 2131 active threshold ms: 4000 active interval ms: 300 idle interval ms: 300 retries: 5
+            2024-03-31 21:52:22.669 DEBUG  SubscriptionHandler  Sending subscription changes for ID 2529153003: MA-contactsensor(0x3b)/BooleanState(0x45)/stateValue(0x0)=true (1805472651)
+            2024-03-31 21:52:22.670 DEBUG  InteractionMessenger Sending DataReport chunk with 1 attributes and 1 events: 85 bytes
+            */
+            setTimeout(() => {
+                this.matterAggregator?.addBridgedDevice(device);
+                this.log.info('Added device to aggregator');
+            }, 30 * 1000);
+            setInterval(() => {
+                const cluster = device.getClusterServer(BooleanStateCluster);
+                if (!cluster)
+                    return;
+                const contact = cluster.getStateValueAttribute();
+                cluster.setStateValueAttribute(!contact);
+                if (cluster.isEventSupportedByName('stateChange'))
+                    cluster.triggerStateChangeEvent({ stateValue: !contact });
+                this.log.info('Set attribute and event for BooleanStateCluster to', !contact);
+            }, 60 * 1000);
+        }, 1000);
     }
     /**
      * Loads the configuration for a plugin.
@@ -884,8 +932,12 @@ export class Matterbridge extends EventEmitter {
         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);
+            const config = JSON.parse(data);
+            this.log.debug(`Config file found: ${configFile}.\nConfig:${rs}\n`, config);
+            /* The first time a plugin is added to the system, the config file is created with the plugin name and type "".*/
+            config.name = plugin.name;
+            config.type = plugin.type;
+            return config;
         }
         catch (err) {
             if (err instanceof Error) {
@@ -962,7 +1014,7 @@ export class Matterbridge extends EventEmitter {
             return Promise.reject(new Error(`Plugin ${plg}${plugin.name}${er} not loaded or no platform`));
         }
         if (plugin.started) {
-            this.log.error(`Plugin ${plg}${plugin.name}${er} already started`);
+            this.log.warn(`Plugin ${plg}${plugin.name}${wr} already started`);
             return Promise.resolve();
         }
         this.log.info(`Starting plugin ${plg}${plugin.name}${db} type ${typ}${plugin.type}${db}`);
@@ -994,7 +1046,7 @@ export class Matterbridge extends EventEmitter {
      */
     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`);
+            this.log.error(`Plugin ${plg}${plugin.name}${er} not loaded (${plugin.loaded}) or not started (${plugin.started}) or not platform (${plugin.platform?.name})`);
             return Promise.reject(new Error(`Plugin ${plg}${plugin.name}${er} not loaded or not started or not platform`));
         }
         if (plugin.configured) {
@@ -1071,12 +1123,14 @@ export class Matterbridge extends EventEmitter {
             }
             else {
                 this.log.error(`Plugin ${plg}${plugin.name}${er} does not provide a default export`);
-                return Promise.reject(new Error(`Plugin ${plg}${plugin.name}${er} does not provide a default export`));
+                return;
+                //return Promise.reject(new Error(`Plugin ${plg}${plugin.name}${er} does not provide a default export`));
             }
         }
         catch (err) {
             this.log.error(`Failed to load plugin ${plg}${plugin.name}${er}: ${err}`);
-            return Promise.reject(new Error(`Failed to load plugin ${plg}${plugin.name}${er}: ${err}`));
+            return;
+            //return Promise.reject(new Error(`Failed to load plugin ${plg}${plugin.name}${er}: ${err}`));
         }
     }
     /**
@@ -1088,7 +1142,7 @@ export class Matterbridge extends EventEmitter {
      * @private
      * @returns {Promise<void>} A promise that resolves when the Matterbridge is started.
      */
-    async startMatterBridge() {
+    async startMatterbridge() {
         if (!this.storageManager) {
             this.log.error('No storage manager initialized');
             await this.cleanup('No storage manager initialized');
@@ -1129,7 +1183,7 @@ export class Matterbridge extends EventEmitter {
                     this.log.info(`Data extracted from pairing code: ${Logger.toJSON(pairingCodeCodec)}`);
                 }
                 else {
-                    longDiscriminator = this.mattercontrollerContext.get('longDiscriminator', 3840);
+                    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);
@@ -1238,30 +1292,62 @@ export class Matterbridge extends EventEmitter {
         if (this.bridgeMode === 'bridge') {
             // 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');
-            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}`);
-            this.matterAggregator = this.createMatterAggregator(this.matterbridgeContext);
-            this.log.debug('Adding matterbridge aggregator to commissioning server');
-            this.commissioningServer.addDevice(this.matterAggregator);
-            this.log.debug('Adding matterbridge commissioning server to matter server');
-            await this.matterServer.addCommissioningServer(this.commissioningServer, { uniqueStorageKey: 'Matterbridge' });
-            this.log.debug('Starting matter server...');
-            await this.startMatterServer();
-            this.log.info('Matter server started');
-            await this.showCommissioningQRCode(this.commissioningServer, this.matterbridgeContext, this.nodeContext, 'Matterbridge');
+            this.log.debug('***Starting startMatterbridge interval for Matterbridge');
+            let failCount = 0;
+            const startInterval = setInterval(async () => {
+                for (const plugin of this.registeredPlugins) {
+                    if (!plugin.enabled)
+                        continue;
+                    if (!plugin.loaded) {
+                        this.log.info(`***Waiting (failSafeCount=${failCount}/30) in startMatterbridge interval for plugin ${plg}${plugin.name}${db} loaded: ${plugin.loaded}...`);
+                        failCount++;
+                        if (failCount > 30) {
+                            this.log.error(`***Failed to load plugin ${plg}${plugin.name}${er}`);
+                            plugin.error = true;
+                        }
+                        else {
+                            return;
+                        }
+                    }
+                }
+                clearInterval(startInterval);
+                this.log.debug('***Cleared startMatterbridge interval for Matterbridge');
+                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 (!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;
+                }
+                await this.matterbridgeContext.set('softwareVersion', 1);
+                await this.matterbridgeContext.set('softwareVersionString', this.matterbridgeVersion);
+                this.log.debug(`Creating commissioning server for ${plg}Matterbridge${db}`);
+                this.commissioningServer = await this.createCommisioningServer(this.matterbridgeContext, 'Matterbridge');
+                this.log.debug(`Creating matter aggregator for ${plg}Matterbridge${db}`);
+                this.matterAggregator = await this.createMatterAggregator(this.matterbridgeContext);
+                this.log.debug('Adding matterbridge aggregator to commissioning server');
+                this.commissioningServer.addDevice(this.matterAggregator);
+                this.log.debug('Adding matterbridge commissioning server to matter server');
+                await this.matterServer?.addCommissioningServer(this.commissioningServer, { uniqueStorageKey: 'Matterbridge' });
+                this.log.debug(`Setting reachability to true for ${plg}Matterbridge${db}`);
+                this.commissioningServer.setReachability(true);
+                this.log.debug('Starting matter server...');
+                await this.startMatterServer();
+                this.log.info('Matter server started');
+                await this.showCommissioningQRCode(this.commissioningServer, this.matterbridgeContext, this.nodeContext, 'Matterbridge');
+                /*
+                setInterval(() => {
+                  this.matterAggregator?.getBridgedDevices().forEach((device) => {
+                    this.log.info(`Bridged device: ${dev}${device.name}${nf}`);
+                    device.getClusterServer(BridgedDeviceBasicInformationCluster)?.setReachableAttribute(true);
+                    device.getClusterServer(BridgedDeviceBasicInformationCluster)?.triggerReachableChangedEvent({ reachableNewValue: true });
+                  });
+                }, 30 * 1000);
+                */
+            }, 1000);
         }
         if (this.bridgeMode === 'childbridge') {
             // Plugins are loaded and started by loadPlugin on startup
@@ -1272,45 +1358,50 @@ export class Matterbridge extends EventEmitter {
                 if (!plugin.enabled)
                     return;
                 // Start the interval to check if the plugins is started
-                // TODO set a counter or a timeout
-                this.log.debug(`*Starting startMatterBridge interval for plugin ${plg}${plugin.name}${db} loaded: ${plugin.loaded} started: ${plugin.started}...`);
+                this.log.debug(`*Starting startMatterbridge interval for plugin ${plg}${plugin.name}${db} loaded: ${plugin.loaded} started: ${plugin.started}...`);
+                let failCount = 0;
                 const startInterval = setInterval(async () => {
-                    if (!this.matterServer) {
-                        this.log.error('No matter server initialized');
-                        await this.cleanup('No matter server initialized');
-                        return;
-                    }
-                    if (!plugin.loaded || !plugin.started) {
-                        this.log.info(`**Waiting in startMatterBridge interval for plugin ${plg}${plugin.name}${db} loaded: ${plugin.loaded} started: ${plugin.started}...`);
+                    if (!plugin.loaded || !plugin.started /* || !plugin.configured*/) {
+                        this.log.info(`***Waiting (failSafeCount=${failCount}/30) in startMatterbridge interval for plugin ${plg}${plugin.name}${db} loaded: ${plugin.loaded} started: ${plugin.started}...`);
+                        failCount++;
+                        if (failCount > 30) {
+                            this.log.error(`***Failed to load plugin ${plg}${plugin.name}${er}`);
+                            plugin.error = true;
+                            clearInterval(startInterval);
+                        }
                         return;
                     }
                     if (plugin.type === 'AccessoryPlatform') {
-                        this.registeredDevices
-                            .filter((registeredDevice) => registeredDevice.plugin === plugin.name)
-                            .forEach((registeredDevice) => {
+                        for (const registeredDevice of this.registeredDevices) {
+                            if (registeredDevice.plugin !== plugin.name)
+                                continue;
                             if (!plugin.storageContext)
-                                plugin.storageContext = this.importCommissioningServerContext(plugin.name, registeredDevice.device);
+                                plugin.storageContext = await this.importCommissioningServerContext(plugin.name, registeredDevice.device);
+                            await plugin.storageContext.set('softwareVersion', 1);
+                            await plugin.storageContext.set('softwareVersionString', this.matterbridgeVersion);
                             if (!plugin.commissioningServer)
-                                plugin.commissioningServer = this.createCommisioningServer(plugin.storageContext, plugin.name);
+                                plugin.commissioningServer = await this.createCommisioningServer(plugin.storageContext, plugin.name);
                             this.log.debug(`Adding device ${dev}${registeredDevice.device.name}${db} to commissioning server for plugin ${plg}${plugin.name}${db}`);
                             plugin.commissioningServer.addDevice(registeredDevice.device);
-                        });
+                        }
                         this.log.debug(`Adding commissioning server to matter server for plugin ${plg}${plugin.name}${db}`);
-                        await this.matterServer.addCommissioningServer(plugin.commissioningServer, { uniqueStorageKey: plugin.name });
+                        await this.matterServer?.addCommissioningServer(plugin.commissioningServer, { uniqueStorageKey: plugin.name });
                     }
                     if (plugin.type === 'DynamicPlatform') {
-                        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);
+                        // eslint-disable-next-line max-len
+                        plugin.storageContext = await this.createCommissioningServerContext(plugin.name, 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge Dynamic Platform');
+                        await plugin.storageContext.set('softwareVersion', 1);
+                        await plugin.storageContext.set('softwareVersionString', this.matterbridgeVersion);
+                        plugin.commissioningServer = await 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
+                        plugin.aggregator = await this.createMatterAggregator(plugin.storageContext); // Generate serialNumber and uniqueId
                         this.log.debug(`Adding matter aggregator to commissioning server for plugin ${plg}${plugin.name}${db}`);
                         plugin.commissioningServer.addDevice(plugin.aggregator);
                         this.log.debug(`Adding commissioning server to matter server for plugin ${plg}${plugin.name}${db}`);
-                        await this.matterServer.addCommissioningServer(plugin.commissioningServer, { uniqueStorageKey: plugin.name });
+                        await this.matterServer?.addCommissioningServer(plugin.commissioningServer, { uniqueStorageKey: plugin.name });
                     }
                     clearInterval(startInterval);
+                    this.log.debug(`*Cleared startMatterbridge interval for plugin ${plg}${plugin.name}${db} loaded: ${plugin.loaded} started: ${plugin.started}...`);
                 }, 1000);
             });
             // Start the interval to check if all plugins are loaded and started and so start the matter server
@@ -1321,10 +1412,12 @@ export class Matterbridge extends EventEmitter {
                 this.registeredPlugins.forEach((plugin) => {
                     if (!plugin.enabled)
                         return;
+                    if (plugin.error)
+                        return;
                     if (plugin.enabled && (!plugin.loaded || !plugin.started))
                         allStarted = false;
                     if (!allStarted)
-                        this.log.info(`**Waiting in start matter server interval for plugin ${plg}${plugin.name}${db} to load (${plugin.loaded}) and start (${plugin.started}) ...`);
+                        this.log.info(`***Waiting in start matter server interval for plugin ${plg}${plugin.name}${db} to load (${plugin.loaded}) and start (${plugin.started}) ...`);
                 });
                 if (!allStarted)
                     return;
@@ -1389,14 +1482,14 @@ export class Matterbridge extends EventEmitter {
      * @returns The commissioning server context.
      * @throws Error if the BasicInformationCluster is not found.
      */
-    importCommissioningServerContext(pluginName, device) {
+    async importCommissioningServerContext(pluginName, device) {
         this.log.debug(`Importing matter commissioning server storage context from device for ${plg}${pluginName}${db}`);
         const basic = device.getClusterServer(BasicInformationCluster);
         if (!basic) {
             throw new Error('importCommissioningServerContext error: cannot find the BasicInformationCluster');
         }
         //const random = 'CS' + CryptoNode.getRandomData(8).toHex();
-        return this.createCommissioningServerContext(pluginName, basic.getNodeLabelAttribute(), DeviceTypeId(device.deviceType), basic.getVendorIdAttribute(), basic.getVendorNameAttribute(), basic.getProductIdAttribute(), basic.getProductNameAttribute(), basic.attributes.serialNumber?.getLocal(), basic.attributes.uniqueId?.getLocal(), basic.attributes.softwareVersion?.getLocal(), basic.attributes.softwareVersionString?.getLocal(), basic.attributes.hardwareVersion?.getLocal(), basic.attributes.hardwareVersionString?.getLocal());
+        return await this.createCommissioningServerContext(pluginName, basic.getNodeLabelAttribute(), DeviceTypeId(device.deviceType), basic.getVendorIdAttribute(), basic.getVendorNameAttribute(), basic.getProductIdAttribute(), basic.getProductNameAttribute(), basic.attributes.serialNumber?.getLocal(), basic.attributes.uniqueId?.getLocal(), basic.getSoftwareVersionAttribute(), basic.getSoftwareVersionStringAttribute(), basic.getHardwareVersionAttribute(), basic.getHardwareVersionStringAttribute());
     }
     /**
      * Creates a commissioning server storage context.
@@ -1416,7 +1509,7 @@ export class Matterbridge extends EventEmitter {
      * @param hardwareVersionString - The hardware version string of the device (optional).
      * @returns The storage context for the commissioning server.
      */
-    createCommissioningServerContext(pluginName, deviceName, deviceType, vendorId, vendorName, productId, productName, serialNumber, uniqueId, softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString) {
+    async createCommissioningServerContext(pluginName, deviceName, deviceType, vendorId, vendorName, productId, productName, serialNumber, uniqueId, softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString) {
         if (!this.storageManager) {
             this.log.error('No storage manager initialized');
             process.exit(1);
@@ -1424,20 +1517,23 @@ export class Matterbridge extends EventEmitter {
         this.log.debug(`Creating commissioning server storage context for ${plg}${pluginName}${db}`);
         const random = 'CS' + CryptoNode.getRandomData(8).toHex();
         const storageContext = this.storageManager.createContext(pluginName);
-        storageContext.set('deviceName', deviceName);
-        storageContext.set('deviceType', deviceType);
-        storageContext.set('vendorId', vendorId);
-        storageContext.set('vendorName', vendorName.slice(0, 32));
-        storageContext.set('productId', productId);
-        storageContext.set('productName', productName.slice(0, 32));
-        storageContext.set('nodeLabel', productName.slice(0, 32));
-        storageContext.set('productLabel', productName.slice(0, 32));
-        storageContext.set('serialNumber', storageContext.get('serialNumber', random));
-        storageContext.set('uniqueId', storageContext.get('uniqueId', random));
-        storageContext.set('softwareVersion', softwareVersion ?? 1);
-        storageContext.set('softwareVersionString', softwareVersionString ?? '1.0');
-        storageContext.set('hardwareVersion', hardwareVersion ?? 1);
-        storageContext.set('hardwareVersionString', hardwareVersionString ?? '1.0');
+        await storageContext.set('deviceName', deviceName);
+        await storageContext.set('deviceType', deviceType);
+        await storageContext.set('vendorId', vendorId);
+        await storageContext.set('vendorName', vendorName.slice(0, 32));
+        await storageContext.set('productId', productId);
+        await storageContext.set('productName', productName.slice(0, 32));
+        await storageContext.set('nodeLabel', productName.slice(0, 32));
+        await storageContext.set('productLabel', productName.slice(0, 32));
+        await storageContext.set('serialNumber', await storageContext.get('serialNumber', random));
+        await storageContext.set('uniqueId', await storageContext.get('uniqueId', random));
+        await storageContext.set('softwareVersion', softwareVersion ?? 1);
+        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')}`);
         return storageContext;
     }
     /**
@@ -1502,20 +1598,20 @@ export class Matterbridge extends EventEmitter {
      * @param {string} pluginName - The name of the commissioning server.
      * @returns {CommissioningServer} The created commissioning server.
      */
-    createCommisioningServer(context, pluginName) {
+    async 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');
-        const vendorName = context.get('vendorName'); // Home app = Manufacturer
-        const productId = context.get('productId');
-        const productName = context.get('productName'); // Home app = Model
-        const serialNumber = context.get('serialNumber');
-        const uniqueId = context.get('uniqueId');
-        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');
+        const deviceName = await context.get('deviceName');
+        const deviceType = await context.get('deviceType');
+        const vendorId = await context.get('vendorId');
+        const vendorName = await context.get('vendorName'); // Home app = Manufacturer
+        const productId = await context.get('productId');
+        const productName = await context.get('productName'); // Home app = Model
+        const serialNumber = await context.get('serialNumber');
+        const uniqueId = await context.get('uniqueId');
+        const softwareVersion = await context.get('softwareVersion', 1);
+        const softwareVersionString = await context.get('softwareVersionString', '1.0.0'); // Home app = Firmware Revision
+        const hardwareVersion = await context.get('hardwareVersion', 1);
+        const hardwareVersionString = await 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}`);
@@ -1645,10 +1741,10 @@ export class Matterbridge extends EventEmitter {
      * @param {StorageContext} context - The storage context.
      * @returns {Aggregator} - The created Matter Aggregator.
      */
-    createMatterAggregator(context) {
+    async createMatterAggregator(context) {
         const random = 'AG' + CryptoNode.getRandomData(8).toHex();
-        context.set('aggregatorSerialNumber', context.get('aggregatorSerialNumber', random));
-        context.set('aggregatorUniqueId', context.get('aggregatorUniqueId', random));
+        await context.set('aggregatorSerialNumber', await context.get('aggregatorSerialNumber', random));
+        await context.set('aggregatorUniqueId', await context.get('aggregatorUniqueId', random));
         const matterAggregator = new Aggregator();
         matterAggregator.addClusterServer(ClusterServer(BasicInformationCluster, {
             dataModelRevision: 1,
@@ -1659,8 +1755,8 @@ export class Matterbridge extends EventEmitter {
             productName: 'Matterbridge aggregator',
             productLabel: 'Matterbridge aggregator',
             nodeLabel: 'Matterbridge aggregator',
-            serialNumber: context.get('aggregatorSerialNumber'),
-            uniqueId: context.get('aggregatorUniqueId'),
+            serialNumber: await context.get('aggregatorSerialNumber'),
+            uniqueId: await context.get('aggregatorUniqueId'),
             softwareVersion: 1,
             softwareVersionString: 'v.1.0',
             hardwareVersion: 1,
@@ -1995,7 +2091,7 @@ export class Matterbridge extends EventEmitter {
                 data.push({
                     pluginName: registeredDevice.plugin,
                     type: registeredDevice.device.name + ' (0x' + registeredDevice.device.deviceType.toString(16).padStart(4, '0') + ')',
-                    endpoint: registeredDevice.device.id,
+                    endpoint: registeredDevice.device.number,
                     name,
                     serial,
                     uniqueId,
@@ -2015,7 +2111,7 @@ export class Matterbridge extends EventEmitter {
             }
             const data = [];
             this.registeredDevices.forEach((registeredDevice) => {
-                if (registeredDevice.plugin === selectedPluginName && registeredDevice.device.id === selectedDeviceEndpoint) {
+                if (registeredDevice.plugin === selectedPluginName && registeredDevice.device.number === selectedDeviceEndpoint) {
                     const clusterServers = registeredDevice.device.getAllClusterServers();
                     clusterServers.forEach((clusterServer) => {
                         Object.entries(clusterServer.attributes).forEach(([key, value]) => {
@@ -2151,21 +2247,50 @@ export class Matterbridge extends EventEmitter {
                     await this.nodeContext?.set('plugins', plugins);
                     this.log.info(`Enabled plugin ${plg}${param}${nf}`);
                 }
+                if (this.bridgeMode === 'bridge') {
+                    const pluginToEnable = this.findPlugin(param);
+                    if (pluginToEnable) {
+                        pluginToEnable.enabled = true;
+                        pluginToEnable.platform = await this.loadPlugin(pluginToEnable);
+                        if (pluginToEnable.platform) {
+                            await this.startPlugin(pluginToEnable, 'The plugin has been enabled', true);
+                            pluginToEnable.enabled = false;
+                        }
+                        else {
+                            pluginToEnable.enabled = false;
+                            pluginToEnable.error = true;
+                            this.log.error(`Error enabling plugin ${plg}${param}${er}`);
+                        }
+                    }
+                }
             }
             // Handle the command disableplugin from Home
             if (command === 'disableplugin') {
-                const plugins = await this.nodeContext?.get('plugins');
-                if (!plugins)
-                    return;
-                const plugin = plugins.find((plugin) => plugin.name === param);
-                if (plugin) {
-                    plugin.enabled = false;
-                    plugin.loaded = undefined;
-                    plugin.started = undefined;
-                    plugin.configured = undefined;
-                    plugin.connected = undefined;
-                    await this.nodeContext?.set('plugins', plugins);
-                    this.log.info(`Disabled plugin ${plg}${param}${nf}`);
+                const pluginToDisable = this.findPlugin(param);
+                if (pluginToDisable) {
+                    if (pluginToDisable.platform) {
+                        await pluginToDisable.platform.onShutdown('The plugin has been removed.');
+                        await this.savePluginConfig(pluginToDisable);
+                    }
+                    pluginToDisable.enabled = false;
+                    pluginToDisable.loaded = undefined;
+                    pluginToDisable.started = undefined;
+                    pluginToDisable.configured = undefined;
+                    pluginToDisable.connected = undefined;
+                    pluginToDisable.platform = undefined;
+                    const plugins = await this.nodeContext?.get('plugins');
+                    if (!plugins)
+                        return;
+                    const plugin = plugins.find((plugin) => plugin.name === param);
+                    if (plugin) {
+                        plugin.enabled = false;
+                        plugin.loaded = undefined;
+                        plugin.started = undefined;
+                        plugin.configured = undefined;
+                        plugin.connected = undefined;
+                        await this.nodeContext?.set('plugins', plugins);
+                        this.log.info(`Disabled plugin ${plg}${param}${nf}`);
+                    }
                 }
             }
             res.json({ message: 'Command received' });
@@ -2199,6 +2324,8 @@ export class Matterbridge extends EventEmitter {
                 attributes += `Cover position: ${clusterServer.attributes.currentPositionLiftPercent100ths.getLocal() / 100}% `;
             if (clusterServer.name === 'DoorLock')
                 attributes += `State: ${clusterServer.attributes.lockState.getLocal() === 1 ? 'Locked' : 'Not locked'} `;
+            if (clusterServer.name === 'Thermostat')
+                attributes += `Temperature: ${clusterServer.attributes.localTemperature.getLocal() / 100}°C `;
             if (clusterServer.name === 'LevelControl')
                 attributes += `Level: ${clusterServer.getCurrentLevelAttribute()}% `;
             if (clusterServer.name === 'ColorControl')