Merge 0510c6d7b2 into 76afff2a6f

go.mod

@@ -21,7 +21,6 @@ require (
 	github.com/xtls/xray-core v1.250911.0
 	go.uber.org/atomic v1.11.0
 	golang.org/x/crypto v0.42.0
-	golang.org/x/sys v0.36.0
 	golang.org/x/text v0.29.0
 	google.golang.org/grpc v1.75.1
 	gorm.io/driver/sqlite v1.6.0
@@ -90,6 +89,7 @@ require (
 	golang.org/x/mod v0.28.0 // indirect
 	golang.org/x/net v0.44.0 // indirect
 	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/sys v0.36.0 // indirect
 	golang.org/x/time v0.13.0 // indirect
 	golang.org/x/tools v0.36.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect

sub/sub.go

@@ -11,7 +11,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"strings"
 
 	"x-ui/logger"
 	"x-ui/util/common"
@@ -75,6 +74,11 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 		engine.Use(middleware.DomainValidatorMiddleware(subDomain))
 	}
 
+	// Provide base_path in context for templates
+	engine.Use(func(c *gin.Context) {
+		c.Set("base_path", "/")
+	})
+
 	LinksPath, err := s.settingService.GetSubPath()
 	if err != nil {
 		return nil, err
@@ -85,11 +89,6 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 		return nil, err
 	}
 
-	// Set base_path based on LinksPath for template rendering
-	engine.Use(func(c *gin.Context) {
-		c.Set("base_path", LinksPath)
-	})
-
 	Encrypt, err := s.settingService.GetSubEncrypt()
 	if err != nil {
 		return nil, err
@@ -155,29 +154,11 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 	}
 
 	// Assets: use disk if present, fallback to embedded
-	// Serve under both root (/assets) and under the subscription path prefix (LinksPath + "assets")
-	// so reverse proxies with a URI prefix can load assets correctly.
-	// Determine LinksPath earlier to compute prefixed assets mount.
-	// Note: LinksPath always starts and ends with "/" (validated in settings).
-	var linksPathForAssets string
-	if LinksPath == "/" {
-		linksPathForAssets = "/assets"
-	} else {
-		// ensure single slash join
-		linksPathForAssets = strings.TrimRight(LinksPath, "/") + "/assets"
-	}
-
 	if _, err := os.Stat("web/assets"); err == nil {
 		engine.StaticFS("/assets", http.FS(os.DirFS("web/assets")))
-		if linksPathForAssets != "/assets" {
-			engine.StaticFS(linksPathForAssets, http.FS(os.DirFS("web/assets")))
-		}
 	} else {
 		if subFS, err := fs.Sub(webpkg.EmbeddedAssets(), "assets"); err == nil {
 			engine.StaticFS("/assets", http.FS(subFS))
-			if linksPathForAssets != "/assets" {
-				engine.StaticFS(linksPathForAssets, http.FS(subFS))
-			}
 		} else {
 			logger.Error("sub: failed to mount embedded assets:", err)
 		}

sub/subJsonService.go

@@ -292,25 +292,34 @@ func (s *SubJsonService) realityData(rData map[string]any) map[string]any {
 
 func (s *SubJsonService) genVnext(inbound *model.Inbound, streamSettings json_util.RawMessage, client model.Client, encryption string) json_util.RawMessage {
 	outbound := Outbound{}
+	usersData := make([]UserVnext, 1)
+
+	usersData[0].ID = client.ID
+	usersData[0].Level = 8
+	if inbound.Protocol == model.VMESS {
+		usersData[0].Security = client.Security
+	}
+	if inbound.Protocol == model.VLESS {
+		usersData[0].Flow = client.Flow
+		usersData[0].Encryption = encryption
+	}
+
+	vnextData := make([]VnextSetting, 1)
+	vnextData[0] = VnextSetting{
+		Address: inbound.Listen,
+		Port:    inbound.Port,
+		Users:   usersData,
+	}
+
 	outbound.Protocol = string(inbound.Protocol)
 	outbound.Tag = "proxy"
 	if s.mux != "" {
 		outbound.Mux = json_util.RawMessage(s.mux)
 	}
 	outbound.StreamSettings = streamSettings
-	// Emit flattened settings inside Settings to match new Xray format
+	outbound.Settings = OutboundSettings{
-	settings := make(map[string]any)
+		Vnext: vnextData,
-	settings["address"] = inbound.Listen
-	settings["port"] = inbound.Port
-	settings["id"] = client.ID
-	if inbound.Protocol == model.VLESS {
-		settings["flow"] = client.Flow
-		settings["encryption"] = encryption
 	}
-	if inbound.Protocol == model.VMESS {
-		settings["security"] = client.Security
-	}
-	outbound.Settings = settings
 
 	result, _ := json.MarshalIndent(outbound, "", "  ")
 	return result
@@ -347,8 +356,8 @@ func (s *SubJsonService) genServer(inbound *model.Inbound, streamSettings json_u
 		outbound.Mux = json_util.RawMessage(s.mux)
 	}
 	outbound.StreamSettings = streamSettings
-	outbound.Settings = map[string]any{
+	outbound.Settings = OutboundSettings{
-		"servers": serverData,
+		Servers: serverData,
 	}
 
 	result, _ := json.MarshalIndent(outbound, "", "  ")
@@ -360,10 +369,28 @@ type Outbound struct {
 	Tag            string               `json:"tag"`
 	StreamSettings json_util.RawMessage `json:"streamSettings"`
 	Mux            json_util.RawMessage `json:"mux,omitempty"`
-	Settings       map[string]any       `json:"settings,omitempty"`
+	ProxySettings  map[string]any       `json:"proxySettings,omitempty"`
+	Settings       OutboundSettings     `json:"settings,omitempty"`
 }
 
-// Legacy vnext-related structs removed for flattened schema
+type OutboundSettings struct {
+	Vnext   []VnextSetting  `json:"vnext,omitempty"`
+	Servers []ServerSetting `json:"servers,omitempty"`
+}
+
+type VnextSetting struct {
+	Address string      `json:"address"`
+	Port    int         `json:"port"`
+	Users   []UserVnext `json:"users"`
+}
+
+type UserVnext struct {
+	Encryption string `json:"encryption,omitempty"`
+	Flow       string `json:"flow,omitempty"`
+	ID         string `json:"id"`
+	Security   string `json:"security,omitempty"`
+	Level      int    `json:"level"`
+}
 
 type ServerSetting struct {
 	Password string `json:"password"`

sub/subService.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net"
 	"net/url"
+	"strconv"
 	"strings"
 	"time"
 
@@ -1109,7 +1110,7 @@ func (s *SubService) BuildPageData(subId string, hostHeader string, traffic xray
 
 	return PageData{
 		Host:         hostHeader,
-		BasePath:     "/", // kept as "/"; templates now use context base_path injected from router
+		BasePath:     "/",
 		SId:          subId,
 		Download:     download,
 		Upload:       upload,
@@ -1138,3 +1139,10 @@ func getHostFromXFH(s string) (string, error) {
 	}
 	return s, nil
 }
+
+func parseInt64(s string) (int64, error) {
+	// handle potential quotes
+	s = strings.Trim(s, "\"'")
+	n, err := strconv.ParseInt(s, 10, 64)
+	return n, err
+}

util/sys/sys_darwin.go

@@ -4,12 +4,7 @@
 package sys
 
 import (
-	"encoding/binary"
-	"fmt"
-	"sync"
-
 	"github.com/shirou/gopsutil/v4/net"
-	"golang.org/x/sys/unix"
 )
 
 func GetTCPCount() (int, error) {
@@ -27,69 +22,3 @@ func GetUDPCount() (int, error) {
 	}
 	return len(stats), nil
 }
-
-// --- CPU Utilization (macOS native) ---
-
-// sysctl kern.cp_time returns an array of 5 longs: user, nice, sys, idle, intr.
-// We compute utilization deltas without cgo.
-var (
-	cpuMu       sync.Mutex
-	lastTotals  [5]uint64
-	hasLastCPUT bool
-)
-
-func CPUPercentRaw() (float64, error) {
-	raw, err := unix.SysctlRaw("kern.cp_time")
-	if err != nil {
-		return 0, err
-	}
-	// Expect either 5*8 bytes (uint64) or 5*4 bytes (uint32)
-	var out [5]uint64
-	switch len(raw) {
-	case 5 * 8:
-		for i := 0; i < 5; i++ {
-			out[i] = binary.LittleEndian.Uint64(raw[i*8 : (i+1)*8])
-		}
-	case 5 * 4:
-		for i := 0; i < 5; i++ {
-			out[i] = uint64(binary.LittleEndian.Uint32(raw[i*4 : (i+1)*4]))
-		}
-	default:
-		return 0, fmt.Errorf("unexpected kern.cp_time size: %d", len(raw))
-	}
-
-	// user, nice, sys, idle, intr
-	user := out[0]
-	nice := out[1]
-	sysv := out[2]
-	idle := out[3]
-	intr := out[4]
-
-	cpuMu.Lock()
-	defer cpuMu.Unlock()
-
-	if !hasLastCPUT {
-		lastTotals = out
-		hasLastCPUT = true
-		return 0, nil
-	}
-
-	dUser := user - lastTotals[0]
-	dNice := nice - lastTotals[1]
-	dSys := sysv - lastTotals[2]
-	dIdle := idle - lastTotals[3]
-	dIntr := intr - lastTotals[4]
-
-	lastTotals = out
-
-	totald := dUser + dNice + dSys + dIdle + dIntr
-	if totald == 0 {
-		return 0, nil
-	}
-	busy := totald - dIdle
-	pct := float64(busy) / float64(totald) * 100.0
-	if pct > 100 {
-		pct = 100
-	}
-	return pct, nil
-}

util/sys/sys_linux.go

@@ -4,14 +4,10 @@
 package sys
 
 import (
-	"bufio"
 	"bytes"
 	"fmt"
 	"io"
 	"os"
-	"strconv"
-	"strings"
-	"sync"
 )
 
 func getLinesNum(filename string) (int, error) {
@@ -83,99 +79,3 @@ func safeGetLinesNum(path string) (int, error) {
 	}
 	return getLinesNum(path)
 }
-
-// --- CPU Utilization (Linux native) ---
-
-var (
-	cpuMu       sync.Mutex
-	lastTotal   uint64
-	lastIdleAll uint64
-	hasLast     bool
-)
-
-// CPUPercentRaw returns instantaneous total CPU utilization by reading /proc/stat.
-// First call initializes and returns 0; subsequent calls return busy/total * 100.
-func CPUPercentRaw() (float64, error) {
-	f, err := os.Open("/proc/stat")
-	if err != nil {
-		return 0, err
-	}
-	defer f.Close()
-
-	rd := bufio.NewReader(f)
-	line, err := rd.ReadString('\n')
-	if err != nil && err != io.EOF {
-		return 0, err
-	}
-	// Expect line like: cpu  user nice system idle iowait irq softirq steal guest guest_nice
-	fields := strings.Fields(line)
-	if len(fields) < 5 || fields[0] != "cpu" {
-		return 0, fmt.Errorf("unexpected /proc/stat format")
-	}
-
-	var nums []uint64
-	for i := 1; i < len(fields); i++ {
-		v, err := strconv.ParseUint(fields[i], 10, 64)
-		if err != nil {
-			break
-		}
-		nums = append(nums, v)
-	}
-	if len(nums) < 4 { // need at least user,nice,system,idle
-		return 0, fmt.Errorf("insufficient cpu fields")
-	}
-
-	// Conform with standard Linux CPU accounting
-	var user, nice, system, idle, iowait, irq, softirq, steal uint64
-	user = nums[0]
-	if len(nums) > 1 {
-		nice = nums[1]
-	}
-	if len(nums) > 2 {
-		system = nums[2]
-	}
-	if len(nums) > 3 {
-		idle = nums[3]
-	}
-	if len(nums) > 4 {
-		iowait = nums[4]
-	}
-	if len(nums) > 5 {
-		irq = nums[5]
-	}
-	if len(nums) > 6 {
-		softirq = nums[6]
-	}
-	if len(nums) > 7 {
-		steal = nums[7]
-	}
-
-	idleAll := idle + iowait
-	nonIdle := user + nice + system + irq + softirq + steal
-	total := idleAll + nonIdle
-
-	cpuMu.Lock()
-	defer cpuMu.Unlock()
-
-	if !hasLast {
-		lastTotal = total
-		lastIdleAll = idleAll
-		hasLast = true
-		return 0, nil
-	}
-
-	totald := total - lastTotal
-	idled := idleAll - lastIdleAll
-	lastTotal = total
-	lastIdleAll = idleAll
-
-	if totald == 0 {
-		return 0, nil
-	}
-	busy := totald - idled
-	pct := float64(busy) / float64(totald) * 100.0
-	if pct > 100 {
-		pct = 100
-	}
-	return pct, nil
-}

util/sys/sys_windows.go

@@ -5,9 +5,6 @@ package sys
 
 import (
 	"errors"
-	"sync"
-	"syscall"
-	"unsafe"
 
 	"github.com/shirou/gopsutil/v4/net"
 )
@@ -31,81 +28,3 @@ func GetTCPCount() (int, error) {
 func GetUDPCount() (int, error) {
 	return GetConnectionCount("udp")
 }
-
-// --- CPU Utilization (Windows native) ---
-
-var (
-	modKernel32        = syscall.NewLazyDLL("kernel32.dll")
-	procGetSystemTimes = modKernel32.NewProc("GetSystemTimes")
-
-	cpuMu      sync.Mutex
-	lastIdle   uint64
-	lastKernel uint64
-	lastUser   uint64
-	hasLast    bool
-)
-
-type filetime struct {
-	LowDateTime  uint32
-	HighDateTime uint32
-}
-
-func ftToUint64(ft filetime) uint64 {
-	return (uint64(ft.HighDateTime) << 32) | uint64(ft.LowDateTime)
-}
-
-// CPUPercentRaw returns the instantaneous total CPU utilization percentage using
-// Windows GetSystemTimes across all logical processors. The first call returns 0
-// as it initializes the baseline. Subsequent calls compute deltas.
-func CPUPercentRaw() (float64, error) {
-	var idleFT, kernelFT, userFT filetime
-	r1, _, e1 := procGetSystemTimes.Call(
-		uintptr(unsafe.Pointer(&idleFT)),
-		uintptr(unsafe.Pointer(&kernelFT)),
-		uintptr(unsafe.Pointer(&userFT)),
-	)
-	if r1 == 0 { // failure
-		if e1 != nil {
-			return 0, e1
-		}
-		return 0, syscall.GetLastError()
-	}
-
-	idle := ftToUint64(idleFT)
-	kernel := ftToUint64(kernelFT)
-	user := ftToUint64(userFT)
-
-	cpuMu.Lock()
-	defer cpuMu.Unlock()
-
-	if !hasLast {
-		lastIdle = idle
-		lastKernel = kernel
-		lastUser = user
-		hasLast = true
-		return 0, nil
-	}
-
-	idleDelta := idle - lastIdle
-	kernelDelta := kernel - lastKernel
-	userDelta := user - lastUser
-
-	// Update for next call
-	lastIdle = idle
-	lastKernel = kernel
-	lastUser = user
-
-	total := kernelDelta + userDelta
-	if total == 0 {
-		return 0, nil
-	}
-	// On Windows, kernel time includes idle time; busy = total - idle
-	busy := total - idleDelta
-
-	pct := float64(busy) / float64(total) * 100.0
-	// lower bound not needed; ratios of uint64 are non-negative
-	if pct > 100 {
-		pct = 100
-	}
-	return pct, nil
-}

web/assets/js/model/outbound.js

@@ -219,7 +219,7 @@ class KcpStreamSettings extends CommonClass {
 
 class WsStreamSettings extends CommonClass {
     constructor(
-        path = '/',
+        path = '/', 
         host = '',
         heartbeatPeriod = 0,
 
@@ -647,6 +647,10 @@ class Outbound extends CommonClass {
         ].includes(this.protocol);
     }
 
+    hasVnext() {
+        return [Protocols.VMess, Protocols.VLESS].includes(this.protocol);
+    }
+
     hasServers() {
         return [Protocols.Trojan, Protocols.Shadowsocks, Protocols.Socks, Protocols.HTTP].includes(this.protocol);
     }
@@ -686,22 +690,13 @@ class Outbound extends CommonClass {
             if (this.stream?.sockopt)
                 stream = { sockopt: this.stream.sockopt.toJson() };
         }
-        // For VMess/VLESS, emit settings as a flat object
-        let settingsOut = this.settings instanceof CommonClass ? this.settings.toJson() : this.settings;
-        // Remove undefined/null keys
-        if (settingsOut && typeof settingsOut === 'object') {
-            Object.keys(settingsOut).forEach(k => {
-                if (settingsOut[k] === undefined || settingsOut[k] === null) delete settingsOut[k];
-            });
-        }
         return {
+            tag: this.tag == '' ? undefined : this.tag,
             protocol: this.protocol,
-            settings: settingsOut,
+            settings: this.settings instanceof CommonClass ? this.settings.toJson() : this.settings,
-            // Only include tag, streamSettings, sendThrough, mux if present and not empty
+            streamSettings: stream,
-            ...(this.tag ? { tag: this.tag } : {}),
+            sendThrough: this.sendThrough != "" ? this.sendThrough : undefined,
-            ...(stream ? { streamSettings: stream } : {}),
+            mux: this.mux?.enabled ? this.mux : undefined,
-            ...(this.sendThrough ? { sendThrough: this.sendThrough } : {}),
-            ...(this.mux?.enabled ? { mux: this.mux } : {}),
         };
     }
 
@@ -913,7 +908,7 @@ Outbound.FreedomSettings = class extends CommonClass {
     toJson() {
         return {
             domainStrategy: ObjectUtil.isEmpty(this.domainStrategy) ? undefined : this.domainStrategy,
-            redirect: ObjectUtil.isEmpty(this.redirect) ? undefined : this.redirect,
+            redirect: ObjectUtil.isEmpty(this.redirect) ? undefined: this.redirect,
             fragment: Object.keys(this.fragment).length === 0 ? undefined : this.fragment,
             noises: this.noises.length === 0 ? undefined : Outbound.FreedomSettings.Noise.toJsonArray(this.noises),
         };
@@ -1031,21 +1026,22 @@ Outbound.VmessSettings = class extends CommonClass {
     }
 
     static fromJson(json = {}) {
-        if (ObjectUtil.isEmpty(json.address) || ObjectUtil.isEmpty(json.port)) return new Outbound.VmessSettings();
+        if (ObjectUtil.isArrEmpty(json.vnext)) return new Outbound.VmessSettings();
         return new Outbound.VmessSettings(
-            json.address,
+            json.vnext[0].address,
-            json.port,
+            json.vnext[0].port,
-            json.id,
+            json.vnext[0].users[0].id,
-            json.security,
+            json.vnext[0].users[0].security,
         );
     }
 
     toJson() {
         return {
-            address: this.address,
+            vnext: [{
-            port: this.port,
+                address: this.address,
-            id: this.id,
+                port: this.port,
-            security: this.security,
+                users: [{ id: this.id, security: this.security }],
+            }],
         };
     }
 };
@@ -1060,23 +1056,23 @@ Outbound.VLESSSettings = class extends CommonClass {
     }
 
     static fromJson(json = {}) {
-        if (ObjectUtil.isEmpty(json.address) || ObjectUtil.isEmpty(json.port)) return new Outbound.VLESSSettings();
+        if (ObjectUtil.isArrEmpty(json.vnext)) return new Outbound.VLESSSettings();
         return new Outbound.VLESSSettings(
-            json.address,
+            json.vnext[0].address,
-            json.port,
+            json.vnext[0].port,
-            json.id,
+            json.vnext[0].users[0].id,
-            json.flow,
+            json.vnext[0].users[0].flow,
-            json.encryption
+            json.vnext[0].users[0].encryption,
         );
     }
 
     toJson() {
         return {
-            address: this.address,
+            vnext: [{
-            port: this.port,
+                address: this.address,
-            id: this.id,
+                port: this.port,
-            flow: this.flow,
+                users: [{ id: this.id, flow: this.flow, encryption: this.encryption }],
-            encryption: this.encryption,
+            }],
         };
     }
 };

web/controller/server.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net/http"
 	"regexp"
-	"strconv"
 	"time"
 
 	"x-ui/web/global"
@@ -40,7 +39,6 @@ func NewServerController(g *gin.RouterGroup) *ServerController {
 func (a *ServerController) initRouter(g *gin.RouterGroup) {
 
 	g.GET("/status", a.status)
-	g.GET("/cpuHistory", a.getCpuHistory)
 	g.GET("/getXrayVersion", a.getXrayVersion)
 	g.GET("/getConfigJson", a.getConfigJson)
 	g.GET("/getDb", a.getDb)
@@ -63,18 +61,16 @@ func (a *ServerController) initRouter(g *gin.RouterGroup) {
 
 func (a *ServerController) refreshStatus() {
 	a.lastStatus = a.serverService.GetStatus(a.lastStatus)
-	// collect cpu history when status is fresh
-	if a.lastStatus != nil {
-		a.serverService.AppendCpuSample(time.Now(), a.lastStatus.Cpu)
-	}
 }
 
 func (a *ServerController) startTask() {
 	webServer := global.GetWebServer()
 	c := webServer.GetCron()
 	c.AddFunc("@every 2s", func() {
-		// Always refresh to keep CPU history collected continuously.
+		now := time.Now()
-		// Sampling is lightweight and capped to ~6 hours in memory.
+		if now.Sub(a.lastGetStatusTime) > time.Minute*3 {
+			return
+		}
 		a.refreshStatus()
 	})
 }
@@ -85,26 +81,6 @@ func (a *ServerController) status(c *gin.Context) {
 	jsonObj(c, a.lastStatus, nil)
 }
 
-// getCpuHistory returns recent CPU utilization points.
-// Query param q=minutes (int). Bounds: 1..360 (6 hours). Defaults to 60.
-func (a *ServerController) getCpuHistory(c *gin.Context) {
-	minsStr := c.Query("q")
-	mins := 60
-	if minsStr != "" {
-		if v, err := strconv.Atoi(minsStr); err == nil {
-			mins = v
-		}
-	}
-	if mins < 1 {
-		mins = 1
-	}
-	if mins > 360 {
-		mins = 360
-	}
-	res := a.serverService.GetCpuHistory(mins)
-	jsonObj(c, res, nil)
-}
-
 func (a *ServerController) getXrayVersion(c *gin.Context) {
 	now := time.Now()
 	if now.Sub(a.lastGetVersionsTime) <= time.Minute {

web/html/component/aClientTable.html

@@ -37,7 +37,7 @@
     <template slot="content" >
       {{ i18n "lastOnline" }}: [[ formatLastOnline(client.email) ]]
     </template>
-    <template v-if="client.enable && isClientOnline(client.email) && !isClientDepleted">
+    <template v-if="client.enable && isClientOnline(client.email)">
       <a-tag color="green">{{ i18n "online" }}</a-tag>
     </template>
     <template v-else>
@@ -49,9 +49,9 @@
   <a-space direction="horizontal" :size="2">
     <a-tooltip>
       <template slot="title">
-        <template v-if="isClientDepleted">{{ i18n "depleted" }}</template>
+        <template v-if="!isClientEnabled(record, client.email)">{{ i18n "depleted" }}</template>
-        <template v-if="!isClientDepleted && !client.enable">{{ i18n "disabled" }}</template>
+        <template v-else-if="!client.enable">{{ i18n "disabled" }}</template>
-        <template v-if="!isClientDepleted && client.enable && isClientOnline(client.email)">{{ i18n "online" }}</template>
+        <template v-else-if="client.enable && isClientOnline(client.email)">{{ i18n "online" }}</template>
       </template>
       <a-badge :class="isClientOnline(client.email)? 'online-animation' : ''" :color="client.enable ? statsExpColor(record, client.email) : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-badge>
     </a-tooltip>

web/html/form/outbound.html

@@ -210,7 +210,7 @@
         </a-form-item>
       </template>
 
-  <!-- VLESS/VMess user settings -->
+      <!-- Vnext (vless/vmess) settings -->
       <template v-if="[Protocols.VMess, Protocols.VLESS].includes(outbound.protocol)">
         <a-form-item label='ID'>
           <a-input v-model.trim="outbound.settings.id"></a-input>

web/html/form/reality_settings.html

@@ -22,10 +22,10 @@
         <a-input-number v-model.number="inbound.stream.reality.maxTimediff" :min="0"></a-input-number>
     </a-form-item>
     <a-form-item label='Min Client Ver'>
-        <a-input v-model.trim="inbound.stream.reality.minClientVer" placeholder='25.9.11'></a-input>
+        <a-input v-model.trim="inbound.stream.reality.minClientVer"></a-input>
     </a-form-item>
     <a-form-item label='Max Client Ver'>
-        <a-input v-model.trim="inbound.stream.reality.maxClientVer" placeholder='25.9.11'></a-input>
+        <a-input v-model.trim="inbound.stream.reality.maxClientVer"></a-input>
     </a-form-item>
     <a-form-item>
         <template slot="label">

web/html/index.html

@@ -41,11 +41,6 @@
                                 <div><b>{{ i18n "pages.index.frequency" }}:</b> [[ CPUFormatter.cpuSpeedFormat(status.cpuSpeedMhz) ]]</div>
                               </template>
                             </a-tooltip>
-                            <a-tooltip :overlay-class-name="themeSwitcher.currentTheme">
-                              <a-button size="small" type="default" class="ml-8" @click="openCpuHistory()">
-                                <a-icon type="history" />
-                              </a-button>
-                            </a-tooltip>
                           </div>
                         </a-col>
                         <a-col :span="12" class="text-center">
@@ -428,36 +423,6 @@
       </a-list-item>
     </a-list>
   </a-modal>
-  <!-- CPU History Modal -->
-  <a-modal id="cpu-history-modal"
-           v-model="cpuHistoryModal.visible"
-           :closable="true" @cancel="() => cpuHistoryModal.visible = false"
-           :class="themeSwitcher.currentTheme"
-           width="900px" footer="">
-    <template slot="title">
-      CPU History
-      <a-select size="small" v-model="cpuHistoryModal.minutes" class="ml-10" style="width: 120px" @change="loadCpuHistory">
-        <a-select-option :value="15">15 min</a-select-option>
-        <a-select-option :value="60">1 hour</a-select-option>
-        <a-select-option :value="180">3 hours</a-select-option>
-        <a-select-option :value="360">6 hours</a-select-option>
-      </a-select>
-    </template>
-    <div style="padding: 8px 0;">
-      <sparkline :data="cpuHistoryLong"
-                 :labels="cpuHistoryLabels"
-                 :vb-width="840"
-                 :height="220"
-                 :stroke="status.cpu.color"
-                 :stroke-width="2.2"
-                 :show-grid="true"
-                 :show-axes="true"
-                 :tick-count-x="5"
-                 :fill-opacity="0.18"
-                 :marker-radius="3.2"
-                 :show-tooltip="true" />
-    </div>
-  </a-modal>
 </a-layout>
 {{template "page/body_scripts" .}}
 {{template "component/aSidebar" .}}
@@ -465,190 +430,6 @@
 {{template "component/aCustomStatistic" .}}
 {{template "modals/textModal"}}
 <script>
-  // Tiny Sparkline component using an inline SVG polyline
-  Vue.component('sparkline', {
-    props: {
-      data: { type: Array, required: true },
-      // viewBox width for drawing space; SVG width will be 100% of container
-      vbWidth: { type: Number, default: 320 },
-      height: { type: Number, default: 80 },
-      stroke: { type: String, default: '#008771' },
-      strokeWidth: { type: Number, default: 2 },
-      maxPoints: { type: Number, default: 120 },
-      showGrid: { type: Boolean, default: true },
-      gridColor: { type: String, default: 'rgba(255,255,255,0.08)' },
-      fillOpacity: { type: Number, default: 0.15 },
-      showMarker: { type: Boolean, default: true },
-      markerRadius: { type: Number, default: 2.8 },
-      // New opts for axes/labels/tooltip
-      labels: { type: Array, default: () => [] }, // same length as data for x labels (e.g., timestamps)
-      showAxes: { type: Boolean, default: false },
-      yTickStep: { type: Number, default: 25 }, // percent ticks
-      tickCountX: { type: Number, default: 4 },
-      paddingLeft: { type: Number, default: 32 },
-      paddingRight: { type: Number, default: 6 },
-      paddingTop: { type: Number, default: 6 },
-      paddingBottom: { type: Number, default: 20 },
-      showTooltip: { type: Boolean, default: false },
-    },
-    data() {
-      return {
-        hoverIdx: -1,
-      }
-    },
-    computed: {
-      viewBoxAttr() {
-        return '0 0 ' + this.vbWidth + ' ' + this.height
-      },
-      drawWidth() {
-        return Math.max(1, this.vbWidth - this.paddingLeft - this.paddingRight)
-      },
-      drawHeight() {
-        return Math.max(1, this.height - this.paddingTop - this.paddingBottom)
-      },
-      nPoints() {
-        return Math.min(this.data.length, this.maxPoints)
-      },
-      dataSlice() {
-        const n = this.nPoints
-        if (n === 0) return []
-        return this.data.slice(this.data.length - n)
-      },
-      labelsSlice() {
-        const n = this.nPoints
-        if (!this.labels || this.labels.length === 0 || n === 0) return []
-        const start = Math.max(0, this.labels.length - n)
-        return this.labels.slice(start)
-      },
-      pointsArr() {
-        const n = this.nPoints
-        if (n === 0) return []
-        const slice = this.dataSlice
-        const max = 100
-        const w = this.drawWidth
-        const h = this.drawHeight
-        const dx = n > 1 ? w / (n - 1) : 0
-        return slice.map((v, i) => {
-          const x = Math.round(this.paddingLeft + i * dx)
-          const y = Math.round(this.paddingTop + (h - (Math.max(0, Math.min(100, v)) / max) * h))
-          return [x, y]
-        })
-      },
-      points() {
-        return this.pointsArr.map(p => `${p[0]},${p[1]}`).join(' ')
-      },
-      areaPath() {
-        if (this.pointsArr.length === 0) return ''
-        const first = this.pointsArr[0]
-        const last = this.pointsArr[this.pointsArr.length - 1]
-        const line = this.points
-        // Close to bottom to create an area fill
-        return `M ${first[0]},${this.paddingTop + this.drawHeight} L ${line.replace(/ /g,' L ')} L ${last[0]},${this.paddingTop + this.drawHeight} Z`
-      },
-      gridLines() {
-        if (!this.showGrid) return []
-        const h = this.drawHeight
-        const w = this.drawWidth
-        // draw at 25%, 50%, 75%
-        return [0.25, 0.5, 0.75]
-          .map(r => Math.round(this.paddingTop + h * r))
-          .map(y => ({ x1: this.paddingLeft, y1: y, x2: this.paddingLeft + w, y2: y }))
-      },
-      lastPoint() {
-        if (this.pointsArr.length === 0) return null
-        return this.pointsArr[this.pointsArr.length - 1]
-      },
-      yTicks() {
-        if (!this.showAxes) return []
-        const step = Math.max(1, this.yTickStep)
-        const ticks = []
-        for (let p = 0; p <= 100; p += step) {
-          const y = Math.round(this.paddingTop + (this.drawHeight - (p / 100) * this.drawHeight))
-          ticks.push({ y, label: `${p}%` })
-        }
-        return ticks
-      },
-      xTicks() {
-        if (!this.showAxes) return []
-        const labels = this.labelsSlice
-        const n = this.nPoints
-        const m = Math.max(2, this.tickCountX)
-        const ticks = []
-        if (n === 0) return ticks
-        const w = this.drawWidth
-        const dx = n > 1 ? w / (n - 1) : 0
-        const positions = []
-        for (let i = 0; i < m; i++) {
-          const idx = Math.round((i * (n - 1)) / (m - 1))
-          positions.push(idx)
-        }
-        positions.forEach(idx => {
-          const label = labels[idx] != null ? String(labels[idx]) : String(idx)
-          const x = Math.round(this.paddingLeft + idx * dx)
-          ticks.push({ x, label })
-        })
-        return ticks
-      },
-    },
-    methods: {
-      onMouseMove(evt) {
-        if (!this.showTooltip || this.pointsArr.length === 0) return
-        const rect = evt.currentTarget.getBoundingClientRect()
-        const px = evt.clientX - rect.left
-        // translate to viewBox space
-        const x = (px / rect.width) * this.vbWidth
-        const n = this.nPoints
-        const dx = n > 1 ? this.drawWidth / (n - 1) : 0
-        const idx = Math.max(0, Math.min(n - 1, Math.round((x - this.paddingLeft) / (dx || 1))))
-        this.hoverIdx = idx
-      },
-      onMouseLeave() {
-        this.hoverIdx = -1
-      },
-      fmtHoverText() {
-        const labels = this.labelsSlice
-        const idx = this.hoverIdx
-        if (idx < 0 || idx >= this.dataSlice.length) return ''
-        const val = Math.max(0, Math.min(100, Number(this.dataSlice[idx] || 0)))
-        const lab = labels[idx] != null ? labels[idx] : ''
-        return `${val}%${lab ? ' • ' + lab : ''}`
-      },
-    },
-    template: `
-      <svg width="100%" :height="height" :viewBox="viewBoxAttr" preserveAspectRatio="none" style="display:block"
-           @mousemove="onMouseMove" @mouseleave="onMouseLeave">
-        <defs>
-          <linearGradient id="spkGrad" x1="0" y1="0" x2="0" y2="1">
-            <stop offset="0%" :stop-color="stroke" :stop-opacity="fillOpacity"/>
-            <stop offset="100%" :stop-color="stroke" stop-opacity="0"/>
-          </linearGradient>
-        </defs>
-        <g v-if="showGrid">
-          <line v-for="(g,i) in gridLines" :key="i" :x1="g.x1" :y1="g.y1" :x2="g.x2" :y2="g.y2" :stroke="gridColor" stroke-width="1"/>
-        </g>
-        <g v-if="showAxes">
-          <!-- Y ticks/labels -->
-          <g v-for="(t,i) in yTicks" :key="'y'+i">
-            <text :x="Math.max(0, paddingLeft - 4)" :y="t.y + 4" text-anchor="end" font-size="10" fill="rgba(200,200,200,0.8)" v-text="t.label"></text>
-          </g>
-          <!-- X ticks/labels -->
-          <g v-for="(t,i) in xTicks" :key="'x'+i">
-            <text :x="t.x" :y="paddingTop + drawHeight + 14" text-anchor="middle" font-size="10" fill="rgba(200,200,200,0.8)" v-text="t.label"></text>
-          </g>
-        </g>
-        <path v-if="areaPath" :d="areaPath" fill="url(#spkGrad)" stroke="none" />
-        <polyline :points="points" fill="none" :stroke="stroke" :stroke-width="strokeWidth" stroke-linecap="round" stroke-linejoin="round"/>
-        <circle v-if="showMarker && lastPoint" :cx="lastPoint[0]" :cy="lastPoint[1]" :r="markerRadius" :fill="stroke" />
-        <!-- Hover marker/tooltip -->
-        <g v-if="showTooltip && hoverIdx >= 0">
-          <line :x1="pointsArr[hoverIdx][0]" :x2="pointsArr[hoverIdx][0]" :y1="paddingTop" :y2="paddingTop + drawHeight" stroke="rgba(255,255,255,0.25)" stroke-width="1" />
-          <circle :cx="pointsArr[hoverIdx][0]" :cy="pointsArr[hoverIdx][1]" r="3.5" :fill="stroke" />
-          <text :x="pointsArr[hoverIdx][0]" :y="paddingTop + 12" text-anchor="middle" font-size="11" fill="#fff" style="paint-order: stroke; stroke: rgba(0,0,0,0.35); stroke-width: 3;" v-text="fmtHoverText()"></text>
-        </g>
-      </svg>
-    `,
-  })
-
     class CurTotal {
 
         constructor(current, total) {
@@ -894,10 +675,6 @@
               spinning: false
             },
             status: new Status(),
-            cpuHistory: [], // keep last N cpu utilization points (0..100)
-            cpuHistoryLong: [], // long-range history for modal (values)
-            cpuHistoryLabels: [], // formatted timestamps matching long history
-            cpuHistoryModal: { visible: false, minutes: 60 },
             versionModal,
             logModal,
             xraylogModal,
@@ -928,46 +705,7 @@
             },
             setStatus(data) {
                 this.status = new Status(data);
-                // Push CPU percent into history (clamped 0..100)
-                const v = Math.max(0, Math.min(100, Number(data?.cpu ?? 0)))
-                this.cpuHistory.push(v)
-                const maxPoints = this.isMobile ? 60 : 120
-                if (this.cpuHistory.length > maxPoints) {
-                  this.cpuHistory.splice(0, this.cpuHistory.length - maxPoints)
-                }
             },
-      openCpuHistory() {
-        this.cpuHistoryModal.visible = true
-        this.loadCpuHistory()
-      },
-      async loadCpuHistory() {
-        const mins = this.cpuHistoryModal.minutes || 60
-        try {
-          const msg = await HttpUtil.get(`/panel/api/server/cpuHistory?q=${mins}`)
-          if (msg.success && Array.isArray(msg.obj)) {
-            // msg.obj is array of {t, cpu}
-            const arr = msg.obj.map(p => Math.max(0, Math.min(100, Number(p.cpu || 0))))
-            const labels = msg.obj.map(p => {
-              const t = p.t
-              let d
-              if (typeof t === 'number') {
-                // Heuristic: if seconds, convert to ms
-                d = new Date(t < 1e12 ? t * 1000 : t)
-              } else {
-                d = new Date(t)
-              }
-              if (isNaN(d.getTime())) return ''
-              const hh = String(d.getHours()).padStart(2, '0')
-              const mm = String(d.getMinutes()).padStart(2, '0')
-              return `${hh}:${mm}`
-            })
-            this.cpuHistoryLong = arr
-            this.cpuHistoryLabels = labels
-          }
-        } catch (e) {
-          console.error('Failed to load CPU history', e)
-        }
-      },
             async openSelectV2rayVersion() {
                 this.loading(true);
                 const msg = await HttpUtil.get('/panel/api/server/getXrayVersion');

web/html/modals/inbound_info_modal.html

@@ -180,9 +180,9 @@
         <tr>
           <td>{{ i18n "status" }}</td>
           <td>
-            <a-tag v-if="isEnable && isActive && !isDepleted" color="green">{{ i18n "enabled" }}</a-tag>
+            <a-tag v-if="isEnable" color="green">{{ i18n "enabled" }}</a-tag>
-            <a-tag v-if="!isEnable && !isDepleted">{{ i18n "disabled" }}</a-tag>
+            <a-tag v-else>{{ i18n "disabled" }}</a-tag>
-            <a-tag v-if="isDepleted" color="red">{{ i18n "depleted" }}</a-tag>
+            <a-tag v-if="!isActive" color="red">{{ i18n "depleted" }}</a-tag>
           </td>
         </tr>
         <tr v-if="infoModal.clientStats">
@@ -587,14 +587,6 @@
         }
         return infoModal.dbInbound.isEnable;
       },
-      get isDepleted() {
-        const stats = this.infoModal.clientStats;
-        if (!stats) return false;
-        const now = new Date().getTime();
-        const expired = stats.expiryTime > 0 && now >= stats.expiryTime;
-        const exhausted = stats.total > 0 && (stats.up + stats.down) >= stats.total;
-        return expired || exhausted;
-      },
     },
     methods: {
       copy(content) {

web/html/xray.html

@@ -535,9 +535,7 @@
         switch (o.protocol) {
           case Protocols.VMess:
           case Protocols.VLESS:
-            if (o.settings && o.settings.address && o.settings.port) {
+            serverObj = o.settings.vnext;
-              return [o.settings.address + ':' + o.settings.port];
-            }
             break;
           case Protocols.HTTP:
           case Protocols.Mixed:

web/service/inbound.go

@@ -1272,7 +1272,7 @@ func (s *InboundService) AddClientStat(tx *gorm.DB, inboundId int, client *model
 	clientTraffic.Email = client.Email
 	clientTraffic.Total = client.TotalGB
 	clientTraffic.ExpiryTime = client.ExpiryTime
-	clientTraffic.Enable = client.Enable
+	clientTraffic.Enable = true
 	clientTraffic.Up = 0
 	clientTraffic.Down = 0
 	clientTraffic.Reset = client.Reset
@@ -1285,7 +1285,7 @@ func (s *InboundService) UpdateClientStat(tx *gorm.DB, email string, client *mod
 	result := tx.Model(xray.ClientTraffic{}).
 		Where("email = ?", email).
 		Updates(map[string]any{
-			"enable":      client.Enable,
+			"enable":      true,
 			"email":       client.Email,
 			"total":       client.TotalGB,
 			"expiry_time": client.ExpiryTime,
@@ -1837,14 +1837,8 @@ func (s *InboundService) DelDepletedClients(id int) (err error) {
 		whereText += "= ?"
 	}
 
-	// Only consider truly depleted clients: expired OR traffic exhausted
-	now := time.Now().Unix() * 1000
 	depletedClients := []xray.ClientTraffic{}
-	err = db.Model(xray.ClientTraffic{}).
+	err = db.Model(xray.ClientTraffic{}).Where(whereText+" and enable = ?", id, false).Select("inbound_id, GROUP_CONCAT(email) as email").Group("inbound_id").Find(&depletedClients).Error
-		Where(whereText+" and ((total > 0 and up + down >= total) or (expiry_time > 0 and expiry_time <= ?))", id, now).
-		Select("inbound_id, GROUP_CONCAT(email) as email").
-		Group("inbound_id").
-		Find(&depletedClients).Error
 	if err != nil {
 		return err
 	}
@@ -1895,8 +1889,7 @@ func (s *InboundService) DelDepletedClients(id int) (err error) {
 		}
 	}
 
-	// Delete stats only for truly depleted clients
+	err = tx.Where(whereText+" and enable = ?", id, false).Delete(xray.ClientTraffic{}).Error
-	err = tx.Where(whereText+" and ((total > 0 and up + down >= total) or (expiry_time > 0 and expiry_time <= ?))", id, now).Delete(xray.ClientTraffic{}).Error
 	if err != nil {
 		return err
 	}
@@ -1944,17 +1937,18 @@ func (s *InboundService) GetClientTrafficTgBot(tgId int64) ([]*xray.ClientTraffi
 }
 
 func (s *InboundService) GetClientTrafficByEmail(email string) (traffic *xray.ClientTraffic, err error) {
-	// Prefer retrieving along with client to reflect actual enabled state from inbound settings
+	db := database.GetDB()
-	t, client, err := s.GetClientByEmail(email)
+	var traffics []*xray.ClientTraffic
+
+	err = db.Model(xray.ClientTraffic{}).Where("email = ?", email).Find(&traffics).Error
 	if err != nil {
 		logger.Warningf("Error retrieving ClientTraffic with email %s: %v", email, err)
 		return nil, err
 	}
-	if t != nil && client != nil {
+	if len(traffics) > 0 {
-		// Ensure enable mirrors the client's current enable flag in settings
+		return traffics[0], nil
-		t.Enable = client.Enable
-		return t, nil
 	}
+
 	return nil, nil
 }
 
@@ -1989,12 +1983,6 @@ func (s *InboundService) GetClientTrafficByID(id string) ([]xray.ClientTraffic,
 		logger.Debug(err)
 		return nil, err
 	}
-	// Reconcile enable flag with client settings per email to avoid stale DB value
-	for i := range traffics {
-		if ct, client, e := s.GetClientByEmail(traffics[i].Email); e == nil && ct != nil && client != nil {
-			traffics[i].Enable = client.Enable
-		}
-	}
 	return traffics, err
 }
 

web/service/server.go

@@ -16,7 +16,6 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
-	"sync"
 	"time"
 
 	"x-ui/config"
@@ -99,20 +98,6 @@ type ServerService struct {
 	cachedIPv4     string
 	cachedIPv6     string
 	noIPv6         bool
-	// CPU utilization smoothing state
-	mu               sync.Mutex
-	lastCPUTimes     cpu.TimesStat
-	hasLastCPUSample bool
-	emaCPU           float64
-	// CPU history buffer (in-memory, protected by mu)
-	cpuHistory  []CPUSample
-	cpuCapacity int
-}
-
-// CPUSample represents a single CPU utilization sample with timestamp
-type CPUSample struct {
-	T   int64   `json:"t"`   // unix seconds
-	Cpu float64 `json:"cpu"` // percent 0..100
 }
 
 type LogEntry struct {
@@ -164,11 +149,11 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 	}
 
 	// CPU stats
-	util, err := s.sampleCPUUtilization()
+	percents, err := cpu.Percent(0, false)
 	if err != nil {
 		logger.Warning("get cpu percent failed:", err)
 	} else {
-		status.Cpu = util
+		status.Cpu = percents[0]
 	}
 
 	status.CpuCores, err = cpu.Counts(false)
@@ -332,137 +317,6 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 	return status
 }
 
-// AppendCpuSample appends a CPU sample into the in-memory history with capacity trimming.
-func (s *ServerService) AppendCpuSample(t time.Time, v float64) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.cpuCapacity == 0 {
-		s.cpuCapacity = 10800 // ~6 hours at 2s per sample
-	}
-	p := CPUSample{T: t.Unix(), Cpu: v}
-	s.cpuHistory = append(s.cpuHistory, p)
-	if len(s.cpuHistory) > s.cpuCapacity {
-		drop := len(s.cpuHistory) - s.cpuCapacity
-		s.cpuHistory = s.cpuHistory[drop:]
-	}
-}
-
-// GetCpuHistory returns samples from the last 'mins' minutes (bounded 1..360).
-func (s *ServerService) GetCpuHistory(mins int) []CPUSample {
-	if mins < 1 {
-		mins = 1
-	}
-	if mins > 360 {
-		mins = 360
-	}
-	cutoff := time.Now().Add(-time.Duration(mins) * time.Minute).Unix()
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if len(s.cpuHistory) == 0 {
-		return nil
-	}
-	// find first index >= cutoff (linear scan from end is fine for these sizes)
-	i := len(s.cpuHistory) - 1
-	for ; i >= 0; i-- {
-		if s.cpuHistory[i].T < cutoff {
-			i++
-			break
-		}
-	}
-	if i < 0 {
-		i = 0
-	}
-	// copy to avoid exposing internal slice
-	out := make([]CPUSample, len(s.cpuHistory)-i)
-	copy(out, s.cpuHistory[i:])
-	return out
-}
-
-// sampleCPUUtilization returns a smoothed total CPU utilization percentage across all logical processors.
-// It computes utilization from CPU time deltas (non-blocking) and applies an exponential moving average
-// to reduce spikes similar to Task Manager's smoothing.
-func (s *ServerService) sampleCPUUtilization() (float64, error) {
-	// 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 val, nil
-		}
-		// If native call fails, fall back to gopsutil times
-	}
-	// Read aggregate CPU times (all CPUs combined)
-	times, err := cpu.Times(false)
-	if err != nil {
-		return 0, err
-	}
-	if len(times) == 0 {
-		return 0, fmt.Errorf("no cpu times available")
-	}
-
-	cur := times[0]
-
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	// If this is the first sample, initialize and return current EMA (0 by default)
-	if !s.hasLastCPUSample {
-		s.lastCPUTimes = cur
-		s.hasLastCPUSample = true
-		return s.emaCPU, nil
-	}
-
-	// Compute busy and total deltas
-	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.Guest - s.lastCPUTimes.Guest) +
-		(cur.GuestNice - s.lastCPUTimes.GuestNice)
-
-	totalDelta := busyDelta + idleDelta
-
-	// Update last sample for next time
-	s.lastCPUTimes = cur
-
-	// Guard against division by zero or negative deltas (e.g., counter resets)
-	if totalDelta <= 0 {
-		return s.emaCPU, nil
-	}
-
-	raw := 100.0 * (busyDelta / totalDelta)
-	if raw < 0 {
-		raw = 0
-	}
-	if raw > 100 {
-		raw = 100
-	}
-
-	// Exponential moving average to smooth spikes
-	const alpha = 0.3 // smoothing factor (0<alpha<=1). Higher = more responsive, lower = smoother
-	if s.emaCPU == 0 {
-		// Initialize EMA with the first real reading to avoid long warm-up from zero
-		s.emaCPU = raw
-	} else {
-		s.emaCPU = alpha*raw + (1-alpha)*s.emaCPU
-	}
-
-	return s.emaCPU, nil
-}
-
 func (s *ServerService) GetXrayVersions() ([]string, error) {
 	const (
 		XrayURL    = "https://api.github.com/repos/XTLS/Xray-core/releases"

web/service/tgbot.go

@@ -548,57 +548,6 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 		if len(dataArray) >= 2 && len(dataArray[1]) > 0 {
 			email := dataArray[1]
 			switch dataArray[0] {
-			case "get_clients_for_sub":
-				inboundId := dataArray[1]
-				inboundIdInt, err := strconv.Atoi(inboundId)
-				if err != nil {
-					t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
-					return
-				}
-				clientsKB, err := t.getInboundClientsFor(inboundIdInt, "client_sub_links")
-				if err != nil {
-					t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
-					return
-				}
-				inbound, _ := t.inboundService.GetInbound(inboundIdInt)
-				t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.chooseClient", "Inbound=="+inbound.Remark), clientsKB)
-			case "get_clients_for_individual":
-				inboundId := dataArray[1]
-				inboundIdInt, err := strconv.Atoi(inboundId)
-				if err != nil {
-					t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
-					return
-				}
-				clientsKB, err := t.getInboundClientsFor(inboundIdInt, "client_individual_links")
-				if err != nil {
-					t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
-					return
-				}
-				inbound, _ := t.inboundService.GetInbound(inboundIdInt)
-				t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.chooseClient", "Inbound=="+inbound.Remark), clientsKB)
-			case "get_clients_for_qr":
-				inboundId := dataArray[1]
-				inboundIdInt, err := strconv.Atoi(inboundId)
-				if err != nil {
-					t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
-					return
-				}
-				clientsKB, err := t.getInboundClientsFor(inboundIdInt, "client_qr_links")
-				if err != nil {
-					t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
-					return
-				}
-				inbound, _ := t.inboundService.GetInbound(inboundIdInt)
-				t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.chooseClient", "Inbound=="+inbound.Remark), clientsKB)
-			case "client_sub_links":
-				t.sendClientSubLinks(chatId, email)
-				return
-			case "client_individual_links":
-				t.sendClientIndividualLinks(chatId, email)
-				return
-			case "client_qr_links":
-				t.sendClientQRLinks(chatId, email)
-				return
 			case "client_get_usage":
 				t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.messages.email", "Email=="+email))
 				t.searchClient(chatId, email)
@@ -1378,27 +1327,6 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 				}
 				t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.allClients"))
 				t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.chooseInbound"), inbounds)
-			case "admin_client_sub_links":
-				inbounds, err := t.getInboundsFor("get_clients_for_sub")
-				if err != nil {
-					t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
-					return
-				}
-				t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.chooseInbound"), inbounds)
-			case "admin_client_individual_links":
-				inbounds, err := t.getInboundsFor("get_clients_for_individual")
-				if err != nil {
-					t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
-					return
-				}
-				t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.chooseInbound"), inbounds)
-			case "admin_client_qr_links":
-				inbounds, err := t.getInboundsFor("get_clients_for_qr")
-				if err != nil {
-					t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
-					return
-				}
-				t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.chooseInbound"), inbounds)
 			}
 
 		}
@@ -1999,11 +1927,6 @@ func (t *Tgbot) SendAnswer(chatId int64, msg string, isAdmin bool) {
 			tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.allClients")).WithCallbackData(t.encodeQuery("get_inbounds")),
 			tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.addClient")).WithCallbackData(t.encodeQuery("add_client")),
 		),
-		tu.InlineKeyboardRow(
-			tu.InlineKeyboardButton(t.I18nBot("pages.settings.subSettings")).WithCallbackData(t.encodeQuery("admin_client_sub_links")),
-			tu.InlineKeyboardButton(t.I18nBot("subscription.individualLinks")).WithCallbackData(t.encodeQuery("admin_client_individual_links")),
-			tu.InlineKeyboardButton(t.I18nBot("qrCode")).WithCallbackData(t.encodeQuery("admin_client_qr_links")),
-		),
 		// TODOOOOOOOOOOOOOO: Add restart button here.
 	)
 	numericKeyboardClient := tu.InlineKeyboard(
@@ -2150,10 +2073,7 @@ func (t *Tgbot) sendClientSubLinks(chatId int64, email string) {
 		"JSON URL:\r\n<code>" + subJsonURL + "</code>"
 	inlineKeyboard := tu.InlineKeyboard(
 		tu.InlineKeyboardRow(
-			tu.InlineKeyboardButton(t.I18nBot("subscription.individualLinks")).WithCallbackData(t.encodeQuery("client_individual_links "+email)),
+			tu.InlineKeyboardButton(t.I18nBot("subscription.individualLinks")).WithCallbackData(t.encodeQuery("client_individual_links " + email)),
-		),
-		tu.InlineKeyboardRow(
-			tu.InlineKeyboardButton(t.I18nBot("qrCode")).WithCallbackData(t.encodeQuery("client_qr_links "+email)),
 		),
 	)
 	t.SendMsgToTgbot(chatId, msg, inlineKeyboard)
@@ -2539,74 +2459,6 @@ func (t *Tgbot) getInbounds() (*telego.InlineKeyboardMarkup, error) {
 	return keyboard, nil
 }
 
-// getInboundsFor builds an inline keyboard of inbounds where each button leads to a custom next action
-// nextAction should be one of: get_clients_for_sub|get_clients_for_individual|get_clients_for_qr
-func (t *Tgbot) getInboundsFor(nextAction string) (*telego.InlineKeyboardMarkup, error) {
-	inbounds, err := t.inboundService.GetAllInbounds()
-	if err != nil {
-		logger.Warning("GetAllInbounds run failed:", err)
-		return nil, errors.New(t.I18nBot("tgbot.answers.getInboundsFailed"))
-	}
-
-	if len(inbounds) == 0 {
-		logger.Warning("No inbounds found")
-		return nil, errors.New(t.I18nBot("tgbot.answers.getInboundsFailed"))
-	}
-
-	var buttons []telego.InlineKeyboardButton
-	for _, inbound := range inbounds {
-		status := "❌"
-		if inbound.Enable {
-			status = "✅"
-		}
-		callbackData := t.encodeQuery(fmt.Sprintf("%s %d", nextAction, inbound.Id))
-		buttons = append(buttons, tu.InlineKeyboardButton(fmt.Sprintf("%v - %v", inbound.Remark, status)).WithCallbackData(callbackData))
-	}
-
-	cols := 1
-	if len(buttons) >= 6 {
-		cols = 2
-	}
-
-	keyboard := tu.InlineKeyboardGrid(tu.InlineKeyboardCols(cols, buttons...))
-	return keyboard, nil
-}
-
-// getInboundClientsFor lists clients of an inbound with a specific action prefix to be appended with email
-func (t *Tgbot) getInboundClientsFor(inboundID int, action string) (*telego.InlineKeyboardMarkup, error) {
-	inbound, err := t.inboundService.GetInbound(inboundID)
-	if err != nil {
-		logger.Warning("getInboundClientsFor run failed:", err)
-		return nil, errors.New(t.I18nBot("tgbot.answers.getInboundsFailed"))
-	}
-	clients, err := t.inboundService.GetClients(inbound)
-	var buttons []telego.InlineKeyboardButton
-
-	if err != nil {
-		logger.Warning("GetInboundClients run failed:", err)
-		return nil, errors.New(t.I18nBot("tgbot.answers.getInboundsFailed"))
-	} else {
-		if len(clients) > 0 {
-			for _, client := range clients {
-				buttons = append(buttons, tu.InlineKeyboardButton(client.Email).WithCallbackData(t.encodeQuery(action+" "+client.Email)))
-			}
-
-		} else {
-			return nil, errors.New(t.I18nBot("tgbot.answers.getClientsFailed"))
-		}
-
-	}
-	cols := 0
-	if len(buttons) < 6 {
-		cols = 3
-	} else {
-		cols = 2
-	}
-	keyboard := tu.InlineKeyboardGrid(tu.InlineKeyboardCols(cols, buttons...))
-
-	return keyboard, nil
-}
-
 func (t *Tgbot) getInboundsAddClient() (*telego.InlineKeyboardMarkup, error) {
 	inbounds, err := t.inboundService.GetAllInbounds()
 	if err != nil {

web/web.go

@@ -289,13 +289,18 @@ func (s *Server) startTask() {
 	// check client ips from log file every day
 	s.cron.AddJob("@daily", job.NewClearLogsJob())
 
-	// Inbound traffic reset jobs
+	// Periodic traffic resets
-	// Run once a day, midnight
+	logger.Info("Scheduling periodic traffic reset jobs")
-	s.cron.AddJob("@daily", job.NewPeriodicTrafficResetJob("daily"))
+	{
-	// Run once a week, midnight between Sat/Sun
+		// Inbound traffic reset jobs
-	s.cron.AddJob("@weekly", job.NewPeriodicTrafficResetJob("weekly"))
+		// Run once a day, midnight
-	// Run once a month, midnight, first of month
+		s.cron.AddJob("@daily", job.NewPeriodicTrafficResetJob("daily"))
-	s.cron.AddJob("@monthly", job.NewPeriodicTrafficResetJob("monthly"))
+		// Run once a week, midnight between Sat/Sun
+		s.cron.AddJob("@weekly", job.NewPeriodicTrafficResetJob("weekly"))
+		// Run once a month, midnight, first of month
+		s.cron.AddJob("@monthly", job.NewPeriodicTrafficResetJob("monthly"))
+
+	}
 
 	// Make a traffic condition every day, 8:30
 	var entry cron.EntryID