fix(snmp): correct power status interpretation using OID set mappings

Move power status value interpretation from hardcoded logic to OID set configuration.
Each UPS model now defines its own value mappings (e.g., CyberPower: 2=online, 3=onBattery).

Fixes incorrect status display where UPS showed "On Battery" when actually online.

Changes:
- Add POWER_STATUS_VALUES to IOidSet interface
- Define value mappings for all UPS models (cyberpower, apc, eaton, tripplite, liebert)
- Refactor determinePowerStatus() to use OID set mappings instead of hardcoded values
- CyberPower now correctly interprets value 2 as online (was incorrectly onBattery)

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@serve.zone/nupst",
-  "version": "4.0.6",
+  "version": "4.1.1",
   "exports": "./mod.ts",
   "tasks": {
     "dev": "deno run --allow-all mod.ts",

ts/cli/service-handler.ts

@@ -129,81 +129,57 @@ export class ServiceHandler {
     try {
       // Check if running as root
       this.checkRootAccess(
-        'This command must be run as root to update NUPST and refresh the systemd service.',
+        'This command must be run as root to update NUPST.',
       );
 
-      const boxWidth = 45;
+      console.log('');
-      logger.logBoxTitle('NUPST Update Process', boxWidth);
+      logger.info('Checking for updates...');
-      logger.logBoxLine('Updating NUPST from repository...');
-
-      // Determine the installation directory (assuming it's either /opt/nupst or the current directory)
-      const { existsSync } = await import('fs');
-      let installDir = '/opt/nupst';
-
-      if (!existsSync(installDir)) {
-        // If not installed in /opt/nupst, use the current directory
-        const { dirname } = await import('path');
-        installDir = dirname(dirname(process.argv[1])); // Go up two levels from the executable
-        logger.logBoxLine(`Using local installation directory: ${installDir}`);
-      }
 
       try {
-        // 1. Update the repository
+        // Get current version
-        logger.logBoxLine('Pulling latest changes from git repository...');
+        const currentVersion = this.nupst.getVersion();
-        execSync(`cd ${installDir} && git fetch origin && git reset --hard origin/main`, {
+
-          stdio: 'pipe',
+        // Fetch latest version from Gitea API
+        const apiUrl = 'https://code.foss.global/api/v1/repos/serve.zone/nupst/releases/latest';
+        const response = execSync(`curl -sSL ${apiUrl}`).toString();
+        const release = JSON.parse(response);
+        const latestVersion = release.tag_name; // e.g., "v4.0.7"
+
+        // Normalize versions for comparison (ensure both have "v" prefix)
+        const normalizedCurrent = currentVersion.startsWith('v') ? currentVersion : `v${currentVersion}`;
+        const normalizedLatest = latestVersion.startsWith('v') ? latestVersion : `v${latestVersion}`;
+
+        logger.dim(`Current version: ${normalizedCurrent}`);
+        logger.dim(`Latest version:  ${normalizedLatest}`);
+        console.log('');
+
+        // Compare normalized versions
+        if (normalizedCurrent === normalizedLatest) {
+          logger.success('Already up to date!');
+          console.log('');
+          return;
+        }
+
+        logger.info(`New version available: ${latestVersion}`);
+        logger.dim('Downloading and installing...');
+        console.log('');
+
+        // Download and run the install script
+        // This handles everything: download binary, stop service, replace, restart
+        const installUrl = 'https://code.foss.global/serve.zone/nupst/raw/branch/main/install.sh';
+
+        execSync(`curl -sSL ${installUrl} | bash`, {
+          stdio: 'inherit', // Show install script output to user
         });
 
-        // 2. Run the install.sh script
+        console.log('');
-        logger.logBoxLine('Running install.sh to update NUPST...');
+        logger.success(`Updated to ${latestVersion}`);
-        execSync(`cd ${installDir} && bash ./install.sh`, { stdio: 'pipe' });
+        console.log('');
-
-        // 3. Run the setup.sh script with force flag to update Node.js and dependencies
-        logger.logBoxLine('Running setup.sh to update Node.js and dependencies...');
-        execSync(`cd ${installDir} && bash ./setup.sh --force`, { stdio: 'pipe' });
-
-        // 4. Refresh the systemd service
-        logger.logBoxLine('Refreshing systemd service...');
-
-        // First check if service exists
-        let serviceExists = false;
-        try {
-          const output = execSync('systemctl list-unit-files | grep nupst.service').toString();
-          serviceExists = output.includes('nupst.service');
       } catch (error) {
-          // If grep fails (service not found), serviceExists remains false
+        console.log('');
-          serviceExists = false;
+        logger.error('Update failed');
-        }
+        logger.dim(`${error instanceof Error ? error.message : String(error)}`);
-
+        console.log('');
-        if (serviceExists) {
-          // Stop the service if it's running
-          const isRunning =
-            execSync('systemctl is-active nupst.service || true').toString().trim() === 'active';
-          if (isRunning) {
-            logger.logBoxLine('Stopping nupst service...');
-            execSync('systemctl stop nupst.service');
-          }
-
-          // Reinstall the service
-          logger.logBoxLine('Reinstalling systemd service...');
-          await this.nupst.getSystemd().install();
-
-          // Restart the service if it was running
-          if (isRunning) {
-            logger.logBoxLine('Restarting nupst service...');
-            execSync('systemctl start nupst.service');
-          }
-        } else {
-          logger.logBoxLine('Systemd service not installed, skipping service refresh.');
-          logger.logBoxLine('Run "nupst enable" to install the service.');
-        }
-
-        logger.logBoxLine('Update completed successfully!');
-        logger.logBoxEnd();
-      } catch (error) {
-        logger.logBoxLine('Error during update process:');
-        logger.logBoxLine(`${error instanceof Error ? error.message : String(error)}`);
-        logger.logBoxEnd();
         process.exit(1);
       }
     } catch (error) {

ts/snmp/manager.ts

@@ -525,6 +525,7 @@ export class NupstSnmp {
 
   /**
    * Determine power status based on UPS model and raw value
+   * Uses the value mappings defined in the OID sets
    * @param upsModel UPS model
    * @param powerStatusValue Raw power status value
    * @returns Standardized power status
@@ -533,38 +534,27 @@ export class NupstSnmp {
     upsModel: TUpsModel | undefined,
     powerStatusValue: number,
   ): 'online' | 'onBattery' | 'unknown' {
-    if (upsModel === 'cyberpower') {
+    // Get the OID set for this UPS model
-      // CyberPower RMCARD205: upsBaseOutputStatus values
+    if (upsModel && upsModel !== 'custom') {
-      // 2=onLine, 3=onBattery, 4=onBoost, 5=onSleep, 6=off, etc.
+      const oidSet = UpsOidSets.getOidSet(upsModel);
-      if (powerStatusValue === 2) {
+
+      // Use the value mappings if available
+      if (oidSet.POWER_STATUS_VALUES) {
+        if (powerStatusValue === oidSet.POWER_STATUS_VALUES.online) {
           return 'online';
-      } else if (powerStatusValue === 3) {
+        } else if (powerStatusValue === oidSet.POWER_STATUS_VALUES.onBattery) {
           return 'onBattery';
         }
-    } else if (upsModel === 'eaton') {
+      }
-      // Eaton UPS: xupsOutputSource values
+    }
-      // 3=normal/mains, 5=battery, etc.
+
+    // Fallback for custom or undefined models (RFC 1628 standard)
+    // upsOutputSource: 3=normal (mains), 5=battery
     if (powerStatusValue === 3) {
       return 'online';
     } else if (powerStatusValue === 5) {
       return 'onBattery';
     }
-    } else if (upsModel === 'apc') {
-      // APC UPS: upsBasicOutputStatus values
-      // 2=online, 3=onBattery, etc.
-      if (powerStatusValue === 2) {
-        return 'online';
-      } else if (powerStatusValue === 3) {
-        return 'onBattery';
-      }
-    } else {
-      // Default interpretation for other UPS models
-      if (powerStatusValue === 1) {
-        return 'online';
-      } else if (powerStatusValue === 2) {
-        return 'onBattery';
-      }
-    }
 
     return 'unknown';
   }

ts/snmp/oid-sets.ts

@@ -11,37 +11,57 @@ export class UpsOidSets {
   private static readonly UPS_OID_SETS: Record<TUpsModel, IOidSet> = {
     // Cyberpower OIDs for RMCARD205 (based on CyberPower_MIB_v2.11)
     cyberpower: {
-      POWER_STATUS: '1.3.6.1.4.1.3808.1.1.1.4.1.1.0', // upsBaseOutputStatus (2=online, 3=on battery)
+      POWER_STATUS: '1.3.6.1.4.1.3808.1.1.1.4.1.1.0', // upsBaseOutputStatus
       BATTERY_CAPACITY: '1.3.6.1.4.1.3808.1.1.1.2.2.1.0', // upsAdvanceBatteryCapacity (percentage)
       BATTERY_RUNTIME: '1.3.6.1.4.1.3808.1.1.1.2.2.4.0', // upsAdvanceBatteryRunTimeRemaining (TimeTicks)
+      POWER_STATUS_VALUES: {
+        online: 2, // upsBaseOutputStatus: 2=onLine
+        onBattery: 3, // upsBaseOutputStatus: 3=onBattery
+      },
     },
 
     // APC OIDs
     apc: {
-      POWER_STATUS: '1.3.6.1.4.1.318.1.1.1.4.1.1.0', // Power status (1=online, 2=on battery)
+      POWER_STATUS: '1.3.6.1.4.1.318.1.1.1.4.1.1.0', // upsBasicOutputStatus
       BATTERY_CAPACITY: '1.3.6.1.4.1.318.1.1.1.2.2.1.0', // Battery capacity in percentage
       BATTERY_RUNTIME: '1.3.6.1.4.1.318.1.1.1.2.2.3.0', // Remaining runtime in minutes
+      POWER_STATUS_VALUES: {
+        online: 2, // upsBasicOutputStatus: 2=onLine
+        onBattery: 3, // upsBasicOutputStatus: 3=onBattery
+      },
     },
 
     // Eaton OIDs
     eaton: {
-      POWER_STATUS: '1.3.6.1.4.1.534.1.4.4.0', // xupsOutputSource (3=normal/mains, 5=battery)
+      POWER_STATUS: '1.3.6.1.4.1.534.1.4.4.0', // xupsOutputSource
       BATTERY_CAPACITY: '1.3.6.1.4.1.534.1.2.4.0', // xupsBatCapacity (percentage)
       BATTERY_RUNTIME: '1.3.6.1.4.1.534.1.2.1.0', // xupsBatTimeRemaining (seconds)
+      POWER_STATUS_VALUES: {
+        online: 3, // xupsOutputSource: 3=normal (mains power)
+        onBattery: 5, // xupsOutputSource: 5=battery
+      },
     },
 
     // TrippLite OIDs
     tripplite: {
-      POWER_STATUS: '1.3.6.1.4.1.850.1.1.3.1.1.1.0', // Power status
+      POWER_STATUS: '1.3.6.1.4.1.850.1.1.3.1.1.1.0', // tlUpsOutputSource
       BATTERY_CAPACITY: '1.3.6.1.4.1.850.1.1.3.2.4.1.0', // Battery capacity in percentage
       BATTERY_RUNTIME: '1.3.6.1.4.1.850.1.1.3.2.2.1.0', // Remaining runtime in minutes
+      POWER_STATUS_VALUES: {
+        online: 2, // tlUpsOutputSource: 2=normal (mains power)
+        onBattery: 3, // tlUpsOutputSource: 3=onBattery
+      },
     },
 
     // Liebert/Vertiv OIDs
     liebert: {
-      POWER_STATUS: '1.3.6.1.4.1.476.1.42.3.9.20.1.20.1.2.1.2.1', // Power status
+      POWER_STATUS: '1.3.6.1.4.1.476.1.42.3.9.20.1.20.1.2.1.2.1', // lgpPwrOutputSource
       BATTERY_CAPACITY: '1.3.6.1.4.1.476.1.42.3.9.20.1.20.1.2.1.4.1', // Battery capacity in percentage
       BATTERY_RUNTIME: '1.3.6.1.4.1.476.1.42.3.9.20.1.20.1.2.1.5.1', // Remaining runtime in minutes
+      POWER_STATUS_VALUES: {
+        online: 2, // lgpPwrOutputSource: 2=normal (mains power)
+        onBattery: 3, // lgpPwrOutputSource: 3=onBattery
+      },
     },
 
     // Custom OIDs (to be provided by the user)

ts/snmp/types.ts

@@ -28,6 +28,13 @@ export interface IOidSet {
   BATTERY_CAPACITY: string;
   /** OID for battery runtime */
   BATTERY_RUNTIME: string;
+  /** Power status value mappings */
+  POWER_STATUS_VALUES?: {
+    /** SNMP value that indicates UPS is online (on AC power) */
+    online: number;
+    /** SNMP value that indicates UPS is on battery */
+    onBattery: number;
+  };
 }
 
 /**

ts/systemd.ts

@@ -50,11 +50,11 @@ WantedBy=multi-user.target
     try {
       await fs.access(configPath);
     } catch (error) {
-      const boxWidth = 50;
+      console.log('');
-      logger.logBoxTitle('Configuration Error', boxWidth);
+      console.log(`${symbols.error} ${theme.error('No configuration found')}`);
-      logger.logBoxLine(`No configuration file found at ${configPath}`);
+      console.log(`  ${theme.dim('Config file:')} ${configPath}`);
-      logger.logBoxLine("Please run 'nupst add' first to create a UPS configuration.");
+      console.log(`  ${theme.dim('Run')} ${theme.command('nupst ups add')} ${theme.dim('to create a configuration')}`);
-      logger.logBoxEnd();
+      console.log('');
       throw new Error('Configuration not found');
     }
   }
@@ -138,16 +138,12 @@ WantedBy=multi-user.target
     try {
       // Enable debug mode if requested
       if (debugMode) {
-        const boxWidth = 45;
+        console.log('');
-        logger.logBoxTitle('Debug Mode', boxWidth);
+        logger.info('Debug Mode: SNMP debugging enabled');
-        logger.logBoxLine('SNMP debugging enabled - detailed logs will be shown');
+        console.log('');
-        logger.logBoxEnd();
         this.daemon.getNupstSnmp().enableDebug();
       }
 
-      // Display version information
-      this.daemon.getNupstSnmp().getNupst().logVersionInfo();
-
       // Check if config exists first
       try {
         await this.checkConfigExists();