matterbridge 3.0.2-dev-20250517-4122c94 → 3.0.3-dev-20250517-bcc5d13

package/CHANGELOG.md

@@ -8,12 +8,29 @@ If you like this project and find it useful, please consider giving it a star on
   <img src="bmc-button.svg" alt="Buy me a coffee" width="120">
 </a>
 
-## [3.0.2] - 2025-05-??
+## [3.0.3] - 2025-05-??
 
 ### Added
 
-- [virtual] Added virtual devices Restart Matterbridge and Update Matterbridge and full Jest tests.
-- [virtual] Added virtual devices Reboot Matterbridge for Shelly board and full Jest tests.
+### Changed
+
+- [package]: Updated dependencies.
+- [export]: Removed long deprecated Matter exports from matterbridge. Use matterbridge/matter.
+- [matterbridge]: Refactored initialize() and cleanup() methods.
+- [matterbridge]: Updated -help informations.
+
+### Fixed
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="bmc-button.svg" alt="Buy me a coffee" width="80">
+</a>
+
+## [3.0.2] - 2025-05-14
+
+### Added
+
+- [virtual] Added virtual devices Restart Matterbridge and Update Matterbridge and full Jest tests (can be disabled adding -novirtual to the command line).
+- [virtual] Added virtual devices Reboot Matterbridge for Shelly board and full Jest tests (can be disabled adding -novirtual to the command line).
 - [shelly] Refactor shelly api and added full Jest test.
 
 ### Changed

package/dist/frontend.js

@@ -8,7 +8,7 @@ import express from 'express';
 import WebSocket, { WebSocketServer } from 'ws';
 import multer from 'multer';
 import { AnsiLogger, stringify, debugStringify, CYAN, db, er, nf, rs, UNDERLINE, UNDERLINEOFF, wr, YELLOW, nt } from './logger/export.js';
-import { createZip, isValidArray, isValidNumber, isValidObject, isValidString, isValidBoolean } from './utils/export.js';
+import { createZip, isValidArray, isValidNumber, isValidObject, isValidString, isValidBoolean, withTimeout } from './utils/export.js';
 import { plg } from './matterbridgeTypes.js';
 import { hasParameter } from './utils/export.js';
 import { BridgedDeviceBasicInformation, PowerSource } from '@matter/main/clusters';
@@ -446,32 +446,7 @@ export class Frontend {
         this.log.debug(`Frontend initialized on port ${YELLOW}${this.port}${db} static ${UNDERLINE}${path.join(this.matterbridge.rootDirectory, 'frontend/build')}${UNDERLINEOFF}${rs}`);
     }
     async stop() {
-        if (this.httpServer) {
-            this.httpServer.close((error) => {
-                if (error) {
-                    this.log.error(`Error closing http server: ${error}`);
-                }
-                else {
-                    this.log.debug('Http server closed successfully');
-                }
-            });
-            this.httpServer.removeAllListeners();
-            this.httpServer = undefined;
-            this.log.debug('Frontend http server closed successfully');
-        }
-        if (this.httpsServer) {
-            this.httpsServer.close((error) => {
-                if (error) {
-                    this.log.error(`Error closing https server: ${error}`);
-                }
-                else {
-                    this.log.debug('Https server closed successfully');
-                }
-            });
-            this.httpsServer.removeAllListeners();
-            this.httpsServer = undefined;
-            this.log.debug('Frontend https server closed successfully');
-        }
+        this.log.debug('Stopping the frontend...');
         if (this.expressApp) {
             this.expressApp.removeAllListeners();
             this.expressApp = undefined;
@@ -483,16 +458,53 @@ export class Frontend {
                     client.close();
                 }
             });
-            this.webSocketServer.close((error) => {
-                if (error) {
-                    this.log.error(`Error closing WebSocket server: ${error}`);
-                }
-                else {
-                    this.log.debug('WebSocket server closed successfully');
-                }
-            });
+            await withTimeout(new Promise((resolve) => {
+                this.webSocketServer?.close((error) => {
+                    if (error) {
+                        this.log.error(`Error closing WebSocket server: ${error}`);
+                    }
+                    else {
+                        this.log.debug('WebSocket server closed successfully');
+                    }
+                    resolve();
+                });
+            }), 10000, false);
+            this.webSocketServer.removeAllListeners();
             this.webSocketServer = undefined;
         }
+        if (this.httpServer) {
+            await withTimeout(new Promise((resolve) => {
+                this.httpServer?.close((error) => {
+                    if (error) {
+                        this.log.error(`Error closing http server: ${error}`);
+                    }
+                    else {
+                        this.log.debug('Http server closed successfully');
+                    }
+                    resolve();
+                });
+            }), 10000, false);
+            this.httpServer.removeAllListeners();
+            this.httpServer = undefined;
+            this.log.debug('Frontend http server closed successfully');
+        }
+        if (this.httpsServer) {
+            await withTimeout(new Promise((resolve) => {
+                this.httpsServer?.close((error) => {
+                    if (error) {
+                        this.log.error(`Error closing https server: ${error}`);
+                    }
+                    else {
+                        this.log.debug('Https server closed successfully');
+                    }
+                    resolve();
+                });
+            }), 10000, false);
+            this.httpsServer.removeAllListeners();
+            this.httpsServer = undefined;
+            this.log.debug('Frontend https server closed successfully');
+        }
+        this.log.debug('Frontend stopped successfully');
     }
     formatMemoryUsage = (bytes) => {
         if (bytes >= 1024 ** 3) {

package/dist/index.js

@@ -1,9 +1,6 @@
 import { Matterbridge } from './matterbridge.js';
 import { hasParameter } from './utils/export.js';
 import { AnsiLogger } from './logger/export.js';
-export { SemanticNamespace, ClosureTag, CompassDirectionTag, CompassLocationTag, DirectionTag, ElectricalMeasurementTag, LaundryTag, LevelTag, LocationTag, NumberTag, PositionTag, PowerSourceTag, RefrigeratorTag, RoomAirConditionerTag, SwitchesTag, } from '@matter/main';
-export * from '@matter/main/clusters';
-export * from '@matter/main/types';
 export * from './matterbridge.js';
 export * from './matterbridgeTypes.js';
 export * from './matterbridgeEndpoint.js';
@@ -14,6 +11,7 @@ export * from './matterbridgePlatform.js';
 export * from './matterbridgeAccessoryPlatform.js';
 export * from './matterbridgeDynamicPlatform.js';
 export * from './roboticVacuumCleaner.js';
+export { addVirtualDevice } from './helpers.js';
 const log = new AnsiLogger({ logName: 'Main', logTimestampFormat: 4, logLevel: hasParameter('debug') ? "debug" : "info" });
 async function main() {
     log.debug('***Matterbridge.loadInstance() called');

package/dist/matterbridge.js

@@ -212,12 +212,28 @@ export class Matterbridge extends EventEmitter {
         });
     }
     async initialize() {
+        this.emit('initialize_started');
         if (hasParameter('service'))
             this.restartMode = 'service';
         if (hasParameter('docker'))
             this.restartMode = 'docker';
         this.homeDirectory = getParameter('homedir') ?? os.homedir();
+        this.matterbridgeInformation.homeDirectory = this.homeDirectory;
+        await this.createDirectory(this.homeDirectory, 'Matterbridge Home Directory');
         this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
+        this.matterbridgeInformation.matterbridgeDirectory = this.matterbridgeDirectory;
+        await this.createDirectory(this.matterbridgeDirectory, 'Matterbridge Directory');
+        await this.createDirectory(path.join(this.matterbridgeDirectory, 'certs'), 'Matterbridge Frontend Certificate Directory');
+        this.matterbridgePluginDirectory = path.join(this.homeDirectory, 'Matterbridge');
+        this.matterbridgeInformation.matterbridgePluginDirectory = this.matterbridgePluginDirectory;
+        await this.createDirectory(this.matterbridgePluginDirectory, 'Matterbridge Plugin Directory');
+        this.matterbridgeCertDirectory = path.join(this.homeDirectory, '.mattercert');
+        this.matterbridgeInformation.matterbridgeCertDirectory = this.matterbridgeCertDirectory;
+        await this.createDirectory(this.matterbridgeCertDirectory, 'Matterbridge Matter Certificate Directory');
+        const { fileURLToPath } = await import('node:url');
+        const currentFileDirectory = path.dirname(fileURLToPath(import.meta.url));
+        this.rootDirectory = path.resolve(currentFileDirectory, '../');
+        this.matterbridgeInformation.rootDirectory = this.rootDirectory;
         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));
@@ -267,7 +283,7 @@ export class Matterbridge extends EventEmitter {
         this.port = getIntParameter('port') ?? (await this.nodeContext.get('matterport', 5540)) ?? 5540;
         this.passcode = getIntParameter('passcode') ?? (await this.nodeContext.get('matterpasscode')) ?? PaseClient.generateRandomPasscode();
         this.discriminator = getIntParameter('discriminator') ?? (await this.nodeContext.get('matterdiscriminator')) ?? PaseClient.generateRandomDiscriminator();
-        const pairingFilePath = path.join(this.homeDirectory, '.mattercert', 'pairing.json');
+        const pairingFilePath = path.join(this.matterbridgeCertDirectory, 'pairing.json');
         try {
             await fs.access(pairingFilePath, fs.constants.R_OK);
             const pairingFileContent = await fs.readFile(pairingFilePath, 'utf8');
@@ -275,7 +291,7 @@ export class Matterbridge extends EventEmitter {
             if (pairingFileJson.passcode && pairingFileJson.discriminator) {
                 this.passcode = pairingFileJson.passcode;
                 this.discriminator = pairingFileJson.discriminator;
-                this.log.info(`Pairing file ${CYAN}${pairingFilePath}${nf} found. Using passcode ${CYAN}${this.passcode}${nf} and discriminator ${CYAN}${this.discriminator}${nf}`);
+                this.log.info(`Pairing file ${CYAN}${pairingFilePath}${nf} found. Using passcode ${CYAN}${this.passcode}${nf} and discriminator ${CYAN}${this.discriminator}${nf} from pairing file.`);
             }
             if (pairingFileJson.privateKey && pairingFileJson.certificate && pairingFileJson.intermediateCertificate && pairingFileJson.declaration) {
                 const hexStringToUint8Array = (hexString) => {
@@ -297,7 +313,7 @@ export class Matterbridge extends EventEmitter {
         await this.nodeContext.set('matterport', this.port);
         await this.nodeContext.set('matterpasscode', this.passcode);
         await this.nodeContext.set('matterdiscriminator', this.discriminator);
-        this.log.debug(`Initializing server node for Matterbridge... on port ${this.port} with passcode ${this.passcode} and discriminator ${this.discriminator}`);
+        this.log.debug(`Initializing server node for Matterbridge on port ${this.port} with passcode ${this.passcode} and discriminator ${this.discriminator}`);
         if (hasParameter('logger')) {
             const level = getParameter('logger');
             if (level === 'debug') {
@@ -502,6 +518,7 @@ export class Matterbridge extends EventEmitter {
             throw new Error(`Node version ${versionMajor} is not supported. Please upgrade to ${minNodeVersion} or above.`);
         }
         await this.parseCommandLine();
+        this.emit('initialize_completed');
         this.initialized = true;
     }
     async parseCommandLine() {
@@ -517,7 +534,9 @@ export class Matterbridge extends EventEmitter {
       - ipv6address [address]: set the ipv6 interface address to use for the matter listener (default all interfaces)
       - frontend [port]:       start the frontend on the given port (default 8283)
       - logger:                set the matterbridge logger level: debug | info | notice | warn | error | fatal (default info)
+      - filelogger             enable the matterbridge file logger (matterbridge.log)
       - matterlogger:          set the matter.js logger level: debug | info | notice | warn | error | fatal (default info)
+      - matterfilelogger       enable the matter.js file logger (matter.log)
       - reset:                 remove the commissioning for Matterbridge (bridge mode). Shutdown Matterbridge before using it!
       - factoryreset:          remove all commissioning information and reset all internal storages. Shutdown Matterbridge before using it!
       - list:                  list the registered plugins
@@ -526,13 +545,14 @@ export class Matterbridge extends EventEmitter {
       - 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
+      - novirtual:             disable the creation of the virtual devices Restart, Update and Reboot Matterbridge
       - ssl:                   enable SSL for the frontend and WebSockerServer (certificates in .matterbridge/certs directory cert.pem, key.pem and ca.pem (optional))
       - vendorId:              override the default vendorId 0xfff1
       - vendorName:            override the default vendorName "Matterbridge"
       - productId:             override the default productId 0x8000
       - productName:           override the default productName "Matterbridge aggregator"
       - service:               enable the service mode (used in the systemctl configuration file)
-      - docker:                enable the docker mode (used in the Dockerfile to build the docker image)
+      - docker:                enable the docker mode (used in the docker image)
       - homedir:               override the home directory (default: os.homedir())
       - 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
@@ -644,11 +664,11 @@ export class Matterbridge extends EventEmitter {
                     this.log.error(`Plugin ${plg}${plugin.name}${er} storageManager not found`);
                 }
                 else {
-                    await matterStorageManager?.createContext('events')?.clearAll();
-                    await matterStorageManager?.createContext('fabrics')?.clearAll();
-                    await matterStorageManager?.createContext('root')?.clearAll();
-                    await matterStorageManager?.createContext('sessions')?.clearAll();
-                    await matterStorageManager?.createContext('persist')?.clearAll();
+                    await matterStorageManager.createContext('events')?.clearAll();
+                    await matterStorageManager.createContext('fabrics')?.clearAll();
+                    await matterStorageManager.createContext('root')?.clearAll();
+                    await matterStorageManager.createContext('sessions')?.clearAll();
+                    await matterStorageManager.createContext('persist')?.clearAll();
                     this.log.info(`Reset commissionig for plugin ${plg}${plugin.name}${nf} done! Remove the device from the controller.`);
                 }
             }
@@ -751,7 +771,7 @@ export class Matterbridge extends EventEmitter {
         };
         process.on('SIGTERM', this.sigtermHandler);
     }
-    deregisterProcesslHandlers() {
+    deregisterProcessHandlers() {
         this.log.debug(`Deregistering uncaughtException and unhandledRejection handlers...`);
         if (this.exceptionHandler)
             process.off('uncaughtException', this.exceptionHandler);
@@ -826,22 +846,18 @@ 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}`);
-        this.homeDirectory = getParameter('homedir') ?? os.homedir();
-        this.matterbridgeInformation.homeDirectory = this.homeDirectory;
-        this.log.debug(`Home Directory: ${this.homeDirectory}`);
-        const { fileURLToPath } = await import('node:url');
-        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}`);
+        this.log.debug(`Home Directory: ${this.homeDirectory}`);
+        this.log.debug(`Matterbridge Directory: ${this.matterbridgeDirectory}`);
+        this.log.debug(`Matterbridge Plugin Directory: ${this.matterbridgePluginDirectory}`);
+        this.log.debug(`Matterbridge Matter Certificate Directory: ${this.matterbridgeCertDirectory}`);
         if (this.nodeContext)
             this.globalModulesDirectory = this.matterbridgeInformation.globalModulesDirectory = await this.nodeContext.get('globalModulesDirectory', '');
         if (this.globalModulesDirectory === '') {
             try {
                 this.execRunningCount++;
-                this.globalModulesDirectory = await getGlobalNodeModules();
+                this.matterbridgeInformation.globalModulesDirectory = this.globalModulesDirectory = await getGlobalNodeModules();
                 this.execRunningCount--;
-                this.matterbridgeInformation.globalModulesDirectory = this.globalModulesDirectory;
                 this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
                 await this.nodeContext?.set('globalModulesDirectory', this.globalModulesDirectory);
             }
@@ -851,82 +867,16 @@ export class Matterbridge extends EventEmitter {
         }
         else
             this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
-        this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
-        this.matterbridgeInformation.matterbridgeDirectory = this.matterbridgeDirectory;
-        try {
-            await fs.access(this.matterbridgeDirectory);
-        }
-        catch (err) {
-            if (err instanceof Error) {
-                const nodeErr = err;
-                if (nodeErr.code === 'ENOENT') {
-                    try {
-                        await fs.mkdir(this.matterbridgeDirectory, { recursive: true });
-                        this.log.info(`Created Matterbridge Directory: ${this.matterbridgeDirectory}`);
-                    }
-                    catch (err) {
-                        this.log.error(`Error creating directory: ${err}`);
-                    }
-                }
-                else {
-                    this.log.error(`Error accessing directory: ${err}`);
-                }
-            }
-        }
-        this.log.debug(`Matterbridge Directory: ${this.matterbridgeDirectory}`);
-        this.matterbridgePluginDirectory = path.join(this.homeDirectory, 'Matterbridge');
-        this.matterbridgeInformation.matterbridgePluginDirectory = this.matterbridgePluginDirectory;
-        try {
-            await fs.access(this.matterbridgePluginDirectory);
-        }
-        catch (err) {
-            if (err instanceof Error) {
-                const nodeErr = err;
-                if (nodeErr.code === 'ENOENT') {
-                    try {
-                        await fs.mkdir(this.matterbridgePluginDirectory, { recursive: true });
-                        this.log.info(`Created Matterbridge Plugin Directory: ${this.matterbridgePluginDirectory}`);
-                    }
-                    catch (err) {
-                        this.log.error(`Error creating directory: ${err}`);
-                    }
-                }
-                else {
-                    this.log.error(`Error accessing directory: ${err}`);
-                }
-            }
-        }
-        this.log.debug(`Matterbridge Plugin Directory: ${this.matterbridgePluginDirectory}`);
-        this.matterbridgeCertDirectory = path.join(this.homeDirectory, '.mattercert');
-        this.matterbridgeInformation.matterbridgeCertDirectory = this.matterbridgeCertDirectory;
-        try {
-            await fs.access(this.matterbridgeCertDirectory);
-        }
-        catch (err) {
-            if (err instanceof Error) {
-                const nodeErr = err;
-                if (nodeErr.code === 'ENOENT') {
-                    try {
-                        await fs.mkdir(this.matterbridgeCertDirectory, { recursive: true });
-                        this.log.info(`Created .mattercert directory: ${this.matterbridgeCertDirectory}`);
-                    }
-                    catch (err) {
-                        this.log.error(`Error creating .mattercert directory: ${err}`);
-                    }
-                }
-                else {
-                    this.log.error(`Error accessing .mattercert directory: ${err}`);
-                }
-            }
-        }
-        this.log.debug(`Matterbridge Matter Cert Directory: ${this.matterbridgeCertDirectory}`);
         const packageJson = JSON.parse(await fs.readFile(path.join(this.rootDirectory, 'package.json'), 'utf-8'));
-        this.matterbridgeVersion = this.matterbridgeLatestVersion = packageJson.version;
-        this.matterbridgeInformation.matterbridgeVersion = this.matterbridgeInformation.matterbridgeLatestVersion = this.matterbridgeVersion;
+        this.matterbridgeVersion = this.matterbridgeLatestVersion = this.matterbridgeDevVersion = packageJson.version;
+        this.matterbridgeInformation.matterbridgeVersion = this.matterbridgeInformation.matterbridgeLatestVersion = this.matterbridgeInformation.matterbridgeDevVersion = packageJson.version;
         this.log.debug(`Matterbridge Version: ${this.matterbridgeVersion}`);
         if (this.nodeContext)
-            this.matterbridgeLatestVersion = await this.nodeContext.get('matterbridgeLatestVersion', this.matterbridgeVersion);
+            this.matterbridgeLatestVersion = this.matterbridgeInformation.matterbridgeLatestVersion = await this.nodeContext.get('matterbridgeLatestVersion', this.matterbridgeVersion);
         this.log.debug(`Matterbridge Latest Version: ${this.matterbridgeLatestVersion}`);
+        if (this.nodeContext)
+            this.matterbridgeDevVersion = this.matterbridgeInformation.matterbridgeDevVersion = await this.nodeContext.get('matterbridgeDevVersion', this.matterbridgeVersion);
+        this.log.debug(`Matterbridge Dev Version: ${this.matterbridgeDevVersion}`);
         const currentDir = process.cwd();
         this.log.debug(`Current Working Directory: ${currentDir}`);
         const cmdArgs = process.argv.slice(2).join(' ');
@@ -934,11 +884,11 @@ export class Matterbridge extends EventEmitter {
     }
     createMatterLogger() {
         const matterLogger = new AnsiLogger({ logName: 'Matter', logTimestampFormat: 4, logLevel: "debug" });
-        return (_level, formattedLog) => {
+        return (level, formattedLog) => {
             const logger = formattedLog.slice(44, 44 + 20).trim();
             const message = formattedLog.slice(65);
             matterLogger.logName = logger;
-            switch (_level) {
+            switch (level) {
                 case MatterLogLevel.DEBUG:
                     matterLogger.log("debug", message);
                     break;
@@ -973,7 +923,7 @@ export class Matterbridge extends EventEmitter {
                 this.log.debug(`Error unlinking the log file ${CYAN}${filePath}${db}: ${error instanceof Error ? error.message : error}`);
             }
         }
-        return async (_level, formattedLog) => {
+        return async (level, formattedLog) => {
             if (fileSize > 100000000)
                 return;
             fileSize += formattedLog.length;
@@ -987,7 +937,7 @@ export class Matterbridge extends EventEmitter {
             const parts = message.split(' ');
             const logger = parts[1];
             const finalMessage = parts.slice(2).join(' ') + os.EOL;
-            switch (_level) {
+            switch (level) {
                 case MatterLogLevel.DEBUG:
                     await fs.appendFile(filePath, `[${timestamp}] [${logger}] [debug] ${finalMessage}`);
                     break;
@@ -1113,12 +1063,13 @@ export class Matterbridge extends EventEmitter {
                 await this.matterbridgeContext?.clearAll();
                 this.log.info('Matter storage reset done! Remove the bridge from the controller.');
             }
-            await this.stopMatterStorage();
-            await this.frontend.stop();
+            await withTimeout(this.stopMatterStorage(), 10000, false);
+            await withTimeout(this.frontend.stop(), 10000, false);
             try {
                 Logger.removeLogger('matterfilelogger');
             }
             catch (error) {
+                this.log.debug(`Error removing the matterfilelogger for file ${CYAN}${path.join(this.matterbridgeDirectory, this.matterLoggerFile)}${db}: ${error instanceof Error ? error.message : String(error)}`);
             }
             if (this.nodeStorage && this.nodeContext) {
                 this.log.debug(`Closing node storage context for ${plg}Matterbridge${db}...`);
@@ -1136,53 +1087,40 @@ export class Matterbridge extends EventEmitter {
                 this.nodeStorage = undefined;
             }
             else {
-                this.log.error('Error saving registered devices: nodeContext not found!');
+                this.log.error('Error close the matterbridge node storage and context: nodeStorage or nodeContext not found!');
             }
             this.plugins.clear();
             this.devices.clear();
             if (message === 'shutting down with factory reset...') {
                 try {
-                    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);
-                    const backup = path.join(this.matterbridgeDirectory, 'matterbridge' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.backup.json');
-                    this.log.info(`Unlinking old matter storage backup file: ${backup}`);
-                    await fs.unlink(backup);
-                }
-                catch (err) {
-                    if (err instanceof Error && err.code !== 'ENOENT') {
-                        this.log.error(`Error unlinking old matter storage file: ${err}`);
-                    }
-                }
-                try {
-                    const dir = path.join(this.matterbridgeDirectory, 'matterstorage' + (getParameter('profile') ? '.' + getParameter('profile') : ''));
-                    this.log.info(`Removing matter node storage directory: ${dir}`);
+                    const dir = path.join(this.matterbridgeDirectory, this.matterStorageName);
+                    this.log.info(`Removing matter storage directory: ${dir}`);
                     await fs.rm(dir, { recursive: true });
-                    const backup = path.join(this.matterbridgeDirectory, 'matterstorage' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.backup');
-                    this.log.info(`Removing matter node storage backup directory: ${backup}`);
+                    const backup = path.join(this.matterbridgeDirectory, this.matterStorageName + '.backup');
+                    this.log.info(`Removing matter storage backup directory: ${backup}`);
                     await fs.rm(backup, { recursive: true });
                 }
-                catch (err) {
-                    if (err instanceof Error && err.code !== 'ENOENT') {
-                        this.log.error(`Error removing matter storage directory: ${err}`);
+                catch (error) {
+                    if (error instanceof Error && error.code !== 'ENOENT') {
+                        this.log.error(`Error removing matter storage directory: ${error}`);
                     }
                 }
                 try {
-                    const dir = path.join(this.matterbridgeDirectory, 'storage' + (getParameter('profile') ? '.' + getParameter('profile') : ''));
-                    this.log.info(`Removing storage directory: ${dir}`);
+                    const dir = path.join(this.matterbridgeDirectory, this.nodeStorageName);
+                    this.log.info(`Removing matterbridge storage directory: ${dir}`);
                     await fs.rm(dir, { recursive: true });
-                    const backup = path.join(this.matterbridgeDirectory, 'storage' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.backup');
-                    this.log.info(`Removing storage backup directory: ${backup}`);
+                    const backup = path.join(this.matterbridgeDirectory, this.nodeStorageName + '.backup');
+                    this.log.info(`Removing matterbridge storage backup directory: ${backup}`);
                     await fs.rm(backup, { recursive: true });
                 }
-                catch (err) {
-                    if (err instanceof Error && err.code !== 'ENOENT') {
-                        this.log.error(`Error removing storage directory: ${err}`);
+                catch (error) {
+                    if (error instanceof Error && error.code !== 'ENOENT') {
+                        this.log.error(`Error removing matterbridge storage directory: ${error}`);
                     }
                 }
                 this.log.info('Factory reset done! Remove all paired fabrics from the controllers.');
             }
-            this.deregisterProcesslHandlers();
+            this.deregisterProcessHandlers();
             if (restart) {
                 if (message === 'updating...') {
                     this.log.info('Cleanup completed. Updating...');
@@ -1692,7 +1630,7 @@ export class Matterbridge extends EventEmitter {
         }
     }
     async createAggregatorNode(storageContext) {
-        this.log.notice(`Creating ${await storageContext.get('storeId')} aggregator `);
+        this.log.notice(`Creating ${await storageContext.get('storeId')} aggregator...`);
         const aggregatorNode = new Endpoint(AggregatorEndpoint, { id: `${await storageContext.get('storeId')}` });
         return aggregatorNode;
     }
@@ -1972,4 +1910,26 @@ export class Matterbridge extends EventEmitter {
             }
         });
     }
+    async createDirectory(path, name) {
+        try {
+            await fs.access(path);
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                const nodeErr = err;
+                if (nodeErr.code === 'ENOENT') {
+                    try {
+                        await fs.mkdir(path, { recursive: true });
+                        this.log.info(`Created ${name}: ${path}`);
+                    }
+                    catch (err) {
+                        this.log.error(`Error creating ${name}: ${err}`);
+                    }
+                }
+                else {
+                    this.log.error(`Error accessing ${name}: ${err}`);
+                }
+            }
+        }
+    }
 }

package/dist/utils/wait.js

@@ -43,9 +43,16 @@ export async function wait(timeout = 1000, name, debug = false) {
         }, timeout);
     });
 }
-export function withTimeout(promise, ms) {
+export function withTimeout(promise, timeoutMillisecs = 10000, reThrow = true) {
     return new Promise((resolve, reject) => {
-        const timer = setTimeout(() => reject(new Error('Operation timed out')), ms);
+        const timer = setTimeout(() => {
+            if (reThrow) {
+                reject(new Error('Operation timed out'));
+            }
+            else {
+                resolve(undefined);
+            }
+        }, timeoutMillisecs).unref();
         promise
             .then((result) => {
             clearTimeout(timer);
@@ -53,7 +60,12 @@ export function withTimeout(promise, ms) {
         })
             .catch((error) => {
             clearTimeout(timer);
-            reject(error);
+            if (reThrow) {
+                reject(error);
+            }
+            else {
+                resolve(undefined);
+            }
         });
     });
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.0.2-dev-20250517-4122c94",
+  "version": "3.0.3-dev-20250517-bcc5d13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.0.2-dev-20250517-4122c94",
+      "version": "3.0.3-dev-20250517-bcc5d13",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.13.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.0.2-dev-20250517-4122c94",
+  "version": "3.0.3-dev-20250517-bcc5d13",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",