matterbridge 3.5.0-dev-20260117-88ddbe4 → 3.5.0-dev-20260119-f9ea00e

package/CHANGELOG.md

@@ -32,7 +32,10 @@ Advantages:
 
 ### Breaking Changes
 
-- [matter]: This release brings the upgrade to matter 1.4.2 and matter.js 0.16.x.
+- [matter]: This release brings the upgrade to matter 1.4.2 and matter.js 0.16.x. It may cause the controllers to see a new device.
+- [childbridge]: Fixed nodeLabel from deviceName in childbridge mode. It may cause the controllers to see a new device.
+- [modeserver]: Fixed nodeLabel from deviceName for server node devices. It may cause the controllers to see a new device.
+- [matterbridge]: On restart (typically on the Home Assistant addon), when the plugin is not found and is reinstalled, it is reinstalled from the latest dev if it was on the dev branch.
 
 ### Changed device types in Matter 1.4.2
 
@@ -59,9 +62,9 @@ Advantages:
 - [Thermostat]: Revision 9 - Removed AlarmMask attribute and AlarmCodeBitmap Type.
 - [Identify]: Revision 6 - Added Q quality for IdentifyTime attribute.
 - [WindowCovering]: Revision 6 - Marked AbsolutePosition feature and associated elements provisional.
-- [RvcCleanMode]: Revision 4 - Add VacuumThenMop cleaning mode.
-- [RvcOperationalState]: Revision 4 - Add several operational states and errors.
-- [ServiceArea]: Revision 2 - Rename InitialTimeEstimate to EstimatedTime.
+- [RvcCleanMode]: Revision 4 - Added VacuumThenMop cleaning mode.
+- [RvcOperationalState]: Revision 4 - Added several operational states and errors.
+- [ServiceArea]: Revision 2 - Renamed InitialTimeEstimate to EstimatedTime.
 
 ### Added
 
@@ -69,20 +72,23 @@ Advantages:
 - [frontend]: Enhanced logging for HTTP/HTTPS server binding in Frontend class.
 - [matterbridge]: Excluded specific network interfaces when looking for the first external interface.
 - [thermostat]: Conformance to new matter.js internal attributes externalMeasuredIndoorTemperature and externallyMeasuredOccupancy (not in Matter 1.4.2 specs).
-- [scenes]: Added SceneManagement when required.
+- [scenes]: Added SceneManagement cluster when required.
+- [server]: Added start and stop devices server mode in plugin restart.
+- [server]: Added start and stop devices server mode in plugin enable and disable.
 - [matter.js]: Bump to matter.j v. 0.16.0.
 - [matter.js]: Bump to matter.j v. 0.16.1.
 - [matter.js]: Bump to matter.j v. 0.16.2.
 - [matter.js]: Bump to matter.j v. 0.16.3.
 - [matter.js]: Bump to matter.j v. 0.16.4.
 - [matter.js]: Bump to matter.j v. 0.16.5.
+- [frontend]: Added the --bind parameter to bind the frontend to a specific address. Defaults to all addresses.
 
 ### Changed
 
 - [package]: Updated dependencies.
 - [eslint]: Moved cache in .cache/.eslintcache.
 - [prettier]: Moved cache in .cache/.prettiercache.
-- [DevContainer]: Refactor DevContainer to use bridge mode.
+- [DevContainer]: Refactor DevContainer to use bridge mode and matterbridge docker network.
 
 ### Fixed
 

package/README.md

@@ -165,13 +165,13 @@ From the frontend you can do all operations in an easy way.
 
 Home page
 
-![Home page](./screenshot/Screenshot%20home.jpg)
+![Home page](./screenshots/Screenshot%20home.jpg)
 
-[Devices page](./screenshot/Screenshot%20devices.jpg)
+[Devices page](./screenshots/Screenshot%20devices.jpg)
 
-[Logs page](./screenshot/Screenshot%20logs.jpg)
+[Logs page](./screenshots/Screenshot%20logs.jpg)
 
-[Config editor](./screenshot/Screenshot%20config%20editor.jpg)
+[Config editor](./screenshots/Screenshot%20config%20editor.jpg)
 
 ## Advanced configurations
 
@@ -216,7 +216,7 @@ The other Home Assistant Community Add-ons and plugins are not verified to work
 ### Shelly
 
 <a href="https://github.com/Luligu/matterbridge-shelly">
-  <img src="./screenshot/Shelly.svg" alt="Shelly plugin logo" width="100" />
+  <img src="./screenshots/Shelly.svg" alt="Shelly plugin logo" width="100" />
 </a>
 
 Matterbridge shelly plugin allows you to expose all Shelly Gen 1, Gen 2, Gen 3 and Gen 4 and BLU devices to Matter.
@@ -245,7 +245,7 @@ Features:
 ### Zigbee2MQTT
 
 <a href="https://github.com/Luligu/matterbridge-zigbee2mqtt">
-  <img src="./screenshot/Zigbee2MQTT.svg" alt="Zigbee2MQTT plugin logo" width="100" />
+  <img src="./screenshots/Zigbee2MQTT.svg" alt="Zigbee2MQTT plugin logo" width="100" />
 </a>
 
 Matterbridge zigbee2mqtt is a matterbridge production-level plugin that expose all zigbee2mqtt devices and groups to Matter.
@@ -255,7 +255,7 @@ No hub or dedicated hardware needed.
 ### Somfy tahoma
 
 <a href="https://github.com/Luligu/matterbridge-somfy-tahoma">
-  <img src="./screenshot/Somfy.svg" alt="Somfy plugin logo" width="100" />
+  <img src="./screenshots/Somfy.svg" alt="Somfy plugin logo" width="100" />
 </a>
 
 Matterbridge Somfy Tahoma is a matterbridge production-level plugin that expose the Somfy Tahoma screen devices to Matter.
@@ -263,7 +263,7 @@ Matterbridge Somfy Tahoma is a matterbridge production-level plugin that expose
 ### Home Assistant
 
 <a href="https://github.com/Luligu/matterbridge-hass">
-  <img src="./screenshot/HomeAssistant.svg" alt="Hass logo" width="100" />
+  <img src="./screenshots/HomeAssistant.svg" alt="Hass logo" width="100" />
 </a>
 
 Matterbridge Home Assistant plugin allows you to expose the Home Assistant devices and entities to Matter.
@@ -445,7 +445,7 @@ Place your own certificates in the `.matterbridge/cert` directory:
 - `key.pem`
 - `ca.pem` (optional)
 
-![image](./screenshot/Screenshot%20Certificates.png)
+![image](./screenshots/Screenshot%20Certificates.png)
 
 Matterbridge looks first for .p12 certificate and if it is not found it looks for cert.pem and key.pem.
 
@@ -480,7 +480,7 @@ matterbridge --ssl --mtls --frontend 443
 
 If the certificate are correctly configured, you will be able to connect with https to the frontend.
 
-![image](./screenshot/Screenshot%20Browser%20Secured.png)
+![image](./screenshots/Screenshot%20Browser%20Secured.png)
 
 ## How to send the debug log files
 
@@ -488,9 +488,9 @@ If the certificate are correctly configured, you will be able to connect with ht
 
 In the frontend, go to settings and enable debug mode as shown below:
 
-![Debug Matterbridge Settings](./screenshot/Screenshot%20Matterbridge%20Logger%20Debug.png)
+![Debug Matterbridge Settings](./screenshots/Screenshot%20Matterbridge%20Logger%20Debug.png)
 
-![Debug Matter Settings](./screenshot/Screenshot%20Matter%20Logger%20Debug.png)
+![Debug Matter Settings](./screenshots/Screenshot%20Matter%20Logger%20Debug.png)
 
 ### Restart
 
@@ -498,7 +498,7 @@ Wait a few minutes to allow the logs to to accumulate.
 
 Then, from the dots menu in the frontend, download the `matterbridge.log` and `matter.log` files.
 
-![image](./screenshot/Screenshot%20Debug%20Download%20Logs.png)
+![image](./screenshots/Screenshot%20Debug%20Download%20Logs.png)
 
 Don't forget to unselect the debug mode when is no more needed. The network traffic and cpu usage is very high in debug mode.
 
@@ -510,7 +510,7 @@ There are two ways to pair a second controller:
 
 - from Matterbridge frontend click `Turn on pairing mode` in the `Paired fabrics` panel and proceed like for the first controller.
 
-![alt text](./screenshot/Turn%20on%20pairing%20mode.png)
+![alt text](./screenshots/Turn%20on%20pairing%20mode.png)
 
 Be patient cause the procedure can fail sometimes.
 

package/dist/cli.js

@@ -145,6 +145,7 @@ function help() {
       --ipv4address [address]: set the ipv4 interface address to use for the matter server listener (default all addresses)
       --ipv6address [address]: set the ipv6 interface address to use for the matter server listener (default all addresses)
       --frontend [port]:       start the frontend on the given port (default 8283)
+      --bind [address]:        bind the frontend to the given address (default all addresses)
       --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)

package/dist/frontend.js

@@ -13,7 +13,7 @@ import { PowerSource } from '@matter/types/clusters/power-source';
 import { MATTER_LOGGER_FILE, MATTER_STORAGE_NAME, MATTERBRIDGE_DIAGNOSTIC_FILE, MATTERBRIDGE_HISTORY_FILE, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg } from './matterbridgeTypes.js';
 import { isValidArray, isValidNumber, isValidObject, isValidString, isValidBoolean } from './utils/isValid.js';
 import { createZip } from './utils/createZip.js';
-import { hasParameter } from './utils/commandLine.js';
+import { hasParameter, getParameter } from './utils/commandLine.js';
 import { withTimeout, wait } from './utils/wait.js';
 import { inspectError } from './utils/error.js';
 import { formatBytes, formatUptime, formatPercent } from './utils/format.js';
@@ -205,14 +205,14 @@ export class Frontend extends EventEmitter {
                 });
             }
             else {
-                this.httpServer.listen(this.port, () => {
+                this.httpServer.listen(this.port, getParameter('bind'), () => {
                     const addr = this.httpServer?.address();
                     if (addr && typeof addr !== 'string') {
                         this.log.info(`The frontend http server is bound to ${addr.family} ${addr.address}:${addr.port}`);
                     }
-                    if (this.matterbridge.systemInformation.ipv4Address !== '')
+                    if (this.matterbridge.systemInformation.ipv4Address !== '' && !getParameter('bind'))
                         this.log.info(`The frontend http server is listening on ${UNDERLINE}http://${this.matterbridge.systemInformation.ipv4Address}:${this.port}${UNDERLINEOFF}${rs}`);
-                    if (this.matterbridge.systemInformation.ipv6Address !== '')
+                    if (this.matterbridge.systemInformation.ipv6Address !== '' && !getParameter('bind'))
                         this.log.info(`The frontend http server is listening on ${UNDERLINE}http://[${this.matterbridge.systemInformation.ipv6Address}]:${this.port}${UNDERLINEOFF}${rs}`);
                     this.listening = true;
                     this.emit('server_listening', 'http', this.port);
@@ -341,14 +341,14 @@ export class Frontend extends EventEmitter {
                 });
             }
             else {
-                this.httpsServer.listen(this.port, () => {
+                this.httpsServer.listen(this.port, getParameter('bind'), () => {
                     const addr = this.httpsServer?.address();
                     if (addr && typeof addr !== 'string') {
                         this.log.info(`The frontend https server is bound to ${addr.family} ${addr.address}:${addr.port}`);
                     }
-                    if (this.matterbridge.systemInformation.ipv4Address !== '')
+                    if (this.matterbridge.systemInformation.ipv4Address !== '' && !getParameter('bind'))
                         this.log.info(`The frontend https server is listening on ${UNDERLINE}https://${this.matterbridge.systemInformation.ipv4Address}:${this.port}${UNDERLINEOFF}${rs}`);
-                    if (this.matterbridge.systemInformation.ipv6Address !== '')
+                    if (this.matterbridge.systemInformation.ipv6Address !== '' && !getParameter('bind'))
                         this.log.info(`The frontend https server is listening on ${UNDERLINE}https://[${this.matterbridge.systemInformation.ipv6Address}]:${this.port}${UNDERLINEOFF}${rs}`);
                     this.listening = true;
                     this.emit('server_listening', 'https', this.port);
@@ -1286,28 +1286,27 @@ export class Frontend extends EventEmitter {
                     return;
                 }
                 const plugin = this.matterbridge.plugins.get(data.params.pluginName);
-                if (plugin && !plugin.enabled) {
-                    plugin.locked = undefined;
-                    plugin.error = undefined;
-                    plugin.loaded = undefined;
-                    plugin.started = undefined;
-                    plugin.configured = undefined;
-                    plugin.platform = undefined;
-                    plugin.registeredDevices = undefined;
-                    plugin.matter = undefined;
-                    await this.matterbridge.plugins.enable(data.params.pluginName);
-                    this.wssSendSnackbarMessage(`Enabled plugin ${data.params.pluginName}`, 5, 'success');
-                    this.matterbridge.plugins
-                        .load(plugin, true, 'The plugin has been enabled', true)
-                        .then(() => {
-                        this.wssSendRefreshRequired('plugins');
-                        this.wssSendRefreshRequired('devices');
-                        this.wssSendSnackbarMessage(`Started plugin ${localData.params.pluginName}`, 5, 'success');
-                        return;
-                    })
-                        .catch((_error) => { });
-                }
-                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
+                plugin.locked = undefined;
+                plugin.error = undefined;
+                plugin.loaded = undefined;
+                plugin.started = undefined;
+                plugin.configured = undefined;
+                plugin.platform = undefined;
+                plugin.registeredDevices = undefined;
+                plugin.matter = undefined;
+                await this.matterbridge.plugins.enable(data.params.pluginName);
+                this.wssSendSnackbarMessage(`Enabled plugin ${data.params.pluginName}`, 5, 'success');
+                setImmediate(async () => {
+                    await this.matterbridge.plugins.load(plugin, true, 'The plugin has been enabled', true);
+                    if (plugin.serverNode)
+                        await this.matterbridge.startServerNode(plugin.serverNode);
+                    for (const device of this.matterbridge.devices.array().filter((d) => d.plugin === plugin.name && d.serverNode))
+                        await this.matterbridge.startServerNode(device.serverNode);
+                    this.wssSendSnackbarMessage(`Started plugin ${localData.params.pluginName}`, 5, 'success');
+                    this.wssSendRefreshRequired('plugins');
+                    this.wssSendRefreshRequired('devices');
+                    sendResponse({ id: localData.id, method: localData.method, src: 'Matterbridge', dst: localData.src, success: true });
+                });
             }
             else if (data.method === '/api/disableplugin') {
                 if (!isValidString(data.params.pluginName, 10) || !this.matterbridge.plugins.has(data.params.pluginName)) {
@@ -1315,6 +1314,13 @@ export class Frontend extends EventEmitter {
                     return;
                 }
                 const plugin = this.matterbridge.plugins.get(data.params.pluginName);
+                for (const device of this.matterbridge.devices.array().filter((d) => d.plugin === plugin.name && d.serverNode)) {
+                    await this.matterbridge.stopServerNode(device.serverNode);
+                    device.serverNode = undefined;
+                }
+                if (plugin.serverNode)
+                    await this.matterbridge.stopServerNode(plugin.serverNode);
+                plugin.serverNode = undefined;
                 await this.matterbridge.plugins.shutdown(plugin, 'The plugin has been disabled.', true);
                 await this.matterbridge.plugins.disable(data.params.pluginName);
                 this.wssSendSnackbarMessage(`Disabled plugin ${data.params.pluginName}`, 5, 'success');
@@ -1327,17 +1333,19 @@ export class Frontend extends EventEmitter {
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter pluginName in /api/restartplugin' });
                     return;
                 }
+                this.wssSendSnackbarMessage(`Restarting plugin ${data.params.pluginName}`, 5, 'info');
                 const plugin = this.matterbridge.plugins.get(data.params.pluginName);
                 await this.matterbridge.plugins.shutdown(plugin, 'The plugin is restarting.', false, true);
                 if (plugin.serverNode) {
                     await this.matterbridge.stopServerNode(plugin.serverNode);
                     plugin.serverNode = undefined;
                 }
-                for (const device of this.matterbridge.devices) {
-                    if (device.plugin === plugin.name) {
-                        this.log.debug(`Removing device ${device.deviceName} from plugin ${plugin.name}`);
-                        this.matterbridge.devices.remove(device);
-                    }
+                for (const device of this.matterbridge.devices.array().filter((d) => d.plugin === plugin.name)) {
+                    if (device.serverNode)
+                        await this.matterbridge.stopServerNode(device.serverNode);
+                    device.serverNode = undefined;
+                    this.log.debug(`Removing device ${device.deviceName} from plugin ${plugin.name}`);
+                    this.matterbridge.devices.remove(device);
                 }
                 if (plugin.type === 'DynamicPlatform' && !plugin.locked)
                     await this.matterbridge.createDynamicPlugin(plugin);
@@ -1348,11 +1356,12 @@ export class Frontend extends EventEmitter {
                     if (plugin.restartRequired)
                         needRestart++;
                 }
-                if (needRestart === 0) {
+                if (needRestart === 0)
                     this.wssSendRestartNotRequired(true);
-                }
                 if (plugin.serverNode)
                     await this.matterbridge.startServerNode(plugin.serverNode);
+                for (const device of this.matterbridge.devices.array().filter((d) => d.plugin === plugin.name && d.serverNode))
+                    await this.matterbridge.startServerNode(device.serverNode);
                 this.wssSendSnackbarMessage(`Restarted plugin ${data.params.pluginName}`, 5, 'success');
                 this.wssSendRefreshRequired('plugins');
                 this.wssSendRefreshRequired('devices');

package/dist/matterNode.js

@@ -685,7 +685,9 @@ export class MatterNode extends EventEmitter {
         const plugin = this.pluginManager.get(pluginName);
         if (!plugin)
             throw new Error(`Error removing bridged endpoint ${plg}${pluginName}${er}:${dev}${device.deviceName}${er} (${zb}${device.name}${er}): plugin not found`);
-        if (this.matterbridge.bridgeMode === 'bridge') {
+        if (device.serverNode) {
+        }
+        else if (this.matterbridge.bridgeMode === 'bridge') {
             if (!this.aggregatorNode)
                 throw new Error(`Error removing bridged endpoint ${plg}${pluginName}${er}:${dev}${device.deviceName}${er} (${zb}${device.name}${er}): aggregator node not found`);
             await device.delete();

package/dist/matterbridge.js

@@ -2,7 +2,7 @@ if (process.argv.includes('--loader') || process.argv.includes('-loader'))
     console.log('\u001B[32mMatterbridge loaded.\u001B[40;0m');
 import os from 'node:os';
 import path from 'node:path';
-import fs from 'node:fs';
+import fs, { unlinkSync } from 'node:fs';
 import EventEmitter from 'node:events';
 import { inspect } from 'node:util';
 import { AnsiLogger, UNDERLINE, UNDERLINEOFF, db, debugStringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, CYAN, nt, BLUE, or } from 'node-ansi-logger';
@@ -475,7 +475,7 @@ export class Matterbridge extends EventEmitter {
             if (!fs.existsSync(plugin.path) && !hasParameter('add') && !hasParameter('remove') && !hasParameter('enable') && !hasParameter('disable') && !hasParameter('reset') && !hasParameter('factoryreset')) {
                 this.log.info(`Error parsing plugin ${plg}${plugin.name}${nf}. Trying to reinstall it from npm...`);
                 const { spawnCommand } = await import('./utils/spawn.js');
-                if (await spawnCommand('npm', ['install', '-g', plugin.name, '--omit=dev', '--verbose'], 'install', plugin.name)) {
+                if (await spawnCommand('npm', ['install', '-g', `${plugin.name}${plugin.version.includes('-dev-') ? '@dev' : ''}`, '--omit=dev', '--verbose'], 'install', plugin.name)) {
                     this.log.info(`Plugin ${plg}${plugin.name}${nf} reinstalled.`);
                     plugin.error = false;
                 }
@@ -525,11 +525,11 @@ export class Matterbridge extends EventEmitter {
             let index = 0;
             for (const plugin of this.plugins) {
                 if (index !== this.plugins.length - 1) {
-                    this.log.info(`├─┬─ plugin ${plg}${plugin.name}${nf}: "${plg}${BRIGHT}${plugin.description}${RESET}${nf}" type: ${typ}${plugin.type}${nf} ${plugin.enabled ? GREEN : RED}enabled${nf}`);
+                    this.log.info(`├─┬─ plugin ${plg}${plugin.name}${nf}: "${plg}${BRIGHT}${plugin.description}${RESET}${nf}" type: ${typ}${plugin.type}${nf} version: ${plg}${plugin.version}${nf} ${plugin.enabled ? GREEN : RED}enabled${nf}`);
                     this.log.info(`│ └─ entry ${UNDERLINE}${db}${plugin.path}${UNDERLINEOFF}${db}`);
                 }
                 else {
-                    this.log.info(`└─┬─ plugin ${plg}${plugin.name}${nf}: "${plg}${BRIGHT}${plugin.description}${RESET}${nf}" type: ${typ}${plugin.type}${nf} ${plugin.enabled ? GREEN : RED}disabled${nf}`);
+                    this.log.info(`└─┬─ plugin ${plg}${plugin.name}${nf}: "${plg}${BRIGHT}${plugin.description}${RESET}${nf}" type: ${typ}${plugin.type}${nf} version: ${plg}${plugin.version}${nf} ${plugin.enabled ? GREEN : RED}disabled${nf}`);
                     this.log.info(`  └─ entry ${UNDERLINE}${db}${plugin.path}${UNDERLINEOFF}${db}`);
                 }
                 index++;
@@ -1053,6 +1053,30 @@ export class Matterbridge extends EventEmitter {
                 this.log.info('Matter storage reset done!');
             }
             await this.stopMatterStorage();
+            function unlinkSafe(path, log) {
+                try {
+                    log.debug(`Removing ${path}...`);
+                    unlinkSync(path);
+                    log.debug(`Removed ${path}`);
+                }
+                catch {
+                }
+            }
+            this.log.debug(`Cleaning matter storage context for ${GREEN}Matterbridge${db}...`);
+            unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, 'Matterbridge', 'sessions.resumptionRecords'), this.log);
+            unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, 'Matterbridge', 'root.subscriptions.subscriptions'), this.log);
+            for (const plugin of this.plugins.array()) {
+                this.log.debug(`Cleaning matter storage context for plugin ${plg}${plugin.name}${db}...`);
+                unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, plugin.name, 'sessions.resumptionRecords'), this.log);
+                unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, plugin.name, 'root.subscriptions.subscriptions'), this.log);
+            }
+            for (const device of this.devices.array().filter((d) => d.mode === 'server')) {
+                if (!device.deviceName)
+                    continue;
+                this.log.debug(`Cleaning matter storage context for server node device ${dev}${device.deviceName}${db}...`);
+                unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, device.deviceName.replace(/[ .]/g, ''), 'sessions.resumptionRecords'), this.log);
+                unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, device.deviceName.replace(/[ .]/g, ''), 'root.subscriptions.subscriptions'), this.log);
+            }
             await this.frontend.stop();
             this.frontend.destroy();
             this.plugins.destroy();
@@ -1380,8 +1404,8 @@ export class Matterbridge extends EventEmitter {
         await storageContext.set('vendorName', vendorName.slice(0, 32));
         await storageContext.set('productId', productId);
         await storageContext.set('productName', productName.slice(0, 32));
-        await storageContext.set('nodeLabel', productName.slice(0, 32));
         await storageContext.set('productLabel', productName.slice(0, 32));
+        await storageContext.set('nodeLabel', deviceName.slice(0, 32));
         await storageContext.set('serialNumber', await storageContext.get('serialNumber', serialNumber ? serialNumber.slice(0, 32) : 'SN' + random));
         await storageContext.set('uniqueId', await storageContext.get('uniqueId', uniqueId ? uniqueId.slice(0, 32) : 'UI' + random));
         await storageContext.set('softwareVersion', isValidNumber(parseVersionString(this.matterbridgeVersion), 0, UINT32_MAX) ? parseVersionString(this.matterbridgeVersion) : 1);
@@ -1396,8 +1420,8 @@ export class Matterbridge extends EventEmitter {
         this.log.debug(`- vendorName: ${await storageContext.get('vendorName')}`);
         this.log.debug(`- productId: ${await storageContext.get('productId')}`);
         this.log.debug(`- productName: ${await storageContext.get('productName')}`);
-        this.log.debug(`- nodeLabel: ${await storageContext.get('nodeLabel')}`);
         this.log.debug(`- productLabel: ${await storageContext.get('productLabel')}`);
+        this.log.debug(`- nodeLabel: ${await storageContext.get('nodeLabel')}`);
         this.log.debug(`- serialNumber: ${await storageContext.get('serialNumber')}`);
         this.log.debug(`- uniqueId: ${await storageContext.get('uniqueId')}`);
         this.log.debug(`- softwareVersion: ${await storageContext.get('softwareVersion')} softwareVersionString: ${await storageContext.get('softwareVersionString')}`);
@@ -1433,12 +1457,12 @@ export class Matterbridge extends EventEmitter {
                 deviceType: DeviceTypeId(await storageContext.get('deviceType')),
             },
             basicInformation: {
+                nodeLabel: await storageContext.get('nodeLabel'),
                 vendorId: VendorId(await storageContext.get('vendorId')),
                 vendorName: await storageContext.get('vendorName'),
                 productId: await storageContext.get('productId'),
                 productName: await storageContext.get('productName'),
                 productLabel: await storageContext.get('productName'),
-                nodeLabel: await storageContext.get('productName'),
                 serialNumber: await storageContext.get('serialNumber'),
                 uniqueId: await storageContext.get('uniqueId'),
                 softwareVersion: await storageContext.get('softwareVersion'),
@@ -1537,7 +1561,7 @@ export class Matterbridge extends EventEmitter {
         this.log.notice(`Starting ${matterServerNode.id} server node`);
         await matterServerNode.start();
     }
-    async stopServerNode(matterServerNode, timeout = 30000) {
+    async stopServerNode(matterServerNode, timeout = 10000) {
         const { withTimeout } = await import('./utils/wait.js');
         if (!matterServerNode)
             return;
@@ -1571,7 +1595,7 @@ export class Matterbridge extends EventEmitter {
         if (!plugin.locked) {
             plugin.locked = true;
             this.log.debug(`Creating dynamic plugin ${plg}${plugin.name}${db} server node...`);
-            plugin.storageContext = await this.createServerNodeContext(plugin.name, 'Matterbridge', this.aggregatorDeviceType, this.aggregatorVendorId, this.aggregatorVendorName, this.aggregatorProductId, plugin.description);
+            plugin.storageContext = await this.createServerNodeContext(plugin.name, plugin.description, this.aggregatorDeviceType, this.aggregatorVendorId, this.aggregatorVendorName, this.aggregatorProductId, this.aggregatorProductName);
             plugin.serverNode = await this.createServerNode(plugin.storageContext, this.port ? this.port++ : undefined, this.passcode ? this.passcode++ : undefined, this.discriminator ? this.discriminator++ : undefined);
             this.log.debug(`Creating dynamic plugin ${plg}${plugin.name}${db} aggregator node...`);
             plugin.aggregatorNode = await this.createAggregatorNode(plugin.storageContext);
@@ -1701,7 +1725,10 @@ export class Matterbridge extends EventEmitter {
             this.log.error(`Error removing bridged endpoint ${dev}${device.deviceName}${er} (${zb}${device.name}${er}) for plugin ${plg}${pluginName}${er}: plugin not found`);
             return;
         }
-        if (this.bridgeMode === 'bridge') {
+        if (device.mode === 'server') {
+            this.log.info(`Removed mode server bridged endpoint(${plugin.registeredDevices}) ${dev}${device.deviceName}${nf} (${zb}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
+        }
+        else if (this.bridgeMode === 'bridge') {
             if (!this.aggregatorNode) {
                 this.log.error(`Error removing bridged endpoint ${dev}${device.deviceName}${er} (${zb}${device.name}${er}) for plugin ${plg}${pluginName}${er}: aggregator node not found`);
                 return;