matterbridge 3.0.8-dev-20250626-50aa686 → 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
 
@@ -23,6 +23,8 @@ If you like this project and find it useful, please consider giving it a star on
 - [JSDoc]: Added missing JSDoc comments, including `@param` and `@returns` tags.
 - [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,8 +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-20250626-fc3a84ce9.
+- [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

@@ -34,6 +34,10 @@ Using a Dev Container provides a fully isolated, reproducible, and pre-configure
 
 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
@@ -247,7 +251,7 @@ It can be useful to call this method from onShutdown() if you don't want to keep
 
 ## MatterbridgeEndpoint api
 
-You create a device with a new instance of MatterbridgeEndpoint(definition: DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>, options: MatterbridgeEndpointOptions = {}, debug: boolean = false).
+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.

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') {
@@ -211,7 +205,10 @@ export class Matterbridge extends EventEmitter {
             }
         }
         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);

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-50aa686",
+  "version": "3.1.0-dev-20250627-2b5adba",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.0.8-dev-20250626-50aa686",
+      "version": "3.1.0-dev-20250627-2b5adba",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/main": "0.15.0-alpha.0-20250626-fc3a84ce9",
+        "@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-20250626-fc3a84ce9",
-      "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.15.0-alpha.0-20250626-fc3a84ce9.tgz",
-      "integrity": "sha512-fQwZ8NEEdZIiQXNZXHjmNP7X21OzQw424ukSGWlt+GB7CrfZlF4rsiroeKsRQBFO1L+zCE0LYYe+rlM89IqKKg==",
+      "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-20250626-fc3a84ce9",
-      "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.15.0-alpha.0-20250626-fc3a84ce9.tgz",
-      "integrity": "sha512-x9QYTk521l21/ihZTAWz+wE1flyQhYPY/fvM6YPDF6YTfJgd790FT9Ryqk5qVgrui9eVGF3X6i7DrdFkzpTLVw==",
+      "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-20250626-fc3a84ce9",
-        "@matter/model": "0.15.0-alpha.0-20250626-fc3a84ce9",
-        "@matter/node": "0.15.0-alpha.0-20250626-fc3a84ce9",
-        "@matter/protocol": "0.15.0-alpha.0-20250626-fc3a84ce9",
-        "@matter/types": "0.15.0-alpha.0-20250626-fc3a84ce9"
+        "@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-20250626-fc3a84ce9"
+        "@matter/nodejs": "0.15.0"
       }
     },
     "node_modules/@matter/model": {
-      "version": "0.15.0-alpha.0-20250626-fc3a84ce9",
-      "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.15.0-alpha.0-20250626-fc3a84ce9.tgz",
-      "integrity": "sha512-MsPhBLOMf+kpzYIHYPp8IO6lf6sbTijzcoCUAq5FLCycuKiqgSQap6mzQKKMMS81FIs/prM5E4dpQQz9aGF6kA==",
+      "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-20250626-fc3a84ce9"
+        "@matter/general": "0.15.0"
       }
     },
     "node_modules/@matter/node": {
-      "version": "0.15.0-alpha.0-20250626-fc3a84ce9",
-      "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.15.0-alpha.0-20250626-fc3a84ce9.tgz",
-      "integrity": "sha512-p0ehfBazBnALPKIplEJHibZ+HmszGDszcgq5bsXLlu9MyEfQ6Y3LZK9+hKEH8pavSaJUbMBfQRn5fEzzAMqn+w==",
+      "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-20250626-fc3a84ce9",
-        "@matter/model": "0.15.0-alpha.0-20250626-fc3a84ce9",
-        "@matter/protocol": "0.15.0-alpha.0-20250626-fc3a84ce9",
-        "@matter/types": "0.15.0-alpha.0-20250626-fc3a84ce9"
+        "@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-20250626-fc3a84ce9",
-      "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.15.0-alpha.0-20250626-fc3a84ce9.tgz",
-      "integrity": "sha512-zkCATPiq29m+QRHAeK7+RUS2F2cuVhSQVMqTQjtuQyEVMRAx+8aucJB/3AfOYqLX4DfOLUenxYpt9Mm59bQLYQ==",
+      "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-20250626-fc3a84ce9",
-        "@matter/node": "0.15.0-alpha.0-20250626-fc3a84ce9",
-        "@matter/protocol": "0.15.0-alpha.0-20250626-fc3a84ce9",
-        "@matter/types": "0.15.0-alpha.0-20250626-fc3a84ce9"
+        "@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-20250626-fc3a84ce9",
-      "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.15.0-alpha.0-20250626-fc3a84ce9.tgz",
-      "integrity": "sha512-82cY1+OXoQQZ7wcApdMipO1n8JBRvryI2+WY0Amy+dPRo7fzd1n0EB2bpoiQ+FZAllrFND31KcaFY5BOR63nvw==",
+      "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-20250626-fc3a84ce9",
-        "@matter/model": "0.15.0-alpha.0-20250626-fc3a84ce9",
-        "@matter/types": "0.15.0-alpha.0-20250626-fc3a84ce9"
+        "@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-20250626-fc3a84ce9",
-      "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.15.0-alpha.0-20250626-fc3a84ce9.tgz",
-      "integrity": "sha512-cxqOVzCxYk7lH9nuP15sJ2xfF9PfSDMFdv33/gmFTny6y85Yf2ZcTNrVfG5G7vNCL42Sj1edc8BLum8KYM3D8w==",
+      "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-20250626-fc3a84ce9",
-        "@matter/model": "0.15.0-alpha.0-20250626-fc3a84ce9"
+        "@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-50aa686",
+  "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-20250626-fc3a84ce9",
+    "@matter/main": "0.15.0",
     "archiver": "7.0.1",
     "express": "5.1.0",
     "glob": "11.0.3",

package/vitest/matterbridge.test.ts

@@ -1,6 +1,13 @@
 import { vi, describe, it, expect, beforeEach, afterEach, MockInstance } from 'vitest';
 import { Matterbridge } from '../src/matterbridge.ts';
-import { AnsiLogger } from 'node-ansi-logger';
+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) => {
@@ -28,7 +35,7 @@ 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 = true; // Set to true to enable debug logging
+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[]) => {});
@@ -52,7 +59,8 @@ describe('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() } as any;
+    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 = {
@@ -61,6 +69,7 @@ describe('Matterbridge', () => {
       wssSendRefreshRequired: vi.fn(),
       wssSendRestartRequired: vi.fn(),
       wssSendSnackbarMessage: vi.fn(),
+      wssSendMessage: vi.fn(),
     } as any;
   });
 
@@ -120,27 +129,27 @@ describe('Matterbridge', () => {
 
   it('should get devices using getDevices()', () => {
     const fakeDevices = [{ id: 1 }, { id: 2 }];
-    matterbridge.devices.array = vi.fn(() => fakeDevices);
+    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);
+    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 = undefined;
-    matterbridge.devices.logLevel = undefined;
-    matterbridge.plugins.logLevel = undefined;
-    (global as any).MatterbridgeEndpoint = { logLevel: undefined };
+    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(1); // 1 = INFO
-    expect(matterbridge.frontend.logLevel).toBe(1);
-    expect(matterbridge.devices.logLevel).toBe(1);
-    expect(matterbridge.plugins.logLevel).toBe(1);
+    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();
   });
 
@@ -154,7 +163,7 @@ describe('Matterbridge', () => {
   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();
+    await matterbridge.destroyInstance(10);
     expect(cleanupSpy).toHaveBeenCalled();
     expect(matterbridge.log.info).toHaveBeenCalledWith(expect.stringContaining('Destroy instance...'));
   });
@@ -172,10 +181,11 @@ describe('Matterbridge', () => {
   });
 
   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();
-    (matterbridge.frontend as any).wssSendRestartRequired = 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();
@@ -184,7 +194,7 @@ describe('Matterbridge', () => {
   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' }];
+    matterbridge.plugins = [{ name: 'p1' }] as any;
     matterbridge.removeAllBridgedEndpoints = vi.fn().mockResolvedValue(undefined);
     matterbridge.devices.clear = vi.fn();
     await matterbridge.unregisterAndShutdownProcess();
@@ -203,6 +213,4 @@ describe('Matterbridge', () => {
     await matterbridge.shutdownProcessAndFactoryReset();
     expect(cleanupSpy).toHaveBeenCalledWith('shutting down with factory reset...', false);
   });
-
-  // Add more tests for all public/protected methods to reach 100% coverage
 });