matterbridge 1.2.12 → 1.2.14

package/dist/matterbridge.js

@@ -32,8 +32,9 @@ import express from 'express';
 import os from 'os';
 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, BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster, ClusterServer, FixedLabelCluster, GeneralCommissioning, PowerSourceCluster, ThreadNetworkDiagnosticsCluster, getClusterNameById, } from '@project-chip/matter-node.js/cluster';
+import { BasicInformationCluster, BooleanStateCluster, 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';
@@ -41,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';
@@ -49,6 +51,7 @@ const typ = '\u001B[38;5;207m';
  */
 export class Matterbridge extends EventEmitter {
     systemInformation = {
+        macAddress: '',
         ipv4Address: '',
         ipv6Address: '',
         nodeVersion: '',
@@ -156,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;
@@ -498,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 {
@@ -512,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 {
@@ -527,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 {
@@ -542,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 {
@@ -564,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 {
@@ -655,7 +658,7 @@ export class Matterbridge extends EventEmitter {
                 if (plugin.platform) {
                     try {
                         await plugin.platform.onShutdown('Matterbridge is closing: ' + message);
-                        await this.savePluginConfig(plugin);
+                        // await this.savePluginConfig(plugin);
                     }
                     catch (error) {
                         this.log.error(`Plugin ${plg}${plugin.name}${er} shutting down error: ${error}`);
@@ -991,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!');
         }
     }
@@ -1122,6 +1126,97 @@ export class Matterbridge extends EventEmitter {
             }, 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;
+                    }
+                    catch (err) {
+                        this.log.error(`Error creating schema file ${schemaFile}: ${err}`);
+                        return schema;
+                    }
+                }
+                else {
+                    this.log.error(`Error accessing schema file ${schemaFile}: ${err}`);
+                    return {};
+                }
+            }
+            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.
      * If the configuration file exists, it reads the file and returns the parsed JSON data.
@@ -1147,22 +1242,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 {};
         }
     }
     /**
@@ -1266,6 +1369,7 @@ export class Matterbridge extends EventEmitter {
                 .then(() => {
                 plugin.configured = true;
                 this.log.info(`Configured plugin ${plg}${plugin.name}${db} type ${typ}${plugin.type}${db}`);
+                this.savePluginConfig(plugin);
                 return Promise.resolve();
             })
                 .catch((err) => {
@@ -1297,7 +1401,7 @@ export class Matterbridge extends EventEmitter {
             this.log.error(`Plugin ${plg}${plugin.name}${er} already loaded`);
             return Promise.resolve(plugin.platform);
         }
-        this.log.info(`Loading plugin ${plg}${plugin.name}${db} type ${typ}${plugin.type}${db}`);
+        this.log.info(`Loading plugin ${plg}${plugin.name}${nf} type ${typ}${plugin.type}${nf}`);
         try {
             // Load the package.json of the plugin
             const packageJson = JSON.parse(await fs.readFile(plugin.path, 'utf8'));
@@ -1316,6 +1420,7 @@ export class Matterbridge extends EventEmitter {
                 const platform = pluginInstance.default(this, log, config);
                 platform.name = packageJson.name;
                 platform.config = config;
+                platform.version = packageJson.version;
                 plugin.name = packageJson.name;
                 plugin.description = packageJson.description;
                 plugin.version = packageJson.version;
@@ -1325,8 +1430,20 @@ export class Matterbridge extends EventEmitter {
                 plugin.loaded = true;
                 plugin.registeredDevices = 0;
                 plugin.addedDevices = 0;
-                await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
-                this.log.info(`Loaded plugin ${plg}${plugin.name}${db} type ${typ}${platform.type}${db} (entrypoint ${UNDERLINE}${pluginEntry}${UNDERLINEOFF})`);
+                await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
+                this.getLatestVersion(plugin.name)
+                    .then(async (latestVersion) => {
+                    plugin.latestVersion = latestVersion;
+                    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
+                        this.log.info(`The plugin ${plg}${plugin.name}${nf} is up to date. Current version: ${plugin.version}, Latest version: ${latestVersion}`);
+                })
+                    .catch((error) => {
+                    this.log.error(`Error getting ${plugin.name} latest version: ${error}`);
+                });
+                this.log.info(`Loaded plugin ${plg}${plugin.name}${nf} type ${typ}${platform.type} ${db}(entrypoint ${UNDERLINE}${pluginEntry}${UNDERLINEOFF})`);
                 if (start)
                     this.startPlugin(plugin, message); // No await do it asyncronously
                 return Promise.resolve(platform);
@@ -1555,8 +1672,6 @@ 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}`);
@@ -1568,6 +1683,7 @@ export class Matterbridge extends EventEmitter {
                 await this.startMatterServer();
                 this.log.info('Matter server started');
                 await this.showCommissioningQRCode(this.commissioningServer, this.matterbridgeContext, this.nodeContext, 'Matterbridge');
+                // logEndpoint(this.commissioningServer.getRootEndpoint());
                 //if (hasParameter('advertise')) await this.commissioningServer.advertise();
                 setTimeout(() => {
                     this.log.info(`Setting reachability to true for ${plg}Matterbridge${db}`);
@@ -1606,8 +1722,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}`);
@@ -1619,10 +1734,9 @@ 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
@@ -1711,10 +1825,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.
@@ -1734,7 +1873,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);
@@ -1752,11 +1891,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;
@@ -1773,14 +1914,14 @@ export class Matterbridge extends EventEmitter {
         if (!commissioningServer || !storageContext || !pluginName)
             return;
         if (!commissioningServer.isCommissioned()) {
-            this.log.info(`***The commissioning server on port ${commissioningServer.getPort()} for ${plg}${pluginName}${nf} is not commissioned. Pair it scanning the QR code ...`);
             const { qrPairingCode, manualPairingCode } = commissioningServer.getPairingCode();
             await storageContext.set('qrPairingCode', qrPairingCode);
             await storageContext.set('manualPairingCode', manualPairingCode);
             await nodeContext.set('qrPairingCode', qrPairingCode);
             await nodeContext.set('manualPairingCode', manualPairingCode);
             const QrCode = new QrCodeSchema();
-            this.log.info(`Pairing code:\n\n${QrCode.encode(qrPairingCode)}\n${plg}${pluginName}${nf}\n\nqrPairingCode: ${qrPairingCode}\n\nManual pairing code: ${manualPairingCode}\n`);
+            this.log.info(`***The commissioning server on port ${commissioningServer.getPort()} for ${plg}${pluginName}${nf} is not commissioned. Pair it scanning the QR code:\n\n` +
+                `${QrCode.encode(qrPairingCode)}\n${plg}${pluginName}${nf}\n\nqrPairingCode: ${qrPairingCode}\n\nManual pairing code: ${manualPairingCode}\n`);
             if (pluginName !== 'Matterbridge') {
                 const plugin = this.findPlugin(pluginName);
                 if (plugin) {
@@ -1789,7 +1930,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 ...`);
@@ -1799,7 +1940,7 @@ export class Matterbridge extends EventEmitter {
                     plugin.paired = true;
                 }
             }
-            await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+            await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
         }
     }
     /**
@@ -1875,6 +2016,9 @@ export class Matterbridge extends EventEmitter {
                 case 4937:
                     vendorName = '(AppleHome)';
                     break;
+                case 4996:
+                    vendorName = '(AppleKeyChain)';
+                    break;
                 case 4362:
                     vendorName = '(SmartThings)';
                     break;
@@ -1996,7 +2140,7 @@ export class Matterbridge extends EventEmitter {
                             }
                             Logger.defaultLogLevel = this.debugEnabled ? Level.DEBUG : Level.INFO;
                         }
-                        //logEndpoint(commissioningServer.getRootEndpoint());
+                        // logEndpoint(commissioningServer.getRootEndpoint());
                     }, 2000);
                 }
             },
@@ -2023,6 +2167,48 @@ export class Matterbridge extends EventEmitter {
                 }
             },
         });
+        const gdcCluster = commissioningServer.getRootClusterServer(GeneralDiagnosticsCluster);
+        if (gdcCluster) {
+            // 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}`);
         commissioningServer.addCommandHandler('testEventTrigger', async ({ request: { enableKey, eventTrigger } }) => this.log.info(`testEventTrigger called on GeneralDiagnostic cluster: ${enableKey} ${eventTrigger}`));
         return commissioningServer;
     }
@@ -2049,7 +2235,7 @@ export class Matterbridge extends EventEmitter {
         const matterAggregator = new Aggregator();
         matterAggregator.addClusterServer(ClusterServer(BasicInformationCluster, {
             dataModelRevision: 1,
-            location: 'XX',
+            location: 'FR',
             vendorId: VendorId(0xfff1),
             vendorName: 'Matterbridge',
             productId: 0x8000,
@@ -2058,10 +2244,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 },
         }, {}, {
@@ -2136,9 +2322,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
@@ -2165,6 +2353,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}`);
@@ -2280,24 +2469,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,
-            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;
     }
     /**
@@ -2518,9 +2713,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) => {
@@ -2625,7 +2820,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}`);
@@ -2642,6 +2837,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;
@@ -2657,6 +2853,11 @@ export class Matterbridge extends EventEmitter {
                     this.debugEnabled = false;
                     Logger.defaultLogLevel = Level.WARN;
                 }
+                else if (param === 'Error') {
+                    this.log.setLogDebug(false);
+                    this.debugEnabled = false;
+                    Logger.defaultLogLevel = Level.ERROR;
+                }
                 this.registeredPlugins.forEach((plugin) => {
                     plugin.platform?.log.setLogDebug(this.debugEnabled);
                 });
@@ -2695,10 +2896,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.`);
@@ -2710,7 +2924,7 @@ export class Matterbridge extends EventEmitter {
                 }
             }
             // Handle the command addplugin from Home
-            if (command === 'addplugin') {
+            if (command === 'addplugin' || command === 'installplugin') {
                 param = param.replace(/\*/g, '\\');
                 if (this.registeredPlugins.find((plugin) => plugin.name === param)) {
                     this.log.warn(`Plugin ${plg}${param}${wr} already added to matterbridge`);
@@ -2730,7 +2944,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 {
@@ -2749,10 +2963,10 @@ export class Matterbridge extends EventEmitter {
                 if (index !== -1) {
                     if (this.registeredPlugins[index].platform) {
                         await this.registeredPlugins[index].platform?.onShutdown('The plugin has been removed.');
-                        await this.savePluginConfig(this.registeredPlugins[index]);
+                        // 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 {
@@ -2799,7 +3013,7 @@ export class Matterbridge extends EventEmitter {
                 if (pluginToDisable) {
                     if (pluginToDisable.platform) {
                         await pluginToDisable.platform.onShutdown('The plugin has been removed.');
-                        await this.savePluginConfig(pluginToDisable);
+                        // await this.savePluginConfig(pluginToDisable);
                     }
                     pluginToDisable.enabled = false;
                     pluginToDisable.error = undefined;