pyre-cli 4.12.0 → 4.14.0

package/README.md

@@ -7,6 +7,8 @@ Mac system monitoring CLI: temps, CPU, memory, disk, battery, live dashboard, pa
 ![Node](https://img.shields.io/badge/node-18%2B-green)
 ![License](https://img.shields.io/badge/license-MIT-green)
 
+> Note : things may not work as intended if your firewall settings do not allow inbound connections for this program
+
 ## Features
 
 - **P2P live data streaming** — send live system stats to another system over TCP with password authentication, TLS encryption, rate limiting, IP allow/deny lists, audit logging, and HMAC message signing
@@ -38,12 +40,6 @@ npm install -g pyre-cli
 curl -fsSL https://raw.githubusercontent.com/somalip/pyre/main/install.sh | bash
 ```
 
-### Homebrew
-
-```bash
-brew install pyre
-```
-
 ## Usage
 
 ### Static snapshot

package/dist/index.js

@@ -504,15 +504,14 @@ async function collectProcesses(limit) {
   try {
     const isMac = process.platform === "darwin";
     const sortArg = isMac ? "-r" : "--sort=-pcpu";
-    const threadsArg = isMac ? "threads" : "nlwp";
     const headClause = limit && limit > 0 ? ` | head -n ${limit + 1}` : "";
-    const raw = (await run(`ps -eo pid,ppid,user,pcpu,pmem,state,${threadsArg},time,comm ${sortArg}${headClause}`)).trim();
+    const raw = (await run(`ps -eo pid,ppid,user,pcpu,pmem,state,time,comm ${sortArg}${headClause}`)).trim();
     const lines = raw.split("\n").slice(1);
     return lines.map((line) => {
-      const parts = line.match(/\s*(\d+)\s+(\d+)\s+(\S+)\s+([\d.]+)\s+([\d.]+)\s+(\S+)\s+(\d+)\s+([\d:]+)\s+(.+)/);
+      const parts = line.match(/\s*(\d+)\s+(\d+)\s+(\S+)\s+([\d.]+)\s+([\d.]+)\s+(\S+)\s+([\d:.]+)\s+(.+)/);
       if (!parts) return null;
-      const runtimeSec = parts[8].split(":").reduce((acc, val, idx) => acc + parseInt(val) * Math.pow(60, 2 - idx), 0);
-      return { pid: parseInt(parts[1]), ppid: parseInt(parts[2]), user: parts[3], cpu: parseFloat(parts[4]), mem: parseFloat(parts[5]), state: parts[6], threads: parseInt(parts[7]), runtime: runtimeSec, command: parts[9] };
+      const runtimeSec = parts[7].split(":").reduce((acc, val, idx) => acc + parseInt(val) * Math.pow(60, 2 - idx), 0);
+      return { pid: parseInt(parts[1]), ppid: parseInt(parts[2]), user: parts[3], cpu: parseFloat(parts[4]), mem: parseFloat(parts[5]), state: parts[6], threads: 0, runtime: runtimeSec, command: parts[8] };
     }).filter((p) => p !== null && p.pid > 0);
   } catch {
     return [];
@@ -590,7 +589,7 @@ async function collectTasks(limit = 12) {
     const raw = (await run(`ps -eo pid,user,pcpu,pmem,state,time,comm ${sortArg} | head -n ${limit + 1}`)).trim();
     const lines = raw.split("\n").slice(1);
     return lines.map((line) => {
-      const parts = line.match(/\s*(\d+)\s+(\S+)\s+([\d.]+)\s+([\d.]+)\s+(\S+)\s+([\d:]+)\s+(.+)/);
+      const parts = line.match(/\s*(\d+)\s+(\S+)\s+([\d.]+)\s+([\d.]+)\s+(\S+)\s+([\d:.]+)\s+(.+)/);
       if (!parts) return null;
       const runtimeSec = parts[6].split(":").reduce((acc, val, idx) => acc + parseInt(val) * Math.pow(60, 2 - idx), 0);
       return { pid: parseInt(parts[1]), user: parts[2], cpu: parseFloat(parts[3]), mem: parseFloat(parts[4]), state: parts[5], runtime: runtimeSec, command: parts[7] };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pyre-cli",
-  "version": "4.12.0",
+  "version": "4.14.0",
   "description": "CLI Mac monitoring tool: temps, system stats, live dashboard, packet monitor, battery predictor, export",
   "main": "dist/index.js",
   "type": "module",

package/src/monitors/collectors.ts

@@ -606,20 +606,19 @@ export async function collectNetwork(): Promise<NetworkData> {
 
 export async function collectProcesses(limit?: number): Promise<ProcessData[]> {
    try {
-     const isMac = process.platform === 'darwin';
-     const sortArg = isMac ? '-r' : '--sort=-pcpu';
-     const threadsArg = isMac ? 'threads' : 'nlwp';
-     const headClause = limit && limit > 0 ? ` | head -n ${limit + 1}` : '';
-     const raw = (await run(`ps -eo pid,ppid,user,pcpu,pmem,state,${threadsArg},time,comm ${sortArg}${headClause}`)).trim();
-     const lines = raw.split('\n').slice(1);
-     return lines
-       .map(line => {
-         const parts = line.match(/\s*(\d+)\s+(\d+)\s+(\S+)\s+([\d.]+)\s+([\d.]+)\s+(\S+)\s+(\d+)\s+([\d:]+)\s+(.+)/);
-         if (!parts) return null;
-         const runtimeSec = parts[8].split(':').reduce((acc, val, idx) => acc + parseInt(val) * Math.pow(60, 2 - idx), 0);
-         return { pid: parseInt(parts[1]), ppid: parseInt(parts[2]), user: parts[3], cpu: parseFloat(parts[4]), mem: parseFloat(parts[5]), state: parts[6], threads: parseInt(parts[7]), runtime: runtimeSec, command: parts[9] };
-       })
-       .filter((p): p is ProcessData => p !== null && p.pid > 0);
+      const isMac = process.platform === 'darwin';
+      const sortArg = isMac ? '-r' : '--sort=-pcpu';
+      const headClause = limit && limit > 0 ? ` | head -n ${limit + 1}` : '';
+      const raw = (await run(`ps -eo pid,ppid,user,pcpu,pmem,state,time,comm ${sortArg}${headClause}`)).trim();
+      const lines = raw.split('\n').slice(1);
+      return lines
+        .map(line => {
+           const parts = line.match(/\s*(\d+)\s+(\d+)\s+(\S+)\s+([\d.]+)\s+([\d.]+)\s+(\S+)\s+([\d:.]+)\s+(.+)/);
+           if (!parts) return null;
+           const runtimeSec = parts[7].split(':').reduce((acc, val, idx) => acc + parseInt(val) * Math.pow(60, 2 - idx), 0);
+           return { pid: parseInt(parts[1]), ppid: parseInt(parts[2]), user: parts[3], cpu: parseFloat(parts[4]), mem: parseFloat(parts[5]), state: parts[6], threads: 0, runtime: runtimeSec, command: parts[8] };
+        })
+        .filter((p): p is ProcessData => p !== null && p.pid > 0);
   } catch {
     return [];
   }
@@ -704,10 +703,10 @@ export async function collectTasks(limit = 12): Promise<TaskData[]> {
      const lines = raw.split('\n').slice(1);
      return lines
        .map(line => {
-         const parts = line.match(/\s*(\d+)\s+(\S+)\s+([\d.]+)\s+([\d.]+)\s+(\S+)\s+([\d:]+)\s+(.+)/);
-         if (!parts) return null;
-         const runtimeSec = parts[6].split(':').reduce((acc, val, idx) => acc + parseInt(val) * Math.pow(60, 2 - idx), 0);
-         return { pid: parseInt(parts[1]), user: parts[2], cpu: parseFloat(parts[3]), mem: parseFloat(parts[4]), state: parts[5], runtime: runtimeSec, command: parts[7] };
+          const parts = line.match(/\s*(\d+)\s+(\S+)\s+([\d.]+)\s+([\d.]+)\s+(\S+)\s+([\d:.]+)\s+(.+)/);
+          if (!parts) return null;
+          const runtimeSec = parts[6].split(':').reduce((acc, val, idx) => acc + parseInt(val) * Math.pow(60, 2 - idx), 0);
+          return { pid: parseInt(parts[1]), user: parts[2], cpu: parseFloat(parts[3]), mem: parseFloat(parts[4]), state: parts[5], runtime: runtimeSec, command: parts[7] };
        })
        .filter((t): t is TaskData => t !== null && t.pid > 0);
   } catch {