pyre-cli 4.13.0 → 4.15.0

package/dist/index.js

@@ -2,6 +2,7 @@
 
 // src/index.ts
 import fs4 from "fs";
+import os from "os";
 import readline2 from "readline";
 import { Command } from "commander";
 import chalk9 from "chalk";
@@ -504,15 +505,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 [];
@@ -3222,8 +3222,45 @@ function stripAnsi(s) {
 function sanitizeHost2(host) {
   return host.trim().replace(/%$/, "");
 }
+function detectLocalIP() {
+  const ifaces = os.networkInterfaces();
+  for (const [, addrs] of Object.entries(ifaces)) {
+    if (!addrs) continue;
+    for (const addr of addrs) {
+      if (addr.family === "IPv4" && !addr.internal) {
+        return addr.address;
+      }
+    }
+  }
+  return null;
+}
+async function runServerCommand() {
+  const ip = detectLocalIP();
+  if (!ip) {
+    console.log(chalk9.red("Could not detect a non-loopback IP address. Connect to a network first."));
+    process.exit(1);
+  }
+  const port = 9876;
+  const password = "mysecret";
+  console.log(chalk9.bold(`
+  pyre server`));
+  console.log(chalk9.dim(`  Detected IP: ${ip}`));
+  console.log(chalk9.dim(`  Port: ${port}`));
+  console.log(chalk9.dim(`  Password: ${password}`));
+  console.log();
+  console.log(chalk9.bold("Run this on THIS machine (server):"));
+  console.log(chalk9.hex("#ff6a39")(`pyre p2p server --p2p-host 0.0.0.0 --p2p-port ${port} --p2p-password ${password}`));
+  console.log();
+  console.log(chalk9.bold("Run this on the OTHER machine (client):"));
+  console.log(chalk9.hex("#ff6a39")(`pyre p2p connect --p2p-host ${ip} --p2p-port ${port} --p2p-password ${password}`));
+  console.log();
+}
 async function main() {
   const cmd = program.args[0];
+  if (cmd === "server") {
+    await runServerCommand();
+    return;
+  }
   if (cmd === "live" || !isExportMode() && !opts.once && cmd !== "p2p") {
     if (cmd === "live") {
       program.args.shift();

package/package.json

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

package/src/index.ts

@@ -7,6 +7,7 @@
  * P2P mode enables live data streaming between two systems over TCP.
  */
 import fs from 'node:fs';
+import os from 'node:os';
 import readline from 'node:readline';
 import { Command } from 'commander';
 import chalk from 'chalk';
@@ -69,9 +70,53 @@ function sanitizeHost(host: string): string {
   return host.trim().replace(/%$/, '');
 }
 
+function detectLocalIP(): string | null {
+  const ifaces = os.networkInterfaces();
+  for (const [, addrs] of Object.entries(ifaces)) {
+    if (!addrs) continue;
+    for (const addr of addrs) {
+      if (addr.family === 'IPv4' && !addr.internal) {
+        return addr.address;
+      }
+    }
+  }
+  return null;
+}
+
+async function runServerCommand(): Promise<void> {
+  const ip = detectLocalIP();
+
+  if (!ip) {
+    console.log(chalk.red('Could not detect a non-loopback IP address. Connect to a network first.'));
+    process.exit(1);
+  }
+
+  const port = 9876;
+  const password = 'mysecret';
+
+  console.log(chalk.bold(`\n  pyre server`));
+  console.log(chalk.dim(`  Detected IP: ${ip}`));
+  console.log(chalk.dim(`  Port: ${port}`));
+  console.log(chalk.dim(`  Password: ${password}`));
+  console.log();
+
+  console.log(chalk.bold('Run this on THIS machine (server):'));
+  console.log(chalk.hex('#ff6a39')(`pyre p2p server --p2p-host 0.0.0.0 --p2p-port ${port} --p2p-password ${password}`));
+  console.log();
+
+  console.log(chalk.bold('Run this on the OTHER machine (client):'));
+  console.log(chalk.hex('#ff6a39')(`pyre p2p connect --p2p-host ${ip} --p2p-port ${port} --p2p-password ${password}`));
+  console.log();
+}
+
 async function main() {
   const cmd = program.args[0];
 
+  if (cmd === 'server') {
+    await runServerCommand();
+    return;
+  }
+
   if (cmd === 'live' || (!isExportMode() && !opts.once && cmd !== 'p2p')) {
     if (cmd === 'live') {
       program.args.shift();

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 [];
   }