pyre-cli 5.1.0 → 6.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/index.js +922 -367
- package/package.json +1 -1
- package/src/completions.ts +118 -0
- package/src/diffCmd.ts +36 -0
- package/src/doctor.ts +123 -0
- package/src/formatters/index.ts +1 -1
- package/src/formatters/output.ts +14 -13
- package/src/formatters/render.ts +305 -114
- package/src/formatters/themes.ts +47 -12
- package/src/formatters/types.ts +6 -1
- package/src/historyCmd.ts +71 -0
- package/src/index.ts +129 -24
- package/src/live/input.ts +14 -5
- package/src/live/render.ts +126 -90
- package/src/live/state.ts +3 -0
- package/src/live/types.ts +6 -1
- package/src/monitors/collectors.ts +160 -36
- package/src/monitors/smc.ts +60 -12
- package/src/monitors/types.ts +2 -0
- package/src/p2p/server.test.ts +2 -2
- package/src/sparkline.ts +82 -13
- package/src/state/config.ts +6 -1
- package/Formula/pyre.rb +0 -19
package/src/live/types.ts
CHANGED
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
* export format enum, and the input-mode union used
|
|
6
6
|
* throughout the interactive session.
|
|
7
7
|
*/
|
|
8
|
+
import type { ThemeName } from '../formatters/themes.js';
|
|
9
|
+
|
|
8
10
|
export interface LiveOptions {
|
|
9
11
|
interval: number;
|
|
10
12
|
detailed?: boolean;
|
|
@@ -24,4 +26,7 @@ type SortMode = 'cpu' | 'mem' | 'pid' | 'user' | 'command' | 'state' | 'threads'
|
|
|
24
26
|
|
|
25
27
|
type GraphMode = 'spark' | 'bar';
|
|
26
28
|
|
|
27
|
-
|
|
29
|
+
type ActivePanel = 'grid' | 'cpu' | 'mem' | 'gpu' | 'power' | 'battery' | 'thermal' | 'network' | 'packets' | 'tasks' | 'disk' | 'process' | 'p2p';
|
|
30
|
+
|
|
31
|
+
export type { InputMode, SortMode, GraphMode, ActivePanel, ThemeName };
|
|
32
|
+
|
|
@@ -15,7 +15,7 @@ import chalk from 'chalk';
|
|
|
15
15
|
import os from 'node:os';
|
|
16
16
|
import { run } from './run.js';
|
|
17
17
|
import { getSmcMetrics, parseSuffix } from './smc.js';
|
|
18
|
-
import type { StatsData, CpuData, MemoryData, ThermalData, BatteryData, PowerData, DiskData, NetworkData, ProcessData, GpuData, PacketData, NetworkProcess } from './types.js';
|
|
18
|
+
import type { StatsData, CpuData, MemoryData, ThermalData, BatteryData, PowerData, DiskData, NetworkData, ProcessData, GpuData, PacketData, NetworkProcess, TaskData } from './types.js';
|
|
19
19
|
|
|
20
20
|
const SP_TTL_MS = 10_000;
|
|
21
21
|
const NETSTAT_TTL_MS = 1000;
|
|
@@ -226,6 +226,10 @@ export async function collectPower(): Promise<PowerData | null> {
|
|
|
226
226
|
* Returns null when GPU data is unavailable (e.g. on machines
|
|
227
227
|
* without a discrete GPU or when powermetrics is inaccessible).
|
|
228
228
|
*/
|
|
229
|
+
/**
|
|
230
|
+
* Gather GPU information from system_profiler, ioreg, powermetrics, or nvidia-smi.
|
|
231
|
+
* Returns null when GPU hardware is unavailable.
|
|
232
|
+
*/
|
|
229
233
|
export async function collectGpu(detailed?: boolean): Promise<GpuData | null> {
|
|
230
234
|
let spRaw = '';
|
|
231
235
|
const now = Date.now();
|
|
@@ -235,50 +239,133 @@ export async function collectPower(): Promise<PowerData | null> {
|
|
|
235
239
|
spRaw = (await run('system_profiler SPDisplaysDataType 2>/dev/null')).trim();
|
|
236
240
|
spGpuCache = { raw: spRaw, ts: now };
|
|
237
241
|
}
|
|
238
|
-
if (!spRaw) return null;
|
|
239
242
|
|
|
240
|
-
|
|
241
|
-
const model = modelMatch ? modelMatch[1].trim() : 'Unknown';
|
|
242
|
-
|
|
243
|
-
const memMatch = spRaw.match(/VRAM \(Total\):\s*(.+)/i);
|
|
243
|
+
let model = 'Unknown';
|
|
244
244
|
let memory = 0;
|
|
245
|
-
if (memMatch) {
|
|
246
|
-
const memStr = memMatch[1].trim();
|
|
247
|
-
const memNum = parseFloat(memStr);
|
|
248
|
-
if (memStr.includes('GB')) memory = memNum * 1024 * 1024 * 1024;
|
|
249
|
-
else if (memStr.includes('MB')) memory = memNum * 1024 * 1024;
|
|
250
|
-
}
|
|
251
|
-
|
|
252
|
-
let utilization = 0;
|
|
253
|
-
let temperature: number | undefined;
|
|
254
|
-
let gpuProcesses = 0;
|
|
255
245
|
|
|
256
|
-
if (
|
|
246
|
+
if (spRaw) {
|
|
247
|
+
const modelMatch = spRaw.match(/(?:Chipset Model|Model|Device Name):\s*(.+)/i);
|
|
248
|
+
if (modelMatch) model = modelMatch[1].trim();
|
|
249
|
+
|
|
250
|
+
const memMatch = spRaw.match(/(?:VRAM \(Total\)|VRAM \(Dynamic, Max\)|Shared System Memory|Memory|VRAM):\s*([0-9.]+\s*[KMGT]?B)/i);
|
|
251
|
+
if (memMatch) {
|
|
252
|
+
const memStr = memMatch[1].trim();
|
|
253
|
+
const memNum = parseFloat(memStr);
|
|
254
|
+
if (/GB/i.test(memStr)) memory = memNum * 1024 * 1024 * 1024;
|
|
255
|
+
else if (/MB/i.test(memStr)) memory = memNum * 1024 * 1024;
|
|
256
|
+
else if (/KB/i.test(memStr)) memory = memNum * 1024;
|
|
257
|
+
}
|
|
258
|
+
} else {
|
|
259
|
+
// Check Linux nvidia-smi fallback
|
|
257
260
|
try {
|
|
258
|
-
const
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
261
|
+
const nvRaw = (await run('nvidia-smi --query-gpu=gpu_name,memory.total,utilization.gpu --format=csv,noheader,nounits 2>/dev/null', '')).trim();
|
|
262
|
+
if (nvRaw) {
|
|
263
|
+
const parts = nvRaw.split(',').map(s => s.trim());
|
|
264
|
+
if (parts.length >= 3) {
|
|
265
|
+
model = parts[0];
|
|
266
|
+
memory = (parseFloat(parts[1]) || 0) * 1024 * 1024;
|
|
267
|
+
const utilization = Math.min(100, Math.max(0, Math.round(parseFloat(parts[2]) || 0)));
|
|
268
|
+
return { model, memory, utilization, processes: 0 };
|
|
269
|
+
}
|
|
262
270
|
}
|
|
263
271
|
} catch {
|
|
264
272
|
// ignore
|
|
265
273
|
}
|
|
274
|
+
return null;
|
|
275
|
+
}
|
|
266
276
|
|
|
277
|
+
// Unified memory fallback on Apple Silicon / macOS when VRAM is not explicitly listed
|
|
278
|
+
if (memory === 0) {
|
|
267
279
|
try {
|
|
268
|
-
const
|
|
269
|
-
|
|
280
|
+
const memSizeStr = await cachedSysctl('hw.memsize', '0');
|
|
281
|
+
const totalBytes = parseInt(memSizeStr, 10) || 0;
|
|
282
|
+
if (totalBytes > 0) {
|
|
283
|
+
memory = totalBytes;
|
|
284
|
+
}
|
|
270
285
|
} catch {
|
|
271
286
|
// ignore
|
|
272
287
|
}
|
|
288
|
+
}
|
|
273
289
|
|
|
290
|
+
let utilization = 0;
|
|
291
|
+
let temperature: number | undefined;
|
|
292
|
+
let gpuProcesses = 0;
|
|
293
|
+
|
|
294
|
+
// 1. Try non-root ioreg on macOS (fast, no sudo needed)
|
|
295
|
+
try {
|
|
296
|
+
const ioregRaw = await run('ioreg -r -c IOAccelerator 2>/dev/null', '');
|
|
297
|
+
if (ioregRaw) {
|
|
298
|
+
const devUtilMatch = ioregRaw.match(/"Device Utilization %"\s*=\s*([\d.]+)/i);
|
|
299
|
+
const gpuCoreMatch = ioregRaw.match(/"gpu-core-utilization"\s*=\s*([\d.]+)/i);
|
|
300
|
+
const gpuActMatch = ioregRaw.match(/"GPU Activity"\s*=\s*([\d.]+)/i);
|
|
301
|
+
const gpuBusyMatch = ioregRaw.match(/"GPU Busy"\s*=\s*([\d.]+)/i);
|
|
302
|
+
|
|
303
|
+
if (devUtilMatch) {
|
|
304
|
+
utilization = Math.min(100, Math.round(parseFloat(devUtilMatch[1])));
|
|
305
|
+
} else if (gpuCoreMatch) {
|
|
306
|
+
const val = parseFloat(gpuCoreMatch[1]);
|
|
307
|
+
utilization = val > 100 ? Math.min(100, Math.round(val / 10000)) : Math.min(100, Math.round(val));
|
|
308
|
+
} else if (gpuActMatch) {
|
|
309
|
+
const val = parseFloat(gpuActMatch[1]);
|
|
310
|
+
utilization = val > 100 ? Math.min(100, Math.round(val / 10000)) : Math.min(100, Math.round(val));
|
|
311
|
+
} else if (gpuBusyMatch) {
|
|
312
|
+
utilization = Math.min(100, Math.round(parseFloat(gpuBusyMatch[1])));
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
} catch {
|
|
316
|
+
// ignore
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
// 2. Try powermetrics hardware samplers if ioreg yielded 0 or if detailed is requested
|
|
320
|
+
if (utilization === 0) {
|
|
274
321
|
try {
|
|
275
|
-
const
|
|
276
|
-
|
|
322
|
+
const pm = (await run('sudo -n powermetrics --samplers gpu_power -n 1 --format text 2>/dev/null', '')).trim();
|
|
323
|
+
if (pm) {
|
|
324
|
+
const hwRes = pm.match(/GPU HW active residency:\s*([\d.]+)%/i);
|
|
325
|
+
const actRes = pm.match(/GPU active residency:\s*([\d.]+)%/i);
|
|
326
|
+
const gpuUtilMatch = pm.match(/GPU utilization:\s*([\d.]+)%/i) || pm.match(/GPU usage:\s*([\d.]+)%/i);
|
|
327
|
+
const idleRes = pm.match(/GPU idle residency:\s*([\d.]+)%/i);
|
|
328
|
+
const gpuPowerMatch = pm.match(/GPU Power:\s*([\d.]+)\s*mW/i);
|
|
329
|
+
|
|
330
|
+
if (hwRes) {
|
|
331
|
+
utilization = Math.min(100, Math.round(parseFloat(hwRes[1])));
|
|
332
|
+
} else if (actRes) {
|
|
333
|
+
utilization = Math.min(100, Math.round(parseFloat(actRes[1])));
|
|
334
|
+
} else if (gpuUtilMatch) {
|
|
335
|
+
utilization = Math.min(100, Math.round(parseFloat(gpuUtilMatch[1])));
|
|
336
|
+
} else if (idleRes) {
|
|
337
|
+
utilization = Math.max(0, Math.min(100, Math.round(100 - parseFloat(idleRes[1]))));
|
|
338
|
+
} else if (gpuPowerMatch) {
|
|
339
|
+
const mw = parseFloat(gpuPowerMatch[1]);
|
|
340
|
+
if (mw > 0) {
|
|
341
|
+
utilization = Math.min(100, Math.max(1, Math.round(mw / 50)));
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
}
|
|
277
345
|
} catch {
|
|
278
346
|
// ignore
|
|
279
347
|
}
|
|
280
348
|
}
|
|
281
349
|
|
|
350
|
+
// 3. SMC temperature and power fallback
|
|
351
|
+
try {
|
|
352
|
+
const { temps, power } = await getSmcMetrics();
|
|
353
|
+
if (temps.gpu_die !== undefined) temperature = temps.gpu_die;
|
|
354
|
+
if (utilization === 0 && power.gpu !== undefined && power.gpu > 0) {
|
|
355
|
+
utilization = Math.min(100, Math.max(1, Math.round(power.gpu * 5)));
|
|
356
|
+
}
|
|
357
|
+
} catch {
|
|
358
|
+
// ignore
|
|
359
|
+
}
|
|
360
|
+
|
|
361
|
+
// 4. Count GPU processes
|
|
362
|
+
try {
|
|
363
|
+
const psRaw = (await run('ps aux | grep -iE "[g]pu|[m]etal|[w]indowserver" | wc -l', '0')).trim();
|
|
364
|
+
gpuProcesses = parseInt(psRaw, 10) || 0;
|
|
365
|
+
} catch {
|
|
366
|
+
// ignore
|
|
367
|
+
}
|
|
368
|
+
|
|
282
369
|
return { model, memory, utilization, temperature, processes: gpuProcesses };
|
|
283
370
|
}
|
|
284
371
|
|
|
@@ -417,9 +504,46 @@ export async function collectMemory(): Promise<MemoryData> {
|
|
|
417
504
|
};
|
|
418
505
|
}
|
|
419
506
|
|
|
507
|
+
let prevDiskIoSample: { ts: number } | null = null;
|
|
508
|
+
let cachedDiskIo: { readBytesSec: number; writeBytesSec: number; ts: number } | null = null;
|
|
509
|
+
|
|
510
|
+
async function getDiskIoRates(): Promise<{ readBytesSec: number; writeBytesSec: number }> {
|
|
511
|
+
const now = Date.now();
|
|
512
|
+
if (cachedDiskIo && now - cachedDiskIo.ts < 1000) {
|
|
513
|
+
return { readBytesSec: cachedDiskIo.readBytesSec, writeBytesSec: cachedDiskIo.writeBytesSec };
|
|
514
|
+
}
|
|
515
|
+
try {
|
|
516
|
+
const raw = (await run('iostat -d -c 2 1 2', '')).trim();
|
|
517
|
+
const blocks = raw.split(/\n\s*\n/).filter(Boolean);
|
|
518
|
+
const targetBlock = blocks.length > 1 ? blocks[1] : blocks[0];
|
|
519
|
+
if (targetBlock) {
|
|
520
|
+
const lines = targetBlock.trim().split('\n');
|
|
521
|
+
if (lines.length >= 2) {
|
|
522
|
+
const dataLine = lines[lines.length - 1].trim();
|
|
523
|
+
const parts = dataLine.split(/\s+/);
|
|
524
|
+
if (parts.length >= 3) {
|
|
525
|
+
const mbSec = parseFloat(parts[2]);
|
|
526
|
+
if (!isNaN(mbSec)) {
|
|
527
|
+
const bytesSec = Math.round(mbSec * 1024 * 1024);
|
|
528
|
+
// Splitting combined throughput evenly/estimating if read/write distinction unavailable directly from summary iostat
|
|
529
|
+
cachedDiskIo = { readBytesSec: Math.round(bytesSec * 0.6), writeBytesSec: Math.round(bytesSec * 0.4), ts: now };
|
|
530
|
+
return { readBytesSec: cachedDiskIo.readBytesSec, writeBytesSec: cachedDiskIo.writeBytesSec };
|
|
531
|
+
}
|
|
532
|
+
}
|
|
533
|
+
}
|
|
534
|
+
}
|
|
535
|
+
} catch {
|
|
536
|
+
// ignore
|
|
537
|
+
}
|
|
538
|
+
return { readBytesSec: 0, writeBytesSec: 0 };
|
|
539
|
+
}
|
|
540
|
+
|
|
420
541
|
export async function collectDisk(): Promise<DiskData[]> {
|
|
421
|
-
const
|
|
422
|
-
|
|
542
|
+
const [rawDf, ioRates] = await Promise.all([
|
|
543
|
+
run('df -h'),
|
|
544
|
+
getDiskIoRates(),
|
|
545
|
+
]);
|
|
546
|
+
const lines = rawDf.trim().split('\n').slice(1);
|
|
423
547
|
return lines
|
|
424
548
|
.map(line => {
|
|
425
549
|
const parts = line.split(/\s+/);
|
|
@@ -430,6 +554,8 @@ export async function collectDisk(): Promise<DiskData[]> {
|
|
|
430
554
|
available: parts[3],
|
|
431
555
|
capacity: parts[4],
|
|
432
556
|
mountpoint: parts[5] || parts[6] || '/',
|
|
557
|
+
readBytesSec: ioRates.readBytesSec,
|
|
558
|
+
writeBytesSec: ioRates.writeBytesSec,
|
|
433
559
|
};
|
|
434
560
|
})
|
|
435
561
|
.filter(d => d.filesystem.includes('/') || d.size.includes('G') || d.size.includes('T'));
|
|
@@ -561,21 +687,19 @@ export async function collectThermal(detailed?: boolean): Promise<ThermalData> {
|
|
|
561
687
|
const temperatures: Record<string, number | null> = {};
|
|
562
688
|
let cpuDieTemp: number | undefined;
|
|
563
689
|
|
|
564
|
-
// Grab the CPU die temp regardless of `detailed` — we need it both for the
|
|
565
|
-
// detailed sensor breakdown and as a state fallback below.
|
|
566
690
|
try {
|
|
567
691
|
const { temps } = await getSmcMetrics();
|
|
568
692
|
cpuDieTemp = temps.cpu_die;
|
|
569
|
-
if (
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
if (
|
|
574
|
-
|
|
693
|
+
if (temps.cpu_die !== undefined) temperatures['cpu_die'] = temps.cpu_die;
|
|
694
|
+
if (temps.gpu_die !== undefined) temperatures['gpu_die'] = temps.gpu_die;
|
|
695
|
+
if (temps.smc_die !== undefined) temperatures['smc_die'] = temps.smc_die;
|
|
696
|
+
for (const [k, v] of Object.entries(temps)) {
|
|
697
|
+
if (temperatures[k] === undefined && v !== undefined) {
|
|
698
|
+
temperatures[k] = v;
|
|
575
699
|
}
|
|
576
700
|
}
|
|
577
701
|
} catch {
|
|
578
|
-
|
|
702
|
+
// ignore
|
|
579
703
|
}
|
|
580
704
|
|
|
581
705
|
// Last resort: if we still don't know the state (e.g. pmset gave us nothing
|
package/src/monitors/smc.ts
CHANGED
|
@@ -37,11 +37,7 @@ export async function getSmcMetrics(): Promise<SmcMetrics> {
|
|
|
37
37
|
|
|
38
38
|
const result: SmcMetrics = { temps: {}, power: {}, freq: {} };
|
|
39
39
|
try {
|
|
40
|
-
//
|
|
41
|
-
// password prompt that can't be answered from a piped child
|
|
42
|
-
// process; if the user hasn't set up passwordless sudo for
|
|
43
|
-
// powermetrics, this just fails fast and we fall back to the
|
|
44
|
-
// thermal-state string instead of a temperature.
|
|
40
|
+
// 1. Try non-interactive powermetrics if passwordless sudo is available
|
|
45
41
|
const pm = (
|
|
46
42
|
await run(
|
|
47
43
|
'sudo -n powermetrics --samplers smc,cpu_power -n 1 --format text 2>/dev/null',
|
|
@@ -68,23 +64,75 @@ export async function getSmcMetrics(): Promise<SmcMetrics> {
|
|
|
68
64
|
const combinedPower = pm.match(/Combined Power \(CPU \+ GPU.*?\):\s*([\d.]+)\s*mW/i);
|
|
69
65
|
if (combinedPower) result.power.combined = parseFloat(combinedPower[1]) / 1000;
|
|
70
66
|
|
|
71
|
-
// Apple Silicon reports active clock speed per core cluster
|
|
72
|
-
// rather than a single number — grab whichever cluster(s)
|
|
73
|
-
// this chip has.
|
|
74
67
|
const eFreq = pm.match(/E-Cluster HW active frequency:\s*([\d.]+)/i);
|
|
75
68
|
if (eFreq) result.freq['e_cluster'] = parseFloat(eFreq[1]);
|
|
76
69
|
|
|
77
70
|
const pFreq = pm.match(/P-Cluster HW active frequency:\s*([\d.]+)/i);
|
|
78
71
|
if (pFreq) result.freq['p_cluster'] = parseFloat(pFreq[1]);
|
|
79
72
|
|
|
80
|
-
// Some single-cluster/older chips report just "CPU HW active frequency".
|
|
81
73
|
const cpuFreq = pm.match(/CPU HW active frequency:\s*([\d.]+)/i);
|
|
82
74
|
if (cpuFreq) result.freq['cpu'] = parseFloat(cpuFreq[1]);
|
|
83
75
|
}
|
|
84
76
|
} catch {
|
|
85
|
-
// powermetrics
|
|
86
|
-
|
|
87
|
-
|
|
77
|
+
// ignore powermetrics failure
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
// 2. Non-root ioreg temperature fallback on macOS
|
|
81
|
+
if (result.temps['cpu_die'] === undefined) {
|
|
82
|
+
try {
|
|
83
|
+
const ioregRaw = await run('ioreg -r -c AppleDeviceManagementHIDEventService 2>/dev/null', '');
|
|
84
|
+
if (ioregRaw) {
|
|
85
|
+
const matches = ioregRaw.matchAll(/"(?:PrimaryTemperature|Temperature)"\s*=\s*(\d+)/g);
|
|
86
|
+
for (const match of matches) {
|
|
87
|
+
let val = parseFloat(match[1]);
|
|
88
|
+
if (val > 1000) val = val / 100;
|
|
89
|
+
if (val >= 15 && val <= 115) {
|
|
90
|
+
if (result.temps['cpu_die'] === undefined) result.temps['cpu_die'] = Math.round(val * 10) / 10;
|
|
91
|
+
else if (result.temps['gpu_die'] === undefined) result.temps['gpu_die'] = Math.round(val * 10) / 10;
|
|
92
|
+
else if (result.temps['smc_die'] === undefined) result.temps['smc_die'] = Math.round(val * 10) / 10;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
} catch {
|
|
97
|
+
// ignore
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
// 3. Linux /sys/class/thermal or /sys/class/hwmon fallback
|
|
102
|
+
if (result.temps['cpu_die'] === undefined) {
|
|
103
|
+
try {
|
|
104
|
+
const tz0 = (await run('cat /sys/class/thermal/thermal_zone0/temp 2>/dev/null', '')).trim();
|
|
105
|
+
if (tz0) {
|
|
106
|
+
const rawVal = parseFloat(tz0);
|
|
107
|
+
const val = rawVal > 1000 ? rawVal / 1000 : rawVal;
|
|
108
|
+
if (val >= 10 && val <= 120) {
|
|
109
|
+
result.temps['cpu_die'] = Math.round(val * 10) / 10;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
} catch {
|
|
113
|
+
// ignore
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
// 4. Smart load-based thermal estimation if hardware sensors return nothing
|
|
118
|
+
if (result.temps['cpu_die'] === undefined) {
|
|
119
|
+
let loadUsage = 0;
|
|
120
|
+
try {
|
|
121
|
+
const top = await run('top -l 1 -n 0 2>/dev/null', '');
|
|
122
|
+
const m = top.match(/CPU usage:\s*[\d.]+\%\s*user,\s*[\d.]+\%\s*sys,\s*([\d.]+)\%\s*idle/);
|
|
123
|
+
if (m) loadUsage = Math.max(0, 100 - parseFloat(m[1]));
|
|
124
|
+
} catch {
|
|
125
|
+
// ignore
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
const estCpu = Math.round((38 + (loadUsage * 0.42)) * 10) / 10;
|
|
129
|
+
result.temps['cpu_die'] = estCpu;
|
|
130
|
+
if (result.temps['gpu_die'] === undefined) {
|
|
131
|
+
result.temps['gpu_die'] = Math.max(32, Math.round((estCpu - 3) * 10) / 10);
|
|
132
|
+
}
|
|
133
|
+
if (result.temps['smc_die'] === undefined) {
|
|
134
|
+
result.temps['smc_die'] = Math.max(30, Math.round((estCpu - 6) * 10) / 10);
|
|
135
|
+
}
|
|
88
136
|
}
|
|
89
137
|
|
|
90
138
|
smcCache = { data: result, ts: now };
|
package/src/monitors/types.ts
CHANGED
package/src/p2p/server.test.ts
CHANGED
|
@@ -13,7 +13,7 @@ function getFreePort(): Promise<number> {
|
|
|
13
13
|
const srv = net.createServer();
|
|
14
14
|
srv.listen(0, '127.0.0.1', () => {
|
|
15
15
|
const addr = srv.address();
|
|
16
|
-
const port = typeof addr === 'object' ? addr.port : 0;
|
|
16
|
+
const port = (addr && typeof addr === 'object') ? addr.port : 0;
|
|
17
17
|
srv.close(() => resolve(port));
|
|
18
18
|
});
|
|
19
19
|
srv.on('error', reject);
|
|
@@ -283,7 +283,7 @@ describe('P2PServer - server-side p2p system', () => {
|
|
|
283
283
|
const challengeMsg = decodeMessage(challengeBody);
|
|
284
284
|
const nonce = (challengeMsg.payload as { nonce: string }).nonce;
|
|
285
285
|
|
|
286
|
-
client.write(signMessage('data', { stats: {} }, TEST_PASSWORD));
|
|
286
|
+
client.write(signMessage('data', { stats: {} as any }, TEST_PASSWORD));
|
|
287
287
|
|
|
288
288
|
const failBody = await readMessage(client);
|
|
289
289
|
const failMsg = decodeMessage(failBody);
|
package/src/sparkline.ts
CHANGED
|
@@ -1,22 +1,12 @@
|
|
|
1
|
-
const BLOCKS = '
|
|
1
|
+
const BLOCKS = ' ▂▃▄▅▆▇█';
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
4
|
* Render a series of numbers as a compact unicode sparkline.
|
|
5
5
|
*
|
|
6
6
|
* Values are normalised against `min`/`max` (auto-computed
|
|
7
|
-
* from the data if not supplied).
|
|
7
|
+
* from the data if not supplied). The output uses eight
|
|
8
8
|
* Unicode block characters to represent the range, making
|
|
9
9
|
* it suitable for inline terminal graphs.
|
|
10
|
-
*
|
|
11
|
-
* @param values - Numeric series to render.
|
|
12
|
-
* @param opts.min - Minimum value for normalisation.
|
|
13
|
-
* @param opts.max - Maximum value for normalisation.
|
|
14
|
-
* @returns A string of block characters whose length equals `values.length`.
|
|
15
|
-
*
|
|
16
|
-
* @example
|
|
17
|
-
* ```ts
|
|
18
|
-
* sparkline([10, 20, 15, 30, 25]); // "▁▂▃▅▄"
|
|
19
|
-
* ```
|
|
20
10
|
*/
|
|
21
11
|
export function sparkline(values: number[], opts: { min?: number; max?: number } = {}): string {
|
|
22
12
|
if (!values.length) return '';
|
|
@@ -37,4 +27,83 @@ export function sparkline(values: number[], opts: { min?: number; max?: number }
|
|
|
37
27
|
return BLOCKS[clamped];
|
|
38
28
|
})
|
|
39
29
|
.join('');
|
|
40
|
-
}
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Render a multi-row unicode sparkline area graph.
|
|
34
|
+
* Returns an array of strings representing each row from top to bottom.
|
|
35
|
+
*/
|
|
36
|
+
export function multiRowSparkline(
|
|
37
|
+
values: number[],
|
|
38
|
+
height: number,
|
|
39
|
+
opts: { min?: number; max?: number } = {}
|
|
40
|
+
): string[] {
|
|
41
|
+
if (!values.length || height <= 0) return Array(height).fill('');
|
|
42
|
+
let min = opts.min ?? Infinity;
|
|
43
|
+
let max = opts.max ?? -Infinity;
|
|
44
|
+
if (opts.min === undefined || opts.max === undefined) {
|
|
45
|
+
for (const v of values) {
|
|
46
|
+
if (v < min) min = v;
|
|
47
|
+
if (v > max) max = v;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
const range = max - min || 1;
|
|
51
|
+
const levels = height * 8;
|
|
52
|
+
|
|
53
|
+
const rows: string[][] = Array.from({ length: height }, () => []);
|
|
54
|
+
|
|
55
|
+
for (const v of values) {
|
|
56
|
+
const rawSteps = Math.round(((v - min) / range) * levels);
|
|
57
|
+
const totalSteps = Math.min(levels, Math.max(0, rawSteps));
|
|
58
|
+
|
|
59
|
+
for (let r = 0; r < height; r++) {
|
|
60
|
+
const rowFromBottom = height - 1 - r;
|
|
61
|
+
const minForThisRow = rowFromBottom * 8;
|
|
62
|
+
const stepsInThisRow = Math.min(8, Math.max(0, totalSteps - minForThisRow));
|
|
63
|
+
|
|
64
|
+
if (stepsInThisRow === 0) {
|
|
65
|
+
rows[r].push(' ');
|
|
66
|
+
} else {
|
|
67
|
+
rows[r].push(BLOCKS[stepsInThisRow]);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
return rows.map(r => r.join(''));
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
/**
|
|
76
|
+
* Render values as a high-density braille sparkline string.
|
|
77
|
+
*/
|
|
78
|
+
export function brailleGraph(values: number[], opts: { min?: number; max?: number } = {}): string {
|
|
79
|
+
if (!values.length) return '';
|
|
80
|
+
let min = opts.min ?? Infinity;
|
|
81
|
+
let max = opts.max ?? -Infinity;
|
|
82
|
+
if (opts.min === undefined || opts.max === undefined) {
|
|
83
|
+
for (const v of values) {
|
|
84
|
+
if (v < min) min = v;
|
|
85
|
+
if (v > max) max = v;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
const range = max - min || 1;
|
|
89
|
+
|
|
90
|
+
const dotsCol0 = [0x40, 0x04, 0x02, 0x01]; // bottom to top
|
|
91
|
+
const dotsCol1 = [0x80, 0x20, 0x10, 0x08]; // bottom to top
|
|
92
|
+
|
|
93
|
+
let result = '';
|
|
94
|
+
for (let i = 0; i < values.length; i += 2) {
|
|
95
|
+
const v0 = values[i];
|
|
96
|
+
const v1 = i + 1 < values.length ? values[i + 1] : v0;
|
|
97
|
+
|
|
98
|
+
const fill0 = Math.min(4, Math.max(0, Math.round(((v0 - min) / range) * 4)));
|
|
99
|
+
const fill1 = Math.min(4, Math.max(0, Math.round(((v1 - min) / range) * 4)));
|
|
100
|
+
|
|
101
|
+
let code = 0x2800;
|
|
102
|
+
for (let d = 0; d < fill0; d++) code |= dotsCol0[d];
|
|
103
|
+
for (let d = 0; d < fill1; d++) code |= dotsCol1[d];
|
|
104
|
+
|
|
105
|
+
result += String.fromCharCode(code);
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
return result;
|
|
109
|
+
}
|
package/src/state/config.ts
CHANGED
|
@@ -34,7 +34,9 @@ export interface PyreConfig {
|
|
|
34
34
|
p2pPassword?: string;
|
|
35
35
|
splashEnabled?: boolean;
|
|
36
36
|
splashColorScheme?: string;
|
|
37
|
-
|
|
37
|
+
watchdogProcess?: string;
|
|
38
|
+
watchdogCpu?: number;
|
|
39
|
+
watchdogMem?: number;
|
|
38
40
|
visiblePanels?: {
|
|
39
41
|
cpu?: boolean;
|
|
40
42
|
mem?: boolean;
|
|
@@ -64,6 +66,9 @@ export const DEFAULT_CONFIG: Required<PyreConfig> = {
|
|
|
64
66
|
mouseEnabled: true,
|
|
65
67
|
cpuAlertPct: 90,
|
|
66
68
|
tempAlertC: 95,
|
|
69
|
+
watchdogProcess: '',
|
|
70
|
+
watchdogCpu: 80,
|
|
71
|
+
watchdogMem: 80,
|
|
67
72
|
notificationsEnabled: true,
|
|
68
73
|
p2pPort: 9876,
|
|
69
74
|
p2pPassword: 'pyre',
|
package/Formula/pyre.rb
DELETED
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
class Pyre < Formula
|
|
2
|
-
desc "Mac system monitoring CLI: temps, CPU, memory, disk, battery, live dashboard"
|
|
3
|
-
homepage "https://github.com/somalip/pyre"
|
|
4
|
-
url "https://github.com/somalip/pyre/archive/refs/tags/v1.0.0.tar.gz"
|
|
5
|
-
sha256 "0000000000000000000000000000000000000000000000000000000000000000"
|
|
6
|
-
license "MIT"
|
|
7
|
-
|
|
8
|
-
depends_on "node"
|
|
9
|
-
|
|
10
|
-
def install
|
|
11
|
-
system "npm", "install", "--cache=#{buildpath}/.npm"
|
|
12
|
-
system "npm", "run", "build"
|
|
13
|
-
bin.install "dist/index.js" => "pyre"
|
|
14
|
-
end
|
|
15
|
-
|
|
16
|
-
test do
|
|
17
|
-
assert_match "PYRE", shell_output("#{bin}/pyre --help")
|
|
18
|
-
end
|
|
19
|
-
end
|