@matterbridge/core 3.10.14-dev-20261010-607ee18 → 3.10.14-dev-20261013-e87a0c8

package/dist/frontend.js

@@ -7,7 +7,7 @@ import { CommissioningOptions } from '@matter/types/commissioning';
 import { FabricIndex } from '@matter/types/datatype';
 import { BroadcastServer } from '@matterbridge/thread/server';
 import { MATTER_LOGGER_FILE, MATTER_STORAGE_DIR, MATTERBRIDGE_DIAGNOSTIC_FILE, MATTERBRIDGE_HISTORY_FILE, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg, } from '@matterbridge/types';
-import { isBun, memoryFootprint } from '@matterbridge/utils/bun';
+import { constrainedMemory, isBun, memoryFootprint } from '@matterbridge/utils/bun';
 import { getParameter, hasAnyParameter, hasParameter } from '@matterbridge/utils/cli';
 import { writeDiagnostic } from '@matterbridge/utils/diagnostic';
 import { getErrorMessage, inspectError, logError } from '@matterbridge/utils/error';
@@ -16,11 +16,15 @@ import { logModuleLoaded } from '@matterbridge/utils/loader';
 import { isValidArray, isValidBoolean, isValidNumber, isValidObject, isValidString } from '@matterbridge/utils/validate';
 import { fireAndForget, wait, withTimeout } from '@matterbridge/utils/wait';
 import { AnsiLogger, bgHex, CYAN, db, debugStringify, er, GREEN, nf, nt, rs, stringify, UNDERLINE, UNDERLINEOFF, wr, YELLOW } from 'node-ansi-logger';
-import { cliEmitter } from './cliEmitter.js';
 import { generateHistoryPage } from './cliHistory.js';
 import { capitalizeFirstLetter } from './matterbridgeEndpointHelpers.js';
 import { deleteAdvertisingNode, getBatteryLevel, getClusterTextFromDevice, getPowerSource, getReachability, getServerNodeData, setAdvertisingNode } from './matterNodeHelpers.js';
 logModuleLoaded('Frontend');
+function sendDownloadError(res, error, message) {
+    if (error.code === 'ECONNABORTED' || res.headersSent)
+        return;
+    res.status(500).send(message);
+}
 export class Frontend extends EventEmitter {
     matterbridge;
     log;
@@ -40,9 +44,6 @@ export class Frontend extends EventEmitter {
     verbose = hasParameter('verbose');
     diagnostic = hasParameter('diagnostic');
     readOnly = hasParameter('readonly') || hasParameter('shelly');
-    shellyBoard = hasParameter('shelly');
-    shellySysUpdate = false;
-    shellyMainUpdate = false;
     restartRequired = false;
     fixedRestartRequired = false;
     updateRequired = false;
@@ -459,16 +460,6 @@ export class Frontend extends EventEmitter {
                 return;
             });
         }
-        cliEmitter.removeAllListeners();
-        cliEmitter.on('uptime', (systemUptime, processUptime) => {
-            this.wssSendUptimeUpdate(systemUptime, processUptime);
-        });
-        cliEmitter.on('memory', (totalMememory, freeMemory, rss, heapTotal, heapUsed, external, arrayBuffers) => {
-            this.wssSendMemoryUpdate(totalMememory, freeMemory, rss, heapTotal, heapUsed, external, arrayBuffers);
-        });
-        cliEmitter.on('cpu', (cpuUsage, processCpuUsage) => {
-            this.wssSendCpuUpdate(cpuUsage, processCpuUsage);
-        });
         this.expressApp.post('/api/login', express.json(), (req, res) => {
             const { password } = req.body;
             this.log.debug(`The frontend sent /api/login with password ${password ? '[redacted]' : '(empty)'}`);
@@ -575,7 +566,7 @@ export class Frontend extends EventEmitter {
             res.download(path.join(os.tmpdir(), MATTERBRIDGE_LOGGER_FILE), 'matterbridge.log', (error) => {
                 if (error) {
                     logError(this.log, `Error downloading log file ${MATTERBRIDGE_LOGGER_FILE}`, error);
-                    res.status(500).send('Error downloading the matterbridge log file');
+                    sendDownloadError(res, error, 'Error downloading the matterbridge log file');
                 }
                 else {
                     this.log.debug(`Matterbridge log file ${MATTERBRIDGE_LOGGER_FILE} downloaded successfully`);
@@ -615,7 +606,7 @@ export class Frontend extends EventEmitter {
             res.download(path.join(os.tmpdir(), MATTER_LOGGER_FILE), 'matter.log', (error) => {
                 if (error) {
                     logError(this.log, `Error downloading log file ${MATTER_LOGGER_FILE}`, error);
-                    res.status(500).send('Error downloading the matter log file');
+                    sendDownloadError(res, error, 'Error downloading the matter log file');
                 }
                 else {
                     this.log.debug(`Matter log file ${MATTER_LOGGER_FILE} downloaded successfully`);
@@ -656,7 +647,7 @@ export class Frontend extends EventEmitter {
             res.download(path.join(os.tmpdir(), MATTERBRIDGE_DIAGNOSTIC_FILE), MATTERBRIDGE_DIAGNOSTIC_FILE, (error) => {
                 if (error) {
                     this.log.error(`Error downloading file ${MATTERBRIDGE_DIAGNOSTIC_FILE}: ${error instanceof Error ? error.message : error}`);
-                    res.status(500).send('Error downloading the diagnostic log file');
+                    sendDownloadError(res, error, 'Error downloading the diagnostic log file');
                 }
                 else {
                     this.log.debug(`Diagnostic log file ${MATTERBRIDGE_DIAGNOSTIC_FILE} downloaded successfully`);
@@ -691,7 +682,7 @@ export class Frontend extends EventEmitter {
                 res.download(path.join(os.tmpdir(), MATTERBRIDGE_HISTORY_FILE), MATTERBRIDGE_HISTORY_FILE, (error) => {
                     if (error) {
                         logError(this.log, `Error in /api/downloadhistory downloading history file ${MATTERBRIDGE_HISTORY_FILE}`, error);
-                        res.status(500).send('Error downloading history file');
+                        sendDownloadError(res, error, 'Error downloading history file');
                     }
                     else {
                         this.log.debug(`History file ${MATTERBRIDGE_HISTORY_FILE} downloaded successfully`);
@@ -711,7 +702,7 @@ export class Frontend extends EventEmitter {
                 this.wssSendCloseSnackbarMessage('Creating matterbridge backup...');
                 if (error) {
                     logError(this.log, `Error downloading file matterbridge.backup.zip`, error);
-                    res.status(500).send(`Error downloading file matterbridge.backup.zip: ${getErrorMessage(error)}`);
+                    sendDownloadError(res, error, `Error downloading file matterbridge.backup.zip: ${getErrorMessage(error)}`);
                 }
                 else {
                     this.log.debug('Backup matterbridge.backup.zip downloaded successfully');
@@ -726,7 +717,7 @@ export class Frontend extends EventEmitter {
                 this.wssSendCloseSnackbarMessage('Creating matterbridge storage backup...');
                 if (error) {
                     this.log.error(`Error downloading file matterbridge.${NODE_STORAGE_DIR}.zip: ${error instanceof Error ? error.message : error}`);
-                    res.status(500).send('Error downloading the matterbridge storage file');
+                    sendDownloadError(res, error, 'Error downloading the matterbridge storage file');
                 }
                 else {
                     this.log.debug(`Matterbridge storage matterbridge.${NODE_STORAGE_DIR}.zip downloaded successfully`);
@@ -741,7 +732,7 @@ export class Frontend extends EventEmitter {
                 this.wssSendCloseSnackbarMessage('Creating matter storage backup...');
                 if (error) {
                     logError(this.log, `Error downloading the matter storage matterbridge.${MATTER_STORAGE_DIR}.zip`, error);
-                    res.status(500).send('Error downloading the matter storage zip file');
+                    sendDownloadError(res, error, 'Error downloading the matter storage zip file');
                 }
                 else {
                     this.log.debug(`Matter storage matterbridge.${MATTER_STORAGE_DIR}.zip downloaded successfully`);
@@ -756,7 +747,7 @@ export class Frontend extends EventEmitter {
                 this.wssSendCloseSnackbarMessage('Creating plugin backup...');
                 if (error) {
                     logError(this.log, `Error downloading file matterbridge.pluginstorage.zip`, error);
-                    res.status(500).send('Error downloading the matterbridge plugin storage file');
+                    sendDownloadError(res, error, 'Error downloading the matterbridge plugin storage file');
                 }
                 else {
                     this.log.debug('Plugin storage matterbridge.pluginstorage.zip downloaded successfully');
@@ -771,7 +762,7 @@ export class Frontend extends EventEmitter {
                 this.wssSendCloseSnackbarMessage('Creating config backup...');
                 if (error) {
                     logError(this.log, `Error downloading file matterbridge.pluginconfig.zip`, error);
-                    res.status(500).send('Error downloading the matterbridge plugin config file');
+                    sendDownloadError(res, error, 'Error downloading the matterbridge plugin config file');
                 }
                 else {
                     this.log.debug('Plugin config matterbridge.pluginconfig.zip downloaded successfully');
@@ -927,6 +918,7 @@ export class Frontend extends EventEmitter {
     }
     getApiSettings() {
         this.matterbridge.systemInformation.totalMemory = formatBytes(os.totalmem());
+        this.matterbridge.systemInformation.constrainedMemory = formatBytes(constrainedMemory());
         this.matterbridge.systemInformation.freeMemory = formatBytes(os.freemem());
         this.matterbridge.systemInformation.systemUptime = formatUptime(os.uptime());
         this.matterbridge.systemInformation.processUptime = formatUptime(Math.floor(process.uptime()));
@@ -966,9 +958,6 @@ export class Frontend extends EventEmitter {
             matterDiscriminator: this.matterbridge.initialDiscriminator,
             matterPasscode: this.matterbridge.initialPasscode,
             readOnly: this.readOnly,
-            shellyBoard: this.shellyBoard,
-            shellySysUpdate: this.shellySysUpdate,
-            shellyMainUpdate: this.shellyMainUpdate,
             restartRequired: this.restartRequired,
             fixedRestartRequired: this.fixedRestartRequired,
             updateRequired: this.updateRequired,
@@ -1028,11 +1017,12 @@ export class Frontend extends EventEmitter {
             if (!device.plugin || !device.deviceType || !device.name || !device.deviceName || !device.serialNumber || !device.uniqueId || !device.lifecycle.isReady)
                 continue;
             devices.push({
-                pluginName: device.plugin,
+                plugin: device.plugin,
                 type: device.name + ' (0x' + device.deviceType.toString(16).padStart(4, '0') + ')',
-                endpoint: device.number,
-                name: device.deviceName,
-                serial: device.serialNumber,
+                number: device.number,
+                id: device.id,
+                deviceName: device.deviceName,
+                serialNumber: device.serialNumber,
                 productUrl: device.productUrl,
                 configUrl: device.configUrl,
                 uniqueId: device.uniqueId,
@@ -1371,20 +1361,6 @@ export class Frontend extends EventEmitter {
                 }, 5_000).unref();
                 sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
             }
-            else if (data.method === '/api/shellysysupdate') {
-            }
-            else if (data.method === '/api/shellymainupdate') {
-            }
-            else if (data.method === '/api/shellycreatesystemlog') {
-            }
-            else if (data.method === '/api/shellynetconfig') {
-            }
-            else if (data.method === '/api/softreset') {
-            }
-            else if (data.method === '/api/hardreset') {
-            }
-            else if (data.method === '/api/reboot') {
-            }
             else if (data.method === '/api/restart') {
                 this.wssSendSnackbarMessage(`Restarting matterbridge...`, 0);
                 await this.matterbridge.restartProcess();
@@ -1560,7 +1536,7 @@ export class Frontend extends EventEmitter {
                     return;
                 }
                 const start = performance.now();
-                const selectDevices = !plugin.platform ? [] : plugin.platform.getSelectDevices().toSorted((keyA, keyB) => keyA.name.localeCompare(keyB.name));
+                const selectDevices = !plugin.platform ? [] : plugin.platform.getSelectDevices().toSorted((keyA, keyB) => keyA.deviceName.localeCompare(keyB.deviceName));
                 if (this.diagnostic)
                     writeDiagnostic(`Frontend:${data.sender}`, `getSelectDevices() took ${(performance.now() - start).toFixed(2)} ms`);
                 sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: selectDevices });
@@ -2014,41 +1990,6 @@ export class Frontend extends EventEmitter {
         this.log.debug('Sending a matterbridge status update message to all connected clients');
         this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'matterbridge_status_update', success: true, response: { status } });
     }
-    wssSendCpuUpdate(cpuUsage, processCpuUsage) {
-        if (!this.listening || this.webSocketServer?.clients.size === 0)
-            return;
-        if (hasParameter('debug'))
-            this.log.debug('Sending a cpu update message to all connected clients');
-        this.wssBroadcastMessage({
-            id: 0,
-            src: 'Matterbridge',
-            dst: 'Frontend',
-            method: 'cpu_update',
-            success: true,
-            response: { cpuUsage: Math.round(cpuUsage * 100) / 100, processCpuUsage: Math.round(processCpuUsage * 100) / 100 },
-        });
-    }
-    wssSendMemoryUpdate(totalMemory, freeMemory, rss, heapTotal, heapUsed, external, arrayBuffers) {
-        if (!this.listening || this.webSocketServer?.clients.size === 0)
-            return;
-        if (hasParameter('debug'))
-            this.log.debug('Sending a memory update message to all connected clients');
-        this.wssBroadcastMessage({
-            id: 0,
-            src: 'Matterbridge',
-            dst: 'Frontend',
-            method: 'memory_update',
-            success: true,
-            response: { totalMemory, freeMemory, rss, heapTotal, heapUsed, external, arrayBuffers },
-        });
-    }
-    wssSendUptimeUpdate(systemUptime, processUptime) {
-        if (!this.listening || this.webSocketServer?.clients.size === 0)
-            return;
-        if (hasParameter('debug'))
-            this.log.debug('Sending a uptime update message to all connected clients');
-        this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'uptime_update', success: true, response: { systemUptime, processUptime } });
-    }
     wssSendSnackbarMessage(message, timeout = 5, severity = 'info') {
         if (!this.listening || this.webSocketServer?.clients.size === 0)
             return;
@@ -2078,7 +2019,7 @@ export class Frontend extends EventEmitter {
         if (!this.listening || this.webSocketServer?.clients.size === 0)
             return;
         const stringifiedMsg = JSON.stringify(msg);
-        if (!['log', 'cpu_update', 'memory_update', 'uptime_update'].includes(msg.method))
+        if (!['log', 'system_update'].includes(msg.method))
             this.log.debug(`Sending a broadcast message: ${debugStringify(msg)}`);
         this.webSocketServer?.clients.forEach((client) => {
             if (client.readyState === client.OPEN) {

package/dist/matterNode.d.ts

@@ -4,8 +4,8 @@ import { type Diagnostic, type StorageContext, type StorageManager, StorageServi
 import { Endpoint, ServerNode } from '@matter/node';
 import { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
 import { type DeviceCertification, MdnsService } from '@matter/protocol';
-import { DeviceTypeId, VendorId } from '@matter/types';
-import type { PluginName, SharedMatterbridge, WorkerMessage } from '@matterbridge/types';
+import { DeviceTypeId, VendorId } from '@matter/types/datatype';
+import type { BridgeStatus, PluginName, PluginStatusUpdate, SharedMatterbridge, WorkerMessage } from '@matterbridge/types';
 import type { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
 import { type Plugin, PluginManager } from './pluginManager.js';
 interface MatterEvents {
@@ -73,6 +73,8 @@ export declare class MatterNode extends EventEmitter<MatterEvents> {
     subscribeAttributeChanged(plugin: Plugin, device: MatterbridgeEndpoint): Promise<void>;
     setServerReachability(reachable: boolean): Promise<void>;
     setAggregatorReachability(aggregatorNode: Endpoint<AggregatorEndpoint>, reachable: boolean): Promise<void>;
+    pluginStatusUpdate(pluginName: string, status: PluginStatusUpdate): void;
+    matterbridgeStatusUpdate(status: BridgeStatus): void;
     yieldToNode(timeout?: number): Promise<void>;
 }
 export {};