bs9 1.3.9 → 1.4.1

package/README.md

@@ -1,7 +1,7 @@
 # BS9 (Bun Sentinel 9) 🚀
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Version](https://img.shields.io/badge/version-1.3.7-blue.svg)](https://github.com/xarhang/bs9)
+[![Version](https://img.shields.io/badge/version-1.3.9-blue.svg)](https://github.com/xarhang/bs9)
 [![Security](https://img.shields.io/badge/security-Enterprise-green.svg)](SECURITY.md)
 [![Production Ready](https://img.shields.io/badge/production-Ready-brightgreen.svg)](PRODUCTION.md)
 [![Cross-Platform](https://img.shields.io/badge/platform-Linux%20%7C%20macOS%20%7C%20Windows-lightgrey.svg)](https://github.com/bs9/bs9)
@@ -26,24 +26,25 @@ chmod +x ~/.local/bin/bs9
 
 ---
 
-### Platform Support
-
-BS9 supports all major platforms with native service management:
+### 🌐 Platform Support
+- **✅ Auto-Detection**: Automatically detects platform and creates directories
+- **✅ Zero Configuration**: No manual setup required
+- **✅ Cross-Platform**: Same commands work on all platforms
 
 #### 🐧 Linux
 - **Service Manager**: Systemd (user-mode)
 - **Features**: Advanced security hardening, resource limits, sandboxing
-- **Commands**: All standard commands available
+- **Commands**: All 21 commands available
 
 #### 🍎 macOS  
 - **Service Manager**: Launchd
 - **Features**: Native macOS integration, automatic recovery
-- **Commands**: Standard commands + `bs9 macos` for launchd management
+- **Commands**: All commands + `bs9 macos` for launchd management
 
 #### 🪟 Windows
 - **Service Manager**: Windows Services
 - **Features**: PowerShell automation, event log integration
-- **Commands**: Standard commands + `bs9 windows` for service management
+- **Commands**: All commands + `bs9 windows` for service management
 
 ```bash
 # Check your platform

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bs9",
-  "version": "1.3.9",
+  "version": "1.4.1",
   "description": "Bun Sentinel 9 - High-performance, non-root process manager for Bun",
   "type": "module",
   "main": "src/index.ts",

package/src/commands/resurrect.ts

@@ -11,7 +11,7 @@
 
 import { execSync } from "node:child_process";
 import { join } from "node:path";
-import { getPlatformInfo } from "../platform/detect.js";
+import { getPlatformInfo, initializePlatformDirectories } from "../platform/detect.js";
 
 interface ResurrectOptions {
   all?: boolean;
@@ -28,6 +28,9 @@ function isValidServiceName(name: string): boolean {
 }
 
 export async function resurrectCommand(name: string, options: ResurrectOptions): Promise<void> {
+  // Initialize platform directories
+  initializePlatformDirectories();
+  
   const platformInfo = getPlatformInfo();
   
   // Handle resurrect all services
@@ -48,8 +51,7 @@ export async function resurrectCommand(name: string, options: ResurrectOptions):
       const escapedName = name.replace(/[^a-zA-Z0-9._-]/g, '');
       
       // Check if service exists in backup
-      const backupDir = join(platformInfo.configDir, 'backups');
-      const backupFile = join(backupDir, `${escapedName}.json`);
+      const backupFile = join(platformInfo.backupDir, `${escapedName}.json`);
       
       if (!require('node:fs').existsSync(backupFile)) {
         console.error(`❌ No backup found for service '${name}'`);
@@ -115,16 +117,12 @@ async function resurrectAllServices(platformInfo: any, options: ResurrectOptions
   try {
     console.log("🔄 Resurrecting all BS9 services from backup...");
     
+    // Initialize platform directories
+    initializePlatformDirectories();
+    
     if (platformInfo.isLinux) {
-      const backupDir = join(platformInfo.configDir, 'backups');
-      
-      if (!require('node:fs').existsSync(backupDir)) {
-        console.log("ℹ️ No backup directory found");
-        return;
-      }
-      
       // Get all backup files
-      const backupFiles = require('node:fs').readdirSync(backupDir)
+      const backupFiles = require('node:fs').readdirSync(platformInfo.backupDir)
         .filter((file: string) => file.endsWith('.json'));
       
       if (backupFiles.length === 0) {
@@ -137,7 +135,7 @@ async function resurrectAllServices(platformInfo: any, options: ResurrectOptions
       for (const backupFile of backupFiles) {
         try {
           const serviceName = backupFile.replace('.json', '');
-          const backupPath = join(backupDir, backupFile);
+          const backupPath = join(platformInfo.backupDir, backupFile);
           const backupConfig = JSON.parse(require('node:fs').readFileSync(backupPath, 'utf8'));
           
           // Restore service using backup configuration
@@ -161,11 +159,11 @@ async function resurrectAllServices(platformInfo: any, options: ResurrectOptions
       
     } else if (platformInfo.isMacOS) {
       console.log("📝 To resurrect all services on macOS, you need to manually restore the plist files from:");
-      console.log(`   ${join(platformInfo.configDir, 'backups')}/*.plist`);
+      console.log(`   ${platformInfo.backupDir}/*.plist`);
       console.log("   And then run: launchctl load ~/Library/LaunchAgents/bs9.*.plist");
     } else if (platformInfo.isWindows) {
       console.log("📝 To resurrect all services on Windows, use PowerShell:");
-      console.log("   Get-ChildItem -Path \"${join(platformInfo.configDir, 'backups')}\" | ForEach-Object { Restore-Service $_.Name }");
+      console.log("   Get-ChildItem -Path \"${platformInfo.backupDir}\" | ForEach-Object { Restore-Service $_.Name }");
     }
     
     console.log(`✅ All BS9 services resurrection process completed`);

package/src/commands/save.ts

@@ -11,7 +11,7 @@
 
 import { execSync } from "node:child_process";
 import { join, resolve } from "node:path";
-import { getPlatformInfo } from "../platform/detect.js";
+import { getPlatformInfo, initializePlatformDirectories } from "../platform/detect.js";
 
 interface SaveOptions {
   all?: boolean;
@@ -28,6 +28,9 @@ function isValidServiceName(name: string): boolean {
 }
 
 export async function saveCommand(name: string, options: SaveOptions): Promise<void> {
+  // Initialize platform directories
+  initializePlatformDirectories();
+  
   const platformInfo = getPlatformInfo();
   
   // Handle save all services
@@ -62,12 +65,8 @@ export async function saveCommand(name: string, options: SaveOptions): Promise<v
       // Parse service configuration to extract startup parameters
       const config = parseServiceConfig(serviceConfig, statusOutput);
       
-      // Create backup directory if it doesn't exist
-      const backupDir = join(platformInfo.configDir, 'backups');
-      require('node:fs').mkdirSync(backupDir, { recursive: true });
-      
       // Save configuration to backup
-      const backupFile = join(backupDir, `${escapedName}.json`);
+      const backupFile = join(platformInfo.backupDir, `${escapedName}.json`);
       const backupData = {
         name: name,
         file: extractFileFromConfig(serviceConfig),
@@ -89,7 +88,7 @@ export async function saveCommand(name: string, options: SaveOptions): Promise<v
       if (options.backup) {
         // Create additional backup with timestamp
         const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
-        const timestampedBackup = join(backupDir, `${escapedName}-${timestamp}.json`);
+        const timestampedBackup = join(platformInfo.backupDir, `${escapedName}-${timestamp}.json`);
         require('node:fs').writeFileSync(timestampedBackup, JSON.stringify(backupData, null, 2));
         console.log(`📦 Additional backup created: ${timestampedBackup}`);
       }
@@ -118,6 +117,9 @@ async function saveAllServices(platformInfo: any, options: SaveOptions): Promise
   try {
     console.log("💾 Saving all BS9 service configurations...");
     
+    // Initialize platform directories
+    initializePlatformDirectories();
+    
     if (platformInfo.isLinux) {
       // Get all BS9 services
       const listOutput = execSync("systemctl --user list-units --type=service --no-pager --no-legend", { encoding: "utf-8" });
@@ -144,10 +146,6 @@ async function saveAllServices(platformInfo: any, options: SaveOptions): Promise
       
       console.log(`Found ${bs9Services.length} BS9 services to save...`);
       
-      // Create backup directory
-      const backupDir = join(platformInfo.configDir, 'backups');
-      require('node:fs').mkdirSync(backupDir, { recursive: true });
-      
       for (const serviceName of bs9Services) {
         try {
           const serviceFile = join(platformInfo.serviceDir, `${serviceName}.service`);
@@ -157,7 +155,7 @@ async function saveAllServices(platformInfo: any, options: SaveOptions): Promise
             const statusOutput = execSync(`systemctl --user show "${serviceName}"`, { encoding: "utf-8" });
             const config = parseServiceConfig(serviceConfig, statusOutput);
             
-            const backupFile = join(backupDir, `${serviceName}.json`);
+            const backupFile = join(platformInfo.backupDir, `${serviceName}.json`);
             const backupData = {
               name: serviceName,
               file: extractFileFromConfig(serviceConfig),

package/src/commands/status.ts

@@ -27,6 +27,7 @@ interface ServiceStatus {
   memory?: string;
   uptime?: string;
   tasks?: string;
+  pid?: string;
 }
 
 export async function statusCommand(options: StatusOptions): Promise<void> {
@@ -93,20 +94,46 @@ async function getLinuxServices(): Promise<ServiceStatus[]> {
         description,
       };
       
-      // Get additional metrics
+      // Get additional metrics with better error handling
       try {
-        const showOutput = execSync(`systemctl --user show ${name} -p CPUUsageNSec MemoryCurrent ActiveEnterTimestamp TasksCurrent`, { encoding: "utf-8" });
+        // Get comprehensive service information
+        const showOutput = execSync(`systemctl --user show ${name}`, { encoding: "utf-8" });
+        
+        // Extract CPU usage
         const cpuMatch = showOutput.match(/CPUUsageNSec=(\d+)/);
+        if (cpuMatch) {
+          status.cpu = formatCPU(Number(cpuMatch[1]));
+        }
+        
+        // Extract memory usage
         const memMatch = showOutput.match(/MemoryCurrent=(\d+)/);
+        if (memMatch) {
+          const memoryBytes = Number(memMatch[1]);
+          status.memory = formatMemory(memoryBytes);
+        }
+        
+        // Extract startup time and calculate uptime
         const timeMatch = showOutput.match(/ActiveEnterTimestamp=(.+)/);
+        if (timeMatch) {
+          status.uptime = formatUptime(timeMatch[1]);
+        }
+        
+        // Extract task count
         const tasksMatch = showOutput.match(/TasksCurrent=(\d+)/);
+        if (tasksMatch) {
+          status.tasks = tasksMatch[1];
+        }
+        
+        // Get process ID for additional info
+        const pidMatch = showOutput.match(/MainPID=(\d+)/);
+        if (pidMatch && pidMatch[1] !== "0") {
+          // We could get more detailed process info here if needed
+          status.pid = pidMatch[1];
+        }
         
-        if (cpuMatch) status.cpu = formatCPU(Number(cpuMatch[1]));
-        if (memMatch) status.memory = formatMemory(Number(memMatch[1]));
-        if (timeMatch) status.uptime = formatUptime(timeMatch[1]);
-        if (tasksMatch) status.tasks = tasksMatch[1];
-      } catch {
-        // Metrics might not be available
+      } catch (metricsError: any) {
+        // If metrics fail, at least we have basic status
+        console.warn(`⚠️  Could not get metrics for ${name}: ${metricsError?.message || metricsError}`);
       }
       
       services.push(status);
@@ -145,25 +172,84 @@ async function getWindowsServices(): Promise<ServiceStatus[]> {
 }
 
 function displayServices(services: ServiceStatus[]): void {
-  // Header
-  console.log(`${"SERVICE".padEnd(20)} ${"STATE".padEnd(12)} ${"CPU".padEnd(8)} ${"MEMORY".padEnd(10)} ${"UPTIME".padEnd(12)} ${"TASKS".padEnd(6)} DESCRIPTION`);
-  console.log("-".repeat(90));
+  if (services.length === 0) {
+    console.log("📋 No BS9 services found");
+    console.log("💡 Use 'bs9 start <file>' to create a service");
+    return;
+  }
+
+  // Header with better formatting
+  console.log(`${"SERVICE".padEnd(18)} ${"STATUS".padEnd(15)} ${"CPU".padEnd(10)} ${"MEMORY".padEnd(12)} ${"UPTIME".padEnd(12)} ${"TASKS".padEnd(8)} DESCRIPTION`);
+  console.log("─".repeat(100));
   
-  for (const svc of services) {
-    const state = `${svc.active}/${svc.sub}`;
+  // Sort services by status (running first, then by name)
+  const sortedServices = services.sort((a, b) => {
+    const aRunning = a.active === "active" && a.sub === "running";
+    const bRunning = b.active === "active" && b.sub === "running";
+    if (aRunning !== bRunning) return bRunning ? 1 : -1;
+    return a.name.localeCompare(b.name);
+  });
+
+  for (const svc of sortedServices) {
+    // Better status formatting with colors/indicators
+    let statusIndicator = "";
+    let status = `${svc.active}/${svc.sub}`;
+    
+    if (svc.active === "active" && svc.sub === "running") {
+      statusIndicator = "✅";
+      status = "running";
+    } else if (svc.active === "activating" && svc.sub.includes("auto-restart")) {
+      statusIndicator = "🔄";
+      status = "restarting";
+    } else if (svc.active === "failed" || svc.sub === "failed") {
+      statusIndicator = "❌";
+      status = "failed";
+    } else if (svc.active === "inactive") {
+      statusIndicator = "⏸️";
+      status = "stopped";
+    } else {
+      statusIndicator = "⚠️";
+    }
+
+    const displayStatus = `${statusIndicator} ${status}`;
+    
     console.log(
-      `${svc.name.padEnd(20)} ${state.padEnd(12)} ${(svc.cpu || "-").padEnd(8)} ${(svc.memory || "-").padEnd(10)} ${(svc.uptime || "-").padEnd(12)} ${(svc.tasks || "-").padEnd(6)} ${svc.description}`
+      `${svc.name.padEnd(18)} ${displayStatus.padEnd(15)} ${(svc.cpu || "-").padEnd(10)} ${(svc.memory || "-").padEnd(12)} ${(svc.uptime || "-").padEnd(12)} ${(svc.tasks || "-").padEnd(8)} ${svc.description}`
     );
   }
   
-  console.log("\n📊 SRE Metrics Summary:");
+  // Enhanced summary
+  console.log("\n📊 Service Summary:");
   const totalServices = services.length;
-  const runningServices = services.filter(s => s.active === "active").length;
+  const runningServices = services.filter(s => s.active === "active" && s.sub === "running").length;
+  const failedServices = services.filter(s => s.active === "failed" || s.sub === "failed").length;
+  const restartingServices = services.filter(s => s.active === "activating" && s.sub.includes("auto-restart")).length;
   const totalMemory = services.reduce((sum, s) => sum + (s.memory ? parseMemory(s.memory) : 0), 0);
   
-  console.log(`  Services: ${runningServices}/${totalServices} running`);
-  console.log(`  Memory: ${formatMemory(totalMemory)}`);
-  console.log(`  Last updated: ${new Date().toISOString()}`);
+  console.log(`  📈 Status: ${runningServices} running, ${failedServices} failed, ${restartingServices} restarting`);
+  console.log(`  📦 Total: ${runningServices}/${totalServices} services running`);
+  console.log(`  💾 Memory: ${formatMemory(totalMemory)}`);
+  console.log(`  🕒 Last updated: ${new Date().toLocaleString()}`);
+
+  // Show failed services details
+  if (failedServices > 0) {
+    console.log("\n❌ Failed Services:");
+    const failed = services.filter(s => s.active === "failed" || s.sub === "failed");
+    for (const svc of failed) {
+      console.log(`  • ${svc.name}: ${svc.active}/${svc.sub}`);
+      console.log(`    💡 Try: bs9 logs ${svc.name} --tail 20`);
+    }
+  }
+
+  // Show restarting services details
+  if (restartingServices > 0) {
+    console.log("\n🔄 Restarting Services:");
+    const restarting = services.filter(s => s.active === "activating" && s.sub.includes("auto-restart"));
+    for (const svc of restarting) {
+      console.log(`  • ${svc.name}: ${svc.active}/${svc.sub}`);
+      console.log(`    💡 Try: bs9 logs ${svc.name} --tail 20`);
+    }
+  }
 }
 
 function formatCPU(nsec: number): string {

package/src/platform/detect.ts

@@ -9,7 +9,8 @@
  * https://github.com/xarhang/bs9
  */
 
-import { platform } from "node:os";
+import { platform, homedir } from "node:os";
+import { join } from "node:path";
 
 export type Platform = 'linux' | 'darwin' | 'win32';
 
@@ -22,10 +23,12 @@ export interface PlatformInfo {
   configDir: string;
   logDir: string;
   serviceDir: string;
+  backupDir: string;
 }
 
 export function getPlatformInfo(): PlatformInfo {
   const currentPlatform = platform() as Platform;
+  const userHome = homedir();
   
   const baseInfo: PlatformInfo = {
     platform: currentPlatform,
@@ -35,29 +38,33 @@ export function getPlatformInfo(): PlatformInfo {
     serviceManager: 'systemd',
     configDir: '',
     logDir: '',
-    serviceDir: ''
+    serviceDir: '',
+    backupDir: ''
   };
   
   switch (currentPlatform) {
     case 'linux':
       baseInfo.serviceManager = 'systemd';
-      baseInfo.configDir = `${process.env.HOME}/.config/bs9`;
-      baseInfo.logDir = `${process.env.HOME}/.local/share/bs9/logs`;
-      baseInfo.serviceDir = `${process.env.HOME}/.config/systemd/user`;
+      baseInfo.configDir = join(userHome, '.config', 'bs9');
+      baseInfo.logDir = join(userHome, '.local', 'share', 'bs9', 'logs');
+      baseInfo.serviceDir = join(userHome, '.config', 'systemd', 'user');
+      baseInfo.backupDir = join(baseInfo.configDir, 'backups');
       break;
       
     case 'darwin':
       baseInfo.serviceManager = 'launchd';
-      baseInfo.configDir = `${process.env.HOME}/.bs9`;
-      baseInfo.logDir = `${process.env.HOME}/.bs9/logs`;
-      baseInfo.serviceDir = `${process.env.HOME}/Library/LaunchAgents`;
+      baseInfo.configDir = join(userHome, '.bs9');
+      baseInfo.logDir = join(userHome, '.bs9', 'logs');
+      baseInfo.serviceDir = join(userHome, 'Library', 'LaunchAgents');
+      baseInfo.backupDir = join(baseInfo.configDir, 'backups');
       break;
       
     case 'win32':
       baseInfo.serviceManager = 'windows-service';
-      baseInfo.configDir = `${process.env.USERPROFILE}/.bs9`;
-      baseInfo.logDir = `${process.env.USERPROFILE}/.bs9/logs`;
-      baseInfo.serviceDir = `${process.env.USERPROFILE}/.bs9/services`;
+      baseInfo.configDir = join(userHome, '.bs9');
+      baseInfo.logDir = join(userHome, '.bs9', 'logs');
+      baseInfo.serviceDir = join(userHome, '.bs9', 'services');
+      baseInfo.backupDir = join(baseInfo.configDir, 'backups');
       break;
       
     default:
@@ -77,13 +84,13 @@ export function getPlatformSpecificCommands(): string[] {
   
   switch (currentPlatform) {
     case 'linux':
-      return ['start', 'stop', 'restart', 'status', 'logs', 'monit', 'web', 'alert', 'export', 'deps', 'profile', 'loadbalancer', 'dbpool'];
+      return ['start', 'stop', 'restart', 'status', 'logs', 'monit', 'web', 'alert', 'export', 'deps', 'profile', 'delete', 'save', 'resurrect', 'loadbalancer', 'dbpool'];
       
     case 'darwin':
-      return ['start', 'stop', 'restart', 'status', 'logs', 'monit', 'web', 'alert', 'export', 'deps', 'profile', 'loadbalancer', 'dbpool', 'macos'];
+      return ['start', 'stop', 'restart', 'status', 'logs', 'monit', 'web', 'alert', 'export', 'deps', 'profile', 'delete', 'save', 'resurrect', 'loadbalancer', 'dbpool', 'macos'];
       
     case 'win32':
-      return ['start', 'stop', 'restart', 'status', 'logs', 'monit', 'web', 'alert', 'export', 'deps', 'profile', 'loadbalancer', 'dbpool', 'windows'];
+      return ['start', 'stop', 'restart', 'status', 'logs', 'monit', 'web', 'alert', 'export', 'deps', 'profile', 'delete', 'save', 'resurrect', 'loadbalancer', 'dbpool', 'windows'];
       
     default:
       return [];
@@ -144,3 +151,19 @@ Windows-specific:
       return `❌ Platform ${currentPlatform} is not supported`;
   }
 }
+
+// Auto-detect and initialize platform-specific directories
+export function initializePlatformDirectories(): void {
+  const platformInfo = getPlatformInfo();
+  
+  // Create directories if they don't exist
+  const fs = require('node:fs');
+  
+  try {
+    fs.mkdirSync(platformInfo.configDir, { recursive: true });
+    fs.mkdirSync(platformInfo.logDir, { recursive: true });
+    fs.mkdirSync(platformInfo.backupDir, { recursive: true });
+  } catch (error) {
+    console.warn(`⚠️  Warning: Could not create platform directories: ${error}`);
+  }
+}