matterbridge 2.0.0-edge1 → 2.1.0-dev.1

package/dist/matterbridge.js

@@ -1,26 +1,3 @@
-/**
- * This file contains the class Matterbridge.
- *
- * @file matterbridge.ts
- * @author Luca Liguori
- * @date 2023-12-29
- * @version 1.5.2
- *
- * Copyright 2023, 2024, 2025 Luca Liguori.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License. *
- */
-// Node.js modules
 import { fileURLToPath } from 'url';
 import { promises as fs } from 'fs';
 import { exec, spawn } from 'child_process';
@@ -28,27 +5,20 @@ import EventEmitter from 'events';
 import os from 'os';
 import path from 'path';
 import { randomBytes } from 'crypto';
-// NodeStorage and AnsiLogger modules
-import { NodeStorageManager } from 'node-persist-manager';
-import { AnsiLogger, TimestampFormat, LogLevel, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, CYAN, nt } from 'node-ansi-logger';
-// Matterbridge
+import { NodeStorageManager } from './storage/export.js';
+import { AnsiLogger, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, CYAN, nt } from './logger/export.js';
 import { logInterfaces, wait, waiter, copyDirectory, getParameter, getIntParameter, hasParameter } from './utils/utils.js';
 import { PluginManager } from './pluginManager.js';
 import { DeviceManager } from './deviceManager.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
 import { bridge } from './matterbridgeDeviceTypes.js';
-// @matter
+import { Frontend } from './frontend.js';
 import { DeviceTypeId, Endpoint as EndpointNode, Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, VendorId, StorageService, Environment, ServerNode } from '@matter/main';
-import { FabricAction, PaseClient } from '@matter/main/protocol';
+import { DeviceCommissioner, FabricAction, MdnsService, PaseClient } from '@matter/main/protocol';
 import { AggregatorEndpoint } from '@matter/main/endpoints';
-import { Frontend } from './frontend.js';
-// Default colors
 const plg = '\u001B[38;5;33m';
 const dev = '\u001B[38;5;79m';
 const typ = '\u001B[38;5;207m';
-/**
- * Represents the Matterbridge application.
- */
 export class Matterbridge extends EventEmitter {
     systemInformation = {
         interfaceName: '',
@@ -79,12 +49,11 @@ export class Matterbridge extends EventEmitter {
         matterbridgeFabricInformations: [],
         matterbridgeSessionInformations: [],
         matterbridgePaired: false,
-        matterbridgeConnected: false,
         bridgeMode: '',
         restartMode: '',
         readOnly: hasParameter('readonly'),
         profile: getParameter('profile'),
-        loggerLevel: LogLevel.INFO,
+        loggerLevel: "info",
         fileLogger: false,
         matterLoggerLevel: MatterLogLevel.INFO,
         matterFileLogger: false,
@@ -106,10 +75,9 @@ export class Matterbridge extends EventEmitter {
     matterbridgeLatestVersion = '';
     matterbridgeQrPairingCode = undefined;
     matterbridgeManualPairingCode = undefined;
-    matterbridgeFabricInformations = [];
-    matterbridgeSessionInformations = [];
-    matterbridgePaired = false;
-    matterbridgeConnected = false;
+    matterbridgeFabricInformations = undefined;
+    matterbridgeSessionInformations = undefined;
+    matterbridgePaired = undefined;
     bridgeMode = '';
     restartMode = '';
     profile = getParameter('profile');
@@ -120,11 +88,9 @@ export class Matterbridge extends EventEmitter {
     plugins;
     devices;
     frontend = new Frontend(this);
-    // Matterbridge storage
     nodeStorage;
     nodeContext;
     nodeStorageName = 'storage' + (getParameter('profile') ? '.' + getParameter('profile') : '');
-    // Cleanup
     hasCleanupStarted = false;
     initialized = false;
     execRunningCount = 0;
@@ -136,57 +102,34 @@ export class Matterbridge extends EventEmitter {
     sigtermHandler;
     exceptionHandler;
     rejectionHandler;
-    // Matter environment
     environment = Environment.default;
-    // Matter storage
     matterStorageName = 'matterstorage' + (getParameter('profile') ? '.' + getParameter('profile') : '');
     matterStorageService;
     matterStorageManager;
     matterbridgeContext;
     mattercontrollerContext;
-    // Matter parameters
-    mdnsInterface; // matter server mdnsInterface: e.g. 'eth0' or 'wlan0' or 'WiFi'
-    ipv4address; // matter commissioning server listeningAddressIpv4
-    ipv6address; // matter commissioning server listeningAddressIpv6
-    port; // first commissioning server port
-    passcode; // first commissioning server passcode
-    discriminator; // first commissioning server discriminator
+    mdnsInterface;
+    ipv4address;
+    ipv6address;
+    port;
+    passcode;
+    discriminator;
     serverNode;
     aggregatorNode;
     aggregatorVendorId = VendorId(getIntParameter('vendorId') ?? 0xfff1);
     aggregatorProductId = getIntParameter('productId') ?? 0x8000;
     static instance;
-    // We load asyncronously so is private
     constructor() {
         super();
     }
-    /**
-     * Retrieves the list of Matterbridge devices.
-     * @returns {MatterbridgeEndpoint[]} An array of MatterbridgeDevice objects.
-     */
     getDevices() {
         return this.devices.array();
     }
-    /**
-     * Retrieves the list of registered plugins.
-     * @returns {RegisteredPlugin[]} An array of RegisteredPlugin objects.
-     */
     getPlugins() {
         return this.plugins.array();
     }
-    /** ***********************************************************************************************************************************/
-    /**                                              loadInstance() and cleanup() methods                                                 */
-    /** ***********************************************************************************************************************************/
-    /**
-     * Loads an instance of the Matterbridge class.
-     * If an instance already exists, return that instance.
-     *
-     * @param initialize - Whether to initialize the Matterbridge instance after loading.
-     * @returns The loaded Matterbridge instance.
-     */
     static async loadInstance(initialize = false) {
         if (!Matterbridge.instance) {
-            // eslint-disable-next-line no-console
             if (hasParameter('debug'))
                 console.log(GREEN + 'Creating a new instance of Matterbridge.', initialize ? 'Initializing...' : 'Not initializing...', rs);
             Matterbridge.instance = new Matterbridge();
@@ -195,11 +138,6 @@ export class Matterbridge extends EventEmitter {
         }
         return Matterbridge.instance;
     }
-    /**
-     * Call cleanup().
-     * @deprecated This method is deprecated and is only used for jest tests.
-     *
-     */
     async destroyInstance() {
         await this.cleanup('destroying instance...', false);
         await waiter('destroying instance...', () => {
@@ -207,68 +145,45 @@ export class Matterbridge extends EventEmitter {
         }, false, 60000, 100, false);
         await wait(1000, 'Wait for the global node_modules and matterbridge version', false);
     }
-    /**
-     * Initializes the Matterbridge application.
-     *
-     * @remarks
-     * This method performs the necessary setup and initialization steps for the Matterbridge application.
-     * It displays the help information if the 'help' parameter is provided, sets up the logger, checks the
-     * node version, registers signal handlers, initializes storage, and parses the command line.
-     *
-     * @returns A Promise that resolves when the initialization is complete.
-     */
     async initialize() {
-        // Set the restart mode
         if (hasParameter('service'))
             this.restartMode = 'service';
         if (hasParameter('docker'))
             this.restartMode = 'docker';
-        // Set the matterbridge directory
         this.homeDirectory = getParameter('homedir') ?? os.homedir();
         this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
-        // Setup matter environment
         this.environment.vars.set('log.level', MatterLogLevel.INFO);
         this.environment.vars.set('log.format', MatterLogFormat.ANSI);
         this.environment.vars.set('path.root', path.join(this.matterbridgeDirectory, this.matterStorageName));
         this.environment.vars.set('runtime.signals', false);
         this.environment.vars.set('runtime.exitcode', false);
-        // Create matterbridge logger
-        this.log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: TimestampFormat.TIME_MILLIS, logLevel: hasParameter('debug') ? LogLevel.DEBUG : LogLevel.INFO });
-        // Register process handlers
+        this.log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: 4, logLevel: hasParameter('debug') ? "debug" : "info" });
         this.registerProcessHandlers();
-        // Initialize nodeStorage and nodeContext
         try {
             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');
-            // TODO: Remove this code when node-persist-manager is updated
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const keys = (await this.nodeStorage?.storage.keys());
             for (const key of keys) {
                 this.log.debug(`Checking node storage manager key: ${CYAN}${key}${db}`);
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 await this.nodeStorage?.storage.get(key);
             }
             const storages = await this.nodeStorage.getStorageNames();
             for (const storage of storages) {
                 this.log.debug(`Checking storage: ${CYAN}${storage}${db}`);
                 const nodeContext = await this.nodeStorage?.createStorage(storage);
-                // TODO: Remove this code when node-persist-manager is updated
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 const keys = (await nodeContext?.storage.keys());
                 keys.forEach(async (key) => {
                     this.log.debug(`Checking key: ${CYAN}${storage}:${key}${db}`);
                     await nodeContext?.get(key);
                 });
             }
-            // Creating a backup of the node storage since it is not corrupted
             this.log.debug('Creating node storage backup...');
             await copyDirectory(path.join(this.matterbridgeDirectory, this.nodeStorageName), path.join(this.matterbridgeDirectory, this.nodeStorageName + '.backup'));
             this.log.debug('Created node storage backup');
         }
         catch (error) {
-            // Restoring the backup of the node storage since it is corrupted
             this.log.error(`Error creating node storage manager and context: ${error instanceof Error ? error.message : error}`);
             if (hasParameter('norestore')) {
                 this.log.fatal(`The matterbridge node storage is corrupted. Parameter -norestore found: exiting...`);
@@ -283,51 +198,45 @@ export class Matterbridge extends EventEmitter {
             this.log.fatal('Fatal error creating node storage manager and context for matterbridge');
             throw new Error('Fatal error creating node storage manager and context for matterbridge');
         }
-        // Set the first port to use for the commissioning server (will be incremented in childbridge mode)
         this.port = getIntParameter('port') ?? (await this.nodeContext.get('matterport', 5540)) ?? 5540;
-        // Set the first passcode to use for the commissioning server (will be incremented in childbridge mode)
         this.passcode = getIntParameter('passcode') ?? (await this.nodeContext.get('matterpasscode')) ?? PaseClient.generateRandomPasscode();
-        // Set the first discriminator to use for the commissioning server (will be incremented in childbridge mode)
         this.discriminator = getIntParameter('discriminator') ?? (await this.nodeContext.get('matterdiscriminator')) ?? PaseClient.generateRandomDiscriminator();
         this.log.debug(`Initializing commissioning server for Matterbridge... on port ${this.port} with passcode ${this.passcode} and discriminator ${this.discriminator}`);
-        // Set matterbridge logger level (context: matterbridgeLogLevel)
         if (hasParameter('logger')) {
             const level = getParameter('logger');
             if (level === 'debug') {
-                this.log.logLevel = LogLevel.DEBUG;
+                this.log.logLevel = "debug";
             }
             else if (level === 'info') {
-                this.log.logLevel = LogLevel.INFO;
+                this.log.logLevel = "info";
             }
             else if (level === 'notice') {
-                this.log.logLevel = LogLevel.NOTICE;
+                this.log.logLevel = "notice";
             }
             else if (level === 'warn') {
-                this.log.logLevel = LogLevel.WARN;
+                this.log.logLevel = "warn";
             }
             else if (level === 'error') {
-                this.log.logLevel = LogLevel.ERROR;
+                this.log.logLevel = "error";
             }
             else if (level === 'fatal') {
-                this.log.logLevel = LogLevel.FATAL;
+                this.log.logLevel = "fatal";
             }
             else {
                 this.log.warn(`Invalid matterbridge logger level: ${level}. Using default level "info".`);
-                this.log.logLevel = LogLevel.INFO;
+                this.log.logLevel = "info";
             }
         }
         else {
-            this.log.logLevel = await this.nodeContext.get('matterbridgeLogLevel', LogLevel.INFO);
+            this.log.logLevel = await this.nodeContext.get('matterbridgeLogLevel', "info");
         }
         MatterbridgeEndpoint.logLevel = this.log.logLevel;
-        // Create the file logger for matterbridge (context: matterbridgeFileLog)
         if (hasParameter('filelogger') || (await this.nodeContext.get('matterbridgeFileLog', false))) {
             AnsiLogger.setGlobalLogfile(path.join(this.matterbridgeDirectory, this.matterbrideLoggerFile), this.log.logLevel, true);
             this.matterbridgeInformation.fileLogger = true;
         }
         this.log.notice('Matterbridge is starting...');
         this.log.debug(`Matterbridge logLevel: ${this.log.logLevel} fileLoger: ${this.matterbridgeInformation.fileLogger}.`);
-        // Set matter.js logger level, format and logger (context: matterLogLevel)
         if (hasParameter('matterlogger')) {
             const level = getParameter('matterlogger');
             if (level === 'debug') {
@@ -358,7 +267,6 @@ export class Matterbridge extends EventEmitter {
         }
         Logger.format = MatterLogFormat.ANSI;
         Logger.setLogger('default', this.createMatterLogger());
-        // Create the file logger for matter.js (context: matterFileLog)
         if (hasParameter('matterfilelogger') || (await this.nodeContext.get('matterFileLog', false))) {
             this.matterbridgeInformation.matterFileLogger = true;
             Logger.addLogger('matterfilelogger', await this.createMatterFileLogger(path.join(this.matterbridgeDirectory, this.matterLoggerFile), true), {
@@ -367,7 +275,6 @@ export class Matterbridge extends EventEmitter {
             });
         }
         this.log.debug(`Matter logLevel: ${Logger.defaultLogLevel} fileLoger: ${this.matterbridgeInformation.matterFileLogger}.`);
-        // Set the interface to use for matter server node mdnsInterface
         if (hasParameter('mdnsinterface')) {
             this.mdnsInterface = getParameter('mdnsinterface');
         }
@@ -376,7 +283,6 @@ export class Matterbridge extends EventEmitter {
             if (this.mdnsInterface === '')
                 this.mdnsInterface = undefined;
         }
-        // Validate mdnsInterface
         if (this.mdnsInterface) {
             const networkInterfaces = os.networkInterfaces();
             const availableInterfaces = Object.keys(networkInterfaces);
@@ -390,7 +296,6 @@ export class Matterbridge extends EventEmitter {
         }
         if (this.mdnsInterface)
             this.environment.vars.set('mdns.networkInterface', this.mdnsInterface);
-        // Set the listeningAddressIpv4 for the matter commissioning server
         if (hasParameter('ipv4address')) {
             this.ipv4address = getParameter('ipv4address');
         }
@@ -399,7 +304,6 @@ export class Matterbridge extends EventEmitter {
             if (this.ipv4address === '')
                 this.ipv4address = undefined;
         }
-        // Set the listeningAddressIpv6 for the matter commissioning server
         if (hasParameter('ipv6address')) {
             this.ipv6address = getParameter('ipv6address');
         }
@@ -408,17 +312,12 @@ export class Matterbridge extends EventEmitter {
             if (this.ipv6address === '')
                 this.ipv6address = undefined;
         }
-        // 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);
             if (packageJson === null && !hasParameter('add') && !hasParameter('remove') && !hasParameter('enable') && !hasParameter('disable') && !hasParameter('reset') && !hasParameter('factoryreset')) {
-                // Try to reinstall the plugin from npm (for Docker pull and external plugins)
-                // We don't do this when the add and other parameters are set because we shut down the process after adding the plugin
                 this.log.info(`Error parsing plugin ${plg}${plugin.name}${nf}. Trying to reinstall it from npm.`);
                 try {
                     await this.spawnCommand('npm', ['install', '-g', plugin.name, '--omit=dev', '--verbose']);
@@ -440,7 +339,6 @@ export class Matterbridge extends EventEmitter {
             await plugin.nodeContext.set('description', plugin.description);
             await plugin.nodeContext.set('author', plugin.author);
         }
-        // Log system info and create .matterbridge directory
         await this.logNodeAndSystemInfo();
         this.log.notice(`Matterbridge version ${this.matterbridgeVersion} ` +
             `${hasParameter('bridge') || (!hasParameter('childbridge') && (await this.nodeContext?.get('bridgeMode', '')) === 'bridge') ? 'mode bridge ' : ''}` +
@@ -448,7 +346,6 @@ export class Matterbridge extends EventEmitter {
             `${hasParameter('controller') ? 'mode controller ' : ''}` +
             `${this.restartMode !== '' ? 'restart mode ' + this.restartMode + ' ' : ''}` +
             `running on ${this.systemInformation.osType} (v.${this.systemInformation.osRelease}) platform ${this.systemInformation.osPlatform} arch ${this.systemInformation.osArch}`);
-        // Check node version and throw error
         const minNodeVersion = 18;
         const nodeVersion = process.versions.node;
         const versionMajor = parseInt(nodeVersion.split('.')[0]);
@@ -456,15 +353,9 @@ export class Matterbridge extends EventEmitter {
             this.log.error(`Node version ${versionMajor} is not supported. Please upgrade to ${minNodeVersion} or above.`);
             throw new Error(`Node version ${versionMajor} is not supported. Please upgrade to ${minNodeVersion} or above.`);
         }
-        // Parse command line
         await this.parseCommandLine();
         this.initialized = true;
     }
-    /**
-     * Parses the command line arguments and performs the corresponding actions.
-     * @private
-     * @returns {Promise<void>} A promise that resolves when the command line arguments have been processed, or the process exits.
-     */
     async parseCommandLine() {
         if (hasParameter('help')) {
             this.log.info(`\nUsage: matterbridge [options]\n
@@ -574,7 +465,6 @@ export class Matterbridge extends EventEmitter {
             await this.shutdownProcessAndFactoryReset();
             return;
         }
-        // Start the matter storage and create the matterbridge context
         try {
             await this.startMatterStorage();
         }
@@ -582,12 +472,10 @@ export class Matterbridge extends EventEmitter {
             this.log.fatal(`Fatal error creating matter storage: ${error instanceof Error ? error.message : error}`);
             throw new Error(`Fatal error creating matter storage: ${error instanceof Error ? error.message : error}`);
         }
-        // Clear the matterbridge context if the reset parameter is set
         if (hasParameter('reset') && getParameter('reset') === undefined) {
             await this.shutdownProcessAndReset();
             return;
         }
-        // Clear matterbridge plugin context if the reset parameter is set
         if (hasParameter('reset') && getParameter('reset') !== undefined) {
             this.log.debug(`Reset plugin ${getParameter('reset')}`);
             const plugin = this.plugins.get(getParameter('reset'));
@@ -609,10 +497,8 @@ export class Matterbridge extends EventEmitter {
             this.emit('shutdown');
             return;
         }
-        // Initialize frontend
         if (getIntParameter('frontend') !== 0 || getIntParameter('frontend') === undefined)
             await this.frontend.start(getIntParameter('frontend'));
-        // Check each 60 minutes the latest versions
         this.checkUpdateInterval = setInterval(() => {
             this.getMatterbridgeLatestVersion();
             for (const plugin of this.plugins) {
@@ -620,24 +506,20 @@ export class Matterbridge extends EventEmitter {
             }
             this.frontend.wssSendRefreshRequired();
         }, 60 * 60 * 1000);
-        // Start the matterbridge in mode test
         if (hasParameter('test')) {
             this.bridgeMode = 'bridge';
             MatterbridgeEndpoint.bridgeMode = 'bridge';
             return;
         }
-        // Start the matterbridge in mode controller
         if (hasParameter('controller')) {
             this.bridgeMode = 'controller';
             await this.startController();
             return;
         }
-        // Check if the bridge mode is set and start matterbridge in bridge mode if not set
         if (!hasParameter('bridge') && !hasParameter('childbridge') && (await this.nodeContext?.get('bridgeMode', '')) === '') {
             this.log.info('Setting default matterbridge start mode to bridge');
             await this.nodeContext?.set('bridgeMode', 'bridge');
         }
-        // Start matterbridge in bridge mode
         if (hasParameter('bridge') || (!hasParameter('childbridge') && (await this.nodeContext?.get('bridgeMode', '')) === 'bridge')) {
             this.bridgeMode = 'bridge';
             MatterbridgeEndpoint.bridgeMode = 'bridge';
@@ -645,7 +527,6 @@ export class Matterbridge extends EventEmitter {
             await this.startBridge();
             return;
         }
-        // Start matterbridge in childbridge mode
         if (hasParameter('childbridge') || (!hasParameter('bridge') && (await this.nodeContext?.get('bridgeMode', '')) === 'childbridge')) {
             this.bridgeMode = 'childbridge';
             MatterbridgeEndpoint.bridgeMode = 'childbridge';
@@ -654,28 +535,16 @@ export class Matterbridge extends EventEmitter {
             return;
         }
     }
-    /**
-     * Asynchronously loads and starts the registered plugins.
-     *
-     * This method is responsible for initializing and staarting all enabled plugins.
-     * It ensures that each plugin is properly loaded and started before the bridge starts.
-     *
-     * @returns {Promise<void>} A promise that resolves when all plugins have been loaded and started.
-     */
     async startPlugins() {
-        // Check, load and start the plugins
         for (const plugin of this.plugins) {
             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 or not validated. Disabling it.`);
                 plugin.enabled = false;
                 plugin.error = true;
                 continue;
             }
-            // Check if the plugin has a new version
-            this.getPluginLatestVersion(plugin); // No await do it asyncronously
             if (!plugin.enabled) {
                 this.log.info(`Plugin ${plg}${plugin.name}${nf} not enabled`);
                 continue;
@@ -685,31 +554,24 @@ export class Matterbridge extends EventEmitter {
             plugin.loaded = false;
             plugin.started = false;
             plugin.configured = false;
-            plugin.connected = undefined;
             plugin.registeredDevices = undefined;
             plugin.addedDevices = undefined;
             plugin.qrPairingCode = undefined;
             plugin.manualPairingCode = undefined;
-            this.plugins.load(plugin, true, 'Matterbridge is starting'); // No await do it asyncronously
+            this.plugins.load(plugin, true, 'Matterbridge is starting');
         }
         this.frontend.wssSendRefreshRequired();
     }
-    /**
-     * Registers the process handlers for uncaughtException, unhandledRejection, SIGINT and SIGTERM.
-     * When either of these signals are received, the cleanup method is called with an appropriate message.
-     */
     registerProcessHandlers() {
         this.log.debug(`Registering uncaughtException and unhandledRejection handlers...`);
         process.removeAllListeners('uncaughtException');
         process.removeAllListeners('unhandledRejection');
         this.exceptionHandler = async (error) => {
             this.log.fatal('Unhandled Exception detected at:', error.stack || error, rs);
-            // await this.cleanup('Unhandled Exception detected, cleaning up...');
         };
         process.on('uncaughtException', this.exceptionHandler);
         this.rejectionHandler = async (reason, promise) => {
             this.log.fatal('Unhandled Rejection detected at:', promise, 'reason:', reason instanceof Error ? reason.stack : reason, rs);
-            // await this.cleanup('Unhandled Rejection detected, cleaning up...');
         };
         process.on('unhandledRejection', this.rejectionHandler);
         this.log.debug(`Registering SIGINT and SIGTERM signal handlers...`);
@@ -722,9 +584,6 @@ export class Matterbridge extends EventEmitter {
         };
         process.on('SIGTERM', this.sigtermHandler);
     }
-    /**
-     * Deregisters the process uncaughtException, unhandledRejection, SIGINT and SIGTERM signal handlers.
-     */
     deregisterProcesslHandlers() {
         this.log.debug(`Deregistering uncaughtException and unhandledRejection handlers...`);
         if (this.exceptionHandler)
@@ -741,17 +600,12 @@ export class Matterbridge extends EventEmitter {
             process.off('SIGTERM', this.sigtermHandler);
         this.sigtermHandler = undefined;
     }
-    /**
-     * Logs the node and system information.
-     */
     async logNodeAndSystemInfo() {
-        // IP address information
         const networkInterfaces = os.networkInterfaces();
         this.systemInformation.interfaceName = '';
         this.systemInformation.ipv4Address = '';
         this.systemInformation.ipv6Address = '';
         for (const [interfaceName, interfaceDetails] of Object.entries(networkInterfaces)) {
-            // this.log.debug(`Checking interface: '${interfaceName}' for '${this.mdnsInterface}'`);
             if (this.mdnsInterface && interfaceName !== this.mdnsInterface)
                 continue;
             if (!interfaceDetails) {
@@ -777,22 +631,19 @@ export class Matterbridge extends EventEmitter {
                 break;
             }
         }
-        // Node information
         this.systemInformation.nodeVersion = process.versions.node;
         const versionMajor = parseInt(this.systemInformation.nodeVersion.split('.')[0]);
         const versionMinor = parseInt(this.systemInformation.nodeVersion.split('.')[1]);
         const versionPatch = parseInt(this.systemInformation.nodeVersion.split('.')[2]);
-        // Host system information
         this.systemInformation.hostname = os.hostname();
         this.systemInformation.user = os.userInfo().username;
-        this.systemInformation.osType = os.type(); // "Windows_NT", "Darwin", etc.
-        this.systemInformation.osRelease = os.release(); // Kernel version
-        this.systemInformation.osPlatform = os.platform(); // "win32", "linux", "darwin", etc.
-        this.systemInformation.osArch = os.arch(); // "x64", "arm", etc.
-        this.systemInformation.totalMemory = (os.totalmem() / 1024 / 1024 / 1024).toFixed(2) + ' GB'; // Convert to GB
-        this.systemInformation.freeMemory = (os.freemem() / 1024 / 1024 / 1024).toFixed(2) + ' GB'; // Convert to GB
-        this.systemInformation.systemUptime = (os.uptime() / 60 / 60).toFixed(2) + ' hours'; // Convert to hours
-        // Log the system information
+        this.systemInformation.osType = os.type();
+        this.systemInformation.osRelease = os.release();
+        this.systemInformation.osPlatform = os.platform();
+        this.systemInformation.osArch = os.arch();
+        this.systemInformation.totalMemory = (os.totalmem() / 1024 / 1024 / 1024).toFixed(2) + ' GB';
+        this.systemInformation.freeMemory = (os.freemem() / 1024 / 1024 / 1024).toFixed(2) + ' GB';
+        this.systemInformation.systemUptime = (os.uptime() / 60 / 60).toFixed(2) + ' hours';
         this.log.debug('Host System Information:');
         this.log.debug(`- Hostname: ${this.systemInformation.hostname}`);
         this.log.debug(`- User: ${this.systemInformation.user}`);
@@ -808,19 +659,15 @@ export class Matterbridge extends EventEmitter {
         this.log.debug(`- Total Memory: ${this.systemInformation.totalMemory}`);
         this.log.debug(`- Free Memory: ${this.systemInformation.freeMemory}`);
         this.log.debug(`- System Uptime: ${this.systemInformation.systemUptime}`);
-        // Home directory
         this.homeDirectory = getParameter('homedir') ?? os.homedir();
         this.matterbridgeInformation.homeDirectory = this.homeDirectory;
         this.log.debug(`Home Directory: ${this.homeDirectory}`);
-        // Package root directory
         const currentFileDirectory = path.dirname(fileURLToPath(import.meta.url));
         this.rootDirectory = path.resolve(currentFileDirectory, '../');
         this.matterbridgeInformation.rootDirectory = this.rootDirectory;
         this.log.debug(`Root Directory: ${this.rootDirectory}`);
-        // Global node_modules directory
         if (this.nodeContext)
-            this.globalModulesDirectory = await this.nodeContext.get('globalModulesDirectory', '');
-        // First run of Matterbridge so the node storage is empty
+            this.globalModulesDirectory = this.matterbridgeInformation.globalModulesDirectory = await this.nodeContext.get('globalModulesDirectory', '');
         if (this.globalModulesDirectory === '') {
             try {
                 this.globalModulesDirectory = await this.getGlobalNodeModules();
@@ -832,19 +679,8 @@ export class Matterbridge extends EventEmitter {
                 this.log.error(`Error getting global node_modules directory: ${error}`);
             }
         }
-        else {
-            this.getGlobalNodeModules()
-                .then(async (globalModulesDirectory) => {
-                this.globalModulesDirectory = globalModulesDirectory;
-                this.matterbridgeInformation.globalModulesDirectory = this.globalModulesDirectory;
-                this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
-                await this.nodeContext?.set('globalModulesDirectory', this.globalModulesDirectory);
-            })
-                .catch((error) => {
-                this.log.error(`Error getting global node_modules directory: ${error}`);
-            });
-        }
-        // Create the data directory .matterbridge in the home directory
+        else
+            this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
         this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
         this.matterbridgeInformation.matterbridgeDirectory = this.matterbridgeDirectory;
         try {
@@ -868,7 +704,6 @@ export class Matterbridge extends EventEmitter {
             }
         }
         this.log.debug(`Matterbridge Directory: ${this.matterbridgeDirectory}`);
-        // Create the plugin directory Matterbridge in the home directory
         this.matterbridgePluginDirectory = path.join(this.homeDirectory, 'Matterbridge');
         this.matterbridgeInformation.matterbridgePluginDirectory = this.matterbridgePluginDirectory;
         try {
@@ -892,28 +727,18 @@ export class Matterbridge extends EventEmitter {
             }
         }
         this.log.debug(`Matterbridge Plugin Directory: ${this.matterbridgePluginDirectory}`);
-        // Matterbridge version
         const packageJson = JSON.parse(await fs.readFile(path.join(this.rootDirectory, 'package.json'), 'utf-8'));
-        this.matterbridgeVersion = packageJson.version;
-        this.matterbridgeInformation.matterbridgeVersion = this.matterbridgeVersion;
+        this.matterbridgeVersion = this.matterbridgeLatestVersion = packageJson.version;
+        this.matterbridgeInformation.matterbridgeVersion = this.matterbridgeInformation.matterbridgeLatestVersion = this.matterbridgeVersion;
         this.log.debug(`Matterbridge Version: ${this.matterbridgeVersion}`);
-        // Matterbridge latest version
         if (this.nodeContext)
-            this.matterbridgeLatestVersion = await this.nodeContext.get('matterbridgeLatestVersion', '');
+            this.matterbridgeLatestVersion = await this.nodeContext.get('matterbridgeLatestVersion', this.matterbridgeVersion);
         this.log.debug(`Matterbridge Latest Version: ${this.matterbridgeLatestVersion}`);
-        this.getMatterbridgeLatestVersion();
-        // Current working directory
         const currentDir = process.cwd();
         this.log.debug(`Current Working Directory: ${currentDir}`);
-        // Command line arguments (excluding 'node' and the script name)
         const cmdArgs = process.argv.slice(2).join(' ');
         this.log.debug(`Command Line Arguments: ${cmdArgs}`);
     }
-    /**
-     * Retrieves the latest version of a package from the npm registry.
-     * @param packageName - The name of the package.
-     * @returns A Promise that resolves to the latest version of the package.
-     */
     async getLatestVersion(packageName) {
         return new Promise((resolve, reject) => {
             this.execRunningCount++;
@@ -928,10 +753,6 @@ export class Matterbridge extends EventEmitter {
             });
         });
     }
-    /**
-     * Retrieves the path to the global Node.js modules directory.
-     * @returns A promise that resolves to the path of the global Node.js modules directory.
-     */
     async getGlobalNodeModules() {
         return new Promise((resolve, reject) => {
             this.execRunningCount++;
@@ -946,11 +767,6 @@ export class Matterbridge extends EventEmitter {
             });
         });
     }
-    /**
-     * Retrieves the latest version of Matterbridge and performs necessary actions based on the version comparison.
-     * @private
-     * @returns {Promise<void>} A promise that resolves when the latest version is retrieved and actions are performed.
-     */
     async getMatterbridgeLatestVersion() {
         this.getLatestVersion('matterbridge')
             .then(async (matterbridgeLatestVersion) => {
@@ -967,19 +783,8 @@ export class Matterbridge extends EventEmitter {
         })
             .catch((error) => {
             this.log.error(`Error getting Matterbridge latest version: ${error.message}`);
-            // error.stack && this.log.debug(error.stack);
         });
     }
-    /**
-     * Retrieves the latest version of a plugin and updates the plugin's latestVersion property.
-     * If the plugin's version is different from the latest version, logs a warning message.
-     * If the plugin's version is the same as the latest version, logs an info message.
-     * If there is an error retrieving the latest version, logs an error message.
-     *
-     * @private
-     * @param {RegisteredPlugin} plugin - The plugin for which to retrieve the latest version.
-     * @returns {Promise<void>} A promise that resolves when the latest version is retrieved and actions are performed.
-     */
     async getPluginLatestVersion(plugin) {
         this.getLatestVersion(plugin.name)
             .then(async (latestVersion) => {
@@ -991,54 +796,40 @@ export class Matterbridge extends EventEmitter {
         })
             .catch((error) => {
             this.log.error(`Error getting ${plg}${plugin.name}${er} latest version: ${error.message}`);
-            // error.stack && this.log.debug(error.stack);
         });
     }
-    /**
-     * Creates a MatterLogger function to show the matter.js log messages in AnsiLogger (for the frontend).
-     *
-     * @returns {Function} The MatterLogger function.
-     */
     createMatterLogger() {
-        const matterLogger = new AnsiLogger({ logName: 'Matter', logTimestampFormat: TimestampFormat.TIME_MILLIS, logLevel: LogLevel.DEBUG });
+        const matterLogger = new AnsiLogger({ logName: 'Matter', logTimestampFormat: 4, logLevel: "debug" });
         return (_level, formattedLog) => {
             const logger = formattedLog.slice(44, 44 + 20).trim();
             const message = formattedLog.slice(65);
             matterLogger.logName = logger;
             switch (_level) {
                 case MatterLogLevel.DEBUG:
-                    matterLogger.log(LogLevel.DEBUG, message);
+                    matterLogger.log("debug", message);
                     break;
                 case MatterLogLevel.INFO:
-                    matterLogger.log(LogLevel.INFO, message);
+                    matterLogger.log("info", message);
                     break;
                 case MatterLogLevel.NOTICE:
-                    matterLogger.log(LogLevel.NOTICE, message);
+                    matterLogger.log("notice", message);
                     break;
                 case MatterLogLevel.WARN:
-                    matterLogger.log(LogLevel.WARN, message);
+                    matterLogger.log("warn", message);
                     break;
                 case MatterLogLevel.ERROR:
-                    matterLogger.log(LogLevel.ERROR, message);
+                    matterLogger.log("error", message);
                     break;
                 case MatterLogLevel.FATAL:
-                    matterLogger.log(LogLevel.FATAL, message);
+                    matterLogger.log("fatal", message);
                     break;
                 default:
-                    matterLogger.log(LogLevel.DEBUG, message);
+                    matterLogger.log("debug", message);
                     break;
             }
         };
     }
-    /**
-     * Creates a Matter File Logger.
-     *
-     * @param {string} filePath - The path to the log file.
-     * @param {boolean} [unlink=false] - Whether to unlink the log file before creating a new one.
-     * @returns {Function} - A function that logs formatted messages to the log file.
-     */
     async createMatterFileLogger(filePath, unlink = false) {
-        // 2024-08-21 08:55:19.488 DEBUG InteractionMessenger Sending DataReport chunk with 28 attributes and 0 events: 1004 bytes
         let fileSize = 0;
         if (unlink) {
             try {
@@ -1087,21 +878,12 @@ export class Matterbridge extends EventEmitter {
             }
         };
     }
-    /**
-     * Restarts the process by exiting the current instance and loading a new instance.
-     */
     async restartProcess() {
         await this.cleanup('restarting...', true);
     }
-    /**
-     * Shut down the process by exiting the current process.
-     */
     async shutdownProcess() {
         await this.cleanup('shutting down...', false);
     }
-    /**
-     * Update matterbridge and and shut down the process.
-     */
     async updateProcess() {
         this.log.info('Updating matterbridge...');
         try {
@@ -1114,9 +896,6 @@ export class Matterbridge extends EventEmitter {
         this.frontend.wssSendRestartRequired();
         await this.cleanup('updating...', false);
     }
-    /**
-     * Unregister all devices and shut down the process.
-     */
     async unregisterAndShutdownProcess() {
         this.log.info('Unregistering all devices and shutting down...');
         for (const plugin of this.plugins) {
@@ -1124,9 +903,6 @@ export class Matterbridge extends EventEmitter {
         }
         await this.cleanup('unregistered all devices and shutting down...', false);
     }
-    /**
-     * Reset commissioning and shut down the process.
-     */
     async shutdownProcessAndReset() {
         this.log.info('Resetting Matterbridge commissioning information...');
         await this.matterStorageManager?.createContext('events')?.clearAll();
@@ -1138,12 +914,8 @@ export class Matterbridge extends EventEmitter {
         this.log.info('Matter storage reset done! Remove the bridge from the controller.');
         await this.cleanup('shutting down with reset...', false);
     }
-    /**
-     * Factory reset and shut down the process.
-     */
     async shutdownProcessAndFactoryReset() {
         try {
-            // Delete old matter storage file and backup
             const file = path.join(this.matterbridgeDirectory, 'matterbridge' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.json');
             this.log.info(`Unlinking old matter storage file: ${file}`);
             await fs.unlink(file);
@@ -1157,7 +929,6 @@ export class Matterbridge extends EventEmitter {
             }
         }
         try {
-            // Delete matter node storage directory with its subdirectories and backup
             const dir = path.join(this.matterbridgeDirectory, 'matterstorage' + (getParameter('profile') ? '.' + getParameter('profile') : ''));
             this.log.info(`Removing matter node storage directory: ${dir}`);
             await fs.rm(dir, { recursive: true });
@@ -1171,7 +942,6 @@ export class Matterbridge extends EventEmitter {
             }
         }
         try {
-            // Delete node storage directory with its subdirectories and backup
             const dir = path.join(this.matterbridgeDirectory, 'storage' + (getParameter('profile') ? '.' + getParameter('profile') : ''));
             this.log.info(`Removing storage directory: ${dir}`);
             await fs.rm(dir, { recursive: true });
@@ -1191,41 +961,30 @@ export class Matterbridge extends EventEmitter {
         this.devices.clear();
         await this.cleanup('shutting down with factory reset...', false);
     }
-    /**
-     * Cleans up the Matterbridge instance.
-     * @param message - The cleanup message.
-     * @param restart - Indicates whether to restart the instance after cleanup. Default is `false`.
-     * @returns A promise that resolves when the cleanup is completed.
-     */
     async cleanup(message, restart = false) {
         if (this.initialized && !this.hasCleanupStarted) {
             this.hasCleanupStarted = true;
             this.log.info(message);
-            // Clear the start matter interval
             if (this.startMatterInterval) {
                 clearInterval(this.startMatterInterval);
                 this.startMatterInterval = undefined;
                 this.log.debug('Start matter interval cleared');
             }
-            // Clear the check update interval
             if (this.checkUpdateInterval) {
                 clearInterval(this.checkUpdateInterval);
                 this.checkUpdateInterval = undefined;
                 this.log.debug('Check update interval cleared');
             }
-            // Clear the configure timeout
             if (this.configureTimeout) {
                 clearTimeout(this.configureTimeout);
                 this.configureTimeout = undefined;
                 this.log.debug('Matterbridge configure timeout cleared');
             }
-            // Clear the reachability timeout
             if (this.reachabilityTimeout) {
                 clearTimeout(this.reachabilityTimeout);
                 this.reachabilityTimeout = undefined;
                 this.log.debug('Matterbridge reachability timeout cleared');
             }
-            // Calling the shutdown method of each plugin and clear the plugins reachability timeout
             for (const plugin of this.plugins) {
                 if (!plugin.enabled || plugin.error)
                     continue;
@@ -1236,13 +995,12 @@ export class Matterbridge extends EventEmitter {
                     this.log.debug(`Plugin ${plg}${plugin.name}${db} reachability timeout cleared`);
                 }
             }
-            // Stop the frontend
             this.frontend.stop();
-            // Stopping matter server nodes
             this.log.info(`Stopping matter server nodes in ${this.bridgeMode} mode...`);
             if (this.bridgeMode === 'bridge') {
                 if (this.serverNode) {
                     await this.stopServerNode(this.serverNode);
+                    this.serverNode = undefined;
                     this.log.info(`Stopped matter server node for Matterbridge`);
                 }
             }
@@ -1250,41 +1008,31 @@ export class Matterbridge extends EventEmitter {
                 for (const plugin of this.plugins.array()) {
                     if (plugin.serverNode) {
                         await this.stopServerNode(plugin.serverNode);
+                        plugin.serverNode = undefined;
                         this.log.info(`Stopped matter server node for ${plugin.name}`);
                     }
                 }
             }
             this.log.info('Stopped matter server nodes');
-            // Stop matter MdnsService
-            // await this.environment.get(MdnsService)[Symbol.asyncDispose]();
-            // this.log.info('Stopped MdnsService');
-            // Stop matter storage
             await this.stopMatterStorage();
-            // Remove the matterfilelogger
             try {
                 Logger.removeLogger('matterfilelogger');
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
             }
             catch (error) {
-                // this.log.debug(`Error removing the matterfilelogger for file ${CYAN}${path.join(this.matterbridgeDirectory, this.matterLoggerFile)}${er}: ${error instanceof Error ? error.message : error}`);
             }
-            // Serialize registeredDevices
             if (this.nodeStorage && this.nodeContext) {
                 this.log.info('Saving registered devices...');
                 const serializedRegisteredDevices = [];
                 this.devices.forEach(async (device) => {
-                    const serializedMatterbridgeDevice = device.serialize();
-                    // this.log.info(`- ${serializedMatterbridgeDevice.deviceName}${rs}\n`, serializedMatterbridgeDevice);
+                    const serializedMatterbridgeDevice = MatterbridgeEndpoint.serialize(device);
                     if (serializedMatterbridgeDevice)
                         serializedRegisteredDevices.push(serializedMatterbridgeDevice);
                 });
                 await this.nodeContext.set('devices', serializedRegisteredDevices);
                 this.log.info(`Saved registered devices (${serializedRegisteredDevices?.length})`);
-                // Clear nodeContext and nodeStorage (they just need 1000ms to write the data to disk)
                 this.log.debug(`Closing node storage context for ${plg}Matterbridge${db}...`);
                 await this.nodeContext.close();
                 this.nodeContext = undefined;
-                // Clear nodeContext for each plugin (they just need 1000ms to write the data to disk)
                 for (const plugin of this.plugins) {
                     if (plugin.nodeContext) {
                         this.log.debug(`Closing node storage context for plugin ${plg}${plugin.name}${db}...`);
@@ -1301,13 +1049,12 @@ export class Matterbridge extends EventEmitter {
             }
             this.plugins.clear();
             this.devices.clear();
-            // Deregisters the process handlers
             this.deregisterProcesslHandlers();
             if (restart) {
                 if (message === 'updating...') {
                     this.log.info('Cleanup completed. Updating...');
                     Matterbridge.instance = undefined;
-                    this.emit('update'); // Restart the process but the update has been done before
+                    this.emit('update');
                 }
                 else if (message === 'restarting...') {
                     this.log.info('Cleanup completed. Restarting...');
@@ -1324,14 +1071,6 @@ export class Matterbridge extends EventEmitter {
             this.initialized = false;
         }
     }
-    /**
-     * Creates and configures the server node for an accessory plugin for a given device.
-     *
-     * @param {RegisteredPlugin} plugin - The plugin to configure.
-     * @param {MatterbridgeEndpoint} device - The device to associate with the plugin.
-     * @param {boolean} [start=false] - Whether to start the server node after adding the device.
-     * @returns {Promise<void>} A promise that resolves when the server node for the accessory plugin is created and configured.
-     */
     async createAccessoryPlugin(plugin, device, start = false) {
         if (!plugin.locked && device.deviceName && device.vendorId && device.productId && device.vendorName && device.productName) {
             plugin.locked = true;
@@ -1343,13 +1082,6 @@ export class Matterbridge extends EventEmitter {
                 await this.startServerNode(plugin.serverNode);
         }
     }
-    /**
-     * Creates and configures the server node for a dynamic plugin.
-     *
-     * @param {RegisteredPlugin} plugin - The plugin to configure.
-     * @param {boolean} [start=false] - Whether to start the server node after adding the aggregator node.
-     * @returns {Promise<void>} A promise that resolves when the server node for the dynamic plugin is created and configured.
-     */
     async createDynamicPlugin(plugin, start = false) {
         if (!plugin.locked) {
             plugin.locked = true;
@@ -1361,13 +1093,7 @@ export class Matterbridge extends EventEmitter {
                 await this.startServerNode(plugin.serverNode);
         }
     }
-    /**
-     * Starts the Matterbridge in bridge mode.
-     * @private
-     * @returns {Promise<void>} A promise that resolves when the Matterbridge is started.
-     */
     async startBridge() {
-        // Plugins are configured by a timer when matter server is started and plugin.configured is set to true
         if (!this.matterStorageManager)
             throw new Error('No storage manager initialized');
         if (!this.matterbridgeContext)
@@ -1404,15 +1130,13 @@ export class Matterbridge extends EventEmitter {
             clearInterval(this.startMatterInterval);
             this.startMatterInterval = undefined;
             this.log.debug('Cleared startMatterInterval interval for Matterbridge');
-            // Start the Matter server node
             this.startServerNode(this.serverNode);
-            // 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); // TODO No await do it in parallel
+                        await this.plugins.configure(plugin);
                     }
                     catch (error) {
                         plugin.error = true;
@@ -1421,7 +1145,6 @@ export class Matterbridge extends EventEmitter {
                 }
                 this.frontend.wssSendRefreshRequired();
             }, 30 * 1000);
-            // Setting reachability to true
             this.reachabilityTimeout = setTimeout(() => {
                 this.log.info(`Setting reachability to true for ${plg}Matterbridge${db}`);
                 if (this.serverNode)
@@ -1432,14 +1155,7 @@ export class Matterbridge extends EventEmitter {
             }, 60 * 1000);
         }, 1000);
     }
-    /**
-     * Starts the Matterbridge in childbridge mode.
-     * @private
-     * @returns {Promise<void>} A promise that resolves when the Matterbridge is started.
-     */
     async startChildbridge() {
-        // Matterbridge.addBridgedDevice creates the commissionig servers and add the devices to the the commissioning server or to the aggregator
-        // Plugins are configured by a timer when matter server is started and plugin.configured is set to true
         if (!this.matterStorageManager)
             throw new Error('No storage manager initialized');
         for (const plugin of this.plugins) {
@@ -1486,13 +1202,12 @@ export class Matterbridge extends EventEmitter {
             clearInterval(this.startMatterInterval);
             this.startMatterInterval = undefined;
             this.log.debug('Cleared startMatterInterval interval in childbridge mode');
-            // 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); // TODO No await do it in parallel
+                        await this.plugins.configure(plugin);
                     }
                     catch (error) {
                         plugin.error = true;
@@ -1520,9 +1235,7 @@ export class Matterbridge extends EventEmitter {
                     this.log.error(`Node storage context not found for plugin ${plg}${plugin.name}${er}`);
                     continue;
                 }
-                // Start the Matter server node
                 this.startServerNode(plugin.serverNode);
-                // Setting reachability to true
                 plugin.reachabilityTimeout = setTimeout(() => {
                     this.log.info(`Setting reachability to true for ${plg}${plugin.name}${db}`);
                     if (plugin.serverNode)
@@ -1536,219 +1249,9 @@ export class Matterbridge extends EventEmitter {
             }
         }, 1000);
     }
-    /**
-     * Starts the Matterbridge controller.
-     * @private
-     * @returns {Promise<void>} A promise that resolves when the Matterbridge is started.
-     */
     async startController() {
-        /*
-        if (!this.storageManager) {
-          this.log.error('No storage manager initialized');
-          await this.cleanup('No storage manager initialized');
-          return;
-        }
-        this.log.info('Creating context: mattercontrollerContext');
-        this.mattercontrollerContext = this.storageManager.createContext('mattercontrollerContext');
-        if (!this.mattercontrollerContext) {
-          this.log.error('No storage context mattercontrollerContext initialized');
-          await this.cleanup('No storage context mattercontrollerContext initialized');
-          return;
-        }
-    
-        this.log.debug('Starting matterbridge in mode', this.bridgeMode);
-        this.matterServer = await this.createMatterServer(this.storageManager);
-        this.log.info('Creating matter commissioning controller');
-        this.commissioningController = new CommissioningController({
-          autoConnect: false,
-        });
-        this.log.info('Adding matter commissioning controller to matter server');
-        await this.matterServer.addCommissioningController(this.commissioningController);
-    
-        this.log.info('Starting matter server');
-        await this.matterServer.start();
-        this.log.info('Matter server started');
-    
-        if (hasParameter('pairingcode')) {
-          this.log.info('Pairing device with pairingcode:', getParameter('pairingcode'));
-          const pairingCode = getParameter('pairingcode');
-          const ip = this.mattercontrollerContext.has('ip') ? this.mattercontrollerContext.get<string>('ip') : undefined;
-          const port = this.mattercontrollerContext.has('port') ? this.mattercontrollerContext.get<number>('port') : undefined;
-    
-          let longDiscriminator, setupPin, shortDiscriminator;
-          if (pairingCode !== undefined) {
-            const pairingCodeCodec = ManualPairingCodeCodec.decode(pairingCode);
-            shortDiscriminator = pairingCodeCodec.shortDiscriminator;
-            longDiscriminator = undefined;
-            setupPin = pairingCodeCodec.passcode;
-            this.log.info(`Data extracted from pairing code: ${Logger.toJSON(pairingCodeCodec)}`);
-          } else {
-            longDiscriminator = await this.mattercontrollerContext.get('longDiscriminator', 3840);
-            if (longDiscriminator > 4095) throw new Error('Discriminator value must be less than 4096');
-            setupPin = this.mattercontrollerContext.get('pin', 20202021);
-          }
-          if ((shortDiscriminator === undefined && longDiscriminator === undefined) || setupPin === undefined) {
-            throw new Error('Please specify the longDiscriminator of the device to commission with -longDiscriminator or provide a valid passcode with -passcode');
-          }
-    
-          const commissioningOptions: ControllerCommissioningFlowOptions = {
-            regulatoryLocation: GeneralCommissioning.RegulatoryLocationType.IndoorOutdoor,
-            regulatoryCountryCode: 'XX',
-          };
-          const options = {
-            commissioning: commissioningOptions,
-            discovery: {
-              knownAddress: ip !== undefined && port !== undefined ? { ip, port, type: 'udp' } : undefined,
-              identifierData: longDiscriminator !== undefined ? { longDiscriminator } : shortDiscriminator !== undefined ? { shortDiscriminator } : {},
-            },
-            passcode: setupPin,
-          } as NodeCommissioningOptions;
-          this.log.info('Commissioning with options:', options);
-          const nodeId = await this.commissioningController.commissionNode(options);
-          this.log.info(`Commissioning successfully done with nodeId: ${nodeId}`);
-          this.log.info('ActiveSessionInformation:', this.commissioningController.getActiveSessionInformation());
-        } // (hasParameter('pairingcode'))
-    
-        if (hasParameter('unpairall')) {
-          this.log.info('***Commissioning controller unpairing all nodes...');
-          const nodeIds = this.commissioningController.getCommissionedNodes();
-          for (const nodeId of nodeIds) {
-            this.log.info('***Commissioning controller unpairing node:', nodeId);
-            await this.commissioningController.removeNode(nodeId);
-          }
-          return;
-        }
-    
-        if (hasParameter('discover')) {
-          // const discover = await this.commissioningController.discoverCommissionableDevices({ productId: 0x8000, deviceType: 0xfff1 });
-          // console.log(discover);
-        }
-    
-        if (!this.commissioningController.isCommissioned()) {
-          this.log.info('***Commissioning controller is not commissioned: use matterbridge -controller -pairingcode [pairingcode] to commission a device');
-          return;
-        }
-    
-        const nodeIds = this.commissioningController.getCommissionedNodes();
-        this.log.info(`***Commissioning controller is commissioned ${this.commissioningController.isCommissioned()} and has ${nodeIds.length} nodes commisioned: `);
-        for (const nodeId of nodeIds) {
-          this.log.info(`***Connecting to commissioned node: ${nodeId}`);
-    
-          const node = await this.commissioningController.connectNode(nodeId, {
-            autoSubscribe: false,
-            attributeChangedCallback: (peerNodeId, { path: { nodeId, clusterId, endpointId, attributeName }, value }) =>
-              this.log.info(`***Commissioning controller attributeChangedCallback ${peerNodeId}: attribute ${nodeId}/${endpointId}/${clusterId}/${attributeName} changed to ${Logger.toJSON(value)}`),
-            eventTriggeredCallback: (peerNodeId, { path: { nodeId, clusterId, endpointId, eventName }, events }) =>
-              this.log.info(`***Commissioning controller eventTriggeredCallback ${peerNodeId}: Event ${nodeId}/${endpointId}/${clusterId}/${eventName} triggered with ${Logger.toJSON(events)}`),
-            stateInformationCallback: (peerNodeId, info) => {
-              switch (info) {
-                case NodeStateInformation.Connected:
-                  this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} connected`);
-                  break;
-                case NodeStateInformation.Disconnected:
-                  this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} disconnected`);
-                  break;
-                case NodeStateInformation.Reconnecting:
-                  this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} reconnecting`);
-                  break;
-                case NodeStateInformation.WaitingForDeviceDiscovery:
-                  this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} waiting for device discovery`);
-                  break;
-                case NodeStateInformation.StructureChanged:
-                  this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} structure changed`);
-                  break;
-                case NodeStateInformation.Decommissioned:
-                  this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} decommissioned`);
-                  break;
-                default:
-                  this.log.info(`***Commissioning controller stateInformationCallback ${peerNodeId}: Node ${nodeId} NodeStateInformation.${info}`);
-                  break;
-              }
-            },
-          });
-    
-          node.logStructure();
-    
-          // Get the interaction client
-          this.log.info('Getting the interaction client');
-          const interactionClient = await node.getInteractionClient();
-          let cluster;
-          let attributes;
-    
-          // Log BasicInformationCluster
-          cluster = BasicInformationCluster;
-          attributes = await interactionClient.getMultipleAttributes({
-            attributes: [{ clusterId: cluster.id }],
-          });
-          if (attributes.length > 0) this.log.info(`Cluster: ${idn}${cluster.name}${rs}${nf} attributes:`);
-          attributes.forEach((attribute) => {
-            this.log.info(
-              `- endpoint ${or}${attribute.path.endpointId}${nf} cluster ${hk}${getClusterNameById(attribute.path.clusterId)}${nf} (${hk}0x${attribute.path.clusterId.toString(16)}${nf}) attribute ${zb}${attribute.path.attributeName}${nf} (${zb}0x${attribute.path.attributeId.toString(16)}${nf}): ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`,
-            );
-          });
-    
-          // Log PowerSourceCluster
-          cluster = PowerSourceCluster;
-          attributes = await interactionClient.getMultipleAttributes({
-            attributes: [{ clusterId: cluster.id }],
-          });
-          if (attributes.length > 0) this.log.info(`Cluster: ${idn}${cluster.name}${rs}${nf} attributes:`);
-          attributes.forEach((attribute) => {
-            this.log.info(
-              `- endpoint ${or}${attribute.path.endpointId}${nf} cluster ${hk}${getClusterNameById(attribute.path.clusterId)}${nf} (${hk}0x${attribute.path.clusterId.toString(16)}${nf}) attribute ${zb}${attribute.path.attributeName}${nf} (${zb}0x${attribute.path.attributeId.toString(16)}${nf}): ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`,
-            );
-          });
-    
-          // Log ThreadNetworkDiagnostics
-          cluster = ThreadNetworkDiagnosticsCluster;
-          attributes = await interactionClient.getMultipleAttributes({
-            attributes: [{ clusterId: cluster.id }],
-          });
-          if (attributes.length > 0) this.log.info(`Cluster: ${idn}${cluster.name}${rs}${nf} attributes:`);
-          attributes.forEach((attribute) => {
-            this.log.info(
-              `- endpoint ${or}${attribute.path.endpointId}${nf} cluster ${hk}${getClusterNameById(attribute.path.clusterId)}${nf} (${hk}0x${attribute.path.clusterId.toString(16)}${nf}) attribute ${zb}${attribute.path.attributeName}${nf} (${zb}0x${attribute.path.attributeId.toString(16)}${nf}): ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`,
-            );
-          });
-    
-          // Log SwitchCluster
-          cluster = SwitchCluster;
-          attributes = await interactionClient.getMultipleAttributes({
-            attributes: [{ clusterId: cluster.id }],
-          });
-          if (attributes.length > 0) this.log.info(`Cluster: ${idn}${cluster.name}${rs}${nf} attributes:`);
-          attributes.forEach((attribute) => {
-            this.log.info(
-              `- endpoint ${or}${attribute.path.endpointId}${nf} cluster ${hk}${getClusterNameById(attribute.path.clusterId)}${nf} (${hk}0x${attribute.path.clusterId.toString(16)}${nf}) attribute ${zb}${attribute.path.attributeName}${nf} (${zb}0x${attribute.path.attributeId.toString(16)}${nf}): ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`,
-            );
-          });
-    
-          this.log.info('Subscribing to all attributes and events');
-          await node.subscribeAllAttributesAndEvents({
-            ignoreInitialTriggers: false,
-            attributeChangedCallback: ({ path: { nodeId, clusterId, endpointId, attributeName }, version, value }) =>
-              this.log.info(
-                `***${db}Commissioning controller attributeChangedCallback version ${version}: attribute ${BLUE}${nodeId}${db}/${or}${endpointId}${db}/${hk}${getClusterNameById(clusterId)}${db}/${zb}${attributeName}${db} changed to ${typeof value === 'object' ? debugStringify(value ?? { none: true }) : value}`,
-              ),
-            eventTriggeredCallback: ({ path: { nodeId, clusterId, endpointId, eventName }, events }) => {
-              this.log.info(
-                `***${db}Commissioning controller eventTriggeredCallback: event ${BLUE}${nodeId}${db}/${or}${endpointId}${db}/${hk}${getClusterNameById(clusterId)}${db}/${zb}${eventName}${db} triggered with ${debugStringify(events ?? { none: true })}`,
-              );
-            },
-          });
-          this.log.info('Subscribed to all attributes and events');
-        }
-        */
     }
-    /** ***********************************************************************************************************************************/
-    /**                                                     Matter.js methods                                                             */
-    /** ***********************************************************************************************************************************/
-    /**
-     * Starts the matter storage process based on the specified storage type and name.
-     * @returns {Promise<void>} - A promise that resolves when the storage process is started.
-     */
     async startMatterStorage() {
-        // Setup Matter storage
         this.log.info(`Starting matter node storage...`);
         this.matterStorageService = this.environment.get(StorageService);
         this.log.info(`Matter node storage service created: ${this.matterStorageService.location}`);
@@ -1756,24 +1259,13 @@ export class Matterbridge extends EventEmitter {
         this.log.info('Matter node storage manager "Matterbridge" created');
         this.matterbridgeContext = await this.createServerNodeContext('Matterbridge', 'Matterbridge', bridge.code, this.aggregatorVendorId, 'Matterbridge', this.aggregatorProductId, 'Matterbridge aggregator');
         this.log.info('Matter node storage started');
-        // Backup matter storage since it is created/opened correctly
         await this.backupMatterStorage(path.join(this.matterbridgeDirectory, this.matterStorageName), path.join(this.matterbridgeDirectory, this.matterStorageName + '.backup'));
     }
-    /**
-     * Makes a backup copy of the specified matter storage directory.
-     *
-     * @param storageName - The name of the storage file to be backed up.
-     * @param backupName - The name of the backup file to be created.
-     */
     async backupMatterStorage(storageName, backupName) {
         this.log.info('Creating matter node storage backup...');
         await copyDirectory(storageName, backupName);
         this.log.info('Created matter node storage backup');
     }
-    /**
-     * Stops the matter storage.
-     * @returns {Promise<void>} A promise that resolves when the storage is stopped.
-     */
     async stopMatterStorage() {
         this.log.info('Closing matter node storage...');
         this.matterStorageManager?.close();
@@ -1782,24 +1274,6 @@ export class Matterbridge extends EventEmitter {
         this.matterbridgeContext = undefined;
         this.log.info('Matter node storage closed');
     }
-    /**
-     * Creates a server node storage context.
-     *
-     * @param pluginName - The name of the plugin.
-     * @param deviceName - The name of the device.
-     * @param deviceType - The deviceType of the device.
-     * @param vendorId - The vendor ID.
-     * @param vendorName - The vendor name.
-     * @param productId - The product ID.
-     * @param productName - The product name.
-     * @param serialNumber - The serial number of the device (optional).
-     * @param uniqueId - The unique ID of the device (optional).
-     * @param softwareVersion - The software version of the device (optional).
-     * @param softwareVersionString - The software version string of the device (optional).
-     * @param hardwareVersion - The hardware version of the device (optional).
-     * @param hardwareVersionString - The hardware version string of the device (optional).
-     * @returns The storage context for the commissioning server.
-     */
     async createServerNodeContext(pluginName, deviceName, deviceType, vendorId, vendorName, productId, productName, serialNumber) {
         if (!this.matterStorageService)
             throw new Error('No storage service initialized');
@@ -1841,33 +1315,21 @@ export class Matterbridge extends EventEmitter {
         this.log.debug(`- 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')}`);
-        /**
-         * Create a Matter ServerNode, which contains the Root Endpoint and all relevant data and configuration
-         */
         const serverNode = await ServerNode.create({
-            // Required: Give the Node a unique ID which is used to store the state of this node
             id: storeId,
-            // Provide Network relevant configuration like the port
-            // Optional when operating only one device on a host, Default port is 5540
             network: {
                 listeningAddressIpv4: this.ipv4address,
                 listeningAddressIpv6: this.ipv6address,
                 port,
             },
-            // Provide Commissioning relevant settings
-            // Optional for development/testing purposes
             commissioning: {
                 passcode,
                 discriminator,
             },
-            // Provide Node announcement settings
-            // Optional: If Ommitted some development defaults are used
             productDescription: {
                 name: await storageContext.get('deviceName'),
                 deviceType: DeviceTypeId(await storageContext.get('deviceType')),
             },
-            // Provide defaults for the BasicInformation cluster on the Root endpoint
-            // Optional: If Omitted some development defaults are used
             basicInformation: {
                 vendorId: VendorId(await storageContext.get('vendorId')),
                 vendorName: await storageContext.get('vendorName'),
@@ -1883,33 +1345,28 @@ export class Matterbridge extends EventEmitter {
                 hardwareVersionString: await storageContext.get('hardwareVersionString'),
             },
         });
-        const sanitizeFabrics = (fabrics) => {
-            // New type of fabric information: Record<FabricIndex, ExposedFabricInformation>
+        const sanitizeFabrics = (fabrics, resetSessions = false) => {
             const sanitizedFabrics = this.sanitizeFabricInformations(Array.from(Object.values(fabrics)));
             this.log.info(`Fabrics: ${debugStringify(sanitizedFabrics)}`);
             if (this.bridgeMode === 'bridge') {
                 this.matterbridgeFabricInformations = sanitizedFabrics;
-                this.matterbridgeSessionInformations = [];
+                if (resetSessions)
+                    this.matterbridgeSessionInformations = undefined;
                 this.matterbridgePaired = true;
             }
             if (this.bridgeMode === 'childbridge') {
                 const plugin = this.plugins.get(storeId);
                 if (plugin) {
                     plugin.fabricInformations = sanitizedFabrics;
-                    plugin.sessionInformations = [];
+                    if (resetSessions)
+                        plugin.sessionInformations = undefined;
                     plugin.paired = true;
                 }
             }
         };
-        /**
-         * This event is triggered when the device is initially commissioned successfully.
-         * This means: It is added to the first fabric.
-         */
         serverNode.lifecycle.commissioned.on(() => this.log.notice(`Server node for ${storeId} was initially commissioned successfully!`));
-        /** This event is triggered when all fabrics are removed from the device, usually it also does a factory reset then. */
         serverNode.lifecycle.decommissioned.on(() => this.log.notice(`Server node for ${storeId} was fully decommissioned successfully!`));
-        /** This event is triggered when the device went online. This means that it is discoverable in the network. */
-        serverNode.lifecycle.online.on(() => {
+        serverNode.lifecycle.online.on(async () => {
             this.log.notice(`Server node for ${storeId} is online`);
             if (!serverNode.lifecycle.isCommissioned) {
                 this.log.notice(`Server node for ${storeId} is not commissioned. Pair to commission ...`);
@@ -1917,50 +1374,64 @@ export class Matterbridge extends EventEmitter {
                 if (this.bridgeMode === 'bridge') {
                     this.matterbridgeQrPairingCode = qrPairingCode;
                     this.matterbridgeManualPairingCode = manualPairingCode;
-                    this.matterbridgeFabricInformations = [];
-                    this.matterbridgeSessionInformations = [];
+                    this.matterbridgeFabricInformations = undefined;
+                    this.matterbridgeSessionInformations = undefined;
                     this.matterbridgePaired = false;
-                    this.matterbridgeConnected = false;
                     this.log.notice(`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`);
                     this.log.notice(`Manual pairing code: ${manualPairingCode}`);
+                    if (this.matterStorageService) {
+                        const storageManager = await this.matterStorageService.open(storeId);
+                        const storageContext = storageManager.createContext('persist');
+                        await storageContext.set('qrPairingCode', qrPairingCode);
+                        await storageContext.set('manualPairingCode', manualPairingCode);
+                    }
                 }
                 if (this.bridgeMode === 'childbridge') {
                     const plugin = this.plugins.get(storeId);
                     if (plugin) {
                         plugin.qrPairingCode = qrPairingCode;
                         plugin.manualPairingCode = manualPairingCode;
-                        plugin.fabricInformations = [];
-                        plugin.sessionInformations = [];
+                        plugin.fabricInformations = undefined;
+                        plugin.sessionInformations = undefined;
                         plugin.paired = false;
-                        plugin.connected = false;
                         this.log.notice(`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`);
                         this.log.notice(`Manual pairing code: ${manualPairingCode}`);
+                        if (this.matterStorageService) {
+                            const storageManager = await this.matterStorageService.open(storeId);
+                            const storageContext = storageManager.createContext('persist');
+                            await storageContext.set('qrPairingCode', qrPairingCode);
+                            await storageContext.set('manualPairingCode', manualPairingCode);
+                        }
                     }
                 }
             }
             else {
                 this.log.notice(`Server node for ${storeId} is already commissioned. Waiting for controllers to connect ...`);
-                sanitizeFabrics(serverNode.state.commissioning.fabrics);
+                sanitizeFabrics(serverNode.state.commissioning.fabrics, true);
             }
             this.frontend.wssSendRefreshRequired();
         });
-        /** This event is triggered when the device went offline. it is not longer discoverable or connectable in the network. */
         serverNode.lifecycle.offline.on(() => {
             this.log.notice(`Server node for ${storeId} is offline`);
             if (this.bridgeMode === 'bridge') {
                 this.matterbridgeQrPairingCode = undefined;
                 this.matterbridgeManualPairingCode = undefined;
-                this.matterbridgeFabricInformations = [];
-                this.matterbridgeSessionInformations = [];
-                this.matterbridgePaired = false;
-                this.matterbridgeConnected = false;
+                this.matterbridgeFabricInformations = undefined;
+                this.matterbridgeSessionInformations = undefined;
+                this.matterbridgePaired = undefined;
+            }
+            if (this.bridgeMode === 'childbridge') {
+                const plugin = this.plugins.get(storeId);
+                if (plugin) {
+                    plugin.qrPairingCode = undefined;
+                    plugin.manualPairingCode = undefined;
+                    plugin.fabricInformations = undefined;
+                    plugin.sessionInformations = undefined;
+                    plugin.paired = undefined;
+                }
             }
             this.frontend.wssSendRefreshRequired();
         });
-        /**
-         * This event is triggered when a fabric is added, removed or updated on the device. Use this if more granular
-         * information is needed.
-         */
         serverNode.events.commissioning.fabricsChanged.on((fabricIndex, fabricAction) => {
             let action = '';
             switch (fabricAction) {
@@ -1994,24 +1465,16 @@ export class Matterbridge extends EventEmitter {
                 }
             }
         };
-        /**
-         * This event is triggered when an operative new session was opened by a Controller.
-         * It is not triggered for the initial commissioning process, just afterwards for real connections.
-         */
         serverNode.events.sessions.opened.on((session) => {
             this.log.notice(`Session opened on server node for ${storeId}: ${debugStringify(session)}`);
             sanitizeSessions(Object.values(serverNode.state.sessions.sessions));
             this.frontend.wssSendRefreshRequired();
         });
-        /**
-         * This event is triggered when an operative session is closed by a Controller or because the Device goes offline.
-         */
         serverNode.events.sessions.closed.on((session) => {
             this.log.notice(`Session closed on server node for ${storeId}: ${debugStringify(session)}`);
             sanitizeSessions(Object.values(serverNode.state.sessions.sessions));
             this.frontend.wssSendRefreshRequired();
         });
-        /** This event is triggered when a subscription gets added or removed on an operative session. */
         serverNode.events.sessions.subscriptionsChanged.on((session) => {
             this.log.notice(`Session subscriptions changed on server node for ${storeId}: ${debugStringify(session)}`);
             sanitizeSessions(Object.values(serverNode.state.sessions.sessions));
@@ -2031,6 +1494,16 @@ export class Matterbridge extends EventEmitter {
             return;
         this.log.notice(`Closing ${matterServerNode.id} server node`);
         await matterServerNode.close();
+        await matterServerNode.env.get(MdnsService)[Symbol.asyncDispose]();
+    }
+    async advertiseServerNode(matterServerNode) {
+        if (matterServerNode && matterServerNode.lifecycle.isCommissioned) {
+            await matterServerNode.env.get(DeviceCommissioner)?.allowBasicCommissioning();
+            const { qrPairingCode, manualPairingCode } = matterServerNode.state.commissioning.pairingCodes;
+            this.log.notice(`Advertising for ${matterServerNode.id} is now started with the following pairing codes: qrPairingCode ${qrPairingCode}, manualPairingCode ${manualPairingCode}`);
+            return { qrPairingCode, manualPairingCode };
+        }
+        return undefined;
     }
     async createAggregatorNode(storageContext) {
         this.log.notice(`Creating ${await storageContext.get('storeId')} aggregator `);
@@ -2038,15 +1511,13 @@ export class Matterbridge extends EventEmitter {
         return aggregatorNode;
     }
     async addBridgedEndpoint(pluginName, device) {
-        // Check if the plugin is registered
         const plugin = this.plugins.get(pluginName);
         if (!plugin) {
             this.log.error(`Error adding bridged endpoint ${dev}${device.deviceName}${er} (${zb}${device.id}${er}) plugin ${plg}${pluginName}${er} not found`);
             return;
         }
-        // Register and add the device to the matterbridge aggregator node
         if (this.bridgeMode === 'bridge') {
-            this.log.debug(`Adding ${plg}${pluginName}${db}:${dev}${device.deviceName}${db} to Matterbridge aggregator node`);
+            this.log.debug(`Adding bridged endpoint ${plg}${pluginName}${db}:${dev}${device.deviceName}${db} to Matterbridge aggregator node`);
             if (!this.aggregatorNode)
                 this.log.error('Aggregator node not found for Matterbridge');
             await this.aggregatorNode?.add(device);
@@ -2057,7 +1528,7 @@ export class Matterbridge extends EventEmitter {
             }
             if (plugin.type === 'DynamicPlatform') {
                 plugin.locked = true;
-                this.log.debug(`Adding ${plg}${pluginName}${db}:${dev}${device.deviceName}${db} to ${plg}${plugin.name}${db} aggregator node`);
+                this.log.debug(`Adding bridged endpoint ${plg}${pluginName}${db}:${dev}${device.deviceName}${db} to ${plg}${plugin.name}${db} aggregator node`);
                 if (!plugin.aggregatorNode)
                     this.log.error(`Aggregator node not found for plugin ${plg}${plugin.name}${db}`);
                 await plugin.aggregatorNode?.add(device);
@@ -2067,19 +1538,16 @@ 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 endpoint (${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.deviceName}${nf} (${dev}${device.id}${nf}) for plugin ${plg}${pluginName}${nf}`);
     }
     async removeBridgedEndpoint(pluginName, device) {
         this.log.debug(`Removing bridged endpoint ${plg}${pluginName}${db}:${dev}${device.deviceName}${db} (${zb}${device.name}${db}) for plugin ${plg}${pluginName}${db}`);
-        // Check if the plugin is registered
         const plugin = this.plugins.get(pluginName);
         if (!plugin) {
             this.log.error(`Error removing bridged endpoint ${dev}${device.deviceName}${er} (${zb}${device.name}${er}) for plugin ${plg}${pluginName}${er}: plugin not found`);
             return;
         }
-        // Register and add the device to the matterbridge aggregator node
         if (this.bridgeMode === 'bridge') {
             if (!this.aggregatorNode) {
                 this.log.error(`Error removing bridged endpoint ${dev}${device.deviceName}${er} (${zb}${device.name}${er}) for plugin ${plg}${pluginName}${er}: aggregator node not found`);
@@ -2094,7 +1562,6 @@ export class Matterbridge extends EventEmitter {
         }
         else if (this.bridgeMode === 'childbridge') {
             if (plugin.type === 'AccessoryPlatform') {
-                // Nothing to do here since the server node has no aggregator node but only the device itself
             }
             else if (plugin.type === 'DynamicPlatform') {
                 if (!plugin.aggregatorNode) {
@@ -2108,7 +1575,6 @@ export class Matterbridge extends EventEmitter {
                 plugin.registeredDevices--;
             if (plugin.addedDevices !== undefined)
                 plugin.addedDevices--;
-            // Close the server node TODO check if this is correct
             if (plugin.registeredDevices === 0 && plugin.addedDevices === 0) {
                 if (plugin.serverNode) {
                     await this.stopServerNode(plugin.serverNode);
@@ -2119,7 +1585,6 @@ export class Matterbridge extends EventEmitter {
                 }
             }
         }
-        // Remove the device from the DeviceManager
         this.devices.remove(device);
     }
     async removeAllBridgedEndpoints(pluginName) {
@@ -2128,12 +1593,6 @@ export class Matterbridge extends EventEmitter {
             await this.removeBridgedEndpoint(pluginName, device);
         }
     }
-    /**
-     * 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.
-     */
     sanitizeFabricInformations(fabricInfo) {
         return fabricInfo.map((info) => {
             return {
@@ -2147,12 +1606,6 @@ export class Matterbridge extends EventEmitter {
             };
         });
     }
-    /**
-     * Sanitizes the session information by converting bigint properties to string.
-     *
-     * @param sessionInfo - The array of session information objects.
-     * @returns An array of sanitized session information objects.
-     */
     sanitizeSessionInformation(sessionInfo) {
         return sessionInfo
             .filter((session) => session.isPeerActive)
@@ -2180,51 +1633,11 @@ export class Matterbridge extends EventEmitter {
             };
         });
     }
-    /**
-     * Sets the reachability of a matter server node and trigger ReachableChanged event.
-     *
-     * @param {ServerNode<ServerNode.RootEndpoint>} serverNode - The commissioning server to set the reachability for.
-     * @param {boolean} reachable - The new reachability status.
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     setServerNodeReachability(serverNode, reachable) {
-        /*
-        const basicInformationCluster = commissioningServer?.getRootClusterServer(BasicInformationCluster);
-        if (basicInformationCluster && basicInformationCluster.attributes.reachable !== undefined) basicInformationCluster.setReachableAttribute(reachable);
-        if (basicInformationCluster && basicInformationCluster.triggerReachableChangedEvent) basicInformationCluster.triggerReachableChangedEvent({ reachableNewValue: reachable });
-        */
     }
-    /**
-     * Sets the reachability of the specified matter aggregator and its bridged devices and trigger.
-     * @param {EndpointNode<AggregatorEndpoint>} aggregatorNode - The matter aggregator to set the reachability for.
-     * @param {boolean} reachable - A boolean indicating the reachability status to set.
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     setAggregatorReachability(aggregatorNode, reachable) {
-        /*
-        const basicInformationCluster = matterAggregator.getClusterServer(BasicInformationCluster);
-        if (basicInformationCluster && basicInformationCluster.attributes.reachable !== undefined) basicInformationCluster.setReachableAttribute(reachable);
-        if (basicInformationCluster && basicInformationCluster.triggerReachableChangedEvent) basicInformationCluster.triggerReachableChangedEvent({ reachableNewValue: reachable });
-        matterAggregator.getBridgedDevices().forEach((device) => {
-          this.log.debug(`Setting reachability to true for bridged device: ${dev}${device.name}${nf}`);
-          device.getClusterServer(BridgedDeviceBasicInformationCluster)?.setReachableAttribute(reachable);
-          device.getClusterServer(BridgedDeviceBasicInformationCluster)?.triggerReachableChangedEvent({ reachableNewValue: reachable });
-        });
-        */
     }
-    /**
-     * Sets the reachability of a device and trigger.
-     *
-     * @param {MatterbridgeEndpoint} device - The device to set the reachability for.
-     * @param {boolean} reachable - The new reachability status of the device.
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     setDeviceReachability(device, reachable) {
-        /*
-        const basicInformationCluster = device.getClusterServer(BasicInformationCluster);
-        if (basicInformationCluster && basicInformationCluster.attributes.reachable !== undefined) basicInformationCluster.setReachableAttribute(reachable);
-        if (basicInformationCluster && basicInformationCluster.triggerReachableChangedEvent) basicInformationCluster.triggerReachableChangedEvent({ reachableNewValue: reachable });
-        */
     }
     getVendorIdName = (vendorId) => {
         if (!vendorId)
@@ -2267,36 +1680,13 @@ export class Matterbridge extends EventEmitter {
         }
         return vendorName;
     };
-    /**
-     * Spawns a child process with the given command and arguments.
-     * @param {string} command - The command to execute.
-     * @param {string[]} args - The arguments to pass to the command (default: []).
-     * @returns {Promise<boolean>} A promise that resolves when the child process exits successfully, or rejects if there is an error.
-     */
     async spawnCommand(command, args = []) {
-        /*
-        npm > npm.cmd on windows
-        cmd.exe ['dir'] on windows
-        await this.spawnCommand('npm', ['install', '-g', 'matterbridge']);
-        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(' ');
             args.splice(0, args.length, '/c', argstring);
             command = 'cmd.exe';
         }
-        // Decide when using sudo on linux
-        // When you need sudo: Spawn stderr: npm error Error: EACCES: permission denied
-        // When you don't need sudo: Failed to start child process "npm install -g matterbridge-eve-door": spawn sudo ENOENT
         if (hasParameter('sudo') || (process.platform === 'linux' && command === 'npm' && !hasParameter('docker') && !hasParameter('nosudo'))) {
             args.unshift(command);
             command = 'sudo';
@@ -2355,4 +1745,3 @@ export class Matterbridge extends EventEmitter {
         });
     }
 }
-//# sourceMappingURL=matterbridge.js.map