matterbridge 1.4.0 → 1.4.2

package/dist/matterbridge.js

@@ -4,7 +4,7 @@
  * @file matterbridge.ts
  * @author Luca Liguori
  * @date 2023-12-29
- * @version 1.3.2
+ * @version 1.4.0
  *
  * Copyright 2023, 2024 Luca Liguori.
  *
@@ -21,8 +21,8 @@
  * limitations under the License. *
  */
 import { NodeStorageManager } from 'node-persist-manager';
-import { AnsiLogger, BRIGHT, RESET, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, stringify, er, nf, rs, wr, RED, GREEN, zb, hk, or, idn, BLUE, CYAN } from 'node-ansi-logger';
-import { fileURLToPath, pathToFileURL } from 'url';
+import { AnsiLogger, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, stringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, hk, or, idn, BLUE, CYAN, nt } from 'node-ansi-logger';
+import { fileURLToPath } from 'url';
 import { promises as fs } from 'fs';
 import { exec, spawn } from 'child_process';
 import { createServer } from 'http';
@@ -34,7 +34,6 @@ import path from 'path';
 import WebSocket, { WebSocketServer } from 'ws';
 // Matterbridge
 import { MatterbridgeDevice } from './matterbridgeDevice.js';
-import { shelly_config, somfytahoma_config, zigbee2mqtt_config } from './defaultConfigSchema.js';
 import { BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster } from './cluster/BridgedDeviceBasicInformationCluster.js';
 import { logInterfaces, wait, waiter } from './utils/utils.js';
 // @project-chip/matter-node.js
@@ -42,12 +41,13 @@ import { CommissioningController, CommissioningServer, MatterServer } from '@pro
 import { BasicInformationCluster, ClusterServer, FixedLabelCluster, GeneralCommissioning, PowerSourceCluster, SwitchCluster, 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';
+import { createFileLogger, Format, Level, Logger } from '@project-chip/matter-node.js/log';
 import { ManualPairingCodeCodec, QrCodeSchema } from '@project-chip/matter-node.js/schema';
 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 { Plugins } from './plugins.js';
+import { PluginManager } from './pluginManager.js';
+import { DeviceManager } from './deviceManager.js';
 // Default colors
 const plg = '\u001B[38;5;33m';
 const dev = '\u001B[38;5;79m';
@@ -86,7 +86,7 @@ export class Matterbridge extends EventEmitter {
         matterbridgeConnected: false,
         bridgeMode: '',
         restartMode: '',
-        debugEnabled: false,
+        loggerLevel: "info" /* LogLevel.INFO */,
         matterLoggerLevel: Level.INFO,
     };
     homeDirectory = '';
@@ -102,10 +102,14 @@ export class Matterbridge extends EventEmitter {
     matterbridgeConnected = false;
     bridgeMode = '';
     restartMode = '';
-    debugEnabled = false;
+    // public debugEnabled = false;
+    // public loggerLevel: LogLevel = LogLevel.INFO;
     profile = getParameter('profile');
     log;
+    matterbrideLoggerFile = 'matterbridge' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.log';
+    matterLoggerFile = 'matter' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.log';
     plugins;
+    devices;
     registeredDevices = [];
     nodeStorage;
     nodeContext;
@@ -201,12 +205,46 @@ export class Matterbridge extends EventEmitter {
             this.restartMode = 'service';
         if (hasParameter('docker'))
             this.restartMode = 'docker';
-        // Set Matterbridge logger
-        if (hasParameter('debug'))
-            this.debugEnabled = true;
-        this.log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logDebug: this.debugEnabled });
+        // Set the matterbridge directory
+        this.homeDirectory = os.homedir();
+        this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
+        // Create the file logger for matterbridge
+        if (hasParameter('filelogger'))
+            AnsiLogger.setGlobalLogfile(path.join(this.matterbridgeDirectory, this.matterbrideLoggerFile), "debug" /* LogLevel.DEBUG */, true);
+        // Create matterbridge logger
+        this.log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logLevel: "info" /* LogLevel.INFO */ });
+        // Set matterbridge logger level
+        if (hasParameter('logger')) {
+            const level = getParameter('logger');
+            if (level === 'debug') {
+                this.log.logLevel = "debug" /* LogLevel.DEBUG */;
+            }
+            else if (level === 'info') {
+                this.log.logLevel = "info" /* LogLevel.INFO */;
+            }
+            else if (level === 'notice') {
+                this.log.logLevel = "notice" /* LogLevel.NOTICE */;
+            }
+            else if (level === 'warn') {
+                this.log.logLevel = "warn" /* LogLevel.WARN */;
+            }
+            else if (level === 'error') {
+                this.log.logLevel = "error" /* LogLevel.ERROR */;
+            }
+            else if (level === 'fatal') {
+                this.log.logLevel = "fatal" /* LogLevel.FATAL */;
+            }
+            else {
+                this.log.warn(`Invalid matterbridge logger level: ${level}. Using default level "info".`);
+                this.log.logLevel = "info" /* LogLevel.INFO */;
+            }
+        }
+        else {
+            this.log.logLevel = "info" /* LogLevel.INFO */;
+        }
+        MatterbridgeDevice.logLevel = this.log.logLevel;
         this.log.debug('Matterbridge is starting...');
-        // Set matter.js logger level and format
+        // Set matter.js logger level, format and logger
         if (hasParameter('matterlogger')) {
             const level = getParameter('matterlogger');
             if (level === 'debug') {
@@ -228,7 +266,7 @@ export class Matterbridge extends EventEmitter {
                 Logger.defaultLogLevel = Level.FATAL;
             }
             else {
-                this.log.warn(`Invalid matterlogger level: ${level}. Using default level ${this.debugEnabled ? 'debug' : 'info'}.`);
+                this.log.warn(`Invalid matter.js logger level: ${level}. Using default level "info".`);
                 Logger.defaultLogLevel = Level.INFO;
             }
         }
@@ -236,16 +274,30 @@ export class Matterbridge extends EventEmitter {
             Logger.defaultLogLevel = Level.INFO;
         }
         Logger.format = Format.ANSI;
+        Logger.setLogger('default', this.createMatterLogger());
+        // Create the file logger for matter.js
+        if (hasParameter('matterfilelogger')) {
+            try {
+                await fs.unlink(path.join(this.matterbridgeDirectory, this.matterLoggerFile));
+            }
+            catch (error) {
+                this.log.debug(`Error unlinking the log file ${CYAN}${path.join(this.matterbridgeDirectory, this.matterLoggerFile)}${er}: ${error instanceof Error ? error.message : error}`);
+            }
+            Logger.addLogger('filelogger', await createFileLogger(path.join(this.matterbridgeDirectory, this.matterLoggerFile)), {
+                defaultLogLevel: Level.DEBUG,
+                logFormat: Format.PLAIN,
+            });
+        }
         // Initialize nodeStorage and nodeContext
-        this.homeDirectory = os.homedir();
-        this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
         this.log.debug(`Creating node storage manager: ${CYAN}${this.nodeStorageName}${db}`);
         this.nodeStorage = new NodeStorageManager({ dir: path.join(this.matterbridgeDirectory, this.nodeStorageName), writeQueue: false, expiredInterval: undefined, logging: false });
         this.log.debug('Creating node storage context for matterbridge');
         this.nodeContext = await this.nodeStorage.createStorage('matterbridge');
-        // Initialize Plugins
-        this.plugins = new Plugins(this);
+        // Initialize PluginManager
+        this.plugins = new PluginManager(this);
         await this.plugins.loadFromStorage();
+        // Initialize DeviceManager
+        this.devices = new DeviceManager(this, this.nodeContext);
         // Get the plugins from node storage and create the plugins node storage contexts
         for (const plugin of this.plugins) {
             const packageJson = await this.plugins.parse(plugin);
@@ -256,6 +308,7 @@ export class Matterbridge extends EventEmitter {
                     await this.spawnCommand('npm', ['install', '-g', plugin.name]);
                     this.log.info(`Plugin ${plg}${plugin.name}${nf} reinstalled.`);
                     plugin.error = false;
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 }
                 catch (error) {
                     plugin.error = true;
@@ -274,7 +327,7 @@ export class Matterbridge extends EventEmitter {
         }
         // Log system info and create .matterbridge directory
         await this.logNodeAndSystemInfo();
-        this.log.info(`Matterbridge version ${this.matterbridgeVersion} mode ${hasParameter('bridge') ? 'bridge' : ''}${hasParameter('childbridge') ? 'childbridge' : ''}${hasParameter('controller') ? 'controller' : ''} ` +
+        this.log.notice(`Matterbridge version ${this.matterbridgeVersion} ${hasParameter('bridge') ? 'mode bridge' : ''}${hasParameter('childbridge') ? 'mode childbridge' : ''}${hasParameter('controller') ? 'mode controller' : ''} ` +
             `${this.restartMode !== '' ? 'restart mode ' + this.restartMode + ' ' : ''}running on ${this.systemInformation.osType} ${this.systemInformation.osRelease} ${this.systemInformation.osPlatform} ${this.systemInformation.osArch} `);
         // Check node version and throw error
         requireMinNodeVersion(18);
@@ -299,7 +352,7 @@ export class Matterbridge extends EventEmitter {
       - port [port]:           start the commissioning server on the given port (default 5540)
       - mdnsinterface [name]:  set the interface to use for the matter server mdnsInterface (default all interfaces)
       - frontend [port]:       start the frontend on the given port (default 8283)
-      - debug:                 enable the Matterbridge debug mode (default false)
+      - logger:                set the matterbridge logger level: debug | info | notice | warn | error | fatal (default info)
       - matterlogger:          set the matter.js logger level: debug | info | notice | warn | error | fatal (default info)
       - reset:                 remove the commissioning for Matterbridge (bridge mode). Shutdown Matterbridge before using it!
       - factoryreset:          remove all commissioning information and reset all internal storages. Shutdown Matterbridge before using it!
@@ -417,13 +470,13 @@ export class Matterbridge extends EventEmitter {
             return;
         }
         // Start the matter storage and create the matterbridge context
-        await this.startStorage('json', path.join(this.matterbridgeDirectory, this.matterStorageName));
+        await this.startMatterStorage('json', path.join(this.matterbridgeDirectory, this.matterStorageName));
         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 (hasParameter('reset') && getParameter('reset') === undefined) {
             this.log.info('Resetting Matterbridge commissioning information...');
             await this.matterbridgeContext?.clearAll();
-            await this.stopStorage();
+            await this.stopMatterStorage();
             this.log.info('Reset done! Remove the device from the controller.');
             this.emit('shutdown');
             return;
@@ -443,7 +496,7 @@ export class Matterbridge extends EventEmitter {
             else {
                 this.log.warn(`Plugin ${plg}${getParameter('reset')}${wr} not registerd in matterbridge`);
             }
-            await this.stopStorage();
+            await this.stopMatterStorage();
             this.emit('shutdown');
             return;
         }
@@ -484,8 +537,8 @@ export class Matterbridge extends EventEmitter {
             this.log.debug('Adding matterbridge commissioning server to matter server');
             await this.matterServer.addCommissioningServer(this.commissioningServer, { uniqueStorageKey: 'Matterbridge' });
             for (const plugin of this.plugins) {
-                plugin.configJson = await this.loadPluginConfig(plugin);
-                plugin.schemaJson = await this.loadPluginSchema(plugin);
+                plugin.configJson = await this.plugins.loadConfig(plugin);
+                plugin.schemaJson = await this.plugins.loadSchema(plugin);
                 // Check if the plugin is available
                 if (!(await this.plugins.resolve(plugin.path))) {
                     this.log.error(`Plugin ${plg}${plugin.name}${er} not found. Disabling it.`);
@@ -509,7 +562,7 @@ export class Matterbridge extends EventEmitter {
                 plugin.addedDevices = undefined;
                 plugin.qrPairingCode = undefined;
                 plugin.manualPairingCode = undefined;
-                this.loadPlugin(plugin, true, 'Matterbridge is starting'); // No await do it asyncronously
+                this.plugins.load(plugin, true, 'Matterbridge is starting'); // this.loadPlugin(plugin, true, 'Matterbridge is starting'); // No await do it asyncronously
             }
             await this.startBridge();
             return;
@@ -522,8 +575,8 @@ export class Matterbridge extends EventEmitter {
             this.log.debug('Starting matterbridge in mode', this.bridgeMode);
             this.matterServer = this.createMatterServer(this.storageManager);
             for (const plugin of this.plugins) {
-                plugin.configJson = await this.loadPluginConfig(plugin);
-                plugin.schemaJson = await this.loadPluginSchema(plugin);
+                plugin.configJson = await this.plugins.loadConfig(plugin);
+                plugin.schemaJson = await this.plugins.loadSchema(plugin);
                 // Check if the plugin is available
                 if (!(await this.plugins.resolve(plugin.path))) {
                     this.log.error(`Plugin ${plg}${plugin.name}${er} not found. Disabling it.`);
@@ -547,7 +600,7 @@ export class Matterbridge extends EventEmitter {
                 plugin.addedDevices = undefined;
                 plugin.qrPairingCode = (await plugin.nodeContext?.get('qrPairingCode', undefined)) ?? undefined;
                 plugin.manualPairingCode = (await plugin.nodeContext?.get('manualPairingCode', undefined)) ?? undefined;
-                this.loadPlugin(plugin, true, 'Matterbridge is starting'); // No await do it asyncronously
+                this.plugins.load(plugin, true, 'Matterbridge is starting'); // this.loadPlugin(plugin, true, 'Matterbridge is starting'); // No await do it asyncronously
             }
             await this.startChildbridge();
             return;
@@ -573,9 +626,11 @@ export class Matterbridge extends EventEmitter {
      */
     deregisterSignalHandlers() {
         this.log.debug(`Deregistering SIGINT and SIGTERM signal handlers...`);
-        this.sigintHandler && process.off('SIGINT', this.sigintHandler);
+        if (this.sigintHandler)
+            process.off('SIGINT', this.sigintHandler);
         this.sigintHandler = undefined;
-        this.sigtermHandler && process.off('SIGTERM', this.sigtermHandler);
+        if (this.sigtermHandler)
+            process.off('SIGTERM', this.sigtermHandler);
         this.sigtermHandler = undefined;
     }
     /**
@@ -824,6 +879,37 @@ export class Matterbridge extends EventEmitter {
             // error.stack && this.log.debug(error.stack);
         });
     }
+    createMatterLogger() {
+        const matterLogger = new AnsiLogger({ logName: 'Matter', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logLevel: "debug" /* LogLevel.DEBUG */ });
+        return (_level, formattedLog) => {
+            const logger = formattedLog.slice(44, 44 + 20).trim();
+            const message = formattedLog.slice(65);
+            matterLogger.logName = logger;
+            switch (_level) {
+                case Level.DEBUG:
+                    matterLogger.log("debug" /* LogLevel.DEBUG */, message);
+                    break;
+                case Level.INFO:
+                    matterLogger.log("info" /* LogLevel.INFO */, message);
+                    break;
+                case Level.NOTICE:
+                    matterLogger.log("notice" /* LogLevel.NOTICE */, message);
+                    break;
+                case Level.WARN:
+                    matterLogger.log("warn" /* LogLevel.WARN */, message);
+                    break;
+                case Level.ERROR:
+                    matterLogger.log("error" /* LogLevel.ERROR */, message);
+                    break;
+                case Level.FATAL:
+                    matterLogger.log("fatal" /* LogLevel.FATAL */, message);
+                    break;
+                default:
+                    matterLogger.log("debug" /* LogLevel.DEBUG */, message);
+                    break;
+            }
+        };
+    }
     /**
      * Update matterbridge and cleanup.
      */
@@ -945,8 +1031,8 @@ export class Matterbridge extends EventEmitter {
             // this.cleanupTimeout1 = setTimeout(async () => {
             // Closing matter
             await this.stopMatterServer();
-            // Closing storage
-            await this.stopStorage();
+            // Closing matter storage
+            await this.stopMatterStorage();
             // Serialize registeredDevices
             if (this.nodeStorage && this.nodeContext) {
                 this.log.info('Saving registered devices...');
@@ -1010,7 +1096,7 @@ export class Matterbridge extends EventEmitter {
                     await fs.rm(path.join(this.matterbridgeDirectory, this.nodeStorageName), { recursive: true });
                     this.log.info('Factory reset done! Remove all paired devices from the controllers.');
                 }
-                this.log.info('Cleanup completed. Shutting down...');
+                this.log.notice('Cleanup completed. Shutting down...');
                 Matterbridge.instance = undefined;
                 this.emit('shutdown');
             }
@@ -1027,10 +1113,6 @@ export class Matterbridge extends EventEmitter {
      * @returns {Promise<void>} - A promise that resolves when the device is added.
      */
     async addBridgedDevice(pluginName, device) {
-        if (this.bridgeMode === 'bridge' && !this.matterAggregator) {
-            this.log.error(`Adding bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
-            return;
-        }
         this.log.debug(`Adding bridged device ${dev}${device.deviceName}${db} (${dev}${device.name}${db}) for plugin ${plg}${pluginName}${db}`);
         // Check if the plugin is registered
         const plugin = this.plugins.get(pluginName);
@@ -1040,12 +1122,17 @@ export class Matterbridge extends EventEmitter {
         }
         // Register and add the device to matterbridge aggregator in bridge mode
         if (this.bridgeMode === 'bridge') {
-            this.matterAggregator?.addBridgedDevice(device);
+            if (!this.matterAggregator) {
+                this.log.error(`Adding bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
+                return;
+            }
+            this.matterAggregator.addBridgedDevice(device);
         }
         // The first time create the commissioning server and the aggregator for DynamicPlatform
         // Register and add the device in childbridge mode
         if (this.bridgeMode === 'childbridge') {
             if (plugin.type === 'AccessoryPlatform') {
+                // Check if the plugin is locked with the commissioning server
                 if (!plugin.locked) {
                     plugin.locked = true;
                     plugin.storageContext = await this.importCommissioningServerContext(plugin.name, device);
@@ -1059,10 +1146,10 @@ export class Matterbridge extends EventEmitter {
                 }
             }
             if (plugin.type === 'DynamicPlatform') {
+                // Check if the plugin is locked with the commissioning server and the aggregator
                 if (!plugin.locked) {
                     plugin.locked = true;
                     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');
                     plugin.storageContext = await this.createCommissioningServerContext(plugin.name, 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, plugin.description);
                     this.log.debug(`Creating commissioning server for ${plg}${plugin.name}${db}`);
                     plugin.commissioningServer = await this.createCommisioningServer(plugin.storageContext, plugin.name);
@@ -1081,6 +1168,8 @@ export class Matterbridge extends EventEmitter {
             plugin.registeredDevices++;
         if (plugin.addedDevices !== undefined)
             plugin.addedDevices++;
+        // Add the device to the DeviceManager
+        this.devices.set(device);
         this.log.info(`Added and registered bridged device (${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
     }
     /**
@@ -1090,10 +1179,6 @@ export class Matterbridge extends EventEmitter {
      * @returns A Promise that resolves when the device is successfully removed.
      */
     async removeBridgedDevice(pluginName, device) {
-        if (this.bridgeMode === 'bridge' && !this.matterAggregator) {
-            this.log.error(`Error removing bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) for plugin ${plg}${pluginName}${er}: matterAggregator not found`);
-            return;
-        }
         this.log.debug(`Removing bridged device ${dev}${device.deviceName}${db} (${dev}${device.name}${db}) for plugin ${plg}${pluginName}${db}`);
         // Check if the plugin is registered
         const plugin = this.plugins.get(pluginName);
@@ -1101,18 +1186,16 @@ export class Matterbridge extends EventEmitter {
             this.log.error(`Error removing bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) for plugin ${plg}${pluginName}${er}: plugin not found`);
             return;
         }
-        if (this.bridgeMode === 'childbridge' && plugin.type === 'AccessoryPlatfoem' && !plugin.aggregator) {
-            this.log.error(`Error removing bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) for plugin ${plg}${pluginName}${er}: aggregator not found`);
-            return;
-        }
-        if (this.bridgeMode === 'childbridge' && plugin.type === 'DynamicPlatfoem' && !plugin.commissioningServer) {
-            this.log.error(`Error removing bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) for plugin ${plg}${pluginName}${er}: commissioning server not found`);
-            return;
-        }
         // Remove the device from matterbridge aggregator in bridge mode
         if (this.bridgeMode === 'bridge') {
+            if (!this.matterAggregator) {
+                this.log.error(`Error removing bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) for plugin ${plg}${pluginName}${er}: matterAggregator not found`);
+                return;
+            }
             device.setBridgedDeviceReachability(false);
             device.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.triggerReachableChangedEvent({ reachableNewValue: false });
+            // device.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.triggerShutDownEvent({});
+            // device.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.triggerLeaveEvent({});
             this.matterAggregator?.removeBridgedDevice(device);
             this.registeredDevices.forEach((registeredDevice, index) => {
                 if (registeredDevice.device === device) {
@@ -1129,6 +1212,10 @@ export class Matterbridge extends EventEmitter {
         // Remove the device in childbridge mode
         if (this.bridgeMode === 'childbridge') {
             if (plugin.type === 'AccessoryPlatform') {
+                if (!plugin.commissioningServer) {
+                    this.log.error(`Error removing bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) for plugin ${plg}${pluginName}${er}: commissioning server not found`);
+                    return;
+                }
                 this.registeredDevices.forEach((registeredDevice, index) => {
                     if (registeredDevice.device === device) {
                         this.registeredDevices.splice(index, 1);
@@ -1137,6 +1224,10 @@ export class Matterbridge extends EventEmitter {
                 });
             }
             else if (plugin.type === 'DynamicPlatform') {
+                if (!plugin.aggregator) {
+                    this.log.error(`Error removing bridged device ${dev}${device.deviceName}${er} (${dev}${device.name}${er}) for plugin ${plg}${pluginName}${er}: aggregator not found`);
+                    return;
+                }
                 this.registeredDevices.forEach((registeredDevice, index) => {
                     if (registeredDevice.device === device) {
                         this.registeredDevices.splice(index, 1);
@@ -1145,19 +1236,22 @@ export class Matterbridge extends EventEmitter {
                 });
                 device.setBridgedDeviceReachability(false);
                 device.getClusterServerById(BridgedDeviceBasicInformation.Cluster.id)?.triggerReachableChangedEvent({ reachableNewValue: false });
-                plugin.aggregator?.removeBridgedDevice(device);
+                plugin.aggregator.removeBridgedDevice(device);
             }
             this.log.info(`Removed bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
             if (plugin.registeredDevices !== undefined)
                 plugin.registeredDevices--;
             if (plugin.addedDevices !== undefined)
                 plugin.addedDevices--;
+            // Remove the commissioning server
             if (plugin.registeredDevices === 0 && plugin.addedDevices === 0 && plugin.commissioningServer) {
                 this.matterServer?.removeCommissioningServer(plugin.commissioningServer);
                 plugin.commissioningServer = undefined;
                 this.log.info(`Removed commissioning server for plugin ${plg}${pluginName}${nf}`);
             }
         }
+        // Remove the device from the DeviceManager
+        this.devices.remove(device);
     }
     /**
      * Removes all bridged devices associated with a specific plugin.
@@ -1177,304 +1271,6 @@ export class Matterbridge extends EventEmitter {
             this.removeBridgedDevice(pluginName, registeredDevice.device);
         }
     }
-    /**
-     * Loads the schema for a plugin.
-     * If the schema file exists in the plugin directory, it reads the file and returns the parsed JSON data and delete the schema form .matterbridge.
-     * If the schema file does not exist, it creates a new schema with the default configuration and returns it.
-     *
-     * @param plugin - The plugin for which to load the schema.
-     * @returns A promise that resolves to the loaded or created schema.
-     */
-    async loadPluginSchema(plugin) {
-        let schemaFile = plugin.path.replace('package.json', `${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}.`);
-            // this.log.debug(`Schema file found: ${schemaFile}.\nSchema:${rs}\n`, schema);
-            schemaFile = path.join(this.matterbridgeDirectory, `${plugin.name}.schema.json`);
-            try {
-                await fs.unlink(schemaFile);
-                this.log.debug(`Schema file ${schemaFile} deleted.`);
-            }
-            catch (err) {
-                this.log.debug(`Schema file ${schemaFile} to delete not found.`);
-            }
-            return schema;
-        }
-        catch (err) {
-            this.log.debug(`Schema file ${schemaFile} not found. Loading default schema.`);
-            const 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,
-                    },
-                    debug: {
-                        description: 'Enable the debug for the plugin (development only)',
-                        type: 'boolean',
-                        default: false,
-                    },
-                    unregisterOnShutdown: {
-                        description: 'Unregister all devices on shutdown (development only)',
-                        type: 'boolean',
-                        default: false,
-                    },
-                },
-            };
-            return schema;
-        }
-    }
-    /**
-     * Loads the configuration for a plugin.
-     * If the configuration file exists, it reads the file and returns the parsed JSON data.
-     * If the configuration file does not exist, it creates a new file with default configuration and returns it.
-     * If any error occurs during file access or creation, it logs an error and return un empty config.
-     *
-     * @param plugin - The plugin for which to load the configuration.
-     * @returns A promise that resolves to the loaded or created configuration.
-     */
-    async loadPluginConfig(plugin) {
-        const configFile = path.join(this.matterbridgeDirectory, `${plugin.name}.config.json`);
-        try {
-            await fs.access(configFile);
-            const data = await fs.readFile(configFile, 'utf8');
-            const config = JSON.parse(data);
-            this.log.debug(`Config file found: ${configFile}.`);
-            // this.log.debug(`Config file found: ${configFile}.\nConfig:${rs}\n`, config);
-            /* The first time a plugin is added to the system, the config file is created with the plugin name and type "".*/
-            config.name = plugin.name;
-            config.type = plugin.type;
-            if (config.debug === undefined)
-                config.debug = false;
-            if (config.unregisterOnShutdown === undefined)
-                config.unregisterOnShutdown = false;
-            return config;
-        }
-        catch (err) {
-            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 if (plugin.name === 'matterbridge-shelly')
-                        config = shelly_config;
-                    else
-                        config = { name: plugin.name, type: plugin.type, debug: false, unregisterOnShutdown: false };
-                    try {
-                        await this.writeFile(configFile, JSON.stringify(config, null, 2));
-                        this.log.debug(`Created config file: ${configFile}.`);
-                        // 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 config;
-                    }
-                }
-                else {
-                    this.log.error(`Error accessing config file ${configFile}: ${err}`);
-                    return { name: plugin.name, type: plugin.type, debug: false, unregisterOnShutdown: false };
-                }
-            }
-            this.log.error(`Error loading config file ${configFile}: ${err}`);
-            return { name: plugin.name, type: plugin.type, debug: false, unregisterOnShutdown: false };
-        }
-    }
-    /**
-     * Saves the configuration of a registered plugin.
-     * @param {RegisteredPlugin} plugin - The plugin whose configuration needs to be saved.
-     * @returns {Promise<void>} - A promise that resolves when the configuration is successfully saved.
-     * @throws {Error} - If the plugin's configuration is not found or if there is an error while saving the configuration.
-     */
-    async savePluginConfig(plugin) {
-        if (!plugin.platform?.config) {
-            this.log.error(`Error saving plugin ${plg}${plugin.name}${er} config: config not found`);
-            return Promise.reject(new Error(`Error saving plugin ${plg}${plugin.name}${er} config: config not found`));
-        }
-        const configFile = path.join(this.matterbridgeDirectory, `${plugin.name}.config.json`);
-        try {
-            await this.writeFile(configFile, JSON.stringify(plugin.platform.config, null, 2));
-            this.log.debug(`Saved config file: ${configFile}.`);
-            // this.log.debug(`Saved config file: ${configFile}.\nConfig:${rs}\n`, plugin.platform.config);
-        }
-        catch (err) {
-            this.log.error(`Error saving plugin ${plg}${plugin.name}${er} config: ${err}`);
-            return Promise.reject(err);
-        }
-    }
-    /**
-     * Writes data to a file.
-     *
-     * @param {string} filePath - The path of the file to write to.
-     * @param {string} data - The data to write to the file.
-     * @returns {Promise<void>} - A promise that resolves when the data is successfully written to the file.
-     */
-    async writeFile(filePath, data) {
-        try {
-            await fs.writeFile(`${filePath}`, data, 'utf8');
-            this.log.debug(`Successfully wrote to ${filePath}`);
-        }
-        catch (error) {
-            this.log.error(`Error writing to ${filePath}:`, error);
-        }
-    }
-    /**
-     * Loads a plugin and returns the corresponding MatterbridgePlatform instance.
-     * @param plugin - The plugin to load.
-     * @param start - Optional flag indicating whether to start the plugin after loading. Default is false.
-     * @param message - Optional message to pass to the plugin when starting.
-     * @returns A Promise that resolves to the loaded MatterbridgePlatform instance.
-     * @throws An error if the plugin is not enabled, already loaded, or fails to load.
-     */
-    async loadPlugin(plugin, start = false, message = '') {
-        if (!plugin.enabled) {
-            this.log.error(`Plugin ${plg}${plugin.name}${er} not enabled`);
-            return Promise.resolve(undefined);
-        }
-        if (plugin.platform) {
-            this.log.error(`Plugin ${plg}${plugin.name}${er} already loaded`);
-            return Promise.resolve(plugin.platform);
-        }
-        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'));
-            // Resolve the main module path relative to package.json
-            const pluginEntry = path.resolve(path.dirname(plugin.path), packageJson.main);
-            // Dynamically import the plugin
-            const pluginUrl = pathToFileURL(pluginEntry);
-            this.log.debug(`Importing plugin ${plg}${plugin.name}${db} from ${pluginUrl.href}`);
-            const pluginInstance = await import(pluginUrl.href);
-            this.log.debug(`Imported plugin ${plg}${plugin.name}${db} from ${pluginUrl.href}`);
-            // Call the default export function of the plugin, passing this MatterBridge instance, the log and the config
-            if (pluginInstance.default) {
-                const config = await this.loadPluginConfig(plugin);
-                const log = new AnsiLogger({ logName: plugin.description ?? 'No description', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logDebug: config.debug ?? false });
-                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 ?? 'No description';
-                plugin.version = packageJson.version;
-                plugin.author = packageJson.author ?? 'Unknown';
-                plugin.type = platform.type;
-                plugin.platform = platform;
-                plugin.loaded = true;
-                plugin.registeredDevices = 0;
-                plugin.addedDevices = 0;
-                plugin.configJson = config;
-                plugin.schemaJson = await this.loadPluginSchema(plugin);
-                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);
-            }
-            else {
-                this.log.error(`Plugin ${plg}${plugin.name}${er} does not provide a default export`);
-                plugin.error = true;
-                return Promise.resolve(undefined);
-            }
-        }
-        catch (err) {
-            this.log.error(`Failed to load plugin ${plg}${plugin.name}${er}: ${err}`);
-            plugin.error = true;
-            return Promise.resolve(undefined);
-        }
-    }
-    /**
-     * Starts a plugin.
-     *
-     * @param {RegisteredPlugin} plugin - The plugin to start.
-     * @param {string} [message] - Optional message to pass to the plugin's onStart method.
-     * @param {boolean} [configure] - Indicates whether to configure the plugin after starting (default false).
-     * @returns {Promise<void>} A promise that resolves when the plugin is started successfully, or rejects with an error if starting the plugin fails.
-     */
-    async startPlugin(plugin, message, configure = false) {
-        if (!plugin.loaded || !plugin.platform) {
-            this.log.error(`Plugin ${plg}${plugin.name}${er} not loaded or no platform`);
-            return Promise.resolve();
-        }
-        if (plugin.started) {
-            this.log.debug(`Plugin ${plg}${plugin.name}${db} already started`);
-            return Promise.resolve();
-        }
-        this.log.info(`Starting plugin ${plg}${plugin.name}${db} type ${typ}${plugin.type}${db}`);
-        try {
-            plugin.platform
-                .onStart(message)
-                .then(() => {
-                plugin.started = true;
-                this.log.info(`Started plugin ${plg}${plugin.name}${db} type ${typ}${plugin.type}${db}`);
-                if (configure)
-                    this.configurePlugin(plugin); // No await do it asyncronously
-                return Promise.resolve();
-            })
-                .catch((err) => {
-                plugin.error = true;
-                this.log.error(`Failed to start plugin ${plg}${plugin.name}${er}: ${err}`);
-                return Promise.resolve();
-            });
-        }
-        catch (err) {
-            plugin.error = true;
-            this.log.error(`Failed to start plugin ${plg}${plugin.name}${er}: ${err}`);
-            return Promise.resolve();
-        }
-    }
-    /**
-     * Configures a plugin.
-     *
-     * @param {RegisteredPlugin} plugin - The plugin to configure.
-     * @returns {Promise<void>} A promise that resolves when the plugin is configured successfully, or rejects with an error if configuration fails.
-     */
-    async configurePlugin(plugin) {
-        if (!plugin.loaded || !plugin.started || !plugin.platform) {
-            this.log.error(`Plugin ${plg}${plugin.name}${er} not loaded (${plugin.loaded}) or not started (${plugin.started}) or not platform (${plugin.platform?.name})`);
-            return Promise.resolve();
-        }
-        if (plugin.configured) {
-            this.log.info(`Plugin ${plg}${plugin.name}${nf} already configured`);
-            return Promise.resolve();
-        }
-        this.log.info(`Configuring plugin ${plg}${plugin.name}${nf} type ${typ}${plugin.type}${nf}`);
-        try {
-            plugin.platform
-                .onConfigure()
-                .then(() => {
-                plugin.configured = true;
-                this.log.info(`Configured plugin ${plg}${plugin.name}${nf} type ${typ}${plugin.type}${nf}`);
-                this.savePluginConfig(plugin);
-                return Promise.resolve();
-            })
-                .catch((err) => {
-                plugin.error = true;
-                this.log.error(`Failed to configure plugin ${plg}${plugin.name}${er}: ${err}`);
-                return Promise.resolve();
-            });
-        }
-        catch (err) {
-            plugin.error = true;
-            this.log.error(`Failed to configure plugin ${plg}${plugin.name}${er}: ${err}`);
-            return Promise.resolve();
-        }
-    }
     async startTest() {
         // Start the Matterbridge
     }
@@ -1514,14 +1310,14 @@ export class Matterbridge extends EventEmitter {
             clearInterval(startMatterInterval);
             this.log.debug('***Cleared startMatterInterval interval for Matterbridge');
             await this.startMatterServer();
-            this.log.info('Matter server started');
+            this.log.notice('Matter server started');
             // Configure the plugins
             this.configureTimeout = setTimeout(async () => {
                 for (const plugin of this.plugins) {
                     if (!plugin.enabled || !plugin.loaded || !plugin.started || plugin.error)
                         continue;
                     try {
-                        await this.plugins.configure(plugin); // No await do it asyncronously
+                        await this.plugins.configure(plugin); // TODO No await do it in parallel
                     }
                     catch (error) {
                         plugin.error = true;
@@ -1582,14 +1378,14 @@ export class Matterbridge extends EventEmitter {
             clearInterval(startMatterInterval);
             this.log.debug('***Cleared startMatterInterval interval in childbridge mode');
             await this.startMatterServer();
-            this.log.info('Matter server started');
+            this.log.notice('Matter server started');
             // Configure the plugins
             this.configureTimeout = setTimeout(async () => {
                 for (const plugin of this.plugins) {
                     if (!plugin.enabled || !plugin.loaded || !plugin.started || plugin.error)
                         continue;
                     try {
-                        await this.plugins.configure(plugin); // No await do it asyncronously
+                        await this.plugins.configure(plugin); // TODO No await do it in parallel
                     }
                     catch (error) {
                         plugin.error = true;
@@ -1815,7 +1611,7 @@ export class Matterbridge extends EventEmitter {
      * @param {string} storageName - The name of the storage file.
      * @returns {Promise<void>} - A promise that resolves when the storage process is started.
      */
-    async startStorage(storageType, storageName) {
+    async startMatterStorage(storageType, storageName) {
         this.log.debug(`Starting ${storageType} storage ${CYAN}${storageName}${db}`);
         if (storageType === 'disk') {
             const storageDisk = new StorageBackendDisk(storageName);
@@ -1836,8 +1632,9 @@ export class Matterbridge extends EventEmitter {
             await this.storageManager.initialize();
             this.log.debug('Storage initialized');
             if (storageType === 'json') {
-                await this.backupJsonStorage(storageName, storageName.replace('.json', '') + '.backup.json');
+                await this.backupJsonMatterStorage(storageName, storageName.replace('.json', '') + '.backup.json');
             }
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
         }
         catch (error) {
             this.log.error(`Storage initialize() error! The file .matterbridge/${storageName} may be corrupted.`);
@@ -1851,7 +1648,7 @@ export class Matterbridge extends EventEmitter {
      * @param storageName - The name of the JSON storage file to be backed up.
      * @param backupName - The name of the backup file to be created.
      */
-    async backupJsonStorage(storageName, backupName) {
+    async backupJsonMatterStorage(storageName, backupName) {
         try {
             this.log.debug(`Making backup copy of ${storageName}`);
             await fs.copyFile(storageName, backupName);
@@ -1875,7 +1672,7 @@ export class Matterbridge extends EventEmitter {
      * Stops the matter storage.
      * @returns {Promise<void>} A promise that resolves when the storage is stopped.
      */
-    async stopStorage() {
+    async stopMatterStorage() {
         this.log.debug('Stopping storage');
         await this.storageManager?.close();
         this.log.debug('Storage closed');
@@ -2028,9 +1825,9 @@ export class Matterbridge extends EventEmitter {
                 const sessionInformations = commissioningServer.getActiveSessionInformation(fabricIndex);
                 let connected = false;
                 sessionInformations.forEach((session) => {
-                    this.log.info(`*Active session changed on fabric ${zb}${fabricIndex}${nf} id ${zb}${session.fabric?.fabricId}${nf} vendor ${zb}${session.fabric?.rootVendorId}${nf} ${this.getVendorIdName(session.fabric?.rootVendorId)} ${session.fabric?.label} for ${plg}${pluginName}${nf}`, debugStringify(session));
+                    this.log.info(`Active session changed on fabric ${zb}${fabricIndex}${nf} id ${zb}${session.fabric?.fabricId}${nf} vendor ${zb}${session.fabric?.rootVendorId}${nf} ${this.getVendorIdName(session.fabric?.rootVendorId)} ${session.fabric?.label} for ${plg}${pluginName}${nf}`, debugStringify(session));
                     if (session.isPeerActive === true && session.secure === true && session.numberOfActiveSubscriptions >= 1) {
-                        this.log.info(`*Controller ${zb}${session.fabric?.rootVendorId}${nf} ${this.getVendorIdName(session.fabric?.rootVendorId)} ${session.fabric?.label} connected to ${plg}${pluginName}${nf} on session ${session.name}`);
+                        this.log.notice(`Controller ${zb}${session.fabric?.rootVendorId}${nt} ${this.getVendorIdName(session.fabric?.rootVendorId)} ${session.fabric?.label} connected to ${plg}${pluginName}${nt} on session ${session.name}`);
                         connected = true;
                     }
                 });
@@ -2081,9 +1878,9 @@ export class Matterbridge extends EventEmitter {
             },
             commissioningChangedCallback: async (fabricIndex) => {
                 const fabricInfo = commissioningServer.getCommissionedFabricInformation(fabricIndex);
-                this.log.debug(`*Commissioning changed on fabric ${zb}${fabricIndex}${nf} for ${plg}${pluginName}${nf}`, debugStringify(fabricInfo));
+                this.log.debug(`Commissioning changed on fabric ${zb}${fabricIndex}${db} for ${plg}${pluginName}${db}`, debugStringify(fabricInfo));
                 if (commissioningServer.getCommissionedFabricInformation().length === 0) {
-                    this.log.warn(`*Commissioning removed from fabric ${zb}${fabricIndex}${nf} for ${plg}${pluginName}${wr}. Resetting the commissioning server ...`);
+                    this.log.warn(`Commissioning removed from fabric ${zb}${fabricIndex}${wr} for ${plg}${pluginName}${wr}. Resetting the commissioning server ...`);
                     await commissioningServer.factoryReset();
                     if (pluginName === 'Matterbridge') {
                         await this.matterbridgeContext?.clearAll();
@@ -2104,7 +1901,7 @@ export class Matterbridge extends EventEmitter {
                             }
                         }
                     }
-                    this.log.warn(`*Restart to activate the pairing for ${plg}${pluginName}${wr}.`);
+                    this.log.warn(`Restart to activate the pairing for ${plg}${pluginName}${wr}.`);
                 }
                 else {
                     const fabricInfo = commissioningServer.getCommissionedFabricInformation();
@@ -2282,7 +2079,7 @@ export class Matterbridge extends EventEmitter {
         }
     }
     /**
-     * Sanitizes the fabric information by converting bigint properties to string cause res..
+     * Sanitizes the fabric information by converting bigint properties to string cause res.json doesn't know bigint.
      *
      * @param fabricInfo - The array of exposed fabric information objects.
      * @returns An array of sanitized exposed fabric information objects.
@@ -2414,10 +2211,9 @@ export class Matterbridge extends EventEmitter {
     };
     /**
      * Retrieves the base registered plugins sanitized for res.json().
-     * @param {boolean} includeAll - Whether to include all information for each plugin.
      * @returns {BaseRegisteredPlugin[]} A promise that resolves to an array of BaseRegisteredPlugin objects.
      */
-    async getBaseRegisteredPlugins(includeAll = false) {
+    async getBaseRegisteredPlugins() {
         const baseRegisteredPlugins = [];
         for (const plugin of this.plugins) {
             baseRegisteredPlugins.push({
@@ -2436,23 +2232,23 @@ export class Matterbridge extends EventEmitter {
                 configured: plugin.configured,
                 paired: plugin.paired,
                 connected: plugin.connected,
-                fabricInformations: includeAll ? plugin.fabricInformations : undefined,
-                sessionInformations: includeAll ? plugin.sessionInformations : undefined,
+                fabricInformations: plugin.fabricInformations,
+                sessionInformations: plugin.sessionInformations,
                 registeredDevices: plugin.registeredDevices,
                 addedDevices: plugin.addedDevices,
                 qrPairingCode: plugin.qrPairingCode,
                 manualPairingCode: plugin.manualPairingCode,
-                configJson: includeAll ? plugin.configJson : undefined,
-                schemaJson: includeAll ? plugin.schemaJson : undefined,
+                configJson: plugin.configJson,
+                schemaJson: plugin.schemaJson,
             });
         }
         return baseRegisteredPlugins;
     }
     /**
      * Spawns a child process with the given command and arguments.
-     * @param command - The command to execute.
-     * @param args - The arguments to pass to the command (default: []).
-     * @returns A promise that resolves when the child process exits successfully, or rejects if there is an error.
+     * @param {string} command - The command to execute.
+     * @param {string[]} args - The arguments to pass to the command (default: []).
+     * @returns {Promise<void>} A promise that resolves when the child process exits successfully, or rejects if there is an error.
      */
     async spawnCommand(command, args = []) {
         /*
@@ -2462,7 +2258,13 @@ export class Matterbridge extends EventEmitter {
         process.on('unhandledRejection', (reason, promise) => {
           this.log.error('Unhandled Rejection at:', promise, 'reason:', reason);
         });
+    
+        spawn - [14:27:21.125] [Matterbridge:spawn]: changed 38 packages in 4s
+        spawn - [14:27:21.125] [Matterbridge:spawn]: 10 packages are looking for funding run `npm fund` for details
+        debug - [14:27:21.131] [Matterbridge]: Child process exited with code 0 and signal null
+        debug - [14:27:21.131] [Matterbridge]: Child process stdio streams have closed with code 0
         */
+        const cmdLine = command + ' ' + args.join(' ');
         if (process.platform === 'win32' && command === 'npm') {
             // Must be spawn('cmd.exe', ['/c', 'npm -g install <package>']);
             const argstring = 'npm ' + args.join(' ');
@@ -2482,9 +2284,11 @@ export class Matterbridge extends EventEmitter {
                 this.log.error(`Failed to start child process: ${err.message}`);
                 reject(err); // Reject the promise on error
             });
-            childProcess.on('close', (code) => {
+            childProcess.on('close', (code, signal) => {
+                this.wssSendMessage('spawn', this.log.now(), 'Matterbridge:spawn', `child process closed with code ${code} and signal ${signal}`);
                 if (code === 0) {
-                    this.log.debug(`Child process stdio streams have closed with code ${code}`);
+                    if (cmdLine.startsWith('npm install -g'))
+                        this.log.notice(`${cmdLine.replace('npm install -g ', '')} installed correctly`);
                     resolve();
                 }
                 else {
@@ -2493,8 +2297,8 @@ export class Matterbridge extends EventEmitter {
                 }
             });
             childProcess.on('exit', (code, signal) => {
+                this.wssSendMessage('spawn', this.log.now(), 'Matterbridge:spawn', `child process exited with code ${code} and signal ${signal}`);
                 if (code === 0) {
-                    this.log.debug(`Child process exited with code ${code} and signal ${signal}`);
                     resolve();
                 }
                 else {
@@ -2509,15 +2313,13 @@ export class Matterbridge extends EventEmitter {
             if (childProcess.stdout) {
                 childProcess.stdout.on('data', (data) => {
                     const message = data.toString().trim();
-                    // this.log.info('\n' + message);
-                    this.wssSendMessage('Matterbridge:spawn', 'spawn', message);
+                    this.wssSendMessage('spawn', this.log.now(), 'Matterbridge:spawn', message);
                 });
             }
             if (childProcess.stderr) {
                 childProcess.stderr.on('data', (data) => {
                     const message = data.toString().trim();
-                    // this.log.debug('\n' + message);
-                    this.wssSendMessage('Matterbridge:spawn', 'spawn', message);
+                    this.wssSendMessage('spawn', this.log.now(), 'Matterbridge:spawn', message);
                 });
             }
         });
@@ -2525,20 +2327,45 @@ export class Matterbridge extends EventEmitter {
     /**
      * Sends a WebSocket message to all connected clients.
      *
-     * @param {string} type - The type of the message: Matterbridge, Plugin, Device, ...
-     * @param {string} subType - The subtype of the message: debug info warn error ....
+     * @param {string} level - The logger level of the message: debug info notice warn error fatal...
+     * @param {string} time - The time string of the message
+     * @param {string} name - The logger name of the message
      * @param {string} message - The content of the message.
      */
-    wssSendMessage(type, subType, message) {
+    wssSendMessage(level, time, name, message) {
+        if (!level || !time || !name || !message)
+            return;
         // Remove ANSI escape codes from the message
         // eslint-disable-next-line no-control-regex
-        const cleanMessage = message.replace(/\x1B\[[0-9;]*[m|s|u|K]/g, '');
+        message = message.replace(/\x1B\[[0-9;]*[m|s|u|K]/g, '');
         // Remove leading asterisks from the message
-        const finalMessage = cleanMessage.replace(/^\*+/, '');
+        message = message.replace(/^\*+/, '');
+        // Replace all occurrences of \t and \n
+        message = message.replace(/[\t\n]/g, '');
+        // Remove non-printable characters
+        // eslint-disable-next-line no-control-regex
+        message = message.replace(/[\x00-\x1F\x7F]/g, '');
+        // Replace all occurrences of \" with "
+        message = message.replace(/\\"/g, '"');
+        // Define the maximum allowed length for continuous characters without a space
+        const maxContinuousLength = 100;
+        const keepStartLength = 20;
+        const keepEndLength = 20;
+        // Split the message into words
+        message = message
+            .split(' ')
+            .map((word) => {
+            // If the word length exceeds the max continuous length, insert spaces and truncate
+            if (word.length > maxContinuousLength) {
+                return word.slice(0, keepStartLength) + ' ... ' + word.slice(-keepEndLength);
+            }
+            return word;
+        })
+            .join(' ');
         // Send the message to all connected clients
         this.webSocketServer?.clients.forEach((client) => {
             if (client.readyState === WebSocket.OPEN) {
-                client.send(JSON.stringify({ type, subType, message: finalMessage }));
+                client.send(JSON.stringify({ level, time, name, message }));
             }
         });
     }
@@ -2639,17 +2466,17 @@ export class Matterbridge extends EventEmitter {
         this.webSocketServer = new WebSocketServer(hasParameter('ssl') ? { server: this.httpsServer } : { server: this.httpServer });
         this.webSocketServer.on('connection', (ws, request) => {
             const clientIp = request.socket.remoteAddress;
-            this.log.info(`WebSocketServer client ${clientIp} connected`);
-            this.log.setGlobalCallback(this.wssSendMessage.bind(this));
+            AnsiLogger.setGlobalCallback(this.wssSendMessage.bind(this), "debug" /* LogLevel.DEBUG */);
             this.log.debug('WebSocketServer logger global callback added');
-            this.wssSendMessage('Matterbridge', 'info', `WebSocketServer client ${clientIp} connected to Matterbridge`);
+            this.log.info(`WebSocketServer client "${clientIp}" connected to Matterbridge`);
+            // this.wssSendMessage('info', this.log.now(), 'Matterbridge', `WebSocketServer client "${clientIp}" connected to Matterbridge`);
             ws.on('message', (message) => {
                 this.log.debug(`WebSocket client message: ${message}`);
             });
             ws.on('close', () => {
                 this.log.info('WebSocket client disconnected');
                 if (this.webSocketServer?.clients.size === 0) {
-                    this.log.setGlobalCallback(undefined);
+                    AnsiLogger.setGlobalCallback(undefined);
                     this.log.debug('All WebSocket clients disconnected. WebSocketServer logger global callback removed');
                 }
             });
@@ -2685,6 +2512,7 @@ export class Matterbridge extends EventEmitter {
                     this.log.warn('/api/login error wrong password');
                     res.json({ valid: false });
                 }
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
             }
             catch (error) {
                 this.log.error('/api/login error getting password');
@@ -2704,6 +2532,7 @@ export class Matterbridge extends EventEmitter {
             try {
                 qrPairingCode = await this.matterbridgeContext.get('qrPairingCode');
                 manualPairingCode = await this.matterbridgeContext.get('manualPairingCode');
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
             }
             catch (error) {
                 if (this.bridgeMode === 'bridge')
@@ -2711,26 +2540,28 @@ export class Matterbridge extends EventEmitter {
             }
             this.matterbridgeInformation.bridgeMode = this.bridgeMode;
             this.matterbridgeInformation.restartMode = this.restartMode;
-            this.matterbridgeInformation.debugEnabled = this.debugEnabled;
+            this.matterbridgeInformation.loggerLevel = this.log.logLevel;
             this.matterbridgeInformation.matterLoggerLevel = Logger.defaultLogLevel;
             this.matterbridgeInformation.matterbridgePaired = this.matterbridgePaired;
             this.matterbridgeInformation.matterbridgeConnected = this.matterbridgeConnected;
             this.matterbridgeInformation.matterbridgeFabricInformations = this.matterbridgeFabricInformations;
             this.matterbridgeInformation.matterbridgeSessionInformations = this.matterbridgeSessionInformations;
-            const response = { wssHost, qrPairingCode, manualPairingCode, systemInformation: this.systemInformation, matterbridgeInformation: this.matterbridgeInformation };
+            if (this.profile)
+                this.matterbridgeInformation.profile = this.profile;
+            const response = { wssHost, ssl: hasParameter('ssl'), qrPairingCode, manualPairingCode, systemInformation: this.systemInformation, matterbridgeInformation: this.matterbridgeInformation };
             // this.log.debug('Response:', debugStringify(response));
-            this.log.debug(`WebSocketServer logger local callback: ${this.log.getCallback() ? 'active' : 'inactive'}`);
-            this.log.debug(`WebSocketServer logger global callback: ${this.log.getGlobalCallback() ? 'active' : 'inactive'}`);
-            if (this.webSocketServer && this.webSocketServer.clients.size > 0 && !this.log.getGlobalCallback()) {
-                this.log.setGlobalCallback(this.wssSendMessage.bind(this));
-                this.log.debug('WebSocketServer logger global callback added');
+            /*
+            if (this.webSocketServer && this.webSocketServer.clients.size > 0 && !AnsiLogger.getGlobalCallback()) {
+              AnsiLogger.setGlobalCallback(this.wssSendMessage.bind(this), LogLevel.DEBUG);
+              this.log.debug('WebSocketServer logger global callback added');
             }
+            */
             res.json(response);
         });
         // Endpoint to provide plugins
         this.expressApp.get('/api/plugins', async (req, res) => {
             this.log.debug('The frontend sent /api/plugins');
-            const response = await this.getBaseRegisteredPlugins(true);
+            const response = await this.getBaseRegisteredPlugins();
             // this.log.debug('Response:', debugStringify(response));
             res.json(response);
         });
@@ -2837,6 +2668,39 @@ export class Matterbridge extends EventEmitter {
             });
             res.json(data);
         });
+        // Endpoint to send the log
+        this.expressApp.get('/api/view-log', async (req, res) => {
+            this.log.debug('The frontend sent /api/log');
+            try {
+                const data = await fs.readFile(path.join(this.matterbridgeDirectory, this.matterbrideLoggerFile), 'utf8');
+                res.type('text/plain');
+                res.send(data);
+            }
+            catch (error) {
+                this.log.error(`Error reading log file ${this.matterbrideLoggerFile}: ${error instanceof Error ? error.message : error}`);
+                res.status(500).send('Error reading log file');
+            }
+        });
+        // Endpoint to download the log
+        this.expressApp.get('/api/download-mblog', (req, res) => {
+            this.log.debug('The frontend sent /api/download-mblog');
+            res.download(path.join(this.matterbridgeDirectory, this.matterbrideLoggerFile), 'matterbridge.log', (error) => {
+                if (error) {
+                    this.log.error(`Error downloading log file ${this.matterbrideLoggerFile}: ${error instanceof Error ? error.message : error}`);
+                    res.status(500).send('Error downloading the matterbridge log file');
+                }
+            });
+        });
+        // Endpoint to download the log
+        this.expressApp.get('/api/download-mjlog', (req, res) => {
+            this.log.debug('The frontend sent /api/download-mjlog');
+            res.download(path.join(this.matterbridgeDirectory, this.matterLoggerFile), 'matter.log', (error) => {
+                if (error) {
+                    this.log.error(`Error downloading log file ${this.matterLoggerFile}: ${error instanceof Error ? error.message : error}`);
+                    res.status(500).send('Error downloading the matter log file');
+                }
+            });
+        });
         // Endpoint to receive commands
         this.expressApp.post('/api/command/:command/:param', express.json(), async (req, res) => {
             const command = req.params.command;
@@ -2859,12 +2723,31 @@ export class Matterbridge extends EventEmitter {
             if (command === 'setmbloglevel') {
                 this.log.debug('Matterbridge log level:', param);
                 if (param === 'Debug') {
-                    this.log.setLogDebug(true);
-                    this.debugEnabled = true;
+                    this.log.logLevel = "debug" /* LogLevel.DEBUG */;
                 }
                 else if (param === 'Info') {
-                    this.log.setLogDebug(false);
-                    this.debugEnabled = false;
+                    this.log.logLevel = "info" /* LogLevel.INFO */;
+                }
+                else if (param === 'Notice') {
+                    this.log.logLevel = "notice" /* LogLevel.NOTICE */;
+                }
+                else if (param === 'Warn') {
+                    this.log.logLevel = "warn" /* LogLevel.WARN */;
+                }
+                else if (param === 'Error') {
+                    this.log.logLevel = "error" /* LogLevel.ERROR */;
+                }
+                else if (param === 'Fatal') {
+                    this.log.logLevel = "fatal" /* LogLevel.FATAL */;
+                }
+                await this.nodeContext?.set('matterbridgeLogLevel', this.log.logLevel);
+                MatterbridgeDevice.logLevel = this.log.logLevel;
+                this.plugins.logLevel = this.log.logLevel;
+                for (const plugin of this.plugins) {
+                    if (!plugin.platform || !plugin.platform.config)
+                        continue;
+                    plugin.platform.log.logLevel = plugin.platform.config.debug ? "debug" /* LogLevel.DEBUG */ : this.log.logLevel;
+                    await plugin.platform.onChangeLoggerLevel(plugin.platform.config.debug ? "debug" /* LogLevel.DEBUG */ : this.log.logLevel);
                 }
                 res.json({ message: 'Command received' });
                 return;
@@ -2890,6 +2773,7 @@ export class Matterbridge extends EventEmitter {
                 else if (param === 'Fatal') {
                     Logger.defaultLogLevel = Level.FATAL;
                 }
+                await this.nodeContext?.set('matterLogLevel', Logger.defaultLogLevel);
                 res.json({ message: 'Command received' });
                 return;
             }
@@ -2929,6 +2813,7 @@ export class Matterbridge extends EventEmitter {
                 try {
                     await this.spawnCommand('npm', ['install', '-g', 'matterbridge']);
                     this.log.info('Matterbridge has been updated. Full restart required.');
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 }
                 catch (error) {
                     this.log.error('Error updating matterbridge');
@@ -2961,6 +2846,7 @@ export class Matterbridge extends EventEmitter {
                 try {
                     await this.spawnCommand('npm', ['install', '-g', param]);
                     this.log.info(`Plugin ${plg}${param}${nf} installed. Full restart required.`);
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 }
                 catch (error) {
                     this.log.error(`Error installing plugin ${plg}${param}${er}`);
@@ -2975,12 +2861,6 @@ export class Matterbridge extends EventEmitter {
                 const plugin = await this.plugins.add(param);
                 if (plugin) {
                     this.plugins.load(plugin, true, 'The plugin has been added', true); // No await do it in the background
-                    /*
-                    plugin.platform = await this.plugins.load(plugin, false, 'The plugin has been added');
-                    if (plugin.platform) {
-                      await this.plugins.start(plugin, 'The plugin has been added', true);
-                    }
-                    */
                 }
                 res.json({ message: 'Command received' });
                 return;
@@ -3017,12 +2897,6 @@ export class Matterbridge extends EventEmitter {
                         plugin.addedDevices = undefined;
                         await this.plugins.enable(param);
                         this.plugins.load(plugin, true, 'The plugin has been enabled', true); // No await do it in the background
-                        /*
-                        plugin.platform = await this.plugins.load(plugin, false, 'The plugin has been enabled');
-                        if (plugin.platform) {
-                          await this.plugins.start(plugin, 'The plugin has been enabled', true);
-                        }
-                        */
                     }
                 }
                 res.json({ message: 'Command received' });
@@ -3053,9 +2927,9 @@ export class Matterbridge extends EventEmitter {
         this.log.debug(`Frontend initialized on port ${YELLOW}${port}${db} static ${UNDERLINE}${path.join(this.rootDirectory, 'frontend/build')}${UNDERLINEOFF}${rs}`);
     }
     /**
-     * Retrieves the cluster text from a given device.
-     * @param device - The MatterbridgeDevice object.
-     * @returns The attributes of the cluster servers in the device.
+     * Retrieves the cluster text description from a given device.
+     * @param {MatterbridgeDevice} device - The MatterbridgeDevice object.
+     * @returns {string} The attributes description of the cluster servers in the device.
      */
     getClusterTextFromDevice(device) {
         const stringifyFixedLabel = (endpoint) => {
@@ -3072,41 +2946,54 @@ export class Matterbridge extends EventEmitter {
         // this.log.debug(`getClusterTextFromDevice: ${device.name}`);
         const clusterServers = device.getAllClusterServers();
         clusterServers.forEach((clusterServer) => {
-            // this.log.debug(`***--clusterServer: ${clusterServer.id} (${clusterServer.name})`);
-            if (clusterServer.name === 'OnOff')
-                attributes += `OnOff: ${clusterServer.getOnOffAttribute()} `;
-            if (clusterServer.name === 'Switch')
-                attributes += `Position: ${clusterServer.getCurrentPositionAttribute()} `;
-            if (clusterServer.name === 'WindowCovering')
-                attributes += `Cover position: ${clusterServer.attributes.currentPositionLiftPercent100ths.getLocal() / 100}% `;
-            if (clusterServer.name === 'DoorLock')
-                attributes += `State: ${clusterServer.attributes.lockState.getLocal() === 1 ? 'Locked' : 'Not locked'} `;
-            if (clusterServer.name === 'Thermostat')
-                attributes += `Temperature: ${clusterServer.attributes.localTemperature.getLocal() / 100}°C `;
-            if (clusterServer.name === 'LevelControl')
-                attributes += `Level: ${clusterServer.getCurrentLevelAttribute()}% `;
-            if (clusterServer.name === 'ColorControl')
-                attributes += `Hue: ${Math.round(clusterServer.getCurrentHueAttribute())} Saturation: ${Math.round(clusterServer.getCurrentSaturationAttribute())}% `;
-            if (clusterServer.name === 'BooleanState')
-                attributes += `Contact: ${clusterServer.getStateValueAttribute()} `;
-            if (clusterServer.name === 'OccupancySensing')
-                attributes += `Occupancy: ${clusterServer.getOccupancyAttribute().occupied} `;
-            if (clusterServer.name === 'IlluminanceMeasurement')
-                attributes += `Illuminance: ${clusterServer.getMeasuredValueAttribute()} `;
-            if (clusterServer.name === 'AirQuality')
-                attributes += `Air quality: ${clusterServer.getAirQualityAttribute()} `;
-            if (clusterServer.name === 'TvocMeasurement')
-                attributes += `Voc: ${clusterServer.getMeasuredValueAttribute()} `;
-            if (clusterServer.name === 'TemperatureMeasurement')
-                attributes += `Temperature: ${clusterServer.getMeasuredValueAttribute() / 100}°C `;
-            if (clusterServer.name === 'RelativeHumidityMeasurement')
-                attributes += `Humidity: ${clusterServer.getMeasuredValueAttribute() / 100}% `;
-            if (clusterServer.name === 'PressureMeasurement')
-                attributes += `Pressure: ${clusterServer.getMeasuredValueAttribute()} `;
-            if (clusterServer.name === 'FlowMeasurement')
-                attributes += `Flow: ${clusterServer.getMeasuredValueAttribute()} `;
-            if (clusterServer.name === 'FixedLabel')
-                attributes += `${stringifyFixedLabel(device)} `;
+            try {
+                // this.log.debug(`***--clusterServer: ${clusterServer.id} (${clusterServer.name})`);
+                if (clusterServer.name === 'OnOff')
+                    attributes += `OnOff: ${clusterServer.getOnOffAttribute()} `;
+                if (clusterServer.name === 'Switch')
+                    attributes += `Position: ${clusterServer.getCurrentPositionAttribute()} `;
+                if (clusterServer.name === 'WindowCovering')
+                    attributes += `Cover position: ${clusterServer.attributes.currentPositionLiftPercent100ths.getLocal() / 100}% `;
+                if (clusterServer.name === 'DoorLock')
+                    attributes += `State: ${clusterServer.attributes.lockState.getLocal() === 1 ? 'Locked' : 'Not locked'} `;
+                if (clusterServer.name === 'Thermostat')
+                    attributes += `Temperature: ${clusterServer.attributes.localTemperature.getLocal() / 100}°C `;
+                if (clusterServer.name === 'LevelControl')
+                    attributes += `Level: ${clusterServer.getCurrentLevelAttribute()}% `;
+                if (clusterServer.name === 'ColorControl' && clusterServer.isAttributeSupportedByName('currentHue'))
+                    attributes += `Hue: ${Math.round(clusterServer.getCurrentHueAttribute())} Saturation: ${Math.round(clusterServer.getCurrentSaturationAttribute())}% `;
+                if (clusterServer.name === 'ColorControl' && clusterServer.isAttributeSupportedByName('colorTemperatureMireds'))
+                    attributes += `ColorTemp: ${Math.round(clusterServer.getColorTemperatureMiredsAttribute())} `;
+                if (clusterServer.name === 'BooleanState')
+                    attributes += `Contact: ${clusterServer.getStateValueAttribute()} `;
+                if (clusterServer.name === 'BooleanStateConfiguration' && clusterServer.isAttributeSupportedByName('alarmsActive'))
+                    attributes += `Active alarms: ${stringify(clusterServer.getAlarmsActiveAttribute())} `;
+                if (clusterServer.name === 'FanControl')
+                    attributes += `Mode: ${clusterServer.getFanModeAttribute()} Speed: ${clusterServer.getPercentCurrentAttribute()} `;
+                if (clusterServer.name === 'FanControl' && clusterServer.isAttributeSupportedByName('speedCurrent'))
+                    attributes += `MultiSpeed: ${clusterServer.getSpeedCurrentAttribute()} `;
+                if (clusterServer.name === 'OccupancySensing')
+                    attributes += `Occupancy: ${clusterServer.getOccupancyAttribute().occupied} `;
+                if (clusterServer.name === 'IlluminanceMeasurement')
+                    attributes += `Illuminance: ${clusterServer.getMeasuredValueAttribute()} `;
+                if (clusterServer.name === 'AirQuality')
+                    attributes += `Air quality: ${clusterServer.getAirQualityAttribute()} `;
+                if (clusterServer.name === 'TvocMeasurement')
+                    attributes += `Voc: ${clusterServer.getMeasuredValueAttribute()} `;
+                if (clusterServer.name === 'TemperatureMeasurement')
+                    attributes += `Temperature: ${clusterServer.getMeasuredValueAttribute() / 100}°C `;
+                if (clusterServer.name === 'RelativeHumidityMeasurement')
+                    attributes += `Humidity: ${clusterServer.getMeasuredValueAttribute() / 100}% `;
+                if (clusterServer.name === 'PressureMeasurement')
+                    attributes += `Pressure: ${clusterServer.getMeasuredValueAttribute()} `;
+                if (clusterServer.name === 'FlowMeasurement')
+                    attributes += `Flow: ${clusterServer.getMeasuredValueAttribute()} `;
+                if (clusterServer.name === 'FixedLabel')
+                    attributes += `${stringifyFixedLabel(device)} `;
+            }
+            catch (error) {
+                this.log.error(`getClusterTextFromDevice with ${clusterServer.name} error: ${error}`);
+            }
         });
         return attributes;
     }
@@ -3116,14 +3003,13 @@ export class Matterbridge extends EventEmitter {
      *
      * @returns A Promise that resolves when the initialization is complete.
      */
-    async startExtension(dataPath, debugEnabled, extensionVersion, port = 5560) {
+    async startExtension(dataPath, extensionVersion, port = 5540) {
         // Set the bridge mode
         this.bridgeMode = 'bridge';
         // Set the first port to use
         this.port = port;
         // Set Matterbridge logger
-        this.debugEnabled = debugEnabled;
-        this.log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logDebug: this.debugEnabled });
+        this.log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logLevel: "info" /* LogLevel.INFO */ });
         this.log.debug('Matterbridge extension is starting...');
         // Initialize NodeStorage
         this.matterbridgeDirectory = dataPath;
@@ -3148,10 +3034,10 @@ export class Matterbridge extends EventEmitter {
         await this.logNodeAndSystemInfo();
         this.matterbridgeDirectory = dataPath;
         // Set matter.js logger level and format
-        Logger.defaultLogLevel = this.debugEnabled ? Level.DEBUG : Level.INFO;
+        Logger.defaultLogLevel = Level.INFO;
         Logger.format = Format.ANSI;
         // Start the storage and create matterbridgeContext
-        await this.startStorage('json', path.join(this.matterbridgeDirectory, this.matterStorageName));
+        await this.startMatterStorage('json', path.join(this.matterbridgeDirectory, this.matterStorageName));
         if (!this.storageManager)
             return false;
         this.matterbridgeContext = await this.createCommissioningServerContext('Matterbridge', 'Matterbridge zigbee2MQTT', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'zigbee2MQTT Matter extension');
@@ -3195,7 +3081,7 @@ export class Matterbridge extends EventEmitter {
         // Clearing the session manager
         // this.matterbridgeContext?.createContext('SessionManager').clear();
         // Closing storage
-        await this.stopStorage();
+        await this.stopMatterStorage();
         this.log.info('Matter server stopped');
     }
     /**