matterbridge 1.6.0 → 1.6.2

package/dist/matterbridge.js

@@ -25,32 +25,32 @@ import { fileURLToPath } from 'url';
 import { promises as fs } from 'fs';
 import { exec, spawn } from 'child_process';
 import { createServer } from 'http';
-import https from 'https';
 import EventEmitter from 'events';
-import express from 'express';
 import os from 'os';
 import path from 'path';
+import { randomBytes } from 'crypto';
+// Package modules
+import https from 'https';
+import express from 'express';
 import WebSocket, { WebSocketServer } from 'ws';
 // NodeStorage and AnsiLogger modules
 import { NodeStorageManager } from 'node-persist-manager';
-import { AnsiLogger, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, stringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, hk, or, idn, BLUE, CYAN, nt } from 'node-ansi-logger';
+import { AnsiLogger, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, stringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, CYAN, nt, idn, or, hk, BLUE } from 'node-ansi-logger';
 // Matterbridge
 import { MatterbridgeDevice } from './matterbridgeDevice.js';
-import { logInterfaces, wait, waiter, createZip } from './utils/utils.js';
+import { WS_ID_LOG, WS_ID_REFRESH_NEEDED, WS_ID_RESTART_NEEDED, wsMessageHandler } from './matterbridgeWebsocket.js';
+import { logInterfaces, wait, waiter, createZip, copyDirectory, getParameter, getIntParameter, hasParameter } from './utils/utils.js';
 import { PluginManager } from './pluginManager.js';
 import { DeviceManager } from './deviceManager.js';
-// @project-chip/matter-node.js
-import { CommissioningController, CommissioningServer, MatterServer } from '@project-chip/matter-node.js';
-import { BasicInformationCluster, BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster, ClusterServer, FixedLabelCluster, GeneralCommissioning, PowerSourceCluster, SwitchCluster, ThreadNetworkDiagnosticsCluster, getClusterNameById, } from '@project-chip/matter-node.js/cluster';
-import { DeviceTypeId, VendorId } from '@project-chip/matter-node.js/datatype';
-import { Aggregator, DeviceTypes, NodeStateInformation } from '@project-chip/matter-node.js/device';
-import { Format, Level, Logger } from '@project-chip/matter-node.js/log';
-import { ManualPairingCodeCodec, QrCodeSchema } from '@project-chip/matter-node.js/schema';
-import { StorageBackendDisk, StorageBackendJsonFile, StorageManager } from '@project-chip/matter-node.js/storage';
-import { getParameter, getIntParameter, hasParameter } from '@project-chip/matter-node.js/util';
-import { CryptoNode } from '@project-chip/matter-node.js/crypto';
-import { Specification } from '@project-chip/matter-node.js/model';
-import { WS_ID_LOG, WS_ID_REFRESH_NEEDED, WS_ID_RESTART_NEEDED, wsMessageHandler } from './matterbridgeWebsocket.js';
+import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
+// @matter
+import { DeviceTypeId, Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, VendorId, StorageManager } from '@matter/main';
+import { BasicInformationCluster, BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster, FixedLabelCluster, GeneralCommissioning, PowerSourceCluster, SwitchCluster, ThreadNetworkDiagnosticsCluster } from '@matter/main/clusters';
+import { getClusterNameById, ManualPairingCodeCodec, QrCodeSchema } from '@matter/main/types';
+import { StorageBackendDisk, StorageBackendJsonFile } from '@matter/nodejs';
+// @project-chip
+import { CommissioningController, CommissioningServer, MatterServer } from '@project-chip/matter.js';
+import { Aggregator, DeviceTypes, NodeStateInformation } from '@project-chip/matter.js/device';
 // Default colors
 const plg = '\u001B[38;5;33m';
 const dev = '\u001B[38;5;79m';
@@ -91,9 +91,11 @@ export class Matterbridge extends EventEmitter {
         matterbridgeConnected: false,
         bridgeMode: '',
         restartMode: '',
+        edge: hasParameter('edge'),
+        profile: getParameter('profile'),
         loggerLevel: "info" /* LogLevel.INFO */,
         fileLogger: false,
-        matterLoggerLevel: Level.INFO,
+        matterLoggerLevel: MatterLogLevel.INFO,
         matterFileLogger: false,
         mattermdnsinterface: undefined,
         matteripv4address: undefined,
@@ -117,6 +119,7 @@ export class Matterbridge extends EventEmitter {
     bridgeMode = '';
     restartMode = '';
     profile = getParameter('profile');
+    edge = hasParameter('edge');
     log;
     matterbrideLoggerFile = 'matterbridge' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.log';
     matterLoggerFile = 'matter' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.log';
@@ -136,6 +139,8 @@ export class Matterbridge extends EventEmitter {
     reachabilityTimeout;
     sigintHandler;
     sigtermHandler;
+    exceptionHandler;
+    rejectionHandler;
     // Frontend
     expressApp;
     httpServer;
@@ -155,6 +160,8 @@ export class Matterbridge extends EventEmitter {
     matterAggregator;
     commissioningServer;
     commissioningController;
+    aggregatorVendorId = VendorId(getIntParameter('vendorId') ?? 0xfff1);
+    aggregatorProductId = getIntParameter('productId') ?? 0x8000;
     static instance;
     // We load asyncronously so is private
     constructor() {
@@ -221,19 +228,54 @@ export class Matterbridge extends EventEmitter {
         // Set the matterbridge directory
         this.homeDirectory = getParameter('homedir') ?? os.homedir();
         this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
-        // Initialize nodeStorage and nodeContext
-        // 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');
-        // Check if the storage is corrupted and remove it
-        // TODO: Check if the storage is corrupted and remove it
         // Create matterbridge logger
-        this.log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logLevel: "info" /* LogLevel.INFO */ });
-        // 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), "debug" /* LogLevel.DEBUG */, true);
-            this.matterbridgeInformation.fileLogger = true;
+        this.log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logLevel: hasParameter('debug') ? "debug" /* LogLevel.DEBUG */ : "info" /* LogLevel.INFO */ });
+        // 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...`);
+                await this.cleanup('Fatal error creating node storage manager and context for matterbridge');
+                return;
+            }
+            this.log.notice(`The matterbridge storage is corrupted. Restoring it with backup...`);
+            await copyDirectory(path.join(this.matterbridgeDirectory, this.nodeStorageName + '.backup'), path.join(this.matterbridgeDirectory, this.nodeStorageName));
+            this.log.notice(`The matterbridge storage has been restored with backup`);
+        }
+        if (!this.nodeStorage || !this.nodeContext) {
+            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 matterbridge logger level (context: matterbridgeLogLevel)
         if (hasParameter('logger')) {
@@ -265,45 +307,50 @@ export class Matterbridge extends EventEmitter {
             this.log.logLevel = await this.nodeContext.get('matterbridgeLogLevel', "info" /* LogLevel.INFO */);
         }
         MatterbridgeDevice.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') {
-                Logger.defaultLogLevel = Level.DEBUG;
+                Logger.defaultLogLevel = MatterLogLevel.DEBUG;
             }
             else if (level === 'info') {
-                Logger.defaultLogLevel = Level.INFO;
+                Logger.defaultLogLevel = MatterLogLevel.INFO;
             }
             else if (level === 'notice') {
-                Logger.defaultLogLevel = Level.NOTICE;
+                Logger.defaultLogLevel = MatterLogLevel.NOTICE;
             }
             else if (level === 'warn') {
-                Logger.defaultLogLevel = Level.WARN;
+                Logger.defaultLogLevel = MatterLogLevel.WARN;
             }
             else if (level === 'error') {
-                Logger.defaultLogLevel = Level.ERROR;
+                Logger.defaultLogLevel = MatterLogLevel.ERROR;
             }
             else if (level === 'fatal') {
-                Logger.defaultLogLevel = Level.FATAL;
+                Logger.defaultLogLevel = MatterLogLevel.FATAL;
             }
             else {
                 this.log.warn(`Invalid matter.js logger level: ${level}. Using default level "info".`);
-                Logger.defaultLogLevel = Level.INFO;
+                Logger.defaultLogLevel = MatterLogLevel.INFO;
             }
         }
         else {
-            Logger.defaultLogLevel = await this.nodeContext.get('matterLogLevel', Level.INFO);
+            Logger.defaultLogLevel = await this.nodeContext.get('matterLogLevel', MatterLogLevel.INFO);
         }
-        Logger.format = Format.ANSI;
+        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), {
-                defaultLogLevel: Level.DEBUG,
-                logFormat: Format.PLAIN,
+                defaultLogLevel: Logger.defaultLogLevel,
+                logFormat: MatterLogFormat.PLAIN,
             });
         }
         this.log.debug(`Matter logLevel: ${Logger.defaultLogLevel} fileLoger: ${this.matterbridgeInformation.matterFileLogger}.`);
@@ -347,7 +394,7 @@ export class Matterbridge extends EventEmitter {
                 // We don't do this when the add parameter is 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', '--omit=dev', plugin.name]);
+                    await this.spawnCommand('npm', ['install', '-g', plugin.name, '--omit=dev', '--verbose']);
                     this.log.info(`Plugin ${plg}${plugin.name}${nf} reinstalled.`);
                     plugin.error = false;
                     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -383,8 +430,8 @@ 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.`);
         }
-        // Register SIGINT SIGTERM signal handlers
-        this.registerSignalHandlers();
+        // Register process handlers
+        this.registerProcessHandlers();
         // Parse command line
         await this.parseCommandLine();
         this.initialized = true;
@@ -415,6 +462,7 @@ export class Matterbridge extends EventEmitter {
       - logstorage:            log the node storage
       - sudo:                  force the use of sudo to install or update packages if the internal logic fails
       - nosudo:                force not to use sudo to install or update packages if the internal logic fails
+      - norestore:             force not to automatically restore the matterbridge node storage and the matter storage from backup if it is corrupted
       - ssl:                   enable SSL for the frontend and WebSockerServer (certificates in .matterbridge/certs directory cert.pem, key.pem and ca.pem (optional))
       - add [plugin path]:     register the plugin from the given absolute or relative path
       - add [plugin name]:     register the globally installed plugin with the given name
@@ -522,7 +570,13 @@ export class Matterbridge extends EventEmitter {
             return;
         }
         // Start the matter storage and create the matterbridge context
-        await this.startMatterStorage('json', path.join(this.matterbridgeDirectory, this.matterStorageName));
+        try {
+            await this.startMatterStorage('json', path.join(this.matterbridgeDirectory, this.matterStorageName));
+        }
+        catch (error) {
+            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}`);
+        }
         if (hasParameter('reset') && getParameter('reset') === undefined) {
             this.log.info('Resetting Matterbridge commissioning information...');
             await this.matterbridgeContext?.clearAll();
@@ -581,6 +635,7 @@ export class Matterbridge extends EventEmitter {
         if (hasParameter('bridge') || (!hasParameter('childbridge') && (await this.nodeContext?.get('bridgeMode', '')) === 'bridge')) {
             this.bridgeMode = 'bridge';
             MatterbridgeDevice.bridgeMode = 'bridge';
+            MatterbridgeEndpoint.bridgeMode = 'bridge';
             this.log.debug(`Starting matterbridge in mode ${this.bridgeMode}`);
             await this.startBridge();
             return;
@@ -589,6 +644,7 @@ export class Matterbridge extends EventEmitter {
         if (hasParameter('childbridge') || (!hasParameter('bridge') && (await this.nodeContext?.get('bridgeMode', '')) === 'childbridge')) {
             this.bridgeMode = 'childbridge';
             MatterbridgeDevice.bridgeMode = 'childbridge';
+            MatterbridgeEndpoint.bridgeMode = 'childbridge';
             this.log.debug(`Starting matterbridge in mode ${this.bridgeMode}`);
             await this.startChildbridge();
             return;
@@ -635,10 +691,23 @@ export class Matterbridge extends EventEmitter {
         this.wssSendRefreshRequired();
     }
     /**
-     * Registers the signal handlers for SIGINT and SIGTERM.
+     * 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.
      */
-    registerSignalHandlers() {
+    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...`);
         this.sigintHandler = async () => {
             await this.cleanup('SIGINT received, cleaning up...');
@@ -650,9 +719,16 @@ export class Matterbridge extends EventEmitter {
         process.on('SIGTERM', this.sigtermHandler);
     }
     /**
-     * Deregisters the SIGINT and SIGTERM signal handlers.
+     * Deregisters the process uncaughtException, unhandledRejection, SIGINT and SIGTERM signal handlers.
      */
-    deregisterSignalHandlers() {
+    deregisterProcesslHandlers() {
+        this.log.debug(`Deregistering uncaughtException and unhandledRejection handlers...`);
+        if (this.exceptionHandler)
+            process.off('uncaughtException', this.exceptionHandler);
+        this.exceptionHandler = undefined;
+        if (this.rejectionHandler)
+            process.off('unhandledRejection', this.rejectionHandler);
+        this.rejectionHandler = undefined;
         this.log.debug(`Deregistering SIGINT and SIGTERM signal handlers...`);
         if (this.sigintHandler)
             process.off('SIGINT', this.sigintHandler);
@@ -922,22 +998,22 @@ export class Matterbridge extends EventEmitter {
             const message = formattedLog.slice(65);
             matterLogger.logName = logger;
             switch (_level) {
-                case Level.DEBUG:
+                case MatterLogLevel.DEBUG:
                     matterLogger.log("debug" /* LogLevel.DEBUG */, message);
                     break;
-                case Level.INFO:
+                case MatterLogLevel.INFO:
                     matterLogger.log("info" /* LogLevel.INFO */, message);
                     break;
-                case Level.NOTICE:
+                case MatterLogLevel.NOTICE:
                     matterLogger.log("notice" /* LogLevel.NOTICE */, message);
                     break;
-                case Level.WARN:
+                case MatterLogLevel.WARN:
                     matterLogger.log("warn" /* LogLevel.WARN */, message);
                     break;
-                case Level.ERROR:
+                case MatterLogLevel.ERROR:
                     matterLogger.log("error" /* LogLevel.ERROR */, message);
                     break;
-                case Level.FATAL:
+                case MatterLogLevel.FATAL:
                     matterLogger.log("fatal" /* LogLevel.FATAL */, message);
                     break;
                 default:
@@ -979,22 +1055,22 @@ export class Matterbridge extends EventEmitter {
             const logger = parts[1];
             const finalMessage = parts.slice(2).join(' ') + os.EOL;
             switch (_level) {
-                case Level.DEBUG:
+                case MatterLogLevel.DEBUG:
                     await fs.appendFile(filePath, `[${timestamp}] [${logger}] [debug] ${finalMessage}`);
                     break;
-                case Level.INFO:
+                case MatterLogLevel.INFO:
                     await fs.appendFile(filePath, `[${timestamp}] [${logger}] [info] ${finalMessage}`);
                     break;
-                case Level.NOTICE:
+                case MatterLogLevel.NOTICE:
                     await fs.appendFile(filePath, `[${timestamp}] [${logger}] [notice] ${finalMessage}`);
                     break;
-                case Level.WARN:
+                case MatterLogLevel.WARN:
                     await fs.appendFile(filePath, `[${timestamp}] [${logger}] [warn] ${finalMessage}`);
                     break;
-                case Level.ERROR:
+                case MatterLogLevel.ERROR:
                     await fs.appendFile(filePath, `[${timestamp}] [${logger}] [error] ${finalMessage}`);
                     break;
-                case Level.FATAL:
+                case MatterLogLevel.FATAL:
                     await fs.appendFile(filePath, `[${timestamp}] [${logger}] [fatal] ${finalMessage}`);
                     break;
                 default:
@@ -1053,8 +1129,8 @@ export class Matterbridge extends EventEmitter {
         if (this.initialized && !this.hasCleanupStarted) {
             this.hasCleanupStarted = true;
             this.log.info(message);
-            // Deregisters the SIGINT and SIGTERM signal handlers
-            this.deregisterSignalHandlers();
+            // Deregisters the process handlers
+            this.deregisterProcesslHandlers();
             // Clear the start matter interval
             if (this.startMatterInterval) {
                 clearInterval(this.startMatterInterval);
@@ -1209,6 +1285,18 @@ export class Matterbridge extends EventEmitter {
             this.initialized = false;
         }
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    async addBridgedEndpoint(pluginName, device) {
+        // Nothing to do here
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    async removeBridgedEndpoint(pluginName, device) {
+        // Nothing to do here
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    async removeAllBridgedEndpoints(pluginName) {
+        // Nothing to do here
+    }
     /**
      * Adds a bridged device to the Matterbridge.
      * @param pluginName - The name of the plugin.
@@ -1717,7 +1805,7 @@ export class Matterbridge extends EventEmitter {
      * @returns {Promise<void>} - A promise that resolves when the storage process is started.
      */
     async startMatterStorage(storageType, storageName) {
-        this.log.debug(`Starting ${storageType} storage ${CYAN}${storageName}${db}`);
+        this.log.debug(`Starting matter ${storageType} storage ${CYAN}${storageName}${db}`);
         if (storageType === 'disk') {
             const storageDisk = new StorageBackendDisk(storageName);
             this.storageManager = new StorageManager(storageDisk);
@@ -1729,22 +1817,34 @@ export class Matterbridge extends EventEmitter {
             this.storageManager = new StorageManager(storageJson);
         }
         else {
-            this.log.error(`Unsupported storage type ${storageType}`);
-            await this.cleanup('Unsupported storage type');
+            this.log.error(`Unsupported matter storage type ${storageType}`);
+            await this.cleanup('Unsupported matter storage type');
             return;
         }
         try {
             await this.storageManager.initialize();
-            this.log.debug('Storage initialized');
+            this.log.debug('Matter storage initialized');
             if (storageType === 'json') {
                 await this.backupMatterStorage(storageName, storageName.replace('.json', '') + '.backup.json');
             }
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
         }
         catch (error) {
-            this.log.error(`Storage initialize() error! The file .matterbridge/${storageName} may be corrupted.`);
-            this.log.error(`Please delete it and rename ${storageName.replace('.json', '.backup.json')} to ${storageName} and try to restart Matterbridge.`);
-            await this.cleanup('Storage initialize() error!');
+            this.log.error(`Matter storage initialize error! The file .matterbridge/${storageName} may be corrupted: ${error instanceof Error ? error.message : error}`);
+            if (hasParameter('norestore')) {
+                this.log.fatal(`Please delete it and rename ${storageName.replace('.json', '.backup.json')} to ${storageName} and try to restart Matterbridge.`);
+                await this.cleanup('Matter storage initialize error and -norestore parameter found!');
+                return;
+            }
+            await this.restoreMatterStorage(storageName.replace('.json', '') + '.backup.json', storageName);
+            try {
+                await this.storageManager.initialize();
+                this.log.notice('Matter storage initialized from the backup file');
+            }
+            catch (error) {
+                this.log.error(`Matter storage initialize error! The backup file for .matterbridge/${storageName} may be corrupted too:`, error instanceof Error ? error.message : error);
+                await this.cleanup('Matter storage initialize error from backup!');
+                return;
+            }
         }
         this.log.debug(`Creating commissioning server context for ${plg}Matterbridge${db}`);
         this.matterbridgeContext = await this.createCommissioningServerContext('Matterbridge', 'Matterbridge', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge aggregator');
@@ -1764,7 +1864,7 @@ export class Matterbridge extends EventEmitter {
         catch (err) {
             if (err instanceof Error && 'code' in err) {
                 if (err.code === 'ENOENT') {
-                    this.log.info(`No existing file to back up for ${storageName}. This is expected on the first run.`);
+                    this.log.debug(`No existing file to back up for ${storageName}. This is expected on the first run.`);
                 }
                 else {
                     this.log.error(`Error making backup copy of ${storageName}: ${err.message}`);
@@ -1775,6 +1875,32 @@ export class Matterbridge extends EventEmitter {
             }
         }
     }
+    /**
+     * Restore the specified matter JSON storage file.
+     *
+     * @param backupName - The name of the backup file to restore from.
+     * @param storageName - The name of the JSON storage file to restored.
+     */
+    async restoreMatterStorage(backupName, storageName) {
+        try {
+            this.log.notice(`Restoring the backup copy of ${storageName}`);
+            await fs.copyFile(backupName, storageName);
+            this.log.notice(`Successfully restored ${backupName} to ${storageName}`);
+        }
+        catch (err) {
+            if (err instanceof Error && 'code' in err) {
+                if (err.code === 'ENOENT') {
+                    this.log.info(`No existing file to restore: ${backupName}.`);
+                }
+                else {
+                    this.log.error(`Error restoring ${backupName}: ${err.message}`);
+                }
+            }
+            else {
+                this.log.error(`An unexpected error occurred during the restore of ${backupName}: ${String(err)}`);
+            }
+        }
+    }
     /**
      * Stops the matter storage.
      * @returns {Promise<void>} A promise that resolves when the storage is stopped.
@@ -1846,39 +1972,52 @@ export class Matterbridge extends EventEmitter {
      * @param {StorageContext} context - The storage context.
      * @returns {Aggregator} - The created Matter Aggregator.
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async createMatterAggregator(context, pluginName) {
-        const random = 'AG' + CryptoNode.getRandomData(8).toHex();
+        /*
+        const random = randomBytes(8).toString('hex');
         await context.set('aggregatorSerialNumber', await context.get('aggregatorSerialNumber', random));
         await context.set('aggregatorUniqueId', await context.get('aggregatorUniqueId', random));
-        this.log.debug(`Creating matter aggregator for plugin ${plg}${pluginName}${db} with uniqueId ${await context.get('aggregatorUniqueId')} serialNumber ${await context.get('aggregatorSerialNumber')}`);
-        this.log.debug(`Creating matter aggregator for plugin ${plg}${pluginName}${db} with softwareVersion ${await context.get('softwareVersion', 1)} softwareVersionString ${await context.get('softwareVersionString', '1.0.0')}`);
-        this.log.debug(`Creating matter aggregator for plugin ${plg}${pluginName}${db} with hardwareVersion ${await context.get('hardwareVersion', 1)} hardwareVersionString ${await context.get('hardwareVersionString', '1.0.0')}`);
+    
+        this.log.debug(`Creating matter aggregator for plugin ${plg}${pluginName}${db} with uniqueId ${await context.get<string>('aggregatorUniqueId')} serialNumber ${await context.get<string>('aggregatorSerialNumber')}`);
+        this.log.debug(`Creating matter aggregator for plugin ${plg}${pluginName}${db} with softwareVersion ${await context.get<number>('softwareVersion', 1)} softwareVersionString ${await context.get<string>('softwareVersionString', '1.0.0')}`);
+        this.log.debug(`Creating matter aggregator for plugin ${plg}${pluginName}${db} with hardwareVersion ${await context.get<number>('hardwareVersion', 1)} hardwareVersionString ${await context.get<string>('hardwareVersionString', '1.0.0')}`);
+        */
         const matterAggregator = new Aggregator();
-        matterAggregator.addClusterServer(ClusterServer(BasicInformationCluster, {
-            dataModelRevision: 1,
-            location: 'FR',
-            vendorId: VendorId(0xfff1),
-            vendorName: 'Matterbridge',
-            productId: 0x8000,
-            productName: 'Matterbridge aggregator',
-            productLabel: 'Matterbridge aggregator',
-            nodeLabel: 'Matterbridge aggregator',
-            serialNumber: await context.get('aggregatorSerialNumber'),
-            uniqueId: await context.get('aggregatorUniqueId'),
-            softwareVersion: await context.get('softwareVersion', 1),
-            softwareVersionString: await context.get('softwareVersionString', '1.0.0'),
-            hardwareVersion: await context.get('hardwareVersion', 1),
-            hardwareVersionString: await context.get('hardwareVersionString', '1.0.0'),
-            reachable: true,
-            capabilityMinima: { caseSessionsPerFabric: 3, subscriptionsPerFabric: 3 },
-            specificationVersion: Specification.SPECIFICATION_VERSION,
-            maxPathsPerInvoke: 1,
-        }, {}, {
-            startUp: true,
-            shutDown: true,
-            leave: true,
-            reachableChanged: true,
-        }));
+        /*
+        matterAggregator.addClusterServer(
+          ClusterServer(
+            BasicInformationCluster,
+            {
+              dataModelRevision: 1,
+              location: 'FR',
+              vendorId: VendorId(0xfff1),
+              vendorName: 'Matterbridge',
+              productId: 0x8000,
+              productName: 'Matterbridge aggregator',
+              productLabel: 'Matterbridge aggregator',
+              nodeLabel: 'Matterbridge aggregator',
+              serialNumber: await context.get<string>('aggregatorSerialNumber'),
+              uniqueId: await context.get<string>('aggregatorUniqueId'),
+              softwareVersion: await context.get<number>('softwareVersion', 1),
+              softwareVersionString: await context.get<string>('softwareVersionString', '1.0.0'),
+              hardwareVersion: await context.get<number>('hardwareVersion', 1),
+              hardwareVersionString: await context.get<string>('hardwareVersionString', '1.0.0'),
+              reachable: true,
+              capabilityMinima: { caseSessionsPerFabric: 3, subscriptionsPerFabric: 3 },
+              specificationVersion: Specification.SPECIFICATION_VERSION,
+              maxPathsPerInvoke: 1,
+            },
+            {},
+            {
+              startUp: true,
+              shutDown: true,
+              leave: true,
+              reachableChanged: true,
+            },
+          ),
+        );
+        */
         return matterAggregator;
     }
     /**
@@ -2071,7 +2210,7 @@ export class Matterbridge extends EventEmitter {
         if (!this.storageManager)
             throw new Error('No storage manager initialized');
         this.log.debug(`Creating commissioning server storage context for ${plg}${pluginName}${db}`);
-        const random = 'CS' + CryptoNode.getRandomData(8).toHex();
+        const random = randomBytes(8).toString('hex');
         const storageContext = this.storageManager.createContext(pluginName);
         await storageContext.set('deviceName', deviceName);
         await storageContext.set('deviceType', deviceType);
@@ -2376,7 +2515,7 @@ export class Matterbridge extends EventEmitter {
      * 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<void>} A promise that resolves when the child process exits successfully, or rejects if there is an error.
+     * @returns {Promise<boolean>} A promise that resolves when the child process exits successfully, or rejects if there is an error.
      */
     async spawnCommand(command, args = []) {
         /*
@@ -2421,7 +2560,7 @@ export class Matterbridge extends EventEmitter {
                     if (cmdLine.startsWith('npm install -g'))
                         this.log.notice(`Package ${cmdLine.replace('npm install -g ', '').replace('--verbose', '').replace('--omit=dev', '')} installed correctly`);
                     this.log.debug(`Child process "${cmdLine}" closed with code ${code} and signal ${signal}`);
-                    resolve();
+                    resolve(true);
                 }
                 else {
                     this.log.error(`Child process "${cmdLine}" closed with code ${code} and signal ${signal}`);
@@ -2432,7 +2571,7 @@ export class Matterbridge extends EventEmitter {
                 this.wssSendMessage('spawn', this.log.now(), 'Matterbridge:spawn', `child process exited with code ${code} and signal ${signal}`);
                 if (code === 0) {
                     this.log.debug(`Child process "${cmdLine}" exited with code ${code} and signal ${signal}`);
-                    resolve();
+                    resolve(true);
                 }
                 else {
                     this.log.error(`Child process "${cmdLine}" exited with code ${code} and signal ${signal}`);
@@ -2441,7 +2580,7 @@ export class Matterbridge extends EventEmitter {
             });
             childProcess.on('disconnect', () => {
                 this.log.debug(`Child process "${cmdLine}" has been disconnected from the parent`);
-                resolve();
+                resolve(true);
             });
             if (childProcess.stdout) {
                 childProcess.stdout.on('data', (data) => {
@@ -3013,22 +3152,22 @@ export class Matterbridge extends EventEmitter {
             if (command === 'setmjloglevel') {
                 this.log.debug('Matter.js log level:', param);
                 if (param === 'Debug') {
-                    Logger.defaultLogLevel = Level.DEBUG;
+                    Logger.defaultLogLevel = MatterLogLevel.DEBUG;
                 }
                 else if (param === 'Info') {
-                    Logger.defaultLogLevel = Level.INFO;
+                    Logger.defaultLogLevel = MatterLogLevel.INFO;
                 }
                 else if (param === 'Notice') {
-                    Logger.defaultLogLevel = Level.NOTICE;
+                    Logger.defaultLogLevel = MatterLogLevel.NOTICE;
                 }
                 else if (param === 'Warn') {
-                    Logger.defaultLogLevel = Level.WARN;
+                    Logger.defaultLogLevel = MatterLogLevel.WARN;
                 }
                 else if (param === 'Error') {
-                    Logger.defaultLogLevel = Level.ERROR;
+                    Logger.defaultLogLevel = MatterLogLevel.ERROR;
                 }
                 else if (param === 'Fatal') {
-                    Logger.defaultLogLevel = Level.FATAL;
+                    Logger.defaultLogLevel = MatterLogLevel.FATAL;
                 }
                 await this.nodeContext?.set('matterLogLevel', Logger.defaultLogLevel);
                 res.json({ message: 'Command received' });
@@ -3082,8 +3221,8 @@ export class Matterbridge extends EventEmitter {
                 if (param === 'true') {
                     try {
                         Logger.addLogger('matterfilelogger', await this.createMatterFileLogger(path.join(this.matterbridgeDirectory, this.matterLoggerFile), true), {
-                            defaultLogLevel: Level.DEBUG,
-                            logFormat: Format.PLAIN,
+                            defaultLogLevel: MatterLogLevel.DEBUG,
+                            logFormat: MatterLogFormat.PLAIN,
                         });
                     }
                     catch (error) {
@@ -3371,8 +3510,8 @@ export class Matterbridge extends EventEmitter {
         await this.logNodeAndSystemInfo();
         this.matterbridgeDirectory = dataPath;
         // Set matter.js logger level and format
-        Logger.defaultLogLevel = Level.INFO;
-        Logger.format = Format.ANSI;
+        Logger.defaultLogLevel = MatterLogLevel.INFO;
+        Logger.format = MatterLogFormat.ANSI;
         // Start the storage and create matterbridgeContext
         await this.startMatterStorage('json', path.join(this.matterbridgeDirectory, this.matterStorageName));
         if (!this.storageManager)