matterbridge 3.0.8-dev-20250626-1445fbd → 3.1.0-dev-20250627-2b5adba

package/CHANGELOG.md

@@ -8,7 +8,7 @@ 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.8] - 2025-06-??
+## [3.1.0] - 2025-06-27
 
 ### Breaking Changes
 
@@ -21,8 +21,10 @@ If you like this project and find it useful, please consider giving it a star on
 - [ESLint]: Added the plugins `eslint-plugin-promise`, `eslint-plugin-jsdoc`, and `@vitest/eslint-plugin`.
 - [Vitest]: Added Vitest for TypeScript project testing. It will replace Jest, which does not work correctly with ESM module mocks.
 - [JSDoc]: Added missing JSDoc comments, including `@param` and `@returns` tags.
-- [MatterbridgeEndpoint]: Add MatterbridgeEndpoint serverMode='server'
-- [MatterbridgeEndpoint]: Add MatterbridgeEndpoint serverMode='matter'
+- [MatterbridgeEndpoint]: Add MatterbridgeEndpoint mode='server'. It allows to advertise a single device like an autonomous device with its server node to be paired.
+- [MatterbridgeEndpoint]: Add MatterbridgeEndpoint mode='matter'. It allows to add a single device to the Matterbridge server node next to the aggregator. The device is not bridged.
+- [storage]: Improved error handling of corrupted storage.
+- [test]: Improved test units on Matterbridge classes.
 
 ### Changed
 
@@ -30,7 +32,7 @@ If you like this project and find it useful, please consider giving it a star on
 - [package]: Updated dependencies.
 - [storage]: Bumped `node-storage-manager` to 2.0.0.
 - [logger]: Bumped `node-ansi-logger` to 3.1.1.
-- [matter.js]: Updated to 0.15.0-alpha.0-20250625-c7634df96.
+- [matter.js]: Updated to 0.15.0-alpha.0-20250625-c7634df96, 0.15.0-alpha.0-20250626-fc3a84ce9, and bumped to 0.15.0.
 
 ### Fixed
 

package/README-DEV.md

@@ -28,6 +28,18 @@ The Matterbridge Plugin Template has an already configured Jest / Vitest test un
 
 It also has a workflow configured to run on push and pull request that build, lint and test the plugin on node 20, 22 and 24 with ubuntu, macOS and windows.
 
+## Dev Container
+
+Using a Dev Container provides a fully isolated, reproducible, and pre-configured development environment. This ensures that all contributors have the same tools, extensions, and dependencies, eliminating "works on my machine" issues. It also makes onboarding new developers fast and hassle-free, as everything needed is set up automatically.
+
+For improved efficiency, the setup uses named Docker volumes for `node_modules`. This means dependencies are installed only once and persist across container rebuilds, making installs and rebuilds much faster than with bind mounts or ephemeral volumes.
+
+To start the Dev Container, simply open the project folder in [Visual Studio Code](https://code.visualstudio.com/) and, if prompted, click "Reopen in Container". Alternatively, use the Command Palette (`Ctrl+Shift+P` or `Cmd+Shift+P`), search for "Dev Containers: Reopen in Container", and select it. VS Code will automatically build and start the containerized environment for you.
+
+> **Note:** The first time you use the Dev Container, it may take a while to download all the required Docker images and set up the environment. Subsequent starts will be much faster.
+
+Since Dev Container doesn't run in network mode 'host', it is not possible to pair Mattebridge running inside the Dev Container.
+
 ## Guidelines on imports/exports
 
 Matterbridge exports from:
@@ -239,7 +251,26 @@ It can be useful to call this method from onShutdown() if you don't want to keep
 
 ## MatterbridgeEndpoint api
 
-Work in progress...
+You create a Matter device with a new instance of MatterbridgeEndpoint(definition: DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>, options: MatterbridgeEndpointOptions = {}, debug: boolean = false).
+
+- @param {DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>} definition - The DeviceTypeDefinition(s) of the endpoint.
+- @param {MatterbridgeEndpointOptions} [options] - The options for the device.
+- @param {boolean} [debug] - Debug flag.
+
+```typescript
+    const device = new MatterbridgeEndpoint([contactSensor, powerSource], { uniqueStorageKey: 'Eve door', mode: 'matter' }, this.config.debug as boolean)
+      .createDefaultIdentifyClusterServer()
+      .createDefaultBasicInformationClusterServer('My contact sensor', '0123456789')
+      .createDefaultBooleanStateClusterServer(true)
+      .createDefaultPowerSourceReplaceableBatteryClusterServer(75)
+      .addRequiredClusterServers(); // Always better to call it at the end of the chain to add all the not already created but required clusters.
+```
+
+In the above example we create a contact sensor device type with also a power source device type feature replaceble battery.
+
+All device types are defined in src\matterbridgeDeviceTypes.ts and taken from the 'Matter-1.4-Device-Library-Specification.pdf'.
+
+All default cluster helpers are available as methods of MatterbridgeEndpoint.
 
 # Contribution Guidelines
 

package/README.md

@@ -5,7 +5,8 @@
 [![Docker Version](https://img.shields.io/docker/v/luligu/matterbridge?label=docker%20version&sort=semver)](https://hub.docker.com/r/luligu/matterbridge)
 [![Docker Pulls](https://img.shields.io/docker/pulls/luligu/matterbridge.svg)](https://hub.docker.com/r/luligu/matterbridge)
 ![Node.js CI](https://github.com/Luligu/matterbridge/actions/workflows/build.yml/badge.svg)
-![Coverage](https://img.shields.io/badge/Jest%20coverage-89%25-brightgreen)
+![CodeQL](https://github.com/Luligu/matterbridge/actions/workflows/codeql.yml/badge.svg)
+[![codecov](https://codecov.io/gh/Luligu/matterbridge/branch/main/graph/badge.svg)](https://codecov.io/gh/Luligu/matterbridge)
 
 [![power by](https://img.shields.io/badge/powered%20by-matter--history-blue)](https://www.npmjs.com/package/matter-history)
 [![power by](https://img.shields.io/badge/powered%20by-node--ansi--logger-blue)](https://www.npmjs.com/package/node-ansi-logger)

package/dist/deviceManager.js

@@ -3,11 +3,9 @@ import { dev } from './matterbridgeTypes.js';
 export class DeviceManager {
     _devices = new Map();
     matterbridge;
-    nodeContext;
     log;
-    constructor(matterbridge, nodeContext) {
+    constructor(matterbridge) {
         this.matterbridge = matterbridge;
-        this.nodeContext = nodeContext;
         this.log = new AnsiLogger({ logName: 'DeviceManager', logTimestampFormat: 4, logLevel: matterbridge.log.logLevel });
         this.log.debug('Matterbridge device manager starting...');
     }

package/dist/matterbridge.js

@@ -3,7 +3,7 @@ import path from 'node:path';
 import { promises as fs } from 'node:fs';
 import EventEmitter from 'node:events';
 import { inspect } from 'node:util';
-import { AnsiLogger, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, CYAN } from 'node-ansi-logger';
+import { AnsiLogger, UNDERLINE, UNDERLINEOFF, db, debugStringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, CYAN } from 'node-ansi-logger';
 import { NodeStorageManager } from 'node-persist-manager';
 import { DeviceTypeId, Endpoint, Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, VendorId, StorageService, Environment, ServerNode, UINT32_MAX, UINT16_MAX, Crypto, } from '@matter/main';
 import { DeviceCommissioner, FabricAction, MdnsService, PaseClient } from '@matter/main/protocol';
@@ -89,26 +89,26 @@ export class Matterbridge extends EventEmitter {
     matterbridgeVersion = '';
     matterbridgeLatestVersion = '';
     matterbridgeDevVersion = '';
-    matterbridgeQrPairingCode = undefined;
-    matterbridgeManualPairingCode = undefined;
-    matterbridgeFabricInformations = undefined;
-    matterbridgeSessionInformations = undefined;
-    matterbridgePaired = undefined;
+    matterbridgeQrPairingCode;
+    matterbridgeManualPairingCode;
+    matterbridgeFabricInformations;
+    matterbridgeSessionInformations;
+    matterbridgePaired;
     bridgeMode = '';
     restartMode = '';
     profile = getParameter('profile');
     shutdown = false;
     edge = true;
     failCountLimit = hasParameter('shelly') ? 600 : 120;
-    log;
+    log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: 4, logLevel: hasParameter('debug') ? "debug" : "info" });
     matterbrideLoggerFile = 'matterbridge' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.log';
     matterLoggerFile = 'matter' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.log';
     plugins;
     devices;
     frontend = new Frontend(this);
+    nodeStorageName = 'storage' + (getParameter('profile') ? '.' + getParameter('profile') : '');
     nodeStorage;
     nodeContext;
-    nodeStorageName = 'storage' + (getParameter('profile') ? '.' + getParameter('profile') : '');
     hasCleanupStarted = false;
     initialized = false;
     execRunningCount = 0;
@@ -145,12 +145,6 @@ export class Matterbridge extends EventEmitter {
     constructor() {
         super();
     }
-    emit(eventName, ...args) {
-        return super.emit(eventName, ...args);
-    }
-    on(eventName, listener) {
-        return super.on(eventName, listener);
-    }
     getDevices() {
         return this.devices.array();
     }
@@ -191,7 +185,7 @@ export class Matterbridge extends EventEmitter {
         }
         return Matterbridge.instance;
     }
-    async destroyInstance() {
+    async destroyInstance(timeout = 1000, pause = 500) {
         this.log.info(`Destroy instance...`);
         const servers = [];
         if (this.bridgeMode === 'bridge') {
@@ -206,12 +200,15 @@ export class Matterbridge extends EventEmitter {
         }
         if (this.devices !== undefined) {
             for (const device of this.devices.array()) {
-                if (device.serverMode === 'server' && device.serverNode)
+                if (device.mode === 'server' && device.serverNode)
                     servers.push(device.serverNode);
             }
         }
         await Promise.resolve();
-        await this.cleanup('destroying instance...', false);
+        await new Promise((resolve) => {
+            setTimeout(resolve, pause);
+        });
+        await this.cleanup('destroying instance...', false, timeout);
         this.log.info(`Dispose ${servers.length} MdnsService...`);
         for (const server of servers) {
             await server.env.get(MdnsService)[Symbol.asyncDispose]();
@@ -219,12 +216,11 @@ export class Matterbridge extends EventEmitter {
         }
         await Promise.resolve();
         await new Promise((resolve) => {
-            setTimeout(resolve, 500);
+            setTimeout(resolve, pause);
         });
     }
     async initialize() {
         this.emit('initialize_started');
-        this.log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: 4, logLevel: hasParameter('debug') ? "debug" : "info" });
         if (hasParameter('service'))
             this.restartMode = 'service';
         if (hasParameter('docker'))
@@ -280,16 +276,15 @@ export class Matterbridge extends EventEmitter {
         catch (error) {
             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.fatal(`The matterbridge storage is corrupted. Found -norestore parameter: exiting...`);
+            }
+            else {
+                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`);
             }
-            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');
         }
         this.port = getIntParameter('port') ?? (await this.nodeContext.get('matterport', 5540)) ?? 5540;
@@ -305,7 +300,7 @@ export class Matterbridge extends EventEmitter {
             if (isValidString(pairingFileJson.vendorName, 3))
                 this.aggregatorVendorName = pairingFileJson.vendorName;
             if (isValidNumber(pairingFileJson.productId))
-                this.aggregatorProductId = VendorId(pairingFileJson.productId);
+                this.aggregatorProductId = pairingFileJson.productId;
             if (isValidString(pairingFileJson.productName, 3))
                 this.aggregatorProductName = pairingFileJson.productName;
             if (isValidNumber(pairingFileJson.passcode) && isValidNumber(pairingFileJson.discriminator)) {
@@ -313,19 +308,6 @@ export class Matterbridge extends EventEmitter {
                 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} from pairing file.`);
             }
-            if (pairingFileJson.privateKey && pairingFileJson.certificate && pairingFileJson.intermediateCertificate && pairingFileJson.declaration) {
-                const hexStringToUint8Array = (hexString) => {
-                    const matches = hexString.match(/.{1,2}/g);
-                    return matches ? new Uint8Array(matches.map((byte) => parseInt(byte, 16))) : new Uint8Array();
-                };
-                this.certification = {
-                    privateKey: hexStringToUint8Array(pairingFileJson.privateKey),
-                    certificate: hexStringToUint8Array(pairingFileJson.certificate),
-                    intermediateCertificate: hexStringToUint8Array(pairingFileJson.intermediateCertificate),
-                    declaration: hexStringToUint8Array(pairingFileJson.declaration),
-                };
-                this.log.info(`Pairing file ${CYAN}${pairingFilePath}${nf} found. Using privateKey, certificate, intermediateCertificate and declaration from pairing file.`);
-            }
         }
         catch (error) {
             this.log.debug(`Pairing file ${CYAN}${pairingFilePath}${db} not found: ${error instanceof Error ? error.message : error}`);
@@ -433,12 +415,12 @@ export class Matterbridge extends EventEmitter {
         }
         if (this.mdnsInterface) {
             if (!availableInterfaces.includes(this.mdnsInterface)) {
-                this.log.error(`Invalid mdnsInterface: ${this.mdnsInterface}. Available interfaces are: ${availableInterfaces.join(', ')}. Using all available interfaces.`);
+                this.log.error(`Invalid mdnsinterface: ${this.mdnsInterface}. Available interfaces are: ${availableInterfaces.join(', ')}. Using all available interfaces.`);
                 this.mdnsInterface = undefined;
                 await this.nodeContext.remove('mattermdnsinterface');
             }
             else {
-                this.log.info(`Using mdnsInterface ${CYAN}${this.mdnsInterface}${nf} for the Matter MdnsBroadcaster.`);
+                this.log.info(`Using mdnsinterface ${CYAN}${this.mdnsInterface}${nf} for the Matter MdnsBroadcaster.`);
             }
         }
         if (this.mdnsInterface)
@@ -505,7 +487,7 @@ export class Matterbridge extends EventEmitter {
         this.plugins = new PluginManager(this);
         await this.plugins.loadFromStorage();
         this.plugins.logLevel = this.log.logLevel;
-        this.devices = new DeviceManager(this, this.nodeContext);
+        this.devices = new DeviceManager(this);
         this.devices.logLevel = this.log.logLevel;
         for (const plugin of this.plugins) {
             const packageJson = await this.plugins.parse(plugin);
@@ -609,18 +591,6 @@ export class Matterbridge extends EventEmitter {
                 }
                 index++;
             }
-            const serializedRegisteredDevices = await this.nodeContext?.get('devices', []);
-            this.log.info(`│ Registered devices (${serializedRegisteredDevices?.length})`);
-            serializedRegisteredDevices?.forEach((device, index) => {
-                if (index !== serializedRegisteredDevices.length - 1) {
-                    this.log.info(`├─┬─ plugin ${plg}${device.pluginName}${nf} device: ${dev}${device.deviceName}${nf} uniqueId: ${YELLOW}${device.uniqueId}${nf}`);
-                    this.log.info(`│ └─ endpoint ${RED}${device.endpoint}${nf} ${typ}${device.endpointName}${nf} ${debugStringify(device.clusterServersId)}`);
-                }
-                else {
-                    this.log.info(`└─┬─ plugin ${plg}${device.pluginName}${nf} device: ${dev}${device.deviceName}${nf} uniqueId: ${YELLOW}${device.uniqueId}${nf}`);
-                    this.log.info(`  └─ endpoint ${RED}${device.endpoint}${nf} ${typ}${device.endpointName}${nf} ${debugStringify(device.clusterServersId)}`);
-                }
-            });
             this.shutdown = true;
             return;
         }
@@ -1024,7 +994,7 @@ export class Matterbridge extends EventEmitter {
     async shutdownProcessAndFactoryReset() {
         await this.cleanup('shutting down with factory reset...', false);
     }
-    async cleanup(message, restart = false) {
+    async cleanup(message, restart = false, timeout = 1000) {
         if (this.initialized && !this.hasCleanupStarted) {
             this.emit('cleanup_started');
             this.hasCleanupStarted = true;
@@ -1035,7 +1005,7 @@ export class Matterbridge extends EventEmitter {
                 this.log.debug('Start matter interval cleared');
             }
             if (this.checkUpdateTimeout) {
-                clearInterval(this.checkUpdateTimeout);
+                clearTimeout(this.checkUpdateTimeout);
                 this.checkUpdateTimeout = undefined;
                 this.log.debug('Check update timeout cleared');
             }
@@ -1066,7 +1036,7 @@ export class Matterbridge extends EventEmitter {
             }
             this.log.notice(`Stopping matter server nodes in ${this.bridgeMode} mode...`);
             this.log.debug('Waiting for the MessageExchange to finish...');
-            await new Promise((resolve) => setTimeout(resolve, 1000));
+            await new Promise((resolve) => setTimeout(resolve, timeout));
             if (this.bridgeMode === 'bridge') {
                 if (this.serverNode) {
                     await this.stopServerNode(this.serverNode);
@@ -1082,9 +1052,10 @@ export class Matterbridge extends EventEmitter {
                 }
             }
             for (const device of this.devices.array()) {
-                if (device.serverMode === 'server' && device.serverNode) {
+                if (device.mode === 'server' && device.serverNode) {
                     await this.stopServerNode(device.serverNode);
                     device.serverNode = undefined;
+                    device.serverContext = undefined;
                 }
             }
             this.log.notice('Stopped matter server nodes');
@@ -1181,10 +1152,10 @@ export class Matterbridge extends EventEmitter {
         }
     }
     async createDeviceServerNode(plugin, device) {
-        if (device.serverMode === 'server' && !device.serverNode && device.deviceType && device.deviceName && device.vendorId && device.productId && device.vendorName && device.productName) {
+        if (device.mode === 'server' && !device.serverNode && device.deviceType && device.deviceName && device.vendorId && device.productId && device.vendorName && device.productName) {
             this.log.debug(`Creating device ${plg}${plugin.name}${db}:${dev}${device.deviceName}${db} server node...`);
-            const storageContext = await this.createServerNodeContext(device.deviceName.replace(/[ .]/g, ''), device.deviceName, DeviceTypeId(device.deviceType), device.vendorId, device.vendorName, device.productId, device.productName);
-            device.serverNode = await this.createServerNode(storageContext, this.port ? this.port++ : undefined, this.passcode ? this.passcode++ : undefined, this.discriminator ? this.discriminator++ : undefined);
+            device.serverContext = await this.createServerNodeContext(device.deviceName.replace(/[ .]/g, ''), device.deviceName, DeviceTypeId(device.deviceType), device.vendorId, device.vendorName, device.productId, device.productName);
+            device.serverNode = await this.createServerNode(device.serverContext, this.port ? this.port++ : undefined, this.passcode ? this.passcode++ : undefined, this.discriminator ? this.discriminator++ : undefined);
             this.log.debug(`Adding ${plg}${plugin.name}${db}:${dev}${device.deviceName}${db} to server node...`);
             await device.serverNode.add(device);
             this.log.debug(`Added ${plg}${plugin.name}${db}:${dev}${device.deviceName}${db} to server node`);
@@ -1256,7 +1227,7 @@ export class Matterbridge extends EventEmitter {
             this.log.debug('Cleared startMatterInterval interval for Matterbridge');
             this.startServerNode(this.serverNode);
             for (const device of this.devices.array()) {
-                if (device.serverMode === 'server' && device.serverNode) {
+                if (device.mode === 'server' && device.serverNode) {
                     this.log.debug(`Starting server node for device ${dev}${device.deviceName}${db} in server mode...`);
                     await this.startServerNode(device.serverNode);
                 }
@@ -1277,13 +1248,15 @@ export class Matterbridge extends EventEmitter {
                     }
                 }
                 this.frontend.wssSendRefreshRequired('plugins');
-            }, 30 * 1000);
+            }, 30 * 1000).unref();
             this.reachabilityTimeout = setTimeout(() => {
                 this.log.info(`Setting reachability to true for ${plg}Matterbridge${db}`);
                 if (this.aggregatorNode)
                     this.setAggregatorReachability(this.aggregatorNode, true);
                 this.frontend.wssSendRefreshRequired('reachability');
-            }, 60 * 1000);
+            }, 60 * 1000).unref();
+            this.emit('bridge_started');
+            this.log.notice('Matterbridge bridge started successfully');
         }, 1000);
     }
     async startChildbridge() {
@@ -1339,7 +1312,7 @@ export class Matterbridge extends EventEmitter {
                     }
                 }
                 this.frontend.wssSendRefreshRequired('plugins');
-            }, 30 * 1000);
+            }, 30 * 1000).unref();
             for (const plugin of this.plugins.array()) {
                 if (!plugin.enabled || plugin.error)
                     continue;
@@ -1365,14 +1338,16 @@ export class Matterbridge extends EventEmitter {
                     if (plugin.type === 'DynamicPlatform' && plugin.aggregatorNode)
                         this.setAggregatorReachability(plugin.aggregatorNode, true);
                     this.frontend.wssSendRefreshRequired('reachability');
-                }, 60 * 1000);
+                }, 60 * 1000).unref();
             }
             for (const device of this.devices.array()) {
-                if (device.serverMode === 'server' && device.serverNode) {
+                if (device.mode === 'server' && device.serverNode) {
                     this.log.debug(`***Starting server node for device ${plg}${device.deviceName}${db} in server mode...`);
                     await this.startServerNode(device.serverNode);
                 }
             }
+            this.emit('childbridge_started');
+            this.log.notice('Matterbridge childbridge started successfully');
         }, 1000);
     }
     async startController() {
@@ -1597,10 +1572,7 @@ export class Matterbridge extends EventEmitter {
             this.frontend.wssSendRefreshRequired('fabrics');
         });
         const sanitizeSessions = (sessions) => {
-            const sanitizedSessions = this.sanitizeSessionInformation(sessions.map((session) => ({
-                ...session,
-                secure: session.name.startsWith('secure'),
-            })));
+            const sanitizedSessions = this.sanitizeSessionInformation(sessions);
             this.log.debug(`Sessions: ${debugStringify(sanitizedSessions)}`);
             if (this.bridgeMode === 'bridge') {
                 this.matterbridgeSessionInformations = sanitizedSessions;
@@ -1702,7 +1674,7 @@ export class Matterbridge extends EventEmitter {
             this.log.error(`Error adding bridged endpoint ${dev}${device.deviceName}${er} (${zb}${device.id}${er}) plugin ${plg}${pluginName}${er} not found`);
             return;
         }
-        if (device.serverMode === 'server') {
+        if (device.mode === 'server') {
             try {
                 this.log.debug(`Creating server node for device ${dev}${device.deviceName}${db} of plugin ${plg}${plugin.name}${db}...`);
                 await this.createDeviceServerNode(plugin, device);
@@ -1715,7 +1687,7 @@ export class Matterbridge extends EventEmitter {
             }
         }
         else if (this.bridgeMode === 'bridge') {
-            if (device.serverMode === 'matter') {
+            if (device.mode === 'matter') {
                 this.log.debug(`Adding matter endpoint ${plg}${pluginName}${db}:${dev}${device.deviceName}${db} to Matterbridge server node...`);
                 if (!this.serverNode) {
                     this.log.error('Server node not found for Matterbridge');
@@ -1774,7 +1746,7 @@ export class Matterbridge extends EventEmitter {
                         this.log.error(`Aggregator node not found for plugin ${plg}${plugin.name}${er}`);
                         return;
                     }
-                    if (device.serverMode === 'matter')
+                    if (device.mode === 'matter')
                         await plugin.serverNode?.add(device);
                     else
                         await plugin.aggregatorNode.add(device);
@@ -1870,8 +1842,8 @@ export class Matterbridge extends EventEmitter {
             };
         });
     }
-    sanitizeSessionInformation(sessionInfo) {
-        return sessionInfo
+    sanitizeSessionInformation(session) {
+        return session
             .filter((session) => session.isPeerActive)
             .map((session) => {
             return {
@@ -1890,7 +1862,6 @@ export class Matterbridge extends EventEmitter {
                     }
                     : undefined,
                 isPeerActive: session.isPeerActive,
-                secure: session.secure,
                 lastInteractionTimestamp: session.lastInteractionTimestamp?.toString(),
                 lastActiveTimestamp: session.lastActiveTimestamp?.toString(),
                 numberOfActiveSubscriptions: session.numberOfActiveSubscriptions,

package/dist/matterbridgeEndpoint.js

@@ -1,4 +1,4 @@
-import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, UINT16_MAX, UINT32_MAX, VendorId } from '@matter/main';
+import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, UINT16_MAX, UINT32_MAX, VendorId, } from '@matter/main';
 import { getClusterNameById, MeasurementType } from '@matter/main/types';
 import { Descriptor } from '@matter/main/clusters/descriptor';
 import { PowerSource } from '@matter/main/clusters/power-source';
@@ -68,7 +68,8 @@ import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequire
 export class MatterbridgeEndpoint extends Endpoint {
     static bridgeMode = '';
     static logLevel = "info";
-    serverMode = undefined;
+    mode = undefined;
+    serverContext;
     serverNode;
     log;
     plugin = undefined;
@@ -126,13 +127,23 @@ export class MatterbridgeEndpoint extends Endpoint {
         if (options.uniqueStorageKey && checkNotLatinCharacters(options.uniqueStorageKey)) {
             options.uniqueStorageKey = generateUniqueId(options.uniqueStorageKey);
         }
+        if (options.id && checkNotLatinCharacters(options.id)) {
+            options.id = generateUniqueId(options.id);
+        }
         const optionsV8 = {
             id: options.uniqueStorageKey?.replace(/[ .]/g, ''),
             number: options.endpointId,
             descriptor: options.tagList ? { tagList: options.tagList, deviceTypeList } : { deviceTypeList },
         };
+        if (options.id !== undefined) {
+            optionsV8.id = options.id.replace(/[ .]/g, '');
+        }
+        if (options.number !== undefined) {
+            optionsV8.number = options.number;
+        }
         super(endpointV8, optionsV8);
-        this.uniqueStorageKey = options.uniqueStorageKey;
+        this.mode = options.mode;
+        this.uniqueStorageKey = options.id ? options.id : options.uniqueStorageKey;
         this.name = firstDefinition.name;
         this.deviceType = firstDefinition.code;
         this.tagList = options.tagList;
@@ -442,7 +453,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productId, productName, softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0') {
+    createDefaultBasicInformationClusterServer(deviceName, serialNumber, vendorId = 0xfff1, vendorName = 'Matterbridge', productId = 0x8000, productName = 'Matterbridge device', softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0') {
         this.log.logName = deviceName;
         this.deviceName = deviceName;
         this.serialNumber = serialNumber;
@@ -455,7 +466,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         this.softwareVersionString = softwareVersionString;
         this.hardwareVersion = hardwareVersion;
         this.hardwareVersionString = hardwareVersionString;
-        if (MatterbridgeEndpoint.bridgeMode === 'bridge') {
+        if (MatterbridgeEndpoint.bridgeMode === 'bridge' && this.mode === undefined) {
             const options = this.getClusterServerOptions(Descriptor.Cluster.id);
             if (options) {
                 const deviceTypeList = options.deviceTypeList;
@@ -465,7 +476,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         }
         return this;
     }
-    createDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId, vendorName, productName, softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0') {
+    createDefaultBridgedDeviceBasicInformationClusterServer(deviceName, serialNumber, vendorId = 0xfff1, vendorName = 'Matterbridge', productName = 'Matterbridge device', softwareVersion = 1, softwareVersionString = '1.0.0', hardwareVersion = 1, hardwareVersionString = '1.0.0') {
         this.log.logName = deviceName;
         this.deviceName = deviceName;
         this.serialNumber = serialNumber;

package/dist/pluginManager.js

@@ -297,13 +297,14 @@ export class PluginManager extends EventEmitter {
     }
     async enable(nameOrPath) {
         const { promises } = await import('node:fs');
-        if (!nameOrPath || nameOrPath === '')
+        if (!nameOrPath)
             return null;
         if (this._plugins.has(nameOrPath)) {
             const plugin = this._plugins.get(nameOrPath);
             plugin.enabled = true;
             this.log.info(`Enabled plugin ${plg}${plugin.name}${nf}`);
             await this.saveToStorage();
+            this.emit('enabled', plugin.name);
             return plugin;
         }
         const packageJsonPath = await this.resolve(nameOrPath);
@@ -331,13 +332,14 @@ export class PluginManager extends EventEmitter {
     }
     async disable(nameOrPath) {
         const { promises } = await import('node:fs');
-        if (!nameOrPath || nameOrPath === '')
+        if (!nameOrPath)
             return null;
         if (this._plugins.has(nameOrPath)) {
             const plugin = this._plugins.get(nameOrPath);
             plugin.enabled = false;
             this.log.info(`Disabled plugin ${plg}${plugin.name}${nf}`);
             await this.saveToStorage();
+            this.emit('disabled', plugin.name);
             return plugin;
         }
         const packageJsonPath = await this.resolve(nameOrPath);
@@ -365,13 +367,14 @@ export class PluginManager extends EventEmitter {
     }
     async remove(nameOrPath) {
         const { promises } = await import('node:fs');
-        if (!nameOrPath || nameOrPath === '')
+        if (!nameOrPath)
             return null;
         if (this._plugins.has(nameOrPath)) {
             const plugin = this._plugins.get(nameOrPath);
             this._plugins.delete(nameOrPath);
             this.log.info(`Removed plugin ${plg}${plugin.name}${nf}`);
             await this.saveToStorage();
+            this.emit('removed', plugin.name);
             return plugin;
         }
         const packageJsonPath = await this.resolve(nameOrPath);
@@ -399,7 +402,7 @@ export class PluginManager extends EventEmitter {
     }
     async add(nameOrPath) {
         const { promises } = await import('node:fs');
-        if (!nameOrPath || nameOrPath === '')
+        if (!nameOrPath)
             return null;
         const packageJsonPath = await this.resolve(nameOrPath);
         if (!packageJsonPath) {
@@ -456,6 +459,7 @@ export class PluginManager extends EventEmitter {
                         if (versionLine) {
                             const version = versionLine.split('@')[1].trim();
                             this.log.info(`Installed plugin ${plg}${name}@${version}${nf}`);
+                            this.emit('installed', name, version);
                             resolve(version);
                         }
                         else {
@@ -479,6 +483,7 @@ export class PluginManager extends EventEmitter {
                 else {
                     this.log.info(`Uninstalled plugin ${plg}${name}${nf}`);
                     this.log.debug(`Uninstalled plugin ${plg}${name}${db}: ${stdout}`);
+                    this.emit('uninstalled', name);
                     resolve(name);
                 }
             });

package/npm-shrinkwrap.json

@@ -1,15 +1,15 @@
 {
   "name": "matterbridge",
-  "version": "3.0.8-dev-20250626-1445fbd",
+  "version": "3.1.0-dev-20250627-2b5adba",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.0.8-dev-20250626-1445fbd",
+      "version": "3.1.0-dev-20250627-2b5adba",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/main": "0.15.0-alpha.0-20250625-c7634df96",
+        "@matter/main": "0.15.0",
         "archiver": "7.0.1",
         "express": "5.1.0",
         "glob": "11.0.3",
@@ -68,86 +68,86 @@
       }
     },
     "node_modules/@matter/general": {
-      "version": "0.15.0-alpha.0-20250625-c7634df96",
-      "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.15.0-alpha.0-20250625-c7634df96.tgz",
-      "integrity": "sha512-SGs0jerp66b6o8pINI6fpSiPX/S1QlAO8Rr/Rz6usJO3JbS31vnWE5HoDIMMf4EPyyjH+dh5+heASuEBW/K5Hg==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.15.0.tgz",
+      "integrity": "sha512-rZC045EkAiWBWt3nUhvjhW6Tx4L/8RLsZMtdo9VEqPytwYIP9JMuLZt01x4+szM0dRx72k1g0e8zaU8CqobGJQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@noble/curves": "^1.9.2"
       }
     },
     "node_modules/@matter/main": {
-      "version": "0.15.0-alpha.0-20250625-c7634df96",
-      "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.15.0-alpha.0-20250625-c7634df96.tgz",
-      "integrity": "sha512-9x3HeF2MPR31jZVHpzvTN4BcFynFUvuy1lWfwZgMha+BWEQPAQp3DS77pvuIpPMFyWe8kaKtjWTvSsGOHt+vig==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.15.0.tgz",
+      "integrity": "sha512-+mtEs4FRaonPMae38BLIaG6lYbszPfYj2gROAhIHYUuRb/Qf/dk05ZANcCyHuY0+ewi9L51q/nhReSHBQpt3vw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/model": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/node": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/protocol": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/types": "0.15.0-alpha.0-20250625-c7634df96"
+        "@matter/general": "0.15.0",
+        "@matter/model": "0.15.0",
+        "@matter/node": "0.15.0",
+        "@matter/protocol": "0.15.0",
+        "@matter/types": "0.15.0"
       },
       "optionalDependencies": {
-        "@matter/nodejs": "0.15.0-alpha.0-20250625-c7634df96"
+        "@matter/nodejs": "0.15.0"
       }
     },
     "node_modules/@matter/model": {
-      "version": "0.15.0-alpha.0-20250625-c7634df96",
-      "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.15.0-alpha.0-20250625-c7634df96.tgz",
-      "integrity": "sha512-QF+R227USkpJhLzt0R/YxiZm34ag3DhfxDfqcxD9Fghf+vIjGjHfXzNeE8It1tbkgmVVRMdqrxFpw2N5EQ63Nw==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.15.0.tgz",
+      "integrity": "sha512-H0gxGN6b0bdV9UmozbC36BLeo949DcV1F84xRvRZvwaOzNEAruP4SSG9Ku0ZWU7cNlRX9+pinmWUAxm8CLomaw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.15.0-alpha.0-20250625-c7634df96"
+        "@matter/general": "0.15.0"
       }
     },
     "node_modules/@matter/node": {
-      "version": "0.15.0-alpha.0-20250625-c7634df96",
-      "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.15.0-alpha.0-20250625-c7634df96.tgz",
-      "integrity": "sha512-CvpjmpcjSOQOKk5YDg4X4WC4+1mkDDBAbI70vI01wJpV2Y8AByPEtLjLdpTEFcXT/AOSj29ga4sMcGR8cm2V3g==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.15.0.tgz",
+      "integrity": "sha512-v15+L1grC+ahHalk28Gf9cKoztxmjHdhkWEkXmYi51YE+XJJYZCC/Ib7QDBHJkk+znf1O6jq19SXoQ2Kylxwug==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/model": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/protocol": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/types": "0.15.0-alpha.0-20250625-c7634df96"
+        "@matter/general": "0.15.0",
+        "@matter/model": "0.15.0",
+        "@matter/protocol": "0.15.0",
+        "@matter/types": "0.15.0"
       }
     },
     "node_modules/@matter/nodejs": {
-      "version": "0.15.0-alpha.0-20250625-c7634df96",
-      "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.15.0-alpha.0-20250625-c7634df96.tgz",
-      "integrity": "sha512-HZJUh5T04E3zfGw3ZjjkNyMOrXQk5qKZoMS8LI2pwUjHBd1vU2hS28EAXqufELcQ9pvdzUisYbSLWPb2N8B+CA==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.15.0.tgz",
+      "integrity": "sha512-CaFEEtNWzUpOzjdoxYu4oiN4GJMEjoZlGv19TAwaSvT7SLjm2B1ojcHBhvD+uUrF1SkGn2zql5mwO+qfYHCJHA==",
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "@matter/general": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/node": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/protocol": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/types": "0.15.0-alpha.0-20250625-c7634df96"
+        "@matter/general": "0.15.0",
+        "@matter/node": "0.15.0",
+        "@matter/protocol": "0.15.0",
+        "@matter/types": "0.15.0"
       },
       "engines": {
         "node": ">=18.0.0"
       }
     },
     "node_modules/@matter/protocol": {
-      "version": "0.15.0-alpha.0-20250625-c7634df96",
-      "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.15.0-alpha.0-20250625-c7634df96.tgz",
-      "integrity": "sha512-YRnbd+nYjp9S3Rjm1V+KnmKoxg8KzZ3nO0tH1weLbn397FldHTDhywyYOielIfQoZshfYxsplBG4xIiE1C8mew==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.15.0.tgz",
+      "integrity": "sha512-TcR3Y+iPDz1N0dcSIQ1qO7uiIbiCwNpcoMSl5Ly8Q9aoyJfYQtIKWMMq6cCrAB9oeMHwLK0SopvSPAbCvWiPkQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/model": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/types": "0.15.0-alpha.0-20250625-c7634df96"
+        "@matter/general": "0.15.0",
+        "@matter/model": "0.15.0",
+        "@matter/types": "0.15.0"
       }
     },
     "node_modules/@matter/types": {
-      "version": "0.15.0-alpha.0-20250625-c7634df96",
-      "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.15.0-alpha.0-20250625-c7634df96.tgz",
-      "integrity": "sha512-PXsCCEit+F++aQR63T0Ya+hA5rrjncYjJyi1dNU7TXm8LDsHd0/wbzXSAmgJoaRY9mbMpFg9idi/6JxKGR+7dw==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.15.0.tgz",
+      "integrity": "sha512-gLh0AGTUs7XZituhPSfpTc8WbC8lRyJqs5jMaLBZZj+4ptuvI9Y29d9ivitElkwBObG3SJYIgWgSPTmnHuz0IQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.15.0-alpha.0-20250625-c7634df96",
-        "@matter/model": "0.15.0-alpha.0-20250625-c7634df96"
+        "@matter/general": "0.15.0",
+        "@matter/model": "0.15.0"
       }
     },
     "node_modules/@noble/curves": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.0.8-dev-20250626-1445fbd",
+  "version": "3.1.0-dev-20250627-2b5adba",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",
@@ -98,7 +98,7 @@
     }
   },
   "dependencies": {
-    "@matter/main": "0.15.0-alpha.0-20250625-c7634df96",
+    "@matter/main": "0.15.0",
     "archiver": "7.0.1",
     "express": "5.1.0",
     "glob": "11.0.3",

package/vitest/matterbridge.test.ts

@@ -0,0 +1,216 @@
+import { vi, describe, it, expect, beforeEach, afterEach, MockInstance } from 'vitest';
+import { Matterbridge } from '../src/matterbridge.ts';
+import { AnsiLogger, LogLevel, TimestampFormat } from 'node-ansi-logger';
+import path from 'node:path';
+import spawn from '../src/utils/spawn.ts';
+
+const NAME = 'ViMatterbridgeGlobal';
+const HOMEDIR = path.join('jest', NAME);
+
+process.argv = ['node', 'matterbridge.test.js', '-novirtual', '-frontend', '0', '-homedir', HOMEDIR, '-logger', 'debug', '-matterlogger', 'debug'];
+
+// Partial mock for @matter/main, preserving all actual exports except Logger
+vi.mock('@matter/main', async (importOriginal) => {
+  const actual = await importOriginal();
+  return {
+    ...(actual as Record<string, unknown>),
+    Logger: {
+      log: vi.fn(),
+      info: vi.fn(),
+      debug: vi.fn(),
+      warn: vi.fn(),
+      error: vi.fn(),
+      fatal: vi.fn(),
+      addLogger: vi.fn(),
+      setLogger: vi.fn(),
+      removeLogger: vi.fn(),
+      toJSON: vi.fn(() => ''),
+    },
+  };
+});
+
+let loggerLogSpy: MockInstance<typeof AnsiLogger.prototype.log>;
+let consoleLogSpy: MockInstance<typeof console.log>;
+let consoleDebugSpy: MockInstance<typeof console.debug>;
+let consoleInfoSpy: MockInstance<typeof console.info>;
+let consoleWarnSpy: MockInstance<typeof console.warn>;
+let consoleErrorSpy: MockInstance<typeof console.error>;
+const debug = false; // Set to true to enable debug logging
+
+if (!debug) {
+  loggerLogSpy = vi.spyOn(AnsiLogger.prototype, 'log').mockImplementation((level: string, message: string, ...parameters: any[]) => {});
+  consoleLogSpy = vi.spyOn(console, 'log').mockImplementation((...args: any[]) => {});
+  consoleDebugSpy = vi.spyOn(console, 'debug').mockImplementation((...args: any[]) => {});
+  consoleInfoSpy = vi.spyOn(console, 'info').mockImplementation((...args: any[]) => {});
+  consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation((...args: any[]) => {});
+  consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation((...args: any[]) => {});
+} else {
+  loggerLogSpy = vi.spyOn(AnsiLogger.prototype, 'log');
+  consoleLogSpy = vi.spyOn(console, 'log');
+  consoleDebugSpy = vi.spyOn(console, 'debug');
+  consoleInfoSpy = vi.spyOn(console, 'info');
+  consoleWarnSpy = vi.spyOn(console, 'warn');
+  consoleErrorSpy = vi.spyOn(console, 'error');
+}
+
+describe('Matterbridge', () => {
+  let matterbridge: Matterbridge;
+
+  beforeEach(async () => {
+    matterbridge = await Matterbridge.loadInstance(false);
+    // Set up required properties/mocks
+    matterbridge.log = { debug: vi.fn(), info: vi.fn(), notice: vi.fn(), warn: vi.fn(), error: vi.fn(), fatal: vi.fn(), now: vi.fn() } as any;
+    // matterbridge.log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: TimestampFormat.TIME_MILLIS, logLevel: LogLevel.DEBUG });
+    matterbridge.plugins = { array: () => [], clear: vi.fn(), [Symbol.iterator]: function* () {} } as any;
+    matterbridge.devices = { array: () => [], clear: vi.fn(), [Symbol.iterator]: function* () {} } as any;
+    matterbridge.frontend = {
+      start: vi.fn(),
+      stop: vi.fn(),
+      wssSendRefreshRequired: vi.fn(),
+      wssSendRestartRequired: vi.fn(),
+      wssSendSnackbarMessage: vi.fn(),
+      wssSendMessage: vi.fn(),
+    } as any;
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should initialize system and matterbridge information', () => {
+    expect(matterbridge.systemInformation).toBeDefined();
+    expect(matterbridge.matterbridgeInformation).toBeDefined();
+  });
+
+  it('should emit initialize_completed after initialize', async () => {
+    const spy = vi.fn();
+    matterbridge.on('initialize_completed', spy);
+    await matterbridge.initialize();
+    expect(spy).toHaveBeenCalled();
+    expect((matterbridge as any)['initialized']).toBe(true);
+  });
+
+  it('should call parseCommandLine during initialize', async () => {
+    const spy = vi.spyOn(matterbridge as any, 'parseCommandLine').mockResolvedValue(undefined);
+    await matterbridge.initialize();
+    expect(spy).toHaveBeenCalled();
+  });
+
+  it('should log system info in logNodeAndSystemInfo', async () => {
+    await (matterbridge as any)['logNodeAndSystemInfo']();
+    expect(matterbridge.log.debug).toHaveBeenCalled();
+  });
+
+  it('should register and deregister process handlers', () => {
+    (matterbridge as any)['registerProcessHandlers']();
+    (matterbridge as any)['deregisterProcessHandlers']();
+    expect(matterbridge.log.error).not.toHaveBeenCalled();
+  });
+
+  it('should call cleanup and emit cleanup events', async () => {
+    (matterbridge as any)['initialized'] = true;
+    (matterbridge as any)['hasCleanupStarted'] = false;
+    const spyStart = vi.fn();
+    const spyComplete = vi.fn();
+    matterbridge.on('cleanup_started', spyStart);
+    matterbridge.on('cleanup_completed', spyComplete);
+    await (matterbridge as any)['cleanup']('test cleanup');
+    expect(spyStart).toHaveBeenCalled();
+    expect(spyComplete).toHaveBeenCalled();
+  });
+
+  it('should not run cleanup if already started', async () => {
+    (matterbridge as any)['initialized'] = true;
+    (matterbridge as any)['hasCleanupStarted'] = true;
+    const debugSpy = matterbridge.log.debug as any;
+    await (matterbridge as any)['cleanup']('test cleanup');
+    expect(debugSpy).toHaveBeenCalledWith('Cleanup already started...');
+  });
+
+  it('should get devices using getDevices()', () => {
+    const fakeDevices = [{ id: 1 }, { id: 2 }];
+    matterbridge.devices.array = vi.fn(() => fakeDevices) as any;
+    expect(matterbridge.getDevices()).toBe(fakeDevices);
+  });
+
+  it('should get plugins using getPlugins()', () => {
+    const fakePlugins = [{ name: 'p1' }, { name: 'p2' }];
+    matterbridge.plugins.array = vi.fn(() => fakePlugins) as any;
+    expect(matterbridge.getPlugins()).toBe(fakePlugins);
+  });
+
+  it('should set log level and propagate to dependencies', async () => {
+    const setLevel = vi.fn();
+    matterbridge.frontend.logLevel = LogLevel.NONE; // Set to NONE initially
+    matterbridge.devices.logLevel = LogLevel.NONE;
+    matterbridge.plugins.logLevel = LogLevel.NONE;
+    (global as any).MatterbridgeEndpoint = { logLevel: LogLevel.NONE };
+    matterbridge.log = { debug: vi.fn() } as any;
+    await matterbridge.setLogLevel(LogLevel.INFO);
+    expect(matterbridge.frontend.logLevel).toBe(LogLevel.INFO);
+    expect(matterbridge.devices.logLevel).toBe(LogLevel.INFO);
+    expect(matterbridge.plugins.logLevel).toBe(LogLevel.INFO);
+    expect(matterbridge.log.debug).toHaveBeenCalled();
+  });
+
+  it('should emit and listen to custom events', () => {
+    const handler = vi.fn();
+    matterbridge.on('online', handler);
+    matterbridge.emit('online', 'nodeid');
+    expect(handler).toHaveBeenCalledWith('nodeid');
+  });
+
+  it('should call destroyInstance and cleanup', async () => {
+    const cleanupSpy = vi.spyOn(matterbridge as any, 'cleanup').mockResolvedValue(undefined);
+    matterbridge.log.info = vi.fn();
+    await matterbridge.destroyInstance(10);
+    expect(cleanupSpy).toHaveBeenCalled();
+    expect(matterbridge.log.info).toHaveBeenCalledWith(expect.stringContaining('Destroy instance...'));
+  });
+
+  it('should call restartProcess and cleanup', async () => {
+    const cleanupSpy = vi.spyOn(matterbridge as any, 'cleanup').mockResolvedValue(undefined);
+    await matterbridge.restartProcess();
+    expect(cleanupSpy).toHaveBeenCalledWith('restarting...', true);
+  });
+
+  it('should call shutdownProcess and cleanup', async () => {
+    const cleanupSpy = vi.spyOn(matterbridge as any, 'cleanup').mockResolvedValue(undefined);
+    await matterbridge.shutdownProcess();
+    expect(cleanupSpy).toHaveBeenCalledWith('shutting down...', false);
+  });
+
+  it('should call updateProcess and cleanup', async () => {
+    const spawnSpy = vi.spyOn(spawn, 'spawnCommand').mockResolvedValueOnce(true);
+    const cleanupSpy = vi.spyOn(matterbridge as any, 'cleanup').mockResolvedValue(undefined);
+    matterbridge.log.info = vi.fn();
+    await matterbridge.updateProcess();
+    expect(spawnSpy).toHaveBeenCalledWith(matterbridge, 'npm', ['install', '-g', 'matterbridge', '--omit=dev', '--verbose']);
+    expect(cleanupSpy).toHaveBeenCalledWith('updating...', false);
+    expect(matterbridge.log.info).toHaveBeenCalledWith(expect.stringContaining('Updating matterbridge...'));
+    expect((matterbridge.frontend as any).wssSendRestartRequired).toHaveBeenCalled();
+  });
+
+  it('should call unregisterAndShutdownProcess and cleanup', async () => {
+    const cleanupSpy = vi.spyOn(matterbridge as any, 'cleanup').mockResolvedValue(undefined);
+    matterbridge.log.info = vi.fn();
+    matterbridge.plugins = [{ name: 'p1' }] as any;
+    matterbridge.removeAllBridgedEndpoints = vi.fn().mockResolvedValue(undefined);
+    matterbridge.devices.clear = vi.fn();
+    await matterbridge.unregisterAndShutdownProcess();
+    expect(cleanupSpy).toHaveBeenCalledWith('unregistered all devices and shutting down...', false);
+    expect(matterbridge.log.info).toHaveBeenCalledWith(expect.stringContaining('Unregistering all devices and shutting down...'));
+  });
+
+  it('should call shutdownProcessAndReset and cleanup', async () => {
+    const cleanupSpy = vi.spyOn(matterbridge as any, 'cleanup').mockResolvedValue(undefined);
+    await matterbridge.shutdownProcessAndReset();
+    expect(cleanupSpy).toHaveBeenCalledWith('shutting down with reset...', false);
+  });
+
+  it('should call shutdownProcessAndFactoryReset and cleanup', async () => {
+    const cleanupSpy = vi.spyOn(matterbridge as any, 'cleanup').mockResolvedValue(undefined);
+    await matterbridge.shutdownProcessAndFactoryReset();
+    expect(cleanupSpy).toHaveBeenCalledWith('shutting down with factory reset...', false);
+  });
+});