bm2 1.0.22 → 1.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bm2",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "A blazing-fast, full-featured process manager built entirely on Bun native APIs. The modern PM2 replacement — zero Node.js dependencies, pure Bun performance.",
   "main": "src/api.ts",
   "module": "src/api.ts",
@@ -65,10 +65,12 @@
   ],
   "dependencies": {
     "cli-table3": "^0.6.5",
+    "pidusage": "^4.0.1",
     "ws": "^8.19.0"
   },
   "devDependencies": {
     "@types/bun": "^1.3.9",
+    "@types/pidusage": "^2.0.5",
     "@types/ws": "^8.18.1",
     "bun-types": "latest",
     "typescript": "^5.9.3"

package/src/process-container.ts

@@ -32,6 +32,9 @@ import {
   DEFAULT_LOG_MAX_SIZE,
   DEFAULT_LOG_RETAIN,
 } from "./constants";
+import pidusage from "pidusage";
+import { readdir } from "node:fs/promises";
+
 
 export class ProcessContainer {
   public id: number;
@@ -238,42 +241,37 @@ export class ProcessContainer {
     } catch {}
   }
 
+  
   private startMonitoring() {
-    this.monitorInterval = setInterval(async () => {
-      if (!this.pid || this.status !== "online") return;
-
-      try {
-        if (process.platform === "linux") {
-          const statusFile = Bun.file(`/proc/${this.pid}/status`);
-          if (await statusFile.exists()) {
-            const content = await statusFile.text();
-            const vmRss = content.match(/VmRSS:\s+(\d+)\s+kB/);
-            if (vmRss) this.memory = parseInt(vmRss[1]!) * 1024;
+      this.monitorInterval = setInterval(async () => {
+        
+        if (!this.pid || this.status !== "online") return;
+  
+        try {
+          
+          // 1. Fetch cross-platform CPU and Memory usage
+          const stats = await pidusage(this.pid);
+          
+          // pidusage returns memory directly in bytes and cpu as a percentage
+          this.memory = stats.memory; 
+          this.cpu = stats.cpu;
+  
+          // 2. Track file descriptors (handles) on Linux
+          // (pidusage does not provide this metric, so we keep the original logic)
+          if (process.platform === "linux") {
+            try {
+              this.handles = (await readdir(`/proc/${this.pid}/fd`)).length;
+            } catch {}
           }
-
-          try {
-            const { readdirSync } = require("fs");
-            this.handles = readdirSync(`/proc/${this.pid}/fd`).length;
-          } catch {}
-        } else {
-          const ps = Bun.spawn(["ps", "-o", "rss=,pcpu=", "-p", String(this.pid)], {
-            stdout: "pipe", stderr: "pipe",
-          });
-          const output = await new Response(ps.stdout).text();
-          const parts = output.trim().split(/\s+/);
-          if (parts.length >= 2) {
-            this.memory = parseInt(parts[0]!) * 1024;
-            this.cpu = parseFloat(parts[1]!);
+  
+          // 3. Max memory restart
+          if (this.config.maxMemoryRestart && this.memory > this.config.maxMemoryRestart) {
+            console.log(`[bm2] ${this.name} exceeded memory limit (${this.memory} > ${this.config.maxMemoryRestart}), restarting...`);
+            await this.restart();
           }
-        }
-
-        // Max memory restart
-        if (this.config.maxMemoryRestart && this.memory > this.config.maxMemoryRestart) {
-          console.log(`[bm2] ${this.name} exceeded memory limit (${this.memory} > ${this.config.maxMemoryRestart}), restarting...`);
-          await this.restart();
-        }
-      } catch {}
-    }, MONITOR_INTERVAL);
+          
+        } catch {}
+      }, MONITOR_INTERVAL);
   }
 
   private startLogRotation(logPaths: { outFile: string; errFile: string }) {

package/src/process-table.ts

@@ -106,6 +106,8 @@ export function printProcessTable(processes: ProcessState[]) {
     style: { border: ["dim"] },
     chars: minimalBorders(),
   });
+  
+  //console.log("processes===>", processes)
 
   for (const p of processes) {
     const cpu = p.monit?.cpu ?? 0;
@@ -158,6 +160,7 @@ export function liveWatchProcess(processes: ProcessState[], interval = 5_000) {
   // Render table
   const render = () => {
     clear();
+    
     printProcessTable(getSortedProcesses());
     
     console.log(color("─".repeat(50), "dim"));

package/src/startup-manager.ts

@@ -15,7 +15,8 @@
  */
  
  import { join } from "path";
- 
+ import { $ } from "bun";
+
  export class StartupManager {
    async generate(platform?: string): Promise<string> {
      const os = platform || process.platform;
@@ -59,7 +60,7 @@ ExecStop=${bunPath} run ${bm2Path} kill
 WantedBy=multi-user.target
 `;
    
-     const servicePath = "/etc/systemd/system/bm2.service";
+const servicePath = "/etc/systemd/system/bm2.service";
 return `# BM2 Systemd Service
 # Save to: ${servicePath}
 # Then run:
@@ -101,29 +102,41 @@ ${unit}`;
  </dict>
  </plist>`;
  
-     const plistPath = `${process.env.HOME}/Library/LaunchAgents/com.bm2.daemon.plist`;
-     return `# BM2 LaunchAgent (macOS)
- # Save to: ${plistPath}
- # Then run:
- #   launchctl load ${plistPath}
+const plistPath = `${process.env.HOME}/Library/LaunchAgents/com.bm2.daemon.plist`;
+
+return `# BM2 LaunchAgent (macOS)
+# Save to: ${plistPath}
+# Then run:
+# launchctl load ${plistPath}
  
- ${plist}`;
-   }
+${plist}`;
+}
  
    async install(): Promise<string> {
      const os = process.platform;
      const content = await this.generate(os);
  
      if (os === "linux") {
+       
        const servicePath = "/etc/systemd/system/bm2.service";
-       // Extract just the unit content
-       //const unitContent = content.split("\n\n").slice(1).join("\n\n");
-       await Bun.write(servicePath, content);
- 
-       Bun.spawn(["sudo", "systemctl", "daemon-reload"], { stdout: "inherit" }).exited;
-       Bun.spawn(["sudo", "systemctl", "enable", "bm2"], { stdout: "inherit" }).exited;
- 
-       return `Service installed at ${servicePath}\nRun: sudo systemctl start bm2`;
+       
+       const unitStart = content.indexOf("[Unit]");
+       const unitContent = content.substring(unitStart);
+       
+       try {
+         await Bun.write(servicePath, unitContent);
+       } catch {
+         return "Failed to create the service file. Please ensure you have sufficient permissions (try running with sudo).";
+       }
+       
+      // Bun.spawn(["sudo", "systemctl", "daemon-reload"], { stdout: "inherit" }).exited;
+      // Bun.spawn(["sudo", "systemctl", "enable", "bm2"], { stdout: "inherit" }).exited;
+       
+       await $`systemctl daemon-reload`;
+       await $`systemctl enable bm2`;
+       await $`systemctl start bm2`;
+ 
+       return `Service installed at ${servicePath}`;
      } else if (os === "darwin") {
        const plistPath = `${process.env.HOME}/Library/LaunchAgents/com.bm2.daemon.plist`;
        // Extract plist content
@@ -141,17 +154,21 @@ ${unit}`;
      const os = process.platform;
  
      if (os === "linux") {
-       Bun.spawn(["sudo", "systemctl", "stop", "bm2"], { stdout: "inherit" });
-       Bun.spawn(["sudo", "systemctl", "disable", "bm2"], { stdout: "inherit" });
-       const { unlinkSync } = require("fs");
-       try { unlinkSync("/etc/systemd/system/bm2.service"); } catch {}
-       Bun.spawn(["sudo", "systemctl", "daemon-reload"], { stdout: "inherit" });
+       
+       await $`systemctl stop bm2`;
+       await $`systemctl disable bm2`;
+              
+       await $`rm -f /etc/systemd/system/bm2.service`;
+       await $`systemctl daemon-reload`;
+      
        return "BM2 service removed";
+     
      } else if (os === "darwin") {
+       
        const plistPath = `${process.env.HOME}/Library/LaunchAgents/com.bm2.daemon.plist`;
-       Bun.spawn(["launchctl", "unload", plistPath], { stdout: "inherit" });
-       const { unlinkSync } = require("fs");
-       try { unlinkSync(plistPath); } catch {}
+       
+       await $`launchctl unload ${plistPath}`;
+       await $`rm -f ${plistPath}`;
        return "BM2 launch agent removed";
      }