matterbridge 3.3.1-dev-20251008-e61b8db → 3.3.1-dev-20251009-008da25

package/dist/frontend.js

@@ -12,11 +12,12 @@ import { BridgedDeviceBasicInformation } from '@matter/main/clusters/bridged-dev
 import { PowerSource } from '@matter/main/clusters/power-source';
 import { DeviceAdvertiser, DeviceCommissioner, FabricManager } from '@matter/main/protocol';
 import { CommissioningOptions } from '@matter/main/types';
-import { MATTER_LOGGER_FILE, MATTER_STORAGE_NAME, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg } from './matterbridgeTypes.js';
+import { MATTER_LOGGER_FILE, MATTER_STORAGE_NAME, MATTERBRIDGE_DIAGNOSTIC_FILE, MATTERBRIDGE_HISTORY_FILE, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg } from './matterbridgeTypes.js';
 import { createZip, isValidArray, isValidNumber, isValidObject, isValidString, isValidBoolean, withTimeout, hasParameter, wait, inspectError } from './utils/export.js';
 import { formatMemoryUsage, formatOsUpTime } from './utils/network.js';
 import { capitalizeFirstLetter, getAttribute } from './matterbridgeEndpointHelpers.js';
-import { cliEmitter, lastCpuUsage } from './cliEmitter.js';
+import { cliEmitter, lastCpuUsage, lastProcessCpuUsage } from './cliEmitter.js';
+import { generateHistoryPage } from './cliHistory.js';
 import { BroadcastServer } from './broadcastServer.js';
 export class Frontend extends EventEmitter {
     matterbridge;
@@ -294,8 +295,8 @@ export class Frontend extends EventEmitter {
         cliEmitter.on('memory', (totalMememory, freeMemory, rss, heapTotal, heapUsed, external, arrayBuffers) => {
             this.wssSendMemoryUpdate(totalMememory, freeMemory, rss, heapTotal, heapUsed, external, arrayBuffers);
         });
-        cliEmitter.on('cpu', (cpuUsage) => {
-            this.wssSendCpuUpdate(cpuUsage);
+        cliEmitter.on('cpu', (cpuUsage, processCpuUsage) => {
+            this.wssSendCpuUpdate(cpuUsage, processCpuUsage);
         });
         this.expressApp.post('/api/login', express.json(), async (req, res) => {
             const { password } = req.body;
@@ -418,11 +419,11 @@ export class Frontend extends EventEmitter {
                     serverNodes.push(device.serverNode);
             }
             const fs = await import('node:fs');
-            if (fs.existsSync(path.join(this.matterbridge.matterbridgeDirectory, 'diagnostic.log')))
-                fs.unlinkSync(path.join(this.matterbridge.matterbridgeDirectory, 'diagnostic.log'));
+            if (fs.existsSync(path.join(this.matterbridge.matterbridgeDirectory, MATTERBRIDGE_DIAGNOSTIC_FILE)))
+                fs.unlinkSync(path.join(this.matterbridge.matterbridgeDirectory, MATTERBRIDGE_DIAGNOSTIC_FILE));
             const diagnosticDestination = LogDestination({ name: 'diagnostic', level: MatterLogLevel.INFO, format: MatterLogFormat.formats.plain });
             diagnosticDestination.write = async (text, _message) => {
-                await fs.promises.appendFile(path.join(this.matterbridge.matterbridgeDirectory, 'diagnostic.log'), text + '\n', { encoding: 'utf8' });
+                await fs.promises.appendFile(path.join(this.matterbridge.matterbridgeDirectory, MATTERBRIDGE_DIAGNOSTIC_FILE), text + '\n', { encoding: 'utf8' });
             };
             Logger.destinations.diagnostic = diagnosticDestination;
             if (!diagnosticDestination.context) {
@@ -439,15 +440,28 @@ export class Frontend extends EventEmitter {
             await wait(500);
             try {
                 const fs = await import('node:fs');
-                const data = await fs.promises.readFile(path.join(this.matterbridge.matterbridgeDirectory, 'diagnostic.log'), 'utf8');
+                const data = await fs.promises.readFile(path.join(this.matterbridge.matterbridgeDirectory, MATTERBRIDGE_DIAGNOSTIC_FILE), 'utf8');
                 res.type('text/plain');
                 res.send(data.slice(29));
             }
             catch (error) {
-                this.log.error(`Error reading diagnostic log file ${MATTER_LOGGER_FILE}: ${error instanceof Error ? error.message : error}`);
+                this.log.error(`Error reading diagnostic log file ${MATTERBRIDGE_DIAGNOSTIC_FILE}: ${error instanceof Error ? error.message : error}`);
                 res.status(500).send('Error reading diagnostic log file.');
             }
         });
+        this.expressApp.get('/api/viewhistory', async (req, res) => {
+            this.log.debug('The frontend sent /api/viewhistory');
+            try {
+                const fs = await import('node:fs');
+                const data = await fs.promises.readFile(path.join(this.matterbridge.matterbridgeDirectory, MATTERBRIDGE_HISTORY_FILE), 'utf8');
+                res.type('text/html');
+                res.send(data);
+            }
+            catch (error) {
+                this.log.error(`Error reading history log file ${MATTERBRIDGE_HISTORY_FILE}: ${error instanceof Error ? error.message : error}`);
+                res.status(500).send('Error reading history log file. Please create the history log before loading it.');
+            }
+        });
         this.expressApp.get('/api/shellyviewsystemlog', async (req, res) => {
             this.log.debug('The frontend sent /api/shellyviewsystemlog');
             try {
@@ -666,6 +680,7 @@ export class Frontend extends EventEmitter {
         this.matterbridge.systemInformation.systemUptime = formatOsUpTime(os.uptime());
         this.matterbridge.systemInformation.processUptime = formatOsUpTime(Math.floor(process.uptime()));
         this.matterbridge.systemInformation.cpuUsage = lastCpuUsage.toFixed(2) + ' %';
+        this.matterbridge.systemInformation.processCpuUsage = lastProcessCpuUsage.toFixed(2) + ' %';
         this.matterbridge.systemInformation.rss = formatMemoryUsage(process.memoryUsage().rss);
         this.matterbridge.systemInformation.heapTotal = formatMemoryUsage(process.memoryUsage().heapTotal);
         this.matterbridge.systemInformation.heapUsed = formatMemoryUsage(process.memoryUsage().heapUsed);
@@ -1268,6 +1283,10 @@ export class Frontend extends EventEmitter {
                 await this.matterbridge.shutdownProcessAndFactoryReset();
                 sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
             }
+            else if (data.method === '/api/generatehistorypage') {
+                generateHistoryPage({ outputPath: path.join(this.matterbridge.matterbridgeDirectory, MATTERBRIDGE_HISTORY_FILE), pageTitle: `Matterbridge on ${this.matterbridge.systemInformation.hostname} Cpu & Memory History` });
+                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)) {
@@ -1749,10 +1768,10 @@ export class Frontend extends EventEmitter {
         this.matterbridge.updateRequired = true;
         this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'update_required', success: true, response: { devVersion } });
     }
-    wssSendCpuUpdate(cpuUsage) {
+    wssSendCpuUpdate(cpuUsage, processCpuUsage) {
         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 } });
+        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 (hasParameter('debug'))

package/dist/matterbridge.js

@@ -42,6 +42,7 @@ export class Matterbridge extends EventEmitter {
         systemUptime: '',
         processUptime: '',
         cpuUsage: '',
+        processCpuUsage: '',
         rss: '',
         heapTotal: '',
         heapUsed: '',

package/dist/matterbridgeTypes.js

@@ -5,3 +5,5 @@ export const MATTERBRIDGE_LOGGER_FILE = 'matterbridge.log';
 export const MATTER_LOGGER_FILE = 'matter.log';
 export const NODE_STORAGE_DIR = 'storage';
 export const MATTER_STORAGE_NAME = 'matterstorage';
+export const MATTERBRIDGE_DIAGNOSTIC_FILE = 'diagnostic.log';
+export const MATTERBRIDGE_HISTORY_FILE = 'history.html';