matterbridge 1.2.13 → 1.2.15

package/dist/matterbridge.js

@@ -34,7 +34,7 @@ import path from 'path';
 import WebSocket, { WebSocketServer } from 'ws';
 import { BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster } from './BridgedDeviceBasicInformationCluster.js';
 import { CommissioningController, CommissioningServer, MatterServer } from '@project-chip/matter-node.js';
-import { BasicInformationCluster, BooleanStateCluster, ClusterServer, FixedLabelCluster, GeneralCommissioning, GeneralDiagnostics, GeneralDiagnosticsCluster, PowerSourceCluster, ThreadNetworkDiagnosticsCluster, getClusterNameById, } from '@project-chip/matter-node.js/cluster';
+import { BasicInformationCluster, ClusterServer, FixedLabelCluster, GeneralCommissioning, GeneralDiagnostics, GeneralDiagnosticsCluster, PowerSourceCluster, ThreadNetworkDiagnosticsCluster, getClusterNameById, } from '@project-chip/matter-node.js/cluster';
 import { DeviceTypeId, VendorId } from '@project-chip/matter-node.js/datatype';
 import { Aggregator, DeviceTypes, NodeStateInformation } from '@project-chip/matter-node.js/device';
 import { Format, Level, Logger } from '@project-chip/matter-node.js/log';
@@ -42,6 +42,7 @@ import { ManualPairingCodeCodec, QrCodeSchema } from '@project-chip/matter-node.
 import { StorageBackendDisk, StorageBackendJsonFile, StorageManager } from '@project-chip/matter-node.js/storage';
 import { requireMinNodeVersion, getParameter, getIntParameter, hasParameter } from '@project-chip/matter-node.js/util';
 import { CryptoNode } from '@project-chip/matter-node.js/crypto';
+import { somfytahoma_config, somfytahoma_schema, zigbee2mqtt_config, zigbee2mqtt_schema } from './defaultConfigSchema.js';
 const plg = '\u001B[38;5;33m';
 const dev = '\u001B[38;5;79m';
 const typ = '\u001B[38;5;207m';
@@ -50,6 +51,7 @@ const typ = '\u001B[38;5;207m';
  */
 export class Matterbridge extends EventEmitter {
     systemInformation = {
+        macAddress: '',
         ipv4Address: '',
         ipv6Address: '',
         nodeVersion: '',
@@ -157,7 +159,7 @@ export class Matterbridge extends EventEmitter {
             addedDevices: 0,
         };
         this.registeredPlugins.push(plugin);
-        await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+        await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
         // Log system info and create .matterbridge directory
         await this.logNodeAndSystemInfo();
         this.matterbridgeDirectory = dataPath;
@@ -179,7 +181,7 @@ export class Matterbridge extends EventEmitter {
         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.matterAggregator = await this.createMatterAggregator(this.matterbridgeContext, 'Matterbridge');
         this.log.debug('Adding matterbridge aggregator to commissioning server');
         this.commissioningServer.addDevice(this.matterAggregator);
         this.log.debug('Adding matterbridge commissioning server to matter server');
@@ -499,7 +501,7 @@ export class Matterbridge extends EventEmitter {
                     const plugin = { path: packageJsonPath, type: '', name: packageJson.name, version: packageJson.version, description: packageJson.description, author: packageJson.author, enabled: true };
                     if (await this.loadPlugin(plugin)) {
                         this.registeredPlugins.push(plugin);
-                        await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                        await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
                         this.log.info(`Plugin ${plg}${packageJsonPath}${nf} type ${plugin.type} added to matterbridge`);
                     }
                     else {
@@ -513,7 +515,7 @@ export class Matterbridge extends EventEmitter {
             else if (mode === 'remove') {
                 if (this.registeredPlugins.find((registeredPlugin) => registeredPlugin.name === packageJson.name)) {
                     this.registeredPlugins.splice(this.registeredPlugins.findIndex((registeredPlugin) => registeredPlugin.name === packageJson.name), 1);
-                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
                     this.log.info(`Plugin ${plg}${packageJsonPath}${nf} removed from matterbridge`);
                 }
                 else {
@@ -528,7 +530,7 @@ export class Matterbridge extends EventEmitter {
                     plugin.started = undefined;
                     plugin.configured = undefined;
                     plugin.connected = undefined;
-                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
                     this.log.info(`Plugin ${plg}${packageJsonPath}${nf} enabled`);
                 }
                 else {
@@ -543,7 +545,7 @@ export class Matterbridge extends EventEmitter {
                     plugin.started = undefined;
                     plugin.configured = undefined;
                     plugin.connected = undefined;
-                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
                     this.log.info(`Plugin ${plg}${packageJsonPath}${nf} disabled`);
                 }
                 else {
@@ -565,7 +567,7 @@ export class Matterbridge extends EventEmitter {
                     if (!context)
                         this.log.error(`Plugin ${plg}${plugin.name}${er} context not found`);
                     await context?.clearAll();
-                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
                     this.log.info(`Reset commissionig for plugin ${plg}${plugin.name}${nf} done! Remove the device from the controller.`);
                 }
                 else {
@@ -992,7 +994,8 @@ export class Matterbridge extends EventEmitter {
             }
         }
         catch (error) {
-            this.log.error('Storage initialize() error!');
+            this.log.error('Storage initialize() error! The file .matterbridge/matterbridge.json may be corrupted.');
+            this.log.error('Please delete it and rename matterbridge.backup.json to matterbridge.json and try to restart Matterbridge.');
             await this.cleanup('Storage initialize() error!');
         }
     }
@@ -1035,93 +1038,176 @@ export class Matterbridge extends EventEmitter {
         this.mattercontrollerContext = undefined;
     }
     async testStartMatterBridge() {
-        // 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;
+          this.log.error('No storage manager initialized');
+          await this.cleanup('No storage manager initialized');
+          return;
         }
         this.log.debug('Starting matterbridge in mode', this.bridgeMode);
         this.matterServer = this.createMatterServer(this.storageManager);
+    
         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;
+          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, 'Matterbridge');
+          this.log.debug('Adding matterbridge aggregator to commissioning server');
+          this.commissioningServer.addDevice(this.matterAggregator);
+    
+          const device = new MatterbridgeDevice(DeviceTypes.CONTACT_SENSOR);
+          device.createDefaultIdentifyClusterServer();
+          device.createDefaultBridgedDeviceBasicInformationClusterServer('Boolean test', '0x89930475', 0x8000, 'Matterbridge', 'Boolean');
+          device.createDefaultBooleanStateClusterServer(true);
+          device.createDefaultPowerSourceReplaceableBatteryClusterServer(75);
+          device.createDefaultPowerSourceConfigurationClusterServer(1);
+    
+          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');
+    
+          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 schema for a plugin.
+     * If the schema file exists, it reads the file and returns the parsed JSON data.
+     * If the schema 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 return an empty schema.
+     *
+     * @param plugin - The plugin for which to load the schema.
+     * @returns A promise that resolves to the loaded or created schema.
+     */
+    async loadPluginSchema(plugin) {
+        const schemaFile = path.join(this.matterbridgeDirectory, `${plugin.name}.schema.json`);
+        try {
+            await fs.access(schemaFile);
+            const data = await fs.readFile(schemaFile, 'utf8');
+            const schema = JSON.parse(data);
+            schema.title = plugin.description;
+            schema.description = plugin.name + ' v. ' + plugin.version + ' by ' + plugin.author;
+            this.log.debug(`Schema file found: ${schemaFile}.\nSchema:${rs}\n`, schema);
+            return schema;
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                const nodeErr = err;
+                if (nodeErr.code === 'ENOENT') {
+                    let schema;
+                    if (plugin.name === 'matterbridge-zigbee2mqtt')
+                        schema = zigbee2mqtt_schema;
+                    else if (plugin.name === 'matterbridge-somfy-tahoma')
+                        schema = somfytahoma_schema;
+                    else
+                        schema = {
+                            title: plugin.description,
+                            description: plugin.name + ' v. ' + plugin.version + ' by ' + plugin.author,
+                            type: 'object',
+                            properties: {
+                                name: {
+                                    description: 'Plugin name',
+                                    type: 'string',
+                                    readOnly: true,
+                                },
+                                type: {
+                                    description: 'Plugin type',
+                                    type: 'string',
+                                    readOnly: true,
+                                },
+                                unregisterOnShutdown: {
+                                    description: 'Unregister all devices on shutdown (development only)',
+                                    type: 'boolean',
+                                },
+                            },
+                        };
+                    try {
+                        await this.writeFile(schemaFile, JSON.stringify(schema, null, 2));
+                        this.log.debug(`Created schema file: ${schemaFile}.\nSchema:${rs}\n`, schema);
+                        return schema;
                     }
-                    else {
-                        return;
+                    catch (err) {
+                        this.log.error(`Error creating schema file ${schemaFile}: ${err}`);
+                        return schema;
                     }
                 }
+                else {
+                    this.log.error(`Error accessing schema file ${schemaFile}: ${err}`);
+                    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);
+            this.log.error(`Error loading schema file ${schemaFile}: ${err}`);
+            return {};
+        }
+    }
+    /**
+     * Saves the plugin configuration to a JSON file.
+     * @param plugin - The registered plugin.
+     * @param config - The platform configuration.
+     * @returns A promise that resolves when the configuration is saved successfully, or rejects with an error.
+     */
+    async savePluginConfigFromJson(plugin, config) {
+        if (!config.name || !config.type || config.name !== plugin.name) {
+            this.log.error(`Error saving plugin ${plg}${plugin.name}${er} config`);
+            return;
+        }
+        const configFile = path.join(this.matterbridgeDirectory, `${plugin.name}.config.json`);
+        try {
+            await this.writeFile(configFile, JSON.stringify(config, null, 2));
+            this.log.debug(`Saved config file: ${configFile}.\nConfig:${rs}\n`, config);
+        }
+        catch (err) {
+            this.log.error(`Error saving plugin ${plg}${plugin.name}${er} config: ${err}`);
+            return;
+        }
     }
     /**
      * Loads the configuration for a plugin.
@@ -1148,22 +1234,30 @@ export class Matterbridge extends EventEmitter {
             if (err instanceof Error) {
                 const nodeErr = err;
                 if (nodeErr.code === 'ENOENT') {
+                    let config;
+                    if (plugin.name === 'matterbridge-zigbee2mqtt')
+                        config = zigbee2mqtt_config;
+                    else if (plugin.name === 'matterbridge-somfy-tahoma')
+                        config = somfytahoma_config;
+                    else
+                        config = { name: plugin.name, type: plugin.type, unregisterOnShutdown: false };
                     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 };
+                        await this.writeFile(configFile, JSON.stringify(config, null, 2));
+                        this.log.debug(`Created config file: ${configFile}.\nConfig:${rs}\n`, config);
+                        return config;
                     }
                     catch (err) {
                         this.log.error(`Error creating config file ${configFile}: ${err}`);
-                        return Promise.reject(err);
+                        return config;
                     }
                 }
                 else {
                     this.log.error(`Error accessing config file ${configFile}: ${err}`);
-                    return Promise.reject(err);
+                    return {};
                 }
             }
-            return Promise.reject(err);
+            this.log.error(`Error loading config file ${configFile}: ${err}`);
+            return {};
         }
     }
     /**
@@ -1328,11 +1422,11 @@ export class Matterbridge extends EventEmitter {
                 plugin.loaded = true;
                 plugin.registeredDevices = 0;
                 plugin.addedDevices = 0;
-                await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
                 this.getLatestVersion(plugin.name)
                     .then(async (latestVersion) => {
                     plugin.latestVersion = latestVersion;
-                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
                     if (plugin.version !== latestVersion)
                         this.log.warn(`The plugin ${plg}${plugin.name}${wr} is out of date. Current version: ${plugin.version}, Latest version: ${latestVersion}`);
                     else
@@ -1570,12 +1664,10 @@ export class Matterbridge extends EventEmitter {
                     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.matterAggregator = await this.createMatterAggregator(this.matterbridgeContext, 'Matterbridge');
                 this.log.debug('Adding matterbridge aggregator to commissioning server');
                 this.commissioningServer.addDevice(this.matterAggregator);
                 this.log.debug('Adding matterbridge commissioning server to matter server');
@@ -1622,8 +1714,7 @@ export class Matterbridge extends EventEmitter {
                                 continue;
                             if (!plugin.storageContext)
                                 plugin.storageContext = await this.importCommissioningServerContext(plugin.name, registeredDevice.device);
-                            await plugin.storageContext.set('softwareVersion', 1);
-                            await plugin.storageContext.set('softwareVersionString', this.matterbridgeVersion);
+                            this.log.debug(`Creating commissioning server for ${plg}${plugin.name}${db}`);
                             if (!plugin.commissioningServer)
                                 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}`);
@@ -1635,13 +1726,12 @@ export class Matterbridge extends EventEmitter {
                         await this.matterServer?.addCommissioningServer(plugin.commissioningServer, { uniqueStorageKey: plugin.name });
                     }
                     if (plugin.type === 'DynamicPlatform') {
-                        // eslint-disable-next-line max-len
+                        this.log.debug(`Creating commissioning server context for ${plg}${plugin.name}${db}`);
                         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);
+                        this.log.debug(`Creating commissioning server for ${plg}${plugin.name}${db}`);
                         plugin.commissioningServer = await this.createCommisioningServer(plugin.storageContext, plugin.name);
                         this.log.debug(`Creating aggregator for plugin ${plg}${plugin.name}${db}`);
-                        plugin.aggregator = await this.createMatterAggregator(plugin.storageContext); // Generate serialNumber and uniqueId
+                        plugin.aggregator = await this.createMatterAggregator(plugin.storageContext, plugin.name); // 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}`);
@@ -1727,10 +1817,35 @@ export class Matterbridge extends EventEmitter {
         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');
+            this.log.error('importCommissioningServerContext error: cannot find the BasicInformationCluster');
+            process.exit(1);
+        }
+        if (!this.storageManager) {
+            this.log.error('importCommissioningServerContext error: no storage manager initialized');
+            process.exit(1);
         }
-        //const random = 'CS' + CryptoNode.getRandomData(8).toHex();
-        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());
+        this.log.debug(`Importing commissioning server storage context for ${plg}${pluginName}${db}`);
+        const storageContext = this.storageManager.createContext(pluginName);
+        await storageContext.set('deviceName', basic.getNodeLabelAttribute());
+        await storageContext.set('deviceType', DeviceTypeId(device.deviceType));
+        await storageContext.set('vendorId', basic.getVendorIdAttribute());
+        await storageContext.set('vendorName', basic.getVendorNameAttribute());
+        await storageContext.set('productId', basic.getProductIdAttribute());
+        await storageContext.set('productName', basic.getProductNameAttribute());
+        await storageContext.set('nodeLabel', basic.getNodeLabelAttribute());
+        await storageContext.set('productLabel', basic.getNodeLabelAttribute());
+        await storageContext.set('serialNumber', basic.attributes.serialNumber?.getLocal());
+        await storageContext.set('uniqueId', basic.attributes.uniqueId?.getLocal());
+        await storageContext.set('softwareVersion', basic.getSoftwareVersionAttribute());
+        await storageContext.set('softwareVersionString', basic.getSoftwareVersionStringAttribute());
+        await storageContext.set('hardwareVersion', basic.getHardwareVersionAttribute());
+        await storageContext.set('hardwareVersionString', basic.getHardwareVersionStringAttribute());
+        this.log.debug(`Imported commissioning server storage context for ${plg}${pluginName}${db}`);
+        this.log.debug(`- deviceName: ${await storageContext.get('deviceName')} deviceType: ${await storageContext.get('deviceType')}(0x${(await storageContext.get('deviceType'))?.toString(16).padStart(4, '0')})`);
+        this.log.debug(`- serialNumber: ${await storageContext.get('serialNumber')} uniqueId: ${await storageContext.get('uniqueId')}`);
+        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;
     }
     /**
      * Creates a commissioning server storage context.
@@ -1750,7 +1865,7 @@ export class Matterbridge extends EventEmitter {
      * @param hardwareVersionString - The hardware version string of the device (optional).
      * @returns The storage context for the commissioning server.
      */
-    async createCommissioningServerContext(pluginName, deviceName, deviceType, vendorId, vendorName, productId, productName, serialNumber, uniqueId, softwareVersion, softwareVersionString, hardwareVersion, hardwareVersionString) {
+    async createCommissioningServerContext(pluginName, deviceName, deviceType, vendorId, vendorName, productId, productName) {
         if (!this.storageManager) {
             this.log.error('No storage manager initialized');
             process.exit(1);
@@ -1768,11 +1883,13 @@ export class Matterbridge extends EventEmitter {
         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');
+        await storageContext.set('softwareVersion', this.matterbridgeVersion && this.matterbridgeVersion.includes('.') ? parseInt(this.matterbridgeVersion.split('.')[0], 10) : 1);
+        await storageContext.set('softwareVersionString', this.matterbridgeVersion ?? '1.0.0');
+        await storageContext.set('hardwareVersion', this.systemInformation.osRelease && this.systemInformation.osRelease.includes('.') ? parseInt(this.systemInformation.osRelease.split('.')[0], 10) : 1);
+        await storageContext.set('hardwareVersionString', this.systemInformation.osRelease ?? '1.0.0');
         this.log.debug(`Created commissioning server storage context for ${plg}${pluginName}${db}`);
+        this.log.debug(`- deviceName: ${await storageContext.get('deviceName')} deviceType: ${await storageContext.get('deviceType')}(0x${(await storageContext.get('deviceType'))?.toString(16).padStart(4, '0')})`);
+        this.log.debug(`- serialNumber: ${await storageContext.get('serialNumber')} uniqueId: ${await storageContext.get('uniqueId')}`);
         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;
@@ -1805,7 +1922,7 @@ export class Matterbridge extends EventEmitter {
                     plugin.paired = false;
                 }
             }
-            await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+            await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
         }
         else {
             this.log.info(`*The commissioning server on port ${commissioningServer.getPort()} for ${plg}${pluginName}${nf} is already commissioned . Waiting for controllers to connect ...`);
@@ -1815,7 +1932,7 @@ export class Matterbridge extends EventEmitter {
                     plugin.paired = true;
                 }
             }
-            await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+            await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
         }
     }
     /**
@@ -2044,18 +2161,43 @@ export class Matterbridge extends EventEmitter {
         });
         const gdcCluster = commissioningServer.getRootClusterServer(GeneralDiagnosticsCluster);
         if (gdcCluster) {
-            gdcCluster.setNetworkInterfacesAttribute([
-                {
-                    name: 'eth0',
-                    isOperational: true,
-                    offPremiseServicesReachableIPv4: null,
-                    offPremiseServicesReachableIPv6: null,
-                    hardwareAddress: Uint8Array.fromString('00000000'),
-                    iPv4Addresses: [Uint8Array.fromString('0000')],
-                    iPv6Addresses: [Uint8Array.fromString('0000000000000000')],
-                    type: GeneralDiagnostics.InterfaceType.Ethernet,
-                },
-            ]);
+            // We have like "30:f6:ef:69:2b:c5" in this.systemInformation.macAddress
+            const macArray = this.systemInformation.macAddress.split(':').map((hex) => parseInt(hex, 16));
+            let hardwareAddress = new Uint8Array(macArray);
+            if (hardwareAddress.length === 6)
+                hardwareAddress = Uint8Array.from([0, 0, ...hardwareAddress]);
+            // We have like "192.168.1.189" in this.systemInformation.ipv4Address
+            const ipv4Array = this.systemInformation.ipv4Address.split('.').map((num) => parseInt(num));
+            const iPv4Address = new Uint8Array(ipv4Array);
+            // We have like "fd78:cbf8:4939:746:d555:85a9:74f6:9c6" in this.systemInformation.ipv6Address
+            const ipv6Groups = this.systemInformation.ipv6Address.split(':');
+            const ipv6Array = [];
+            for (const group of ipv6Groups) {
+                const decimal = parseInt(group, 16);
+                ipv6Array.push(decimal >> 8); // High byte
+                ipv6Array.push(decimal & 0xff); // Low byte
+            }
+            const iPv6Address = new Uint8Array(ipv6Array);
+            this.log.debug(`GeneralDiagnosticsCluster for ${plg}${pluginName}${db} hardwareAddress ${this.systemInformation.macAddress} => ${debugStringify(hardwareAddress)}`);
+            this.log.debug(`GeneralDiagnosticsCluster for ${plg}${pluginName}${db} iPv4Address ${this.systemInformation.ipv4Address} => ${debugStringify(iPv4Address)}`);
+            this.log.debug(`GeneralDiagnosticsCluster for ${plg}${pluginName}${db} iPv6Address ${this.systemInformation.ipv6Address} => ${debugStringify(iPv6Address)}`);
+            try {
+                gdcCluster.setNetworkInterfacesAttribute([
+                    {
+                        name: 'eth0',
+                        isOperational: true,
+                        offPremiseServicesReachableIPv4: null,
+                        offPremiseServicesReachableIPv6: null,
+                        hardwareAddress,
+                        iPv4Addresses: [iPv4Address],
+                        iPv6Addresses: [iPv6Address],
+                        type: GeneralDiagnostics.InterfaceType.Ethernet,
+                    },
+                ]);
+            }
+            catch (error) {
+                this.log.error(`GeneralDiagnosticsCluster.setNetworkInterfacesAttribute for ${plg}${pluginName}${er} error:`, error);
+            }
         }
         else
             this.log.warn(`*GeneralDiagnosticsCluster not found for ${plg}${pluginName}${wr}`);
@@ -2078,10 +2220,13 @@ export class Matterbridge extends EventEmitter {
      * @param {StorageContext} context - The storage context.
      * @returns {Aggregator} - The created Matter Aggregator.
      */
-    async createMatterAggregator(context) {
+    async createMatterAggregator(context, pluginName) {
         const random = 'AG' + CryptoNode.getRandomData(8).toHex();
         await context.set('aggregatorSerialNumber', await context.get('aggregatorSerialNumber', random));
         await context.set('aggregatorUniqueId', await context.get('aggregatorUniqueId', random));
+        this.log.debug(`Creating matter aggregator for plugin ${plg}${pluginName}${db} with uniqueId ${await context.get('aggregatorUniqueId')} serialNumber ${await context.get('aggregatorSerialNumber')}`);
+        this.log.debug(`Creating matter aggregator for plugin ${plg}${pluginName}${db} with softwareVersion ${await context.get('softwareVersion', 1)} softwareVersionString ${await context.get('softwareVersionString', '1.0.0')}`);
+        this.log.debug(`Creating matter aggregator for plugin ${plg}${pluginName}${db} with hardwareVersion ${await context.get('hardwareVersion', 1)} hardwareVersionString ${await context.get('hardwareVersionString', '1.0.0')}`);
         const matterAggregator = new Aggregator();
         matterAggregator.addClusterServer(ClusterServer(BasicInformationCluster, {
             dataModelRevision: 1,
@@ -2094,10 +2239,10 @@ export class Matterbridge extends EventEmitter {
             nodeLabel: 'Matterbridge aggregator',
             serialNumber: await context.get('aggregatorSerialNumber'),
             uniqueId: await context.get('aggregatorUniqueId'),
-            softwareVersion: 1,
-            softwareVersionString: 'v.1.0',
-            hardwareVersion: 1,
-            hardwareVersionString: 'v.1.0',
+            softwareVersion: await context.get('softwareVersion', 1),
+            softwareVersionString: await context.get('softwareVersionString', '1.0.0'),
+            hardwareVersion: await context.get('hardwareVersion', 1),
+            hardwareVersionString: await context.get('hardwareVersionString', '1.0.0'),
             reachable: true,
             capabilityMinima: { caseSessionsPerFabric: 3, subscriptionsPerFabric: 3 },
         }, {}, {
@@ -2172,9 +2317,11 @@ export class Matterbridge extends EventEmitter {
             for (const detail of interfaceDetails) {
                 if (detail.family === 'IPv4' && !detail.internal && this.systemInformation.ipv4Address === 'Not found') {
                     this.systemInformation.ipv4Address = detail.address;
+                    this.systemInformation.macAddress = detail.mac;
                 }
                 else if (detail.family === 'IPv6' && !detail.internal && this.systemInformation.ipv6Address === 'Not found') {
                     this.systemInformation.ipv6Address = detail.address;
+                    this.systemInformation.macAddress = detail.mac;
                 }
             }
             // Break if both addresses are found to improve efficiency
@@ -2201,6 +2348,7 @@ export class Matterbridge extends EventEmitter {
         this.log.debug('Host System Information:');
         this.log.debug(`- Hostname: ${this.systemInformation.hostname}`);
         this.log.debug(`- User: ${this.systemInformation.user}`);
+        this.log.debug(`- MAC Address: ${this.systemInformation.macAddress}`);
         this.log.debug(`- IPv4 Address: ${this.systemInformation.ipv4Address}`);
         this.log.debug(`- IPv6 Address: ${this.systemInformation.ipv6Address}`);
         this.log.debug(`- Node.js: ${versionMajor}.${versionMinor}.${versionPatch}`);
@@ -2316,25 +2464,30 @@ export class Matterbridge extends EventEmitter {
      *
      * @returns {BaseRegisteredPlugin[]} An array of base registered plugins.
      */
-    getBaseRegisteredPlugins() {
-        const baseRegisteredPlugins = this.registeredPlugins.map((plugin) => ({
-            path: plugin.path,
-            type: plugin.type,
-            name: plugin.name,
-            version: plugin.version,
-            latestVersion: plugin.latestVersion,
-            description: plugin.description,
-            author: plugin.author,
-            enabled: plugin.enabled,
-            loaded: plugin.loaded,
-            started: plugin.started,
-            configured: plugin.configured,
-            paired: plugin.paired,
-            connected: plugin.connected,
-            registeredDevices: plugin.registeredDevices,
-            qrPairingCode: plugin.qrPairingCode,
-            manualPairingCode: plugin.manualPairingCode,
-        }));
+    async getBaseRegisteredPlugins(includeConfigSchema = false) {
+        const baseRegisteredPlugins = [];
+        for (const plugin of this.registeredPlugins) {
+            baseRegisteredPlugins.push({
+                path: plugin.path,
+                type: plugin.type,
+                name: plugin.name,
+                version: plugin.version,
+                latestVersion: plugin.latestVersion,
+                description: plugin.description,
+                author: plugin.author,
+                enabled: plugin.enabled,
+                loaded: plugin.loaded,
+                started: plugin.started,
+                configured: plugin.configured,
+                paired: plugin.paired,
+                connected: plugin.connected,
+                registeredDevices: plugin.registeredDevices,
+                qrPairingCode: plugin.qrPairingCode,
+                manualPairingCode: plugin.manualPairingCode,
+                configJson: includeConfigSchema ? await this.loadPluginConfig(plugin) : {},
+                schemaJson: includeConfigSchema ? await this.loadPluginSchema(plugin) : {},
+            });
+        }
         return baseRegisteredPlugins;
     }
     /**
@@ -2555,9 +2708,9 @@ export class Matterbridge extends EventEmitter {
             res.json(response);
         });
         // Endpoint to provide plugins
-        this.expressApp.get('/api/plugins', (req, res) => {
+        this.expressApp.get('/api/plugins', async (req, res) => {
             this.log.debug('The frontend sent /api/plugins');
-            res.json(this.getBaseRegisteredPlugins());
+            res.json(await this.getBaseRegisteredPlugins(true));
         });
         // Endpoint to provide devices
         this.expressApp.get('/api/devices', (req, res) => {
@@ -2662,7 +2815,7 @@ export class Matterbridge extends EventEmitter {
             res.json(data);
         });
         // Endpoint to receive commands
-        this.expressApp.post('/api/command/:command/:param', async (req, res) => {
+        this.expressApp.post('/api/command/:command/:param', express.json(), async (req, res) => {
             const command = req.params.command;
             let param = req.params.param;
             this.log.debug(`The frontend sent /api/command/${command}/${param}`);
@@ -2679,6 +2832,7 @@ export class Matterbridge extends EventEmitter {
             }
             // Handle the command debugLevel from Settings
             if (command === 'setloglevel') {
+                this.log.debug('setloglevel:', param);
                 if (param === 'Debug') {
                     this.log.setLogDebug(true);
                     this.debugEnabled = true;
@@ -2737,10 +2891,23 @@ export class Matterbridge extends EventEmitter {
                 }
                 this.updateProcess();
             }
+            // Handle the command saveschema from Home
+            if (command === 'saveconfig') {
+                param = param.replace(/\*/g, '\\');
+                this.log.info(`Saving config for plugin ${plg}${param}${nf}...`);
+                //console.log('Req.body:', JSON.stringify(req.body, null, 2));
+                const plugins = await this.nodeContext?.get('plugins');
+                if (!plugins)
+                    return;
+                const plugin = plugins.find((plugin) => plugin.name === param);
+                if (!plugin)
+                    return;
+                this.savePluginConfigFromJson(plugin, req.body);
+            }
             // Handle the command installplugin from Home
             if (command === 'installplugin') {
                 param = param.replace(/\*/g, '\\');
-                this.log.info(`Installing plugin ${plg}${param}${db}...`);
+                this.log.info(`Installing plugin ${plg}${param}${nf}...`);
                 try {
                     await this.spawnCommand('npm', ['install', '-g', param, '--loglevel=verbose']);
                     this.log.info(`Plugin ${plg}${param}${nf} installed. Full restart required.`);
@@ -2772,7 +2939,7 @@ export class Matterbridge extends EventEmitter {
                     const plugin = { path: packageJsonPath, type: '', name: packageJson.name, version: packageJson.version, description: packageJson.description, author: packageJson.author, enabled: true };
                     if (await this.loadPlugin(plugin)) {
                         this.registeredPlugins.push(plugin);
-                        await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                        await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
                         this.log.info(`Plugin ${plg}${packageJsonPath}${nf} type ${plugin.type} added to matterbridge. Restart required.`);
                     }
                     else {
@@ -2794,7 +2961,7 @@ export class Matterbridge extends EventEmitter {
                         // await this.savePluginConfig(this.registeredPlugins[index]);
                     }
                     this.registeredPlugins.splice(index, 1);
-                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
                     this.log.info(`Plugin ${plg}${param}${nf} removed from matterbridge`);
                 }
                 else {