matterbridge 3.2.8-dev-20250918-52dc90c → 3.2.8-dev-20250919-e967b55

package/dist/frontend.js

@@ -636,20 +636,12 @@ export class Frontend extends EventEmitter {
         this.matterbridge.matterbridgeInformation.profile = this.matterbridge.profile;
         this.matterbridge.matterbridgeInformation.loggerLevel = this.matterbridge.log.logLevel;
         this.matterbridge.matterbridgeInformation.matterLoggerLevel = Logger.defaultLogLevel;
-        this.matterbridge.matterbridgeInformation.mattermdnsinterface = this.matterbridge.mdnsInterface;
-        this.matterbridge.matterbridgeInformation.matteripv4address = this.matterbridge.ipv4address;
-        this.matterbridge.matterbridgeInformation.matteripv6address = this.matterbridge.ipv6address;
+        this.matterbridge.matterbridgeInformation.matterMdnsInterface = this.matterbridge.mdnsInterface;
+        this.matterbridge.matterbridgeInformation.matterIpv4Address = this.matterbridge.ipv4address;
+        this.matterbridge.matterbridgeInformation.matterIpv6Address = this.matterbridge.ipv6address;
         this.matterbridge.matterbridgeInformation.matterPort = (await this.matterbridge.nodeContext?.get('matterport', 5540)) ?? 5540;
         this.matterbridge.matterbridgeInformation.matterDiscriminator = await this.matterbridge.nodeContext?.get('matterdiscriminator');
         this.matterbridge.matterbridgeInformation.matterPasscode = await this.matterbridge.nodeContext?.get('matterpasscode');
-        if (this.matterbridge.bridgeMode === 'bridge' && this.matterbridge.serverNode && !this.matterbridge.hasCleanupStarted) {
-            this.matterbridge.matterbridgeInformation.matter = this.matterbridge.getServerNodeData(this.matterbridge.serverNode);
-            this.matterbridge.matterbridgeInformation.matterbridgePaired = this.matterbridge.serverNode.state.commissioning.commissioned;
-            this.matterbridge.matterbridgeInformation.matterbridgeQrPairingCode = this.matterbridge.matterbridgeInformation.matterbridgeEndAdvertise ? undefined : this.matterbridge.serverNode.state.commissioning.pairingCodes.qrPairingCode;
-            this.matterbridge.matterbridgeInformation.matterbridgeManualPairingCode = this.matterbridge.matterbridgeInformation.matterbridgeEndAdvertise ? undefined : this.matterbridge.serverNode.state.commissioning.pairingCodes.manualPairingCode;
-            this.matterbridge.matterbridgeInformation.matterbridgeFabricInformations = this.matterbridge.sanitizeFabricInformations(Object.values(this.matterbridge.serverNode.state.commissioning.fabrics));
-            this.matterbridge.matterbridgeInformation.matterbridgeSessionInformations = this.matterbridge.sanitizeSessionInformation(Object.values(this.matterbridge.serverNode.state.sessions.sessions));
-        }
         return { systemInformation: this.matterbridge.systemInformation, matterbridgeInformation: this.matterbridge.matterbridgeInformation };
     }
     getReachability(device) {
@@ -928,8 +920,16 @@ export class Frontend extends EventEmitter {
         let data;
         const sendResponse = (data) => {
             if (client.readyState === WebSocket.OPEN) {
-                const { response, ...rest } = data;
-                this.log.debug(`Sending api response broadcast message: ${debugStringify(rest)}`);
+                if ('response' in data) {
+                    const { response, ...rest } = data;
+                    this.log.debug(`Sending api response message: ${debugStringify(rest)}`);
+                }
+                else if ('error' in data) {
+                    this.log.debug(`Sending api error message: ${debugStringify(data)}`);
+                }
+                else {
+                    this.log.debug(`Sending api response message: ${debugStringify(data)}`);
+                }
                 client.send(JSON.stringify(data));
             }
         };
@@ -964,6 +964,7 @@ export class Frontend extends EventEmitter {
                 }
             }
             else if (data.method === '/api/install') {
+                const localData = data;
                 if (!isValidString(data.params.packageName, 10) || !isValidBoolean(data.params.restart)) {
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter in /api/install' });
                     return;
@@ -972,11 +973,11 @@ export class Frontend extends EventEmitter {
                 const { spawnCommand } = await import('./utils/spawn.js');
                 spawnCommand(this.matterbridge, 'npm', ['install', '-g', data.params.packageName, '--omit=dev', '--verbose'])
                     .then((_response) => {
-                    sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
-                    this.wssSendCloseSnackbarMessage(`Installing package ${data.params.packageName}...`);
-                    this.wssSendSnackbarMessage(`Installed package ${data.params.packageName}`, 5, 'success');
-                    const packageName = data.params.packageName.replace(/@.*$/, '');
-                    if (data.params.restart === false && packageName !== 'matterbridge') {
+                    sendResponse({ id: localData.id, method: localData.method, src: 'Matterbridge', dst: data.src, success: true });
+                    this.wssSendCloseSnackbarMessage(`Installing package ${localData.params.packageName}...`);
+                    this.wssSendSnackbarMessage(`Installed package ${localData.params.packageName}`, 5, 'success');
+                    const packageName = localData.params.packageName.replace(/@.*$/, '');
+                    if (localData.params.restart === false && packageName !== 'matterbridge') {
                         this.matterbridge.plugins
                             .add(packageName)
                             .then((plugin) => {
@@ -1018,11 +1019,12 @@ export class Frontend extends EventEmitter {
                 })
                     .catch((error) => {
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: error instanceof Error ? error.message : error });
-                    this.wssSendCloseSnackbarMessage(`Installing package ${data.params.packageName}...`);
-                    this.wssSendSnackbarMessage(`Package ${data.params.packageName} not installed`, 10, 'error');
+                    this.wssSendCloseSnackbarMessage(`Installing package ${localData.params.packageName}...`);
+                    this.wssSendSnackbarMessage(`Package ${localData.params.packageName} not installed`, 10, 'error');
                 });
             }
             else if (data.method === '/api/uninstall') {
+                const localData = data;
                 if (!isValidString(data.params.packageName, 10)) {
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter packageName in /api/uninstall' });
                     return;
@@ -1039,19 +1041,20 @@ export class Frontend extends EventEmitter {
                 const { spawnCommand } = await import('./utils/spawn.js');
                 spawnCommand(this.matterbridge, 'npm', ['uninstall', '-g', data.params.packageName, '--verbose'])
                     .then((_response) => {
-                    sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
-                    this.wssSendCloseSnackbarMessage(`Uninstalling package ${data.params.packageName}...`);
-                    this.wssSendSnackbarMessage(`Uninstalled package ${data.params.packageName}`, 5, 'success');
+                    sendResponse({ id: localData.id, method: localData.method, src: 'Matterbridge', dst: data.src, success: true });
+                    this.wssSendCloseSnackbarMessage(`Uninstalling package ${localData.params.packageName}...`);
+                    this.wssSendSnackbarMessage(`Uninstalled package ${localData.params.packageName}`, 5, 'success');
                     return;
                 })
                     .catch((error) => {
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: error instanceof Error ? error.message : error });
-                    this.wssSendCloseSnackbarMessage(`Uninstalling package ${data.params.packageName}...`);
-                    this.wssSendSnackbarMessage(`Package ${data.params.packageName} not uninstalled`, 10, 'error');
+                    this.wssSendCloseSnackbarMessage(`Uninstalling package ${localData.params.packageName}...`);
+                    this.wssSendSnackbarMessage(`Package ${localData.params.packageName} not uninstalled`, 10, 'error');
                     this.wssSendSnackbarMessage(`Restart required`, 0);
                 });
             }
             else if (data.method === '/api/addplugin') {
+                const localData = data;
                 if (!isValidString(data.params.pluginNameOrPath, 10)) {
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter pluginNameOrPath in /api/addplugin' });
                     return;
@@ -1064,14 +1067,14 @@ export class Frontend extends EventEmitter {
                 }
                 const plugin = await this.matterbridge.plugins.add(data.params.pluginNameOrPath);
                 if (plugin) {
-                    sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, response: plugin.name });
+                    sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
                     this.wssSendSnackbarMessage(`Added plugin ${data.params.pluginNameOrPath}`, 5, 'success');
                     this.matterbridge.plugins
                         .load(plugin, true, 'The plugin has been added', true)
                         .then(() => {
                         this.wssSendRefreshRequired('plugins');
                         this.wssSendRefreshRequired('devices');
-                        this.wssSendSnackbarMessage(`Started plugin ${data.params.pluginNameOrPath}`, 5, 'success');
+                        this.wssSendSnackbarMessage(`Started plugin ${localData.params.pluginNameOrPath}`, 5, 'success');
                         return;
                     })
                         .catch((_error) => {
@@ -1096,6 +1099,7 @@ export class Frontend extends EventEmitter {
                 sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
             }
             else if (data.method === '/api/enableplugin') {
+                const localData = data;
                 if (!isValidString(data.params.pluginName, 10) || !this.matterbridge.plugins.has(data.params.pluginName)) {
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter pluginName in /api/enableplugin' });
                     return;
@@ -1117,7 +1121,7 @@ export class Frontend extends EventEmitter {
                         .then(() => {
                         this.wssSendRefreshRequired('plugins');
                         this.wssSendRefreshRequired('devices');
-                        this.wssSendSnackbarMessage(`Started plugin ${data.params.pluginName}`, 5, 'success');
+                        this.wssSendSnackbarMessage(`Started plugin ${localData.params.pluginName}`, 5, 'success');
                         return;
                     })
                         .catch((_error) => {
@@ -1188,7 +1192,6 @@ export class Frontend extends EventEmitter {
                 if (plugin) {
                     this.matterbridge.plugins.saveConfigFromJson(plugin, data.params.formData, true);
                     this.wssSendSnackbarMessage(`Saved config for plugin ${data.params.pluginName}`);
-                    this.wssSendRefreshRequired('pluginsRestart');
                     this.wssSendRestartRequired();
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
                 }
@@ -1270,6 +1273,7 @@ export class Frontend extends EventEmitter {
                 sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
             }
             else if (data.method === '/api/matter') {
+                const localData = data;
                 if (!isValidString(data.params.id)) {
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter id in /api/matter' });
                     return;
@@ -1278,7 +1282,7 @@ export class Frontend extends EventEmitter {
                 if (data.params.id === 'Matterbridge')
                     serverNode = this.matterbridge.serverNode;
                 else
-                    serverNode = this.matterbridge.getPlugins().find((p) => p.serverNode && p.serverNode.id === data.params.id)?.serverNode || this.matterbridge.getDevices().find((d) => d.serverNode && d.serverNode.id === data.params.id)?.serverNode;
+                    serverNode = this.matterbridge.getPlugins().find((p) => p.serverNode && p.serverNode.id === localData.params.id)?.serverNode || this.matterbridge.getDevices().find((d) => d.serverNode && d.serverNode.id === localData.params.id)?.serverNode;
                 if (!serverNode) {
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Unknown server node id in /api/matter' });
                     return;
@@ -1292,14 +1296,14 @@ export class Frontend extends EventEmitter {
                 if (data.params.startCommission) {
                     await serverNode.env.get(DeviceCommissioner)?.allowBasicCommissioning();
                     this.matterbridge.advertisingNodes.set(serverNode.id, Date.now());
-                    this.log.debug(`*Commissioning has been sent for node ${data.params.id}`);
-                    this.wssSendRefreshRequired('matter', { matter: { ...matter, advertising: true } });
+                    this.log.debug(`*Allow commissioning has been sent for node ${data.params.id}`);
+                    this.wssSendRefreshRequired('matter', { matter: { ...matter, advertiseTime: Date.now(), advertising: true } });
                 }
                 if (data.params.stopCommission) {
                     await serverNode.env.get(DeviceCommissioner)?.endCommissioning();
                     this.matterbridge.advertisingNodes.delete(serverNode.id);
-                    this.log.debug(`*Stop commissioning has been sent for node ${data.params.id}`);
-                    this.wssSendRefreshRequired('matter', { matter: { ...matter, advertising: false } });
+                    this.log.debug(`*End commissioning has been sent for node ${data.params.id}`);
+                    this.wssSendRefreshRequired('matter', { matter: { ...matter, advertiseTime: 0, advertising: false } });
                 }
                 if (data.params.advertise) {
                     await serverNode.env.get(DeviceAdvertiser)?.advertise(true);
@@ -1315,15 +1319,15 @@ export class Frontend extends EventEmitter {
                 sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: matter });
             }
             else if (data.method === '/api/settings') {
-                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, response: await this.getApiSettings() });
+                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: await this.getApiSettings() });
             }
             else if (data.method === '/api/plugins') {
                 const plugins = this.getPlugins();
-                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, response: plugins });
+                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: plugins });
             }
             else if (data.method === '/api/devices') {
                 const devices = await this.getDevices(isValidString(data.params.pluginName) ? data.params.pluginName : undefined);
-                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, response: devices });
+                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: devices });
             }
             else if (data.method === '/api/clusters') {
                 if (!isValidString(data.params.plugin, 10)) {
@@ -1341,6 +1345,7 @@ export class Frontend extends EventEmitter {
                         method: data.method,
                         src: 'Matterbridge',
                         dst: data.src,
+                        success: true,
                         response,
                     });
                 }
@@ -1359,7 +1364,7 @@ export class Frontend extends EventEmitter {
                     return;
                 }
                 const selectDeviceValues = plugin.platform?.getSelectDevices().sort((keyA, keyB) => keyA.name.localeCompare(keyB.name));
-                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, response: selectDeviceValues });
+                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: selectDeviceValues });
             }
             else if (data.method === '/api/select/entities') {
                 if (!isValidString(data.params.plugin, 10)) {
@@ -1372,9 +1377,10 @@ export class Frontend extends EventEmitter {
                     return;
                 }
                 const selectEntityValues = plugin.platform?.getSelectEntities().sort((keyA, keyB) => keyA.name.localeCompare(keyB.name));
-                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, response: selectEntityValues });
+                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: selectEntityValues });
             }
             else if (data.method === '/api/action') {
+                const localData = data;
                 if (!isValidString(data.params.plugin, 5) || !isValidString(data.params.action, 1)) {
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter in /api/action' });
                     return;
@@ -1388,12 +1394,12 @@ export class Frontend extends EventEmitter {
                 plugin.platform
                     ?.onAction(data.params.action, data.params.value, data.params.id, data.params.formData)
                     .then(() => {
-                    sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
+                    sendResponse({ id: localData.id, method: localData.method, src: 'Matterbridge', dst: localData.src, success: true });
                     return;
                 })
                     .catch((error) => {
-                    this.log.error(`Error in plugin ${plugin.name} action ${data.params.action}: ${error}`);
-                    sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: `Error in plugin ${plugin.name} action ${data.params.action}: ${error}` });
+                    this.log.error(`Error in plugin ${plugin.name} action ${localData.params.action}: ${error}`);
+                    sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: `Error in plugin ${plugin.name} action ${localData.params.action}: ${error}` });
                 });
             }
             else if (data.method === '/api/config') {
@@ -1497,7 +1503,7 @@ export class Frontend extends EventEmitter {
                         if (isValidString(data.params.value)) {
                             this.log.debug(`Matter.js mdns interface: ${data.params.value === '' ? 'all interfaces' : data.params.value}`);
                             this.matterbridge.mdnsInterface = data.params.value === '' ? undefined : data.params.value;
-                            this.matterbridge.matterbridgeInformation.mattermdnsinterface = this.matterbridge.mdnsInterface;
+                            this.matterbridge.matterbridgeInformation.matterMdnsInterface = this.matterbridge.mdnsInterface;
                             await this.matterbridge.nodeContext?.set('mattermdnsinterface', data.params.value);
                             this.wssSendRestartRequired();
                             sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
@@ -1507,7 +1513,7 @@ export class Frontend extends EventEmitter {
                         if (isValidString(data.params.value)) {
                             this.log.debug(`Matter.js ipv4 address: ${data.params.value === '' ? 'all ipv4 addresses' : data.params.value}`);
                             this.matterbridge.ipv4address = data.params.value === '' ? undefined : data.params.value;
-                            this.matterbridge.matterbridgeInformation.matteripv4address = this.matterbridge.ipv4address;
+                            this.matterbridge.matterbridgeInformation.matterIpv4Address = this.matterbridge.ipv4address;
                             await this.matterbridge.nodeContext?.set('matteripv4address', data.params.value);
                             this.wssSendRestartRequired();
                             sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
@@ -1517,34 +1523,35 @@ export class Frontend extends EventEmitter {
                         if (isValidString(data.params.value)) {
                             this.log.debug(`Matter.js ipv6 address: ${data.params.value === '' ? 'all ipv6 addresses' : data.params.value}`);
                             this.matterbridge.ipv6address = data.params.value === '' ? undefined : data.params.value;
-                            this.matterbridge.matterbridgeInformation.matteripv6address = this.matterbridge.ipv6address;
+                            this.matterbridge.matterbridgeInformation.matterIpv6Address = this.matterbridge.ipv6address;
                             await this.matterbridge.nodeContext?.set('matteripv6address', data.params.value);
                             this.wssSendRestartRequired();
                             sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
                         }
                         break;
                     case 'setmatterport':
-                        data.params.value = isValidString(data.params.value) ? parseInt(data.params.value) : 0;
-                        if (isValidNumber(data.params.value, 5540, 5580)) {
-                            this.log.debug(`Set matter commissioning port to ${CYAN}${data.params.value}${db}`);
-                            this.matterbridge.matterbridgeInformation.matterPort = data.params.value;
-                            await this.matterbridge.nodeContext?.set('matterport', data.params.value);
+                        const port = isValidString(data.params.value) ? parseInt(data.params.value) : 0;
+                        if (isValidNumber(port, 5540, 5600)) {
+                            this.log.debug(`Set matter commissioning port to ${CYAN}${port}${db}`);
+                            this.matterbridge.matterbridgeInformation.matterPort = port;
+                            await this.matterbridge.nodeContext?.set('matterport', port);
                             this.wssSendRestartRequired();
+                            sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
                         }
                         else {
                             this.log.debug(`Reset matter commissioning port to ${CYAN}5540${db}`);
                             this.matterbridge.matterbridgeInformation.matterPort = 5540;
                             await this.matterbridge.nodeContext?.set('matterport', 5540);
                             this.wssSendRestartRequired();
+                            sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Invalid value: reset matter commissioning port to default 5540' });
                         }
-                        sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
                         break;
                     case 'setmatterdiscriminator':
-                        data.params.value = isValidString(data.params.value) ? parseInt(data.params.value) : 0;
-                        if (isValidNumber(data.params.value, 1000, 4095)) {
-                            this.log.debug(`Set matter commissioning discriminator to ${CYAN}${data.params.value}${db}`);
-                            this.matterbridge.matterbridgeInformation.matterDiscriminator = data.params.value;
-                            await this.matterbridge.nodeContext?.set('matterdiscriminator', data.params.value);
+                        const discriminator = isValidString(data.params.value) ? parseInt(data.params.value) : 0;
+                        if (isValidNumber(discriminator, 1000, 4095)) {
+                            this.log.debug(`Set matter commissioning discriminator to ${CYAN}${discriminator}${db}`);
+                            this.matterbridge.matterbridgeInformation.matterDiscriminator = discriminator;
+                            await this.matterbridge.nodeContext?.set('matterdiscriminator', discriminator);
                             this.wssSendRestartRequired();
                             sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
                         }
@@ -1553,15 +1560,15 @@ export class Frontend extends EventEmitter {
                             this.matterbridge.matterbridgeInformation.matterDiscriminator = undefined;
                             await this.matterbridge.nodeContext?.remove('matterdiscriminator');
                             this.wssSendRestartRequired();
-                            sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: false });
+                            sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Invalid value: reset matter commissioning discriminator to default undefined' });
                         }
                         break;
                     case 'setmatterpasscode':
-                        data.params.value = isValidString(data.params.value) ? parseInt(data.params.value) : 0;
-                        if (isValidNumber(data.params.value, 10000000, 90000000)) {
-                            this.matterbridge.matterbridgeInformation.matterPasscode = data.params.value;
-                            this.log.debug(`Set matter commissioning passcode to ${CYAN}${data.params.value}${db}`);
-                            await this.matterbridge.nodeContext?.set('matterpasscode', data.params.value);
+                        const passcode = isValidString(data.params.value) ? parseInt(data.params.value) : 0;
+                        if (isValidNumber(passcode, 10000000, 90000000)) {
+                            this.matterbridge.matterbridgeInformation.matterPasscode = passcode;
+                            this.log.debug(`Set matter commissioning passcode to ${CYAN}${passcode}${db}`);
+                            await this.matterbridge.nodeContext?.set('matterpasscode', passcode);
                             this.wssSendRestartRequired();
                             sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
                         }
@@ -1570,7 +1577,7 @@ export class Frontend extends EventEmitter {
                             this.matterbridge.matterbridgeInformation.matterPasscode = undefined;
                             await this.matterbridge.nodeContext?.remove('matterpasscode');
                             this.wssSendRestartRequired();
-                            sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: false });
+                            sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Invalid value: reset matter commissioning passcode to default undefined' });
                         }
                         break;
                     case 'setvirtualmode':
@@ -1588,6 +1595,7 @@ export class Frontend extends EventEmitter {
                 }
             }
             else if (data.method === '/api/command') {
+                const localData = data;
                 if (!isValidString(data.params.command, 5)) {
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong parameter command in /api/command' });
                     return;
@@ -1618,19 +1626,16 @@ export class Frontend extends EventEmitter {
                         }
                         if (isValidArray(config.blackList, 1)) {
                             if (select === 'serial' && config.blackList.includes(data.params.serial)) {
-                                config.blackList = config.blackList.filter((item) => item !== data.params.serial);
+                                config.blackList = config.blackList.filter((item) => item !== localData.params.serial);
                             }
                             else if (select === 'name' && config.blackList.includes(data.params.name)) {
-                                config.blackList = config.blackList.filter((item) => item !== data.params.name);
+                                config.blackList = config.blackList.filter((item) => item !== localData.params.name);
                             }
                         }
                         if (plugin.platform)
                             plugin.platform.config = config;
                         plugin.configJson = config;
-                        const restartRequired = plugin.restartRequired;
                         await this.matterbridge.plugins.saveConfigFromPlugin(plugin, true);
-                        if (!restartRequired)
-                            this.wssSendRefreshRequired('pluginsRestart');
                         this.wssSendRestartRequired(false);
                         sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
                     }
@@ -1657,10 +1662,10 @@ export class Frontend extends EventEmitter {
                         }
                         if (isValidArray(config.whiteList, 1)) {
                             if (select === 'serial' && config.whiteList.includes(data.params.serial)) {
-                                config.whiteList = config.whiteList.filter((item) => item !== data.params.serial);
+                                config.whiteList = config.whiteList.filter((item) => item !== localData.params.serial);
                             }
                             else if (select === 'name' && config.whiteList.includes(data.params.name)) {
-                                config.whiteList = config.whiteList.filter((item) => item !== data.params.name);
+                                config.whiteList = config.whiteList.filter((item) => item !== localData.params.name);
                             }
                         }
                         if (isValidArray(config.blackList)) {
@@ -1674,10 +1679,7 @@ export class Frontend extends EventEmitter {
                         if (plugin.platform)
                             plugin.platform.config = config;
                         plugin.configJson = config;
-                        const restartRequired = plugin.restartRequired;
                         await this.matterbridge.plugins.saveConfigFromPlugin(plugin, true);
-                        if (!restartRequired)
-                            this.wssSendRefreshRequired('pluginsRestart');
                         this.wssSendRestartRequired(false);
                         sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
                     }
@@ -1688,8 +1690,9 @@ export class Frontend extends EventEmitter {
                 }
             }
             else {
-                this.log.error(`Invalid method from websocket client: ${debugStringify(data)}`);
-                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Invalid method' });
+                const localData = data;
+                this.log.error(`Invalid method from websocket client: ${debugStringify(localData)}`);
+                sendResponse({ id: localData.id, method: localData.method, src: 'Matterbridge', dst: localData.src, error: 'Invalid method' });
             }
         }
         catch (error) {
@@ -1719,7 +1722,7 @@ export class Frontend extends EventEmitter {
             .join(' ');
         this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'log', params: { level, time, name, message } });
     }
-    wssSendRefreshRequired(changed = null, params) {
+    wssSendRefreshRequired(changed, params) {
         this.log.debug('Sending a refresh required message to all connected clients');
         this.wssBroadcastMessage({ id: 1, src: 'Matterbridge', dst: 'Frontend', method: 'refresh_required', params: { changed, ...params } });
     }
@@ -1746,7 +1749,7 @@ export class Frontend extends EventEmitter {
     wssSendCpuUpdate(cpuUsage) {
         if (hasParameter('debug'))
             this.log.debug('Sending a cpu update message to all connected clients');
-        this.wssBroadcastMessage({ id: 4, src: 'Matterbridge', dst: 'Frontend', method: 'cpu_update', params: { cpuUsage } });
+        this.wssBroadcastMessage({ id: 4, src: 'Matterbridge', dst: 'Frontend', method: 'cpu_update', params: { cpuUsage: Math.round(cpuUsage * 100) / 100 } });
     }
     wssSendMemoryUpdate(totalMemory, freeMemory, rss, heapTotal, heapUsed, external, arrayBuffers) {
         if (hasParameter('debug'))

package/dist/matterbridge.js

@@ -51,14 +51,6 @@ export class Matterbridge extends EventEmitter {
         matterbridgeVersion: '',
         matterbridgeLatestVersion: '',
         matterbridgeDevVersion: '',
-        matterbridgeSerialNumber: '',
-        matterbridgeQrPairingCode: undefined,
-        matterbridgeManualPairingCode: undefined,
-        matterbridgeFabricInformations: [],
-        matterbridgeSessionInformations: [],
-        matterbridgePaired: false,
-        matterbridgeAdvertise: false,
-        matterbridgeEndAdvertise: false,
         bridgeMode: '',
         restartMode: '',
         virtualMode: 'outlet',
@@ -71,9 +63,9 @@ export class Matterbridge extends EventEmitter {
         fileLogger: false,
         matterLoggerLevel: MatterLogLevel.INFO,
         matterFileLogger: false,
-        mattermdnsinterface: undefined,
-        matteripv4address: undefined,
-        matteripv6address: undefined,
+        matterMdnsInterface: undefined,
+        matterIpv4Address: undefined,
+        matterIpv6Address: undefined,
         matterPort: 5540,
         matterDiscriminator: undefined,
         matterPasscode: undefined,
@@ -112,7 +104,6 @@ export class Matterbridge extends EventEmitter {
     checkUpdateTimeout;
     configureTimeout;
     reachabilityTimeout;
-    endAdvertiseTimeout;
     sigintHandler;
     sigtermHandler;
     exceptionHandler;
@@ -673,7 +664,6 @@ export class Matterbridge extends EventEmitter {
                     await storageContext?.set('serialNumber', this.aggregatorSerialNumber);
                 if (this.aggregatorUniqueId)
                     await storageContext?.set('uniqueId', this.aggregatorUniqueId);
-                this.matterbridgeInformation.matterbridgeSerialNumber = this.aggregatorSerialNumber;
             }
         }
         catch (error) {
@@ -1253,7 +1243,6 @@ export class Matterbridge extends EventEmitter {
                 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).unref();
             this.emit('bridge_started');
             this.log.notice('Matterbridge bridge started successfully');
@@ -1342,7 +1331,6 @@ export class Matterbridge extends EventEmitter {
                     this.log.info(`Setting reachability to true for ${plg}${plugin.name}${nf} type ${plugin.type} server node ${plugin.serverNode !== undefined} aggregator node ${plugin.aggregatorNode !== undefined} device ${plugin.device !== undefined}`);
                     if (plugin.type === 'DynamicPlatform' && plugin.aggregatorNode)
                         this.setAggregatorReachability(plugin.aggregatorNode, true);
-                    this.frontend.wssSendRefreshRequired('reachability');
                 }, 60 * 1000).unref();
             }
             for (const device of this.devices.array()) {
@@ -1364,7 +1352,6 @@ export class Matterbridge extends EventEmitter {
         this.matterStorageManager = await this.matterStorageService.open('Matterbridge');
         this.log.info('Matter node storage manager "Matterbridge" created');
         this.matterbridgeContext = await this.createServerNodeContext('Matterbridge', 'Matterbridge', this.aggregatorDeviceType, this.aggregatorVendorId, this.aggregatorVendorName, this.aggregatorProductId, this.aggregatorProductName, this.aggregatorSerialNumber, this.aggregatorUniqueId);
-        this.matterbridgeInformation.matterbridgeSerialNumber = await this.matterbridgeContext.get('serialNumber', '');
         this.log.info('Matter node storage started');
         await this.backupMatterStorage(path.join(this.matterbridgeDirectory, this.matterStorageName), path.join(this.matterbridgeDirectory, this.matterStorageName + '.backup'));
     }
@@ -1470,21 +1457,29 @@ export class Matterbridge extends EventEmitter {
         });
         serverNode.lifecycle.commissioned.on(() => {
             this.log.notice(`Server node for ${storeId} was initially commissioned successfully!`);
-            clearTimeout(this.endAdvertiseTimeout);
+            this.advertisingNodes.delete(storeId);
+            this.frontend.wssSendRefreshRequired('settings');
+            this.frontend.wssSendRefreshRequired('plugins');
+            this.frontend.wssSendRefreshRequired('devices');
+            this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
         });
         serverNode.lifecycle.decommissioned.on(() => {
             this.log.notice(`Server node for ${storeId} was fully decommissioned successfully!`);
-            clearTimeout(this.endAdvertiseTimeout);
+            this.advertisingNodes.delete(storeId);
+            this.frontend.wssSendRefreshRequired('settings');
+            this.frontend.wssSendRefreshRequired('plugins');
+            this.frontend.wssSendRefreshRequired('devices');
+            this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
+            this.frontend.wssSendSnackbarMessage(`${storeId} is offline`, 5, 'warning');
         });
         serverNode.lifecycle.online.on(async () => {
             this.log.notice(`Server node for ${storeId} is online`);
             if (!serverNode.lifecycle.isCommissioned) {
                 this.log.notice(`Server node for ${storeId} is not commissioned. Pair to commission ...`);
+                this.advertisingNodes.set(storeId, Date.now());
                 const { qrPairingCode, manualPairingCode } = serverNode.state.commissioning.pairingCodes;
                 this.log.notice(`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`);
                 this.log.notice(`Manual pairing code: ${manualPairingCode}`);
-                this.startEndAdvertiseTimer(serverNode);
-                this.advertisingNodes.set(storeId, Date.now());
             }
             else {
                 this.log.notice(`Server node for ${storeId} is already commissioned. Waiting for controllers to connect ...`);
@@ -1498,7 +1493,6 @@ export class Matterbridge extends EventEmitter {
         });
         serverNode.lifecycle.offline.on(() => {
             this.log.notice(`Server node for ${storeId} is offline`);
-            this.matterbridgeInformation.matterbridgeEndAdvertise = true;
             this.frontend.wssSendRefreshRequired('plugins');
             this.frontend.wssSendRefreshRequired('settings');
             this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
@@ -1510,9 +1504,6 @@ export class Matterbridge extends EventEmitter {
             switch (fabricAction) {
                 case FabricAction.Added:
                     this.advertisingNodes.delete(storeId);
-                    clearTimeout(this.endAdvertiseTimeout);
-                    this.endAdvertiseTimeout = undefined;
-                    this.matterbridgeInformation.matterbridgeEndAdvertise = true;
                     action = 'added';
                     break;
                 case FabricAction.Removed:
@@ -1523,46 +1514,23 @@ export class Matterbridge extends EventEmitter {
                     break;
             }
             this.log.notice(`Commissioned fabric index ${fabricIndex} ${action} on server node for ${storeId}: ${debugStringify(serverNode.state.commissioning.fabrics[fabricIndex])}`);
-            this.frontend.wssSendRefreshRequired('fabrics');
             this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
         });
         serverNode.events.sessions.opened.on((session) => {
             this.log.notice(`Session opened on server node for ${storeId}: ${debugStringify(session)}`);
-            this.frontend.wssSendRefreshRequired('sessions');
             this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
         });
         serverNode.events.sessions.closed.on((session) => {
             this.log.notice(`Session closed on server node for ${storeId}: ${debugStringify(session)}`);
-            this.frontend.wssSendRefreshRequired('sessions');
             this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
         });
         serverNode.events.sessions.subscriptionsChanged.on((session) => {
             this.log.notice(`Session subscriptions changed on server node for ${storeId}: ${debugStringify(session)}`);
-            this.frontend.wssSendRefreshRequired('sessions');
             this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
         });
         this.log.info(`Created server node for ${storeId}`);
         return serverNode;
     }
-    startEndAdvertiseTimer(matterServerNode) {
-        if (this.endAdvertiseTimeout) {
-            this.log.debug(`Clear ${matterServerNode.id} server node end advertise timer`);
-            clearTimeout(this.endAdvertiseTimeout);
-        }
-        this.log.debug(`Starting ${matterServerNode.id} server node end advertise timer`);
-        this.endAdvertiseTimeout = setTimeout(() => {
-            if (matterServerNode.lifecycle.isCommissioned)
-                return;
-            this.matterbridgeInformation.matterbridgeEndAdvertise = true;
-            this.frontend.wssSendRefreshRequired('plugins');
-            this.frontend.wssSendRefreshRequired('settings');
-            this.frontend.wssSendRefreshRequired('fabrics');
-            this.frontend.wssSendRefreshRequired('sessions');
-            this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(matterServerNode) } });
-            this.frontend.wssSendSnackbarMessage(`Advertising stopped.`, 0);
-            this.log.notice(`Advertising stopped.`);
-        }, 15 * 60 * 1000).unref();
-    }
     getServerNodeData(serverNode) {
         const advertiseTime = this.advertisingNodes.get(serverNode.id) || 0;
         return {

package/dist/update.js

@@ -51,7 +51,6 @@ export async function getMatterbridgeLatestVersion(matterbridge) {
         if (matterbridge.matterbridgeVersion !== matterbridge.matterbridgeLatestVersion) {
             matterbridge.log.notice(`Matterbridge is out of date. Current version: ${matterbridge.matterbridgeVersion}. Latest version: ${matterbridge.matterbridgeLatestVersion}.`);
             matterbridge.frontend.wssSendSnackbarMessage('Matterbridge latest update available', 0, 'info');
-            matterbridge.frontend.wssSendRefreshRequired('matterbridgeLatestVersion');
             matterbridge.frontend.wssSendUpdateRequired();
         }
         else {
@@ -73,7 +72,6 @@ export async function getMatterbridgeDevVersion(matterbridge) {
         if (matterbridge.matterbridgeVersion.includes('-dev-') && matterbridge.matterbridgeVersion !== version) {
             matterbridge.log.notice(`Matterbridge@dev is out of date. Current version: ${matterbridge.matterbridgeVersion}. Latest dev version: ${matterbridge.matterbridgeDevVersion}.`);
             matterbridge.frontend.wssSendSnackbarMessage('Matterbridge dev update available', 0, 'info');
-            matterbridge.frontend.wssSendRefreshRequired('matterbridgeDevVersion');
             matterbridge.frontend.wssSendUpdateRequired(true);
         }
         else if (matterbridge.matterbridgeVersion.includes('-dev-') && matterbridge.matterbridgeVersion === version) {