feat(processmonitor): Add CPU monitoring and display CPU in process list

This commit is contained in:
2025-08-30 23:36:26 +00:00
parent 8f96118e0c
commit fa50ce40c8
5 changed files with 52 additions and 10 deletions

View File

@@ -24,6 +24,8 @@ export class ProcessMonitor extends EventEmitter {
private lastRetryAt: number | null = null;
private readonly MAX_RETRIES = 10;
private readonly RESET_WINDOW_MS = 60 * 60 * 1000; // 1 hour
private lastMemoryUsage: number = 0;
private lastCpuUsage: number = 0;
constructor(config: IMonitorConfig & { id?: ProcessId }) {
super();
@@ -260,12 +262,16 @@ export class ProcessMonitor extends EventEmitter {
memoryLimit: number,
): Promise<void> {
try {
const memoryUsage = await this.getProcessGroupMemory(pid);
const { memory: memoryUsage, cpu: cpuUsage } = await this.getProcessGroupStats(pid);
this.logger.debug(
`Memory usage for PID ${pid}: ${this.humanReadableBytes(memoryUsage)} (${memoryUsage} bytes)`,
);
// Store latest readings
this.lastMemoryUsage = memoryUsage;
this.lastCpuUsage = cpuUsage;
// Only log memory usage in debug mode to avoid spamming
if (process.env.TSPM_DEBUG) {
this.log(
@@ -303,7 +309,7 @@ export class ProcessMonitor extends EventEmitter {
/**
* Get the total memory usage (in bytes) for the process group (the main process and its children).
*/
private getProcessGroupMemory(pid: number): Promise<number> {
private getProcessGroupStats(pid: number): Promise<{ memory: number; cpu: number }> {
return new Promise((resolve, reject) => {
this.logger.debug(
`Getting memory usage for process group with PID ${pid}`,
@@ -333,7 +339,7 @@ export class ProcessMonitor extends EventEmitter {
plugins.pidusage(
pids,
(err: Error | null, stats: Record<string, { memory: number }>) => {
(err: Error | null, stats: Record<string, { memory: number; cpu: number }>) => {
if (err) {
const processError = new ProcessError(
`Failed to get process usage stats: ${err.message}`,
@@ -345,14 +351,16 @@ export class ProcessMonitor extends EventEmitter {
}
let totalMemory = 0;
let totalCpu = 0;
for (const key in stats) {
totalMemory += stats[key].memory;
totalCpu += Number.isFinite(stats[key].cpu) ? stats[key].cpu : 0;
}
this.logger.debug(
`Total memory for process group: ${this.humanReadableBytes(totalMemory)}`,
);
resolve(totalMemory);
resolve({ memory: totalMemory, cpu: totalCpu });
},
);
},
@@ -448,6 +456,20 @@ export class ProcessMonitor extends EventEmitter {
return this.processWrapper?.isRunning() || false;
}
/**
* Get last measured memory usage for the process group (bytes)
*/
public getLastMemoryUsage(): number {
return this.lastMemoryUsage;
}
/**
* Get last measured CPU usage for the process group (sum of group, percent)
*/
public getLastCpuUsage(): number {
return this.lastCpuUsage;
}
/**
* Helper method for logging messages with the instance name.
*/