Merge 3b262cf180 into b65ec83c39

web/service/server.go

@@ -110,7 +110,6 @@ type ServerService struct {
 	mu                 sync.Mutex
 	lastCPUTimes       cpu.TimesStat
 	hasLastCPUSample   bool
-	hasNativeCPUSample bool
 	emaCPU             float64
 	cpuHistory         []CPUSample
 	cachedCpuSpeedMhz  float64
@@ -433,27 +432,23 @@ func (s *ServerService) AppendCpuSample(t time.Time, v float64) {
 }
 
 func (s *ServerService) sampleCPUUtilization() (float64, error) {
-	// Try native platform-specific CPU implementation first (Windows, Linux, macOS)
-	if pct, err := sys.CPUPercentRaw(); err == nil {
-		s.mu.Lock()
-		// First call to native method returns 0 (initializes baseline)
-		if !s.hasNativeCPUSample {
-			s.hasNativeCPUSample = true
+	// Prefer native Windows API to avoid external deps for CPU percent
+	if runtime.GOOS == "windows" {
+		if pct, err := sys.CPUPercentRaw(); err == nil {
+			s.mu.Lock()
+			// Smooth with EMA
+			const alpha = 0.3
+			if s.emaCPU == 0 {
+				s.emaCPU = pct
+			} else {
+				s.emaCPU = alpha*pct + (1-alpha)*s.emaCPU
+			}
+			val := s.emaCPU
 			s.mu.Unlock()
-			return 0, nil
+			return val, nil
 		}
-		// Smooth with EMA
-		const alpha = 0.3
-		if s.emaCPU == 0 {
-			s.emaCPU = pct
-		} else {
-			s.emaCPU = alpha*pct + (1-alpha)*s.emaCPU
-		}
-		val := s.emaCPU
-		s.mu.Unlock()
-		return val, nil
+		// If native call fails, fall back to gopsutil times
 	}
-	// If native call fails, fall back to gopsutil times
 	// Read aggregate CPU times (all CPUs combined)
 	times, err := cpu.Times(false)
 	if err != nil {
@@ -476,16 +471,17 @@ func (s *ServerService) sampleCPUUtilization() (float64, error) {
 	}
 
 	// Compute busy and total deltas
-	// Note: Guest and GuestNice times are already included in User and Nice respectively,
-	// so we exclude them to avoid double-counting (Linux kernel accounting)
 	idleDelta := cur.Idle - s.lastCPUTimes.Idle
+	// Sum of busy deltas (exclude Idle)
 	busyDelta := (cur.User - s.lastCPUTimes.User) +
 		(cur.System - s.lastCPUTimes.System) +
 		(cur.Nice - s.lastCPUTimes.Nice) +
 		(cur.Iowait - s.lastCPUTimes.Iowait) +
 		(cur.Irq - s.lastCPUTimes.Irq) +
 		(cur.Softirq - s.lastCPUTimes.Softirq) +
-		(cur.Steal - s.lastCPUTimes.Steal)
+		(cur.Steal - s.lastCPUTimes.Steal) +
+		(cur.Guest - s.lastCPUTimes.Guest) +
+		(cur.GuestNice - s.lastCPUTimes.GuestNice)
 
 	totalDelta := busyDelta + idleDelta
 

x-ui.sh

@@ -189,9 +189,9 @@ reset_user() {
     fi
     
     read -rp "Please set the login username [default is a random username]: " config_account
-    [[ -z $config_account ]] && config_account=$(gen_random_string 10)
+    [[ -z $config_account ]] && config_account=$(date +%s%N | md5sum | cut -c 1-8)
     read -rp "Please set the login password [default is a random password]: " config_password
-    [[ -z $config_password ]] && config_password=$(gen_random_string 18)
+    [[ -z $config_password ]] && config_password=$(date +%s%N | md5sum | cut -c 1-8)
 
     read -rp "Do you want to disable currently configured two-factor authentication? (y/n): " twoFactorConfirm
     if [[ $twoFactorConfirm != "y" && $twoFactorConfirm != "Y" ]]; then