2.6.16

changelog.md

@@ -1,5 +1,119 @@
 # Changelog
 
+## 2025-03-26 - 2.6.16 - fix(cli)
+Improve CLI logging consistency by replacing direct console output with unified logger calls.
+
+- Replaced console.log and console.error with logger.log and logger.error in CLI commands
+- Standardized debug, error, and status messages using logger's logbox utilities
+- Enhanced consistency of log output throughout the ts/cli.ts file
+
+## 2025-03-26 - 2.6.15 - fix(logger)
+Replace direct console logging with unified logger interface for consistent formatting
+
+- Substitute console.log, console.error, and related calls with logger methods in cli, daemon, systemd, nupst, and index modules
+- Integrate logBox formatting for structured output and consistent log presentation
+- Update test expectations in test.logger.ts to check for standardized error messages
+- Refactor logging calls throughout the codebase for improved clarity and maintainability
+
+## 2025-03-26 - 2.6.14 - fix(systemd)
+Shorten closing log divider in systemd service installation output for consistent formatting.
+
+- Replaced the overly long footer with a shorter one in ts/systemd.ts.
+- This change improves log readability without affecting functionality.
+
+## 2025-03-26 - 2.6.13 - fix(cli)
+Fix CLI update output box formatting
+
+- Adjusted the closing box line in the update process log messages for consistent visual formatting
+
+## 2025-03-26 - 2.6.12 - fix(systemd)
+Adjust logging border in systemd service installation output
+
+- Updated the closing border line for consistent output formatting in ts/systemd.ts
+
+## 2025-03-26 - 2.6.11 - fix(cli, systemd)
+Adjust log formatting for consistent output in CLI and systemd commands
+
+- Fixed spacing issues in service installation and status log messages in the systemd module.
+- Revised output formatting in the CLI to improve message clarity.
+
+## 2025-03-26 - 2.6.10 - fix(daemon)
+Adjust console log box formatting for consistent output in daemon status messages
+
+- Updated closing box borders to align properly in configuration error, periodic updates, and UPS status logs
+- Improved visual consistency in log messages
+
+## 2025-03-26 - 2.6.9 - fix(cli)
+Improve console output formatting for status banners and logging messages
+
+- Standardize banner messages in daemon status updates
+- Refine version information banner in nupst logging
+- Update UPS connection and status banners in systemd
+
+## 2025-03-26 - 2.6.8 - fix(cli)
+Improve CLI formatting, refine debug option filtering, and remove unused dgram import in SNMP manager
+
+- Standardize whitespace and formatting in ts/cli.ts for consistency
+- Refine argument filtering for debug mode and prompt messages
+- Remove unused 'dgram' import from ts/snmp/manager.ts
+
+## 2025-03-26 - 2.6.7 - fix(setup.sh)
+Clarify net-snmp dependency installation message in setup.sh
+
+- Updated echo statement to indicate installation of net-snmp along with 2 subdependencies
+- Improves clarity on dependency installation during setup
+
+## 2025-03-26 - 2.6.6 - fix(setup.sh)
+Improve setup script to detect and execute npm-cli.js directly using the Node.js binary
+
+- Replace use of the npm binary with direct execution of npm-cli.js
+- Add fallback logic to locate npm-cli.js when not found at the expected path
+- Simplify cleanup by removing unnecessary PATH modifications
+
+## 2025-03-26 - 2.6.5 - fix(daemon, setup)
+Improve shutdown command detection and fallback logic; update setup script to use absolute Node/npm paths
+
+- Use execFileAsync to execute shutdown commands reliably
+- Add multiple fallback alternatives for shutdown and emergency shutdown handling
+- Update setup.sh to log the Node and NPM versions using absolute paths without modifying PATH
+
+## 2025-03-26 - 2.6.4 - fix(setup)
+Improve installation process in setup script by cleaning up package files and ensuring a minimal net-snmp dependency installation.
+
+- Remove existing package-lock.json along with node_modules to prevent stale artifacts.
+- Back up the original package.json before modifying it.
+- Create a minimal package.json with only the net-snmp dependency based on the backed-up version.
+- Use a clean install to guarantee that only net-snmp is installed.
+- Restore the original package.json if the installation fails.
+
+## 2025-03-26 - 2.6.3 - fix(setup)
+Update setup script to install only net-snmp dependency and create a minimal package-lock.json for better dependency control.
+
+- Removed full production dependency install in favor of installing only net-snmp@3.20.0
+- Added verification step to confirm net-snmp installation
+- Generate a minimal package-lock.json if one does not exist
+
+## 2025-03-26 - 2.6.2 - fix(setup/readme)
+Improve force update instructions and dependency installation process in setup.sh and readme.md
+
+- Clarify force update commands with explicit paths in readme.md
+- Remove existing node_modules before installing dependencies in setup.sh
+- Switch from 'npm ci --only=production' to 'npm install --omit=dev' with updated error instructions
+
+## 2025-03-26 - 2.6.1 - fix(setup)
+Update setup.sh to temporarily add vendor Node.js binary to PATH for dependency installation, log Node and npm versions, and restore the original PATH afterwards.
+
+- Temporarily prepend vendor Node.js binary directory to PATH to ensure proper npm execution.
+- Log Node.js and npm versions for debugging purposes.
+- Restore the original PATH after installing dependencies.
+
+## 2025-03-26 - 2.6.0 - feat(setup)
+Add --force update flag to setup script and update installation instructions
+
+- Implemented --force option in setup.sh to force-update Node.js binary and dependencies
+- Updated readme.md to document the --force flag and revised update steps
+- Modified ts/cli.ts update command to pass the --force flag to setup.sh
+
 ## 2025-03-26 - 2.5.2 - fix(installer)
 Improve Node.js binary detection, dependency management, and SNMPv3 fallback logic
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serve.zone/nupst",
-  "version": "2.5.2",
+  "version": "2.6.16",
   "description": "Node.js UPS Shutdown Tool for SNMP-enabled UPS devices",
   "main": "dist/index.js",
   "bin": {
@@ -56,5 +56,6 @@
       "mongodb-memory-server",
       "puppeteer"
     ]
-  }
+  },
+  "packageManager": "pnpm@10.7.0+sha512.6b865ad4b62a1d9842b61d674a393903b871d9244954f652b8842c2b553c72176b278f64c463e52d40fff8aba385c235c8c9ecf5cc7de4fd78b8bb6d49633ab6"
 }

pnpm-lock.yaml

@@ -9,7 +9,7 @@ importers:
   .:
     dependencies:
       net-snmp:
-        specifier: ^3.20.0
+        specifier: 3.20.0
         version: 3.20.0
     devDependencies:
       '@git.zone/tsbuild':

readme.md

@@ -227,8 +227,19 @@ sudo nupst update
 This will:
 1. Pull the latest changes from the git repository
 2. Run the installation scripts
-3. Refresh the systemd service configuration
-4. Restart the service if it was running
+3. Force-update Node.js and all dependencies, even if they already exist
+4. Refresh the systemd service configuration
+5. Restart the service if it was running
+
+You can also manually run the setup script with the force flag to update Node.js and dependencies without updating the application code:
+
+```bash
+# If you're in the nupst directory:
+bash ./setup.sh --force
+
+# If you're in another directory, specify the full path:
+bash /opt/nupst/setup.sh --force
+```
 
 ## Security
 

setup.sh

@@ -2,6 +2,22 @@
 
 # NUPST Setup Script
 # Downloads the appropriate Node.js binary for the current platform
+# and installs production dependencies
+
+# Parse command line arguments
+FORCE_UPDATE=0
+
+for arg in "$@"; do
+  case $arg in
+    --force|-f)
+      FORCE_UPDATE=1
+      shift
+      ;;
+    *)
+      # Unknown option
+      ;;
+  esac
+done
 
 # Find the directory where this script is located
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
@@ -74,8 +90,9 @@ case "$OS" in
 esac
 
 # Check if we already have the Node.js binary
-if [ -f "$SCRIPT_DIR/vendor/$NODE_DIR/bin/node" ]; then
+if [ -f "$SCRIPT_DIR/vendor/$NODE_DIR/bin/node" ] && [ $FORCE_UPDATE -eq 0 ]; then
   echo "Node.js binary already exists for $OS-$ARCH. Skipping download."
+  echo "Use --force or -f to force update Node.js."
 else
   echo "Downloading Node.js v$NODE_VERSION for $OS-$ARCH..."
   
@@ -222,25 +239,90 @@ echo "dist_ts directory successfully downloaded from npm registry."
 # Make launcher script executable
 chmod +x "$SCRIPT_DIR/bin/nupst"
 
-# Install production dependencies
-echo "Installing production dependencies..."
-"$SCRIPT_DIR/vendor/$NODE_DIR/bin/npm" --prefix "$SCRIPT_DIR" ci --only=production --no-audit --no-fund
+# Set up Node.js binary path
+NODE_BIN_DIR="$SCRIPT_DIR/vendor/$NODE_DIR/bin"
+NODE_BIN="$NODE_BIN_DIR/node"
+NPM_CLI_JS="$NODE_BIN_DIR/../lib/node_modules/npm/bin/npm-cli.js"
 
-if [ $? -ne 0 ]; then
-  echo "Warning: Failed to install dependencies with 'npm ci'. Trying 'npm install'..."
-  "$SCRIPT_DIR/vendor/$NODE_DIR/bin/npm" --prefix "$SCRIPT_DIR" install --only=production --no-audit --no-fund
+# Ensure we have executable permissions
+chmod +x "$NODE_BIN"
+
+# Make sure the npm-cli.js exists
+if [ ! -f "$NPM_CLI_JS" ]; then
+  # Try to find npm-cli.js
+  NPM_CLI_JS=$(find "$NODE_BIN_DIR/.." -name "npm-cli.js" | head -1)
   
-  if [ $? -ne 0 ]; then
-    echo "Error: Failed to install dependencies. NUPST may not function correctly."
-    echo "You can try to install dependencies manually by running:"
-    echo "cd $SCRIPT_DIR && npm install --only=production"
+  if [ -z "$NPM_CLI_JS" ]; then
+    echo "Warning: Could not find npm-cli.js, npm commands may fail"
+    # Set to a fallback value so code can continue
+    NPM_CLI_JS="$NODE_BIN_DIR/npm"
   else
-    echo "Dependencies installed successfully with 'npm install'."
+    echo "Found npm-cli.js at: $NPM_CLI_JS"
   fi
-else
-  echo "Dependencies installed successfully with 'npm ci'."
 fi
 
+# Display which binaries we're using
+echo "Using Node binary: $NODE_BIN"
+echo "Using NPM CLI JS: $NPM_CLI_JS"
+
+# Remove existing node_modules directory and package files
+echo "Cleaning up existing installation..."
+rm -rf "$SCRIPT_DIR/node_modules"
+rm -f "$SCRIPT_DIR/package-lock.json"
+
+# Back up existing package.json if it exists
+if [ -f "$SCRIPT_DIR/package.json" ]; then
+  echo "Backing up existing package.json..."
+  cp "$SCRIPT_DIR/package.json" "$SCRIPT_DIR/package.json.bak"
+fi
+
+# Create a clean minimal package.json with ONLY net-snmp dependency
+echo "Creating minimal package.json with only net-snmp dependency..."
+VERSION=$(grep -o '"version": "[^"]*"' "$SCRIPT_DIR/package.json.bak" | head -1 | cut -d'"' -f4 || echo "2.6.3")
+echo '{
+  "name": "@serve.zone/nupst",
+  "version": "'$VERSION'",
+  "description": "Node.js UPS Shutdown Tool for SNMP-enabled UPS devices",
+  "main": "dist_ts/index.js",
+  "type": "module",
+  "bin": {
+    "nupst": "bin/nupst"
+  },
+  "dependencies": {
+    "net-snmp": "3.20.0"
+  },
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "private": true
+}' > "$SCRIPT_DIR/package.json"
+
+# Install ONLY net-snmp
+echo "Installing ONLY net-snmp dependency (+ 2 subdependencies)..."
+echo "Node version: $("$NODE_BIN" --version)"
+echo "Executing NPM directly with Node.js"
+
+# Execute npm-cli.js directly with our Node.js binary
+"$NODE_BIN" "$NPM_CLI_JS" --prefix "$SCRIPT_DIR" install --no-audit --no-fund
+
+INSTALL_STATUS=$?
+if [ $INSTALL_STATUS -ne 0 ]; then
+  echo "Error: Failed to install net-snmp dependency. NUPST may not function correctly."
+  echo "Restoring original package.json..."
+  mv "$SCRIPT_DIR/package.json.bak" "$SCRIPT_DIR/package.json"
+  exit 1
+else
+  echo "net-snmp dependency installed successfully."
+  # Show what's actually installed
+  echo "Installed modules:"
+  find "$SCRIPT_DIR/node_modules" -maxdepth 1 -type d | grep -v "^$SCRIPT_DIR/node_modules$" | sort
+  
+  # Remove backup if successful
+  rm -f "$SCRIPT_DIR/package.json.bak"
+fi
+
+# No temporary files to clean up
+
 echo "NUPST setup completed successfully."
 echo "You can now run NUPST using: $SCRIPT_DIR/bin/nupst"
 echo "To install NUPST globally, run: sudo ln -s $SCRIPT_DIR/bin/nupst /usr/local/bin/nupst"

test/test.logger.ts

@@ -0,0 +1,147 @@
+import { tap, expect } from '@push.rocks/tapbundle';
+import { Logger } from '../ts/logger.js';
+
+// Create a Logger instance for testing
+const logger = new Logger();
+
+tap.test('should create a logger instance', async () => {
+  expect(logger instanceof Logger).toBeTruthy();
+});
+
+tap.test('should log messages with different log levels', async () => {
+  // We're not testing console output directly, just ensuring no errors
+  logger.log('Regular log message');
+  logger.error('Error message');
+  logger.warn('Warning message');
+  logger.success('Success message');
+
+  // Just assert that the test runs without errors
+  expect(true).toBeTruthy();
+});
+
+tap.test('should create a logbox with title, content, and end', async () => {
+  // Just ensuring no errors occur
+  logger.logBoxTitle('Test Box', 40);
+  logger.logBoxLine('This is a test line');
+  logger.logBoxEnd();
+
+  // Just assert that the test runs without errors
+  expect(true).toBeTruthy();
+});
+
+tap.test('should handle width persistence between logbox calls', async () => {
+  logger.logBoxTitle('Width Test', 45);
+  
+  // These should use the width from the title
+  logger.logBoxLine('Line 1');
+  logger.logBoxLine('Line 2');
+  logger.logBoxEnd();
+  
+  let errorThrown = false;
+  
+  try {
+    // This should work fine after the reset in logBoxEnd
+    logger.logBoxTitle('New Box', 30);
+    logger.logBoxLine('New line');
+    logger.logBoxEnd();
+  } catch (error) {
+    errorThrown = true;
+  }
+  
+  expect(errorThrown).toBeFalsy();
+});
+
+tap.test('should throw error when using logBoxLine without width', async () => {
+  let errorThrown = false;
+  let errorMessage = '';
+  
+  try {
+    // Should throw because no width is set
+    logger.logBoxLine('This should fail');
+  } catch (error) {
+    errorThrown = true;
+    errorMessage = (error as Error).message;
+  }
+  
+  expect(errorThrown).toBeTruthy();
+  expect(errorMessage).toBeTruthy();
+  expect(errorMessage.includes('No box width')).toBeTruthy();
+});
+
+tap.test('should create a complete logbox in one call', async () => {
+  // Just ensuring no errors occur
+  logger.logBox('Complete Box', [
+    'Line 1',
+    'Line 2',
+    'Line 3'
+  ], 40);
+  
+  // Just assert that the test runs without errors
+  expect(true).toBeTruthy();
+});
+
+tap.test('should handle content that exceeds box width', async () => {
+  // Just ensuring no errors occur when content is too long
+  logger.logBox('Truncation Test', [
+    'This line is way too long and should be truncated because it exceeds the available space'
+  ], 30);
+  
+  // Just assert that the test runs without errors
+  expect(true).toBeTruthy();
+});
+
+tap.test('should create dividers with custom characters', async () => {
+  // Just ensuring no errors occur
+  logger.logDivider(30);
+  logger.logDivider(20, '*');
+  
+  // Just assert that the test runs without errors
+  expect(true).toBeTruthy();
+});
+
+tap.test('Logger Demo', async () => {
+  console.log('\n=== LOGGER DEMO ===\n');
+  
+  // Basic logging
+  logger.log('Regular log message');
+  logger.error('Error message');
+  logger.warn('Warning message');
+  logger.success('Success message');
+  
+  // Logbox with title, content lines, and end
+  logger.logBoxTitle('Configuration Loaded', 50);
+  logger.logBoxLine('SNMP Settings:');
+  logger.logBoxLine('  Host: 127.0.0.1');
+  logger.logBoxLine('  Port: 161');
+  logger.logBoxLine('  Version: 1');
+  logger.logBoxEnd();
+  
+  // Complete logbox in one call
+  logger.logBox('UPS Status', [
+    'Power Status: onBattery',
+    'Battery Capacity: 75%',
+    'Runtime Remaining: 30 minutes'
+  ], 45);
+  
+  // Logbox with content that's too long for the width
+  logger.logBox('Truncation Example', [
+    'This line is short enough to fit within the box width',
+    'This line is way too long and will be truncated because it exceeds the available space for content within the logbox'
+  ], 40);
+  
+  // Demonstrating logbox width being remembered
+  logger.logBoxTitle('Width Persistence Example', 60);
+  logger.logBoxLine('These lines use the width from the title');
+  logger.logBoxLine('No need to specify the width again');
+  logger.logBoxEnd();
+  
+  // Divider example
+  logger.log('\nDivider example:');
+  logger.logDivider(30);
+  logger.logDivider(30, '*');
+  
+  expect(true).toBeTruthy();
+});
+
+// Export the default tap object
+export default tap.start();

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@serve.zone/nupst',
-  version: '2.5.2',
+  version: '2.6.16',
   description: 'Node.js UPS Shutdown Tool for SNMP-enabled UPS devices'
 }

ts/daemon.ts

@@ -1,11 +1,13 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { exec } from 'child_process';
+import { exec, execFile } from 'child_process';
 import { promisify } from 'util';
 import { NupstSnmp } from './snmp/manager.js';
 import type { ISnmpConfig } from './snmp/types.js';
+import { logger } from './logger.js';
 
 const execAsync = promisify(exec);
+const execFileAsync = promisify(execFile);
 
 /**
  * Configuration interface for the daemon
@@ -124,7 +126,7 @@ export class NupstDaemon {
     console.error('┌─ Configuration Error ─────────────────────┐');
     console.error(`│ ${message}`);
     console.error('│ Please run \'nupst setup\' first to create a configuration.');
-    console.error('└──────────────────────────────────────────┘');
+    console.error('└───────────────────────────────────────────┘');
   }
 
   /**
@@ -146,11 +148,11 @@ export class NupstDaemon {
    */
   public async start(): Promise<void> {
     if (this.isRunning) {
-      console.log('Daemon is already running');
+      logger.log('Daemon is already running');
       return;
     }
 
-    console.log('Starting NUPST daemon...');
+    logger.log('Starting NUPST daemon...');
     
     try {
       // Load configuration - this will throw an error if config doesn't exist
@@ -164,11 +166,12 @@ export class NupstDaemon {
       this.snmp.getNupst().checkForUpdates().then(updateAvailable => {
         if (updateAvailable) {
           const updateStatus = this.snmp.getNupst().getUpdateStatus();
-          console.log('┌─ Update Available ───────────────────────┐');
-          console.log(`│ Current Version: ${updateStatus.currentVersion}`);
-          console.log(`│ Latest Version: ${updateStatus.latestVersion}`);
-          console.log('│ Run "sudo nupst update" to update');
-          console.log('└──────────────────────────────────────────┘');
+          const boxWidth = 45;
+          logger.logBoxTitle('Update Available', boxWidth);
+          logger.logBoxLine(`Current Version: ${updateStatus.currentVersion}`);
+          logger.logBoxLine(`Latest Version: ${updateStatus.latestVersion}`);
+          logger.logBoxLine('Run "sudo nupst update" to update');
+          logger.logBoxEnd();
         }
       }).catch(() => {}); // Ignore errors checking for updates
       
@@ -177,7 +180,7 @@ export class NupstDaemon {
       await this.monitor();
     } catch (error) {
       this.isRunning = false;
-      console.error(`Daemon failed to start: ${error.message}`);
+      logger.error(`Daemon failed to start: ${error.message}`);
       process.exit(1); // Exit with error
     }
   }
@@ -186,23 +189,24 @@ export class NupstDaemon {
    * Log the loaded configuration settings
    */
   private logConfigLoaded(): void {
-    console.log('┌─ Configuration Loaded ─────────────────────┐');
-    console.log('│ SNMP Settings:');
-    console.log(`│   Host: ${this.config.snmp.host}`);
-    console.log(`│   Port: ${this.config.snmp.port}`);
-    console.log(`│   Version: ${this.config.snmp.version}`);
-    console.log('│ Thresholds:');
-    console.log(`│   Battery: ${this.config.thresholds.battery}%`);
-    console.log(`│   Runtime: ${this.config.thresholds.runtime} minutes`);
-    console.log(`│ Check Interval: ${this.config.checkInterval / 1000} seconds`);
-    console.log('└──────────────────────────────────────────┘');
+    const boxWidth = 50;
+    logger.logBoxTitle('Configuration Loaded', boxWidth);
+    logger.logBoxLine('SNMP Settings:');
+    logger.logBoxLine(`  Host: ${this.config.snmp.host}`);
+    logger.logBoxLine(`  Port: ${this.config.snmp.port}`);
+    logger.logBoxLine(`  Version: ${this.config.snmp.version}`);
+    logger.logBoxLine('Thresholds:');
+    logger.logBoxLine(`  Battery: ${this.config.thresholds.battery}%`);
+    logger.logBoxLine(`  Runtime: ${this.config.thresholds.runtime} minutes`);
+    logger.logBoxLine(`Check Interval: ${this.config.checkInterval / 1000} seconds`);
+    logger.logBoxEnd();
   }
 
   /**
    * Stop the monitoring daemon
    */
   public stop(): void {
-    console.log('Stopping NUPST daemon...');
+    logger.log('Stopping NUPST daemon...');
     this.isRunning = false;
   }
 
@@ -210,7 +214,7 @@ export class NupstDaemon {
    * Monitor the UPS status and trigger shutdown when necessary
    */
   private async monitor(): Promise<void> {
-    console.log('Starting UPS monitoring...');
+    logger.log('Starting UPS monitoring...');
     
     let lastStatus: 'online' | 'onBattery' | 'unknown' = 'unknown';
     let lastLogTime = 0; // Track when we last logged status
@@ -225,20 +229,22 @@ export class NupstDaemon {
         
         // Log status changes
         if (status.powerStatus !== lastStatus) {
-          console.log('┌──────────────────────────────────────────┐');
-          console.log(`│ Power status changed: ${lastStatus} → ${status.powerStatus}`);
-          console.log('└──────────────────────────────────────────┘');
+          const statusBoxWidth = 45;
+          logger.logBoxTitle('Power Status Change', statusBoxWidth);
+          logger.logBoxLine(`Status changed: ${lastStatus} → ${status.powerStatus}`);
+          logger.logBoxEnd();
           lastStatus = status.powerStatus;
           lastLogTime = currentTime; // Reset log timer when status changes
         }
         // Log status periodically (at least every 5 minutes)
         else if (shouldLogStatus) {
           const timestamp = new Date().toISOString();
-          console.log('┌──────────────────────────────────────────┐');
-          console.log(`│ [${timestamp}] Periodic Status Update`);
-          console.log(`│ Power Status: ${status.powerStatus}`);
-          console.log(`│ Battery: ${status.batteryCapacity}% | Runtime: ${status.batteryRuntime} min`);
-          console.log('└──────────────────────────────────────────┘');
+          const periodicBoxWidth = 45;
+          logger.logBoxTitle('Periodic Status Update', periodicBoxWidth);
+          logger.logBoxLine(`Timestamp: ${timestamp}`);
+          logger.logBoxLine(`Power Status: ${status.powerStatus}`);
+          logger.logBoxLine(`Battery: ${status.batteryCapacity}% | Runtime: ${status.batteryRuntime} min`);
+          logger.logBoxEnd();
           lastLogTime = currentTime;
         }
         
@@ -266,8 +272,8 @@ export class NupstDaemon {
     batteryCapacity: number,
     batteryRuntime: number
   }): Promise<void> {
-    console.log('┌─ UPS Status ───────────────────────────────┐');
-    console.log(`│ Battery: ${status.batteryCapacity}% | Runtime: ${status.batteryRuntime} min │`);
+    console.log('┌─ UPS Status ─────────────────────────────┐');
+    console.log(`│ Battery: ${status.batteryCapacity}% | Runtime: ${status.batteryRuntime} min`);
     console.log('└──────────────────────────────────────────┘');
     
     // Check battery threshold
@@ -292,29 +298,107 @@ export class NupstDaemon {
    * @param reason Reason for shutdown
    */
   public async initiateShutdown(reason: string): Promise<void> {
-    console.log(`Initiating system shutdown due to: ${reason}`);
+    logger.log(`Initiating system shutdown due to: ${reason}`);
     
     // Set a longer delay for shutdown to allow VMs and services to close
     const shutdownDelayMinutes = 5;
     
     try {
-      // Execute shutdown command with delay to allow for VM graceful shutdown
-      const { stdout } = await execAsync(`shutdown -h +${shutdownDelayMinutes} "UPS battery critical, shutting down in ${shutdownDelayMinutes} minutes"`);
-      console.log('Shutdown initiated:', stdout);
-      console.log(`Allowing ${shutdownDelayMinutes} minutes for VMs to shut down safely`);
+      // Find shutdown command in common system paths
+      const shutdownPaths = [
+        '/sbin/shutdown',
+        '/usr/sbin/shutdown',
+        '/bin/shutdown',
+        '/usr/bin/shutdown'
+      ];
+      
+      let shutdownCmd = '';
+      for (const path of shutdownPaths) {
+        try {
+          if (fs.existsSync(path)) {
+            shutdownCmd = path;
+            logger.log(`Found shutdown command at: ${shutdownCmd}`);
+            break;
+          }
+        } catch (e) {
+          // Continue checking other paths
+        }
+      }
+      
+      if (shutdownCmd) {
+        // Execute shutdown command with delay to allow for VM graceful shutdown
+        logger.log(`Executing: ${shutdownCmd} -h +${shutdownDelayMinutes} "UPS battery critical..."`);
+        const { stdout } = await execFileAsync(shutdownCmd, [
+          '-h', 
+          `+${shutdownDelayMinutes}`, 
+          `UPS battery critical, shutting down in ${shutdownDelayMinutes} minutes`
+        ]);
+        logger.log(`Shutdown initiated: ${stdout}`);
+        logger.log(`Allowing ${shutdownDelayMinutes} minutes for VMs to shut down safely`);
+      } else {
+        // Try using the PATH to find shutdown
+        try {
+          logger.log('Shutdown command not found in common paths, trying via PATH...');
+          const { stdout } = await execAsync(`shutdown -h +${shutdownDelayMinutes} "UPS battery critical, shutting down in ${shutdownDelayMinutes} minutes"`, {
+            env: process.env // Pass the current environment
+          });
+          logger.log(`Shutdown initiated: ${stdout}`);
+        } catch (e) {
+          throw new Error(`Shutdown command not found: ${e.message}`);
+        }
+      }
       
       // Monitor UPS during shutdown and force immediate shutdown if battery gets too low
-      console.log('Monitoring UPS during shutdown process...');
+      logger.log('Monitoring UPS during shutdown process...');
       await this.monitorDuringShutdown();
     } catch (error) {
-      console.error('Failed to initiate shutdown:', error);
-      // Try a different method if first one fails
-      try {
-        console.log('Trying alternative shutdown method...');
-        await execAsync('poweroff --force');
-      } catch (innerError) {
-        console.error('All shutdown methods failed:', innerError);
+      logger.error(`Failed to initiate shutdown: ${error}`);
+      
+      // Try alternative shutdown methods
+      const alternatives = [
+        { cmd: 'poweroff', args: ['--force'] },
+        { cmd: 'halt', args: ['-p'] },
+        { cmd: 'systemctl', args: ['poweroff'] },
+        { cmd: 'reboot', args: ['-p'] } // Some systems allow reboot -p for power off
+      ];
+      
+      for (const alt of alternatives) {
+        try {
+          // First check if command exists in common system paths
+          const paths = [
+            `/sbin/${alt.cmd}`,
+            `/usr/sbin/${alt.cmd}`,
+            `/bin/${alt.cmd}`,
+            `/usr/bin/${alt.cmd}`
+          ];
+          
+          let cmdPath = '';
+          for (const path of paths) {
+            if (fs.existsSync(path)) {
+              cmdPath = path;
+              break;
+            }
+          }
+          
+          if (cmdPath) {
+            logger.log(`Trying alternative shutdown method: ${cmdPath} ${alt.args.join(' ')}`);
+            await execFileAsync(cmdPath, alt.args);
+            return; // Exit if successful
+          } else {
+            // Try using PATH environment
+            logger.log(`Trying alternative via PATH: ${alt.cmd} ${alt.args.join(' ')}`);
+            await execAsync(`${alt.cmd} ${alt.args.join(' ')}`, {
+              env: process.env // Pass the current environment
+            });
+            return; // Exit if successful
+          }
+        } catch (altError) {
+          logger.error(`Alternative method ${alt.cmd} failed: ${altError}`);
+          // Continue to next method
+        }
       }
+      
+      logger.error('All shutdown methods failed');
     }
   }
   
@@ -346,10 +430,79 @@ export class NupstDaemon {
           console.log('└──────────────────────────────────────────┘');
           
           try {
-            await execAsync('shutdown -h now "EMERGENCY: UPS battery critically low, shutting down NOW"');
+            // Find shutdown command in common system paths
+            const shutdownPaths = [
+              '/sbin/shutdown',
+              '/usr/sbin/shutdown',
+              '/bin/shutdown',
+              '/usr/bin/shutdown'
+            ];
+            
+            let shutdownCmd = '';
+            for (const path of shutdownPaths) {
+              if (fs.existsSync(path)) {
+                shutdownCmd = path;
+                console.log(`Found shutdown command at: ${shutdownCmd}`);
+                break;
+              }
+            }
+            
+            if (shutdownCmd) {
+              console.log(`Executing emergency shutdown: ${shutdownCmd} -h now`);
+              await execFileAsync(shutdownCmd, ['-h', 'now', 'EMERGENCY: UPS battery critically low, shutting down NOW']);
+            } else {
+              // Try using the PATH to find shutdown
+              console.log('Shutdown command not found in common paths, trying via PATH...');
+              await execAsync('shutdown -h now "EMERGENCY: UPS battery critically low, shutting down NOW"', {
+                env: process.env // Pass the current environment
+              });
+            }
           } catch (error) {
-            console.error('Emergency shutdown failed, trying alternative method...');
-            await execAsync('poweroff --force');
+            console.error('Emergency shutdown failed, trying alternative methods...');
+            
+            // Try alternative shutdown methods in sequence
+            const alternatives = [
+              { cmd: 'poweroff', args: ['--force'] },
+              { cmd: 'halt', args: ['-p'] },
+              { cmd: 'systemctl', args: ['poweroff'] }
+            ];
+            
+            for (const alt of alternatives) {
+              try {
+                // Check common paths
+                const paths = [
+                  `/sbin/${alt.cmd}`,
+                  `/usr/sbin/${alt.cmd}`,
+                  `/bin/${alt.cmd}`,
+                  `/usr/bin/${alt.cmd}`
+                ];
+                
+                let cmdPath = '';
+                for (const path of paths) {
+                  if (fs.existsSync(path)) {
+                    cmdPath = path;
+                    break;
+                  }
+                }
+                
+                if (cmdPath) {
+                  console.log(`Emergency: using ${cmdPath} ${alt.args.join(' ')}`);
+                  await execFileAsync(cmdPath, alt.args);
+                  return; // Exit if successful
+                } else {
+                  // Try using PATH
+                  console.log(`Emergency: trying ${alt.cmd} via PATH`);
+                  await execAsync(`${alt.cmd} ${alt.args.join(' ')}`, {
+                    env: process.env
+                  });
+                  return; // Exit if successful
+                }
+              } catch (altError) {
+                // Continue to next method
+              }
+            }
+            
+            console.error('All emergency shutdown methods failed');
           }
           
           // Stop monitoring after initiating emergency shutdown

ts/index.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import { NupstCli } from './cli.js';
+import { logger } from './logger.js';
 
 /**
  * Main entry point for NUPST
@@ -13,6 +14,6 @@ async function main() {
 
 // Run the main function and handle any errors
 main().catch(error => {
-  console.error('Error:', error);
+  logger.error(`Error: ${error}`);
   process.exit(1);
 });

ts/logger.ts

@@ -0,0 +1,147 @@
+/**
+ * A simple logger class that provides consistent formatting for log messages
+ * including support for logboxes with title, lines, and closing
+ */
+export class Logger {
+  private currentBoxWidth: number | null = null;
+  private static instance: Logger;
+
+  /**
+   * Creates a new Logger instance
+   */
+  constructor() {
+    this.currentBoxWidth = null;
+  }
+
+  /**
+   * Get the singleton logger instance
+   * @returns The singleton logger instance
+   */
+  public static getInstance(): Logger {
+    if (!Logger.instance) {
+      Logger.instance = new Logger();
+    }
+    return Logger.instance;
+  }
+
+  /**
+   * Log a message
+   * @param message Message to log
+   */
+  public log(message: string): void {
+    console.log(message);
+  }
+
+  /**
+   * Log an error message
+   * @param message Error message to log
+   */
+  public error(message: string): void {
+    console.error(message);
+  }
+
+  /**
+   * Log a warning message with a warning emoji
+   * @param message Warning message to log
+   */
+  public warn(message: string): void {
+    console.warn(`⚠️ ${message}`);
+  }
+
+  /**
+   * Log a success message with a checkmark
+   * @param message Success message to log
+   */
+  public success(message: string): void {
+    console.log(`✓ ${message}`);
+  }
+
+  /**
+   * Log a logbox title and set the current box width
+   * @param title Title of the logbox
+   * @param width Width of the logbox (including borders)
+   */
+  public logBoxTitle(title: string, width: number): void {
+    this.currentBoxWidth = width;
+    
+    // Create the title line with appropriate padding
+    const paddedTitle = ` ${title} `;
+    const remainingSpace = width - 3 - paddedTitle.length;
+    
+    // Title line: ┌─ Title ───┐
+    const titleLine = `┌─${paddedTitle}${'─'.repeat(remainingSpace)}┐`;
+    
+    console.log(titleLine);
+  }
+
+  /**
+   * Log a logbox line
+   * @param content Content of the line
+   * @param width Optional width override. If not provided, uses the current box width.
+   */
+  public logBoxLine(content: string, width?: number): void {
+    const boxWidth = width || this.currentBoxWidth;
+    
+    if (!boxWidth) {
+      throw new Error('No box width specified and no previous box width to use');
+    }
+    
+    // Calculate the available space for content
+    const availableSpace = boxWidth - 2; // Account for left and right borders
+    
+    if (content.length <= availableSpace - 1) {
+      // If content fits with at least one space for the right border stripe
+      const padding = availableSpace - content.length - 1;
+      console.log(`│ ${content}${' '.repeat(padding)}│`);
+    } else {
+      // Content is too long, let it flow out of boundaries.
+      console.log(`│ ${content}`);
+    }
+  }
+
+  /**
+   * Log a logbox end
+   * @param width Optional width override. If not provided, uses the current box width.
+   */
+  public logBoxEnd(width?: number): void {
+    const boxWidth = width || this.currentBoxWidth;
+    
+    if (!boxWidth) {
+      throw new Error('No box width specified and no previous box width to use');
+    }
+    
+    // Create the bottom border: └────────┘
+    console.log(`└${'─'.repeat(boxWidth - 2)}┘`);
+    
+    // Reset the current box width
+    this.currentBoxWidth = null;
+  }
+
+  /**
+   * Log a complete logbox with title, content lines, and ending
+   * @param title Title of the logbox
+   * @param lines Array of content lines
+   * @param width Width of the logbox
+   */
+  public logBox(title: string, lines: string[], width: number): void {
+    this.logBoxTitle(title, width);
+    
+    for (const line of lines) {
+      this.logBoxLine(line);
+    }
+    
+    this.logBoxEnd();
+  }
+
+  /**
+   * Log a divider line
+   * @param width Width of the divider
+   * @param character Character to use for the divider (default: ─)
+   */
+  public logDivider(width: number, character: string = '─'): void {
+    console.log(character.repeat(width));
+  }
+}
+
+// Export a singleton instance for easy use
+export const logger = Logger.getInstance();

ts/nupst.ts

@@ -4,6 +4,7 @@ import { NupstSystemd } from './systemd.js';
 import { commitinfo } from './00_commitinfo_data.js';
 import { spawn } from 'child_process';
 import * as https from 'https';
+import { logger } from './logger.js';
 
 /**
  * Main Nupst class that coordinates all components
@@ -70,7 +71,7 @@ export class Nupst {
       
       return this.updateAvailable;
     } catch (error) {
-      console.error(`Error checking for updates: ${error.message}`);
+      logger.error(`Error checking for updates: ${error.message}`);
       return false;
     }
   }
@@ -162,28 +163,33 @@ export class Nupst {
    */
   public logVersionInfo(checkForUpdates: boolean = true): void {
     const version = this.getVersion();
-    console.log('┌─ NUPST Version ────────────────────────┐');
-    console.log(`│ Current Version: ${version}`);
+    const boxWidth = 45;
+    
+    logger.logBoxTitle('NUPST Version', boxWidth);
+    logger.logBoxLine(`Current Version: ${version}`);
     
     if (this.updateAvailable && this.latestVersion) {
-      console.log(`│ Update Available: ${this.latestVersion}`);
-      console.log('│ Run "sudo nupst update" to update');
+      logger.logBoxLine(`Update Available: ${this.latestVersion}`);
+      logger.logBoxLine('Run "sudo nupst update" to update');
+      logger.logBoxEnd();
     } else if (checkForUpdates) {
-      console.log('│ Checking for updates...');
+      logger.logBoxLine('Checking for updates...');
+      
+      // We can't end the box yet since we're in an async operation
       this.checkForUpdates().then(updateAvailable => {
         if (updateAvailable) {
-          console.log(`│ Update Available: ${this.latestVersion}`);
-          console.log('│ Run "sudo nupst update" to update');
+          logger.logBoxLine(`Update Available: ${this.latestVersion}`);
+          logger.logBoxLine('Run "sudo nupst update" to update');
         } else {
-          console.log('│ You are running the latest version');
+          logger.logBoxLine('You are running the latest version');
         }
-        console.log('└──────────────────────────────────────────┘');
+        logger.logBoxEnd();
       }).catch(() => {
-        console.log('│ Could not check for updates');
-        console.log('└──────────────────────────────────────────┘');
+        logger.logBoxLine('Could not check for updates');
+        logger.logBoxEnd();
       });
     } else {
-      console.log('└──────────────────────────────────────────┘');
+      logger.logBoxEnd();
     }
   }
 }

ts/snmp/manager.ts

@@ -1,4 +1,3 @@
-import * as dgram from 'dgram';
 import * as snmp from 'net-snmp';
 import type { IOidSet, ISnmpConfig, TUpsModel, IUpsStatus } from './types.js';
 import { UpsOidSets } from './oid-sets.js';

ts/systemd.ts

@@ -1,6 +1,7 @@
 import { promises as fs } from 'fs';
 import { execSync } from 'child_process';
 import { NupstDaemon } from './daemon.js';
+import { logger } from './logger.js';
 
 /**
  * Class for managing systemd service
@@ -47,10 +48,11 @@ WantedBy=multi-user.target
     try {
       await fs.access(configPath);
     } catch (error) {
-      console.error('┌─ Configuration Error ─────────────────────┐');
-      console.error(`│ No configuration file found at ${configPath}`);
-      console.error('│ Please run \'nupst setup\' first to create a configuration.');
-      console.error('└──────────────────────────────────────────┘');
+      const boxWidth = 50;
+      logger.logBoxTitle('Configuration Error', boxWidth);
+      logger.logBoxLine(`No configuration file found at ${configPath}`);
+      logger.logBoxLine("Please run 'nupst setup' first to create a configuration.");
+      logger.logBoxEnd();
       throw new Error('Configuration not found');
     }
   }
@@ -66,23 +68,24 @@ WantedBy=multi-user.target
       
       // Write the service file
       await fs.writeFile(this.serviceFilePath, this.serviceTemplate);
-      console.log('┌─ Service Installation ─────────────────────┐');
-      console.log(`│ Service file created at ${this.serviceFilePath}`);
+      const boxWidth = 50;
+      logger.logBoxTitle('Service Installation', boxWidth);
+      logger.logBoxLine(`Service file created at ${this.serviceFilePath}`);
 
       // Reload systemd daemon
       execSync('systemctl daemon-reload');
-      console.log('│ Systemd daemon reloaded');
+      logger.logBoxLine('Systemd daemon reloaded');
 
       // Enable the service
       execSync('systemctl enable nupst.service');
-      console.log('│ Service enabled to start on boot');
-      console.log('└──────────────────────────────────────────┘');
+      logger.logBoxLine('Service enabled to start on boot');
+      logger.logBoxEnd();
     } catch (error) {
       if (error.message === 'Configuration not found') {
         // Just rethrow the error as the message has already been displayed
         throw error;
       }
-      console.error('Failed to install systemd service:', error);
+      logger.error(`Failed to install systemd service: ${error}`);
       throw error;
     }
   }
@@ -97,15 +100,16 @@ WantedBy=multi-user.target
       await this.checkConfigExists();
       
       execSync('systemctl start nupst.service');
-      console.log('┌─ Service Status ─────────────────────────┐');
-      console.log('│ NUPST service started successfully');
-      console.log('└──────────────────────────────────────────┘');
+      const boxWidth = 45;
+      logger.logBoxTitle('Service Status', boxWidth);
+      logger.logBoxLine('NUPST service started successfully');
+      logger.logBoxEnd();
     } catch (error) {
       if (error.message === 'Configuration not found') {
         // Exit with error code since configuration is required
         process.exit(1);
       }
-      console.error('Failed to start service:', error);
+      logger.error(`Failed to start service: ${error}`);
       throw error;
     }
   }
@@ -117,9 +121,9 @@ WantedBy=multi-user.target
   public async stop(): Promise<void> {
     try {
       execSync('systemctl stop nupst.service');
-      console.log('NUPST service stopped');
+      logger.success('NUPST service stopped');
     } catch (error) {
-      console.error('Failed to stop service:', error);
+      logger.error(`Failed to stop service: ${error}`);
       throw error;
     }
   }
@@ -132,9 +136,10 @@ WantedBy=multi-user.target
     try {
       // Enable debug mode if requested
       if (debugMode) {
-        console.log('┌─ Debug Mode ─────────────────────────────┐');
-        console.log('│ SNMP debugging enabled - detailed logs will be shown');
-        console.log('└──────────────────────────────────────────┘');
+        const boxWidth = 45;
+        logger.logBoxTitle('Debug Mode', boxWidth);
+        logger.logBoxLine('SNMP debugging enabled - detailed logs will be shown');
+        logger.logBoxEnd();
         this.daemon.getNupstSnmp().enableDebug();
       }
       
@@ -152,7 +157,7 @@ WantedBy=multi-user.target
       await this.displayServiceStatus();
       await this.displayUpsStatus();
     } catch (error) {
-      console.error(`Failed to get status: ${error.message}`);
+      logger.error(`Failed to get status: ${error.message}`);
     }
   }
 
@@ -163,13 +168,18 @@ WantedBy=multi-user.target
   private async displayServiceStatus(): Promise<void> {
     try {
       const serviceStatus = execSync('systemctl status nupst.service').toString();
-      console.log('┌─ Service Status ─────────────────────────┐');
-      console.log(serviceStatus.split('\n').map(line => `│ ${line}`).join('\n'));
-      console.log('└──────────────────────────────────────────┘');
+      const boxWidth = 45;
+      logger.logBoxTitle('Service Status', boxWidth);
+      // Process each line of the status output
+      serviceStatus.split('\n').forEach(line => {
+        logger.logBoxLine(line);
+      });
+      logger.logBoxEnd();
     } catch (error) {
-      console.error('┌─ Service Status ─────────────────────────┐');
-      console.error('│ Service is not running');
-      console.error('└──────────────────────────────────────────┘');
+      const boxWidth = 45;
+      logger.logBoxTitle('Service Status', boxWidth);
+      logger.logBoxLine('Service is not running');
+      logger.logBoxEnd();
     }
   }
 
@@ -190,22 +200,24 @@ WantedBy=multi-user.target
         timeout: Math.min(config.snmp.timeout, 10000) // Use at most 10 seconds for status check
       };
       
-      console.log('┌─ Connecting to UPS... ────────────────────┐');
-      console.log(`│ Host: ${config.snmp.host}:${config.snmp.port}`);
-      console.log(`│ UPS Model: ${config.snmp.upsModel || 'cyberpower'}`);
-      console.log('└──────────────────────────────────────────┘');
+      const boxWidth = 45;
+      logger.logBoxTitle('Connecting to UPS...', boxWidth);
+      logger.logBoxLine(`Host: ${config.snmp.host}:${config.snmp.port}`);
+      logger.logBoxLine(`UPS Model: ${config.snmp.upsModel || 'cyberpower'}`);
+      logger.logBoxEnd();
       
       const status = await snmp.getUpsStatus(snmpConfig);
       
-      console.log('┌─ UPS Status ───────────────────────────────┐');
-      console.log(`│ Power Status: ${status.powerStatus}`);
-      console.log(`│ Battery Capacity: ${status.batteryCapacity}%`);
-      console.log(`│ Runtime Remaining: ${status.batteryRuntime} minutes`);
-      console.log('└──────────────────────────────────────────┘');
+      logger.logBoxTitle('UPS Status', boxWidth);
+      logger.logBoxLine(`Power Status: ${status.powerStatus}`);
+      logger.logBoxLine(`Battery Capacity: ${status.batteryCapacity}%`);
+      logger.logBoxLine(`Runtime Remaining: ${status.batteryRuntime} minutes`);
+      logger.logBoxEnd();
     } catch (error) {
-      console.error('┌─ UPS Status ───────────────────────────────┐');
-      console.error(`│ Failed to retrieve UPS status: ${error.message}`);
-      console.error('└──────────────────────────────────────────┘');
+      const boxWidth = 45;
+      logger.logBoxTitle('UPS Status', boxWidth);
+      logger.logBoxLine(`Failed to retrieve UPS status: ${error.message}`);
+      logger.logBoxEnd();
     }
   }
 
@@ -221,10 +233,10 @@ WantedBy=multi-user.target
       
       // Reload systemd daemon
       execSync('systemctl daemon-reload');
-      console.log('Systemd daemon reloaded');
-      console.log('NUPST service has been successfully uninstalled');
+      logger.log('Systemd daemon reloaded');
+      logger.success('NUPST service has been successfully uninstalled');
     } catch (error) {
-      console.error('Failed to disable and uninstall service:', error);
+      logger.error(`Failed to disable and uninstall service: ${error}`);
       throw error;
     }
   }
@@ -235,11 +247,11 @@ WantedBy=multi-user.target
    */
   private async stopService(): Promise<void> {
     try {
-      console.log('Stopping NUPST service...');
+      logger.log('Stopping NUPST service...');
       execSync('systemctl stop nupst.service');
     } catch (error) {
       // Service might not be running, that's okay
-      console.log('Service was not running or could not be stopped');
+      logger.log('Service was not running or could not be stopped');
     }
   }
 
@@ -249,10 +261,10 @@ WantedBy=multi-user.target
    */
   private async disableService(): Promise<void> {
     try {
-      console.log('Disabling NUPST service...');
+      logger.log('Disabling NUPST service...');
       execSync('systemctl disable nupst.service');
     } catch (error) {
-      console.log('Service was not enabled or could not be disabled');
+      logger.log('Service was not enabled or could not be disabled');
     }
   }
 
@@ -262,11 +274,11 @@ WantedBy=multi-user.target
    */
   private async removeServiceFile(): Promise<void> {
     if (await fs.stat(this.serviceFilePath).catch(() => null)) {
-      console.log(`Removing service file ${this.serviceFilePath}...`);
+      logger.log(`Removing service file ${this.serviceFilePath}...`);
       await fs.unlink(this.serviceFilePath);
-      console.log('Service file removed');
+      logger.log('Service file removed');
     } else {
-      console.log('Service file did not exist');
+      logger.log('Service file did not exist');
     }
   }
 }