feat(server): add traffic storage and statistics tracking for improved traffic management

- 移除了所有客户端日志消息中的 [Client] 前缀
- 修改 handleProxyConfig 函数以接收 stream 参数并添加延迟关闭
- 更新 sendProxyConfig 函数以等待客户端配置确认
- 改进了代理配置同步的可靠性

cmd/server/main.go

@@ -84,6 +84,7 @@ func main() {
 	registry := plugin.NewRegistry()
 	server.SetPluginRegistry(registry)
 	server.SetJSPluginStore(clientStore) // 设置 JS 插件存储，用于客户端重连时恢复插件
+	server.SetTrafficStore(clientStore)  // 设置流量存储，用于记录流量统计
 
 	// 启动 Web 控制台
 	if cfg.Server.Web.Enabled {

go.mod

@@ -59,7 +59,7 @@ require (
 	github.com/quic-go/qpack v0.6.0 // indirect
 	github.com/quic-go/quic-go v0.58.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/shoenig/go-m1cpu v0.1.6 // indirect
+	github.com/shoenig/go-m1cpu v0.1.7 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect

go.sum

@@ -122,10 +122,10 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
 github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
-github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
-github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
-github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
-github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
+github.com/shoenig/go-m1cpu v0.1.7 h1:C76Yd0ObKR82W4vhfjZiCp0HxcSZ8Nqd84v+HZ0qyI0=
+github.com/shoenig/go-m1cpu v0.1.7/go.mod h1:KkDOw6m3ZJQAPHbrzkZki4hnx+pDRR1Lo+ldA56wD5w=
+github.com/shoenig/test v1.7.0 h1:eWcHtTXa6QLnBvm0jgEabMRN/uJ4DMV3M8xUGgRkZmk=
+github.com/shoenig/test v1.7.0/go.mod h1:UxJ6u/x2v/TNs/LoLxBNJRV9DiwBBKYxXSyczsBHFoI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=

internal/client/tunnel/client.go

@@ -32,7 +32,6 @@ const (
 	reconnectDelay   = 5 * time.Second
 	disconnectDelay  = 3 * time.Second
 	udpBufferSize    = 65535
-	idFileName       = "id"
 )
 
 // Client 隧道客户端
@@ -40,6 +39,7 @@ type Client struct {
 	ServerAddr     string
 	Token          string
 	ID             string
+	Name           string // 客户端名称（主机名）
 	TLSEnabled     bool
 	TLSConfig      *tls.Config
 	DataDir        string // 数据目录
@@ -61,23 +61,28 @@ func NewClient(serverAddr, token, id string) *Client {
 
 	// 确保数据目录存在
 	if err := os.MkdirAll(dataDir, 0755); err != nil {
-		log.Printf("[Client] Failed to create data dir: %v", err)
+		log.Printf("Failed to create data dir: %v", err)
 	}
 
+	// ID 优先级：命令行参数 > 机器ID
 	if id == "" {
-		id = loadClientID(dataDir)
+		id = getMachineID()
 	}
 
+	// 获取主机名作为客户端名称
+	hostname, _ := os.Hostname()
+
 	// 初始化日志收集器
 	logger, err := NewLogger(dataDir)
 	if err != nil {
-		log.Printf("[Client] Failed to initialize logger: %v", err)
+		log.Printf("Failed to initialize logger: %v", err)
 	}
 
 	return &Client{
 		ServerAddr:     serverAddr,
 		Token:          token,
 		ID:             id,
+		Name:           hostname,
 		DataDir:        dataDir,
 		runningPlugins: make(map[string]plugin.ClientPlugin),
 		logger:         logger,
@@ -94,27 +99,6 @@ func (c *Client) InitVersionStore() error {
 	return nil
 }
 
-// getIDFilePath 获取 ID 文件路径
-func getIDFilePath(dataDir string) string {
-	return filepath.Join(dataDir, idFileName)
-}
-
-// loadClientID 从本地文件加载客户端 ID
-func loadClientID(dataDir string) string {
-	data, err := os.ReadFile(getIDFilePath(dataDir))
-	if err != nil {
-		return ""
-	}
-	return string(data)
-}
-
-// saveClientID 保存客户端 ID 到本地文件
-func saveClientID(dataDir, id string) {
-	if err := os.WriteFile(getIDFilePath(dataDir), []byte(id), 0600); err != nil {
-		log.Printf("[Client] Failed to save client ID: %v", err)
-	}
-}
-
 // SetPluginRegistry 设置插件注册表
 func (c *Client) SetPluginRegistry(registry *plugin.Registry) {
 	c.pluginRegistry = registry
@@ -151,14 +135,14 @@ func (c *Client) logWarnf(format string, args ...interface{}) {
 func (c *Client) Run() error {
 	for {
 		if err := c.connect(); err != nil {
-			c.logErrorf("[Client] Connect error: %v", err)
-			c.logf("[Client] Reconnecting in %v...", reconnectDelay)
+			c.logErrorf("Connect error: %v", err)
+			c.logf("Reconnecting in %v...", reconnectDelay)
 			time.Sleep(reconnectDelay)
 			continue
 		}
 
 		c.handleSession()
-		c.logWarnf("[Client] Disconnected, reconnecting...")
+		c.logWarnf("Disconnected, reconnecting...")
 		time.Sleep(disconnectDelay)
 	}
 }
@@ -181,6 +165,7 @@ func (c *Client) connect() error {
 	authReq := protocol.AuthRequest{
 		ClientID: c.ID,
 		Token:    c.Token,
+		Name:     c.Name,
 		OS:       runtime.GOOS,
 		Arch:     runtime.GOARCH,
 		Version:  version.Version,
@@ -207,14 +192,13 @@ func (c *Client) connect() error {
 		return fmt.Errorf("auth failed: %s", authResp.Message)
 	}
 
-	// 如果服务端分配了新 ID，则更新并保存
+	// 如果服务端分配了新 ID，则更新
 	if authResp.ClientID != "" && authResp.ClientID != c.ID {
 		c.ID = authResp.ClientID
-		saveClientID(c.DataDir, c.ID)
-		c.logf("[Client] New ID assigned and saved: %s", c.ID)
+		c.logf("ID updated to: %s", c.ID)
 	}
 
-	c.logf("[Client] Authenticated as %s", c.ID)
+	c.logf("Authenticated as %s", c.ID)
 
 	session, err := yamux.Client(conn, nil)
 	if err != nil {
@@ -252,8 +236,7 @@ func (c *Client) handleStream(stream net.Conn) {
 
 	switch msg.Type {
 	case protocol.MsgTypeProxyConfig:
-		defer stream.Close()
-		c.handleProxyConfig(msg)
+		c.handleProxyConfig(stream, msg)
 	case protocol.MsgTypeNewProxy:
 		defer stream.Close()
 		c.handleNewProxy(stream, msg)
@@ -295,10 +278,12 @@ func (c *Client) handleStream(stream net.Conn) {
 }
 
 // handleProxyConfig 处理代理配置
-func (c *Client) handleProxyConfig(msg *protocol.Message) {
+func (c *Client) handleProxyConfig(stream net.Conn, msg *protocol.Message) {
+	defer stream.Close()
+
 	var cfg protocol.ProxyConfig
 	if err := msg.ParsePayload(&cfg); err != nil {
-		c.logErrorf("[Client] Parse proxy config error: %v", err)
+		c.logErrorf("Parse proxy config error: %v", err)
 		return
 	}
 
@@ -306,17 +291,21 @@ func (c *Client) handleProxyConfig(msg *protocol.Message) {
 	c.rules = cfg.Rules
 	c.mu.Unlock()
 
-	c.logf("[Client] Received %d proxy rules", len(cfg.Rules))
+	c.logf("Received %d proxy rules", len(cfg.Rules))
 	for _, r := range cfg.Rules {
-		c.logf("[Client]   %s: %s:%d", r.Name, r.LocalIP, r.LocalPort)
+		c.logf("  %s: %s:%d", r.Name, r.LocalIP, r.LocalPort)
 	}
+
+	// 发送配置确认
+	ack := &protocol.Message{Type: protocol.MsgTypeProxyReady}
+	protocol.WriteMessage(stream, ack)
 }
 
 // handleNewProxy 处理新代理请求
 func (c *Client) handleNewProxy(stream net.Conn, msg *protocol.Message) {
 	var req protocol.NewProxyRequest
 	if err := msg.ParsePayload(&req); err != nil {
-		c.logErrorf("[Client] Parse new proxy request error: %v", err)
+		c.logErrorf("Parse new proxy request error: %v", err)
 		return
 	}
 
@@ -331,14 +320,14 @@ func (c *Client) handleNewProxy(stream net.Conn, msg *protocol.Message) {
 	c.mu.RUnlock()
 
 	if rule == nil {
-		c.logWarnf("[Client] Unknown port %d", req.RemotePort)
+		c.logWarnf("Unknown port %d", req.RemotePort)
 		return
 	}
 
 	localAddr := fmt.Sprintf("%s:%d", rule.LocalIP, rule.LocalPort)
 	localConn, err := net.DialTimeout("tcp", localAddr, localDialTimeout)
 	if err != nil {
-		c.logErrorf("[Client] Connect %s error: %v", localAddr, err)
+		c.logErrorf("Connect %s error: %v", localAddr, err)
 		return
 	}
 
@@ -448,24 +437,24 @@ func (c *Client) findRuleByPort(port int) *protocol.ProxyRule {
 func (c *Client) handlePluginConfig(msg *protocol.Message) {
 	var cfg protocol.PluginConfigSync
 	if err := msg.ParsePayload(&cfg); err != nil {
-		c.logErrorf("[Client] Parse plugin config error: %v", err)
+		c.logErrorf("Parse plugin config error: %v", err)
 		return
 	}
 
-	c.logf("[Client] Received config for plugin: %s", cfg.PluginName)
+	c.logf("Received config for plugin: %s", cfg.PluginName)
 
 	// 应用配置到插件
 	if c.pluginRegistry != nil {
 		handler, err := c.pluginRegistry.GetClient(cfg.PluginName)
 		if err != nil {
-			c.logWarnf("[Client] Plugin %s not found: %v", cfg.PluginName, err)
+			c.logWarnf("Plugin %s not found: %v", cfg.PluginName, err)
 			return
 		}
 		if err := handler.Init(cfg.Config); err != nil {
-			c.logErrorf("[Client] Plugin %s init error: %v", cfg.PluginName, err)
+			c.logErrorf("Plugin %s init error: %v", cfg.PluginName, err)
 			return
 		}
-		c.logf("[Client] Plugin %s config applied", cfg.PluginName)
+		c.logf("Plugin %s config applied", cfg.PluginName)
 	}
 }
 
@@ -479,7 +468,7 @@ func (c *Client) handleClientPluginStart(stream net.Conn, msg *protocol.Message)
 		return
 	}
 
-	c.logf("[Client] Starting plugin %s for rule %s", req.PluginName, req.RuleName)
+	c.logf("Starting plugin %s for rule %s", req.PluginName, req.RuleName)
 
 	// 获取插件
 	if c.pluginRegistry == nil {
@@ -511,7 +500,7 @@ func (c *Client) handleClientPluginStart(stream net.Conn, msg *protocol.Message)
 	c.runningPlugins[key] = handler
 	c.pluginMu.Unlock()
 
-	c.logf("[Client] Plugin %s started at %s", req.PluginName, localAddr)
+	c.logf("Plugin %s started at %s", req.PluginName, localAddr)
 	c.sendPluginStatus(stream, req.PluginName, req.RuleName, true, localAddr, "")
 }
 
@@ -553,7 +542,7 @@ func (c *Client) handleClientPluginConn(stream net.Conn, msg *protocol.Message)
 	c.pluginMu.RUnlock()
 
 	if !ok {
-		c.logWarnf("[Client] Plugin %s (ID: %s) not running", req.PluginName, req.PluginID)
+		c.logWarnf("Plugin %s (ID: %s) not running", req.PluginName, req.PluginID)
 		stream.Close()
 		return
 	}
@@ -572,7 +561,7 @@ func (c *Client) handleJSPluginInstall(stream net.Conn, msg *protocol.Message) {
 		return
 	}
 
-	c.logf("[Client] Installing JS plugin: %s (ID: %s)", req.PluginName, req.PluginID)
+	c.logf("Installing JS plugin: %s (ID: %s)", req.PluginName, req.PluginID)
 
 	// 使用 PluginID 作为 key（如果有），否则回退到 pluginName:ruleName
 	key := req.PluginID
@@ -583,9 +572,9 @@ func (c *Client) handleJSPluginInstall(stream net.Conn, msg *protocol.Message) {
 	// 如果插件已经在运行，先停止它
 	c.pluginMu.Lock()
 	if existingHandler, ok := c.runningPlugins[key]; ok {
-		c.logf("[Client] Stopping existing plugin %s before reinstall", key)
+		c.logf("Stopping existing plugin %s before reinstall", key)
 		if err := existingHandler.Stop(); err != nil {
-			c.logErrorf("[Client] Stop existing plugin error: %v", err)
+			c.logErrorf("Stop existing plugin error: %v", err)
 		}
 		delete(c.runningPlugins, key)
 	}
@@ -593,11 +582,11 @@ func (c *Client) handleJSPluginInstall(stream net.Conn, msg *protocol.Message) {
 
 	// 验证官方签名
 	if err := c.verifyJSPluginSignature(req.PluginName, req.Source, req.Signature); err != nil {
-		c.logErrorf("[Client] JS plugin %s signature verification failed: %v", req.PluginName, err)
+		c.logErrorf("JS plugin %s signature verification failed: %v", req.PluginName, err)
 		c.sendJSPluginResult(stream, req.PluginName, false, "signature verification failed: "+err.Error())
 		return
 	}
-	c.logf("[Client] JS plugin %s signature verified", req.PluginName)
+	c.logf("JS plugin %s signature verified", req.PluginName)
 
 	// 创建 JS 插件
 	jsPlugin, err := script.NewJSPlugin(req.PluginName, req.Source)
@@ -611,7 +600,7 @@ func (c *Client) handleJSPluginInstall(stream net.Conn, msg *protocol.Message) {
 		c.pluginRegistry.RegisterClient(jsPlugin)
 	}
 
-	c.logf("[Client] JS plugin %s installed", req.PluginName)
+	c.logf("JS plugin %s installed", req.PluginName)
 
 	// 保存版本信息（防止降级攻击）
 	if c.versionStore != nil {
@@ -644,13 +633,13 @@ func (c *Client) sendJSPluginResult(stream net.Conn, name string, success bool,
 // startJSPlugin 启动 JS 插件
 func (c *Client) startJSPlugin(handler plugin.ClientPlugin, req protocol.JSPluginInstallRequest) {
 	if err := handler.Init(req.Config); err != nil {
-		c.logErrorf("[Client] JS plugin %s init error: %v", req.PluginName, err)
+		c.logErrorf("JS plugin %s init error: %v", req.PluginName, err)
 		return
 	}
 
 	localAddr, err := handler.Start()
 	if err != nil {
-		c.logErrorf("[Client] JS plugin %s start error: %v", req.PluginName, err)
+		c.logErrorf("JS plugin %s start error: %v", req.PluginName, err)
 		return
 	}
 
@@ -663,7 +652,7 @@ func (c *Client) startJSPlugin(handler plugin.ClientPlugin, req protocol.JSPlugi
 	c.runningPlugins[key] = handler
 	c.pluginMu.Unlock()
 
-	c.logf("[Client] JS plugin %s (ID: %s) started at %s", req.PluginName, req.PluginID, localAddr)
+	c.logf("JS plugin %s (ID: %s) started at %s", req.PluginName, req.PluginID, localAddr)
 }
 
 // verifyJSPluginSignature 验证 JS 插件签名
@@ -741,13 +730,13 @@ func (c *Client) handleClientPluginStop(stream net.Conn, msg *protocol.Message)
 
 	if ok {
 		if err := handler.Stop(); err != nil {
-			c.logErrorf("[Client] Plugin %s stop error: %v", key, err)
+			c.logErrorf("Plugin %s stop error: %v", key, err)
 		}
 		delete(c.runningPlugins, key)
 	}
 	c.pluginMu.Unlock()
 
-	c.logf("[Client] Plugin %s stopped", key)
+	c.logf("Plugin %s stopped", key)
 	c.sendPluginStatus(stream, req.PluginName, req.RuleName, false, "", "")
 }
 
@@ -758,7 +747,7 @@ func (c *Client) handleClientRestart(stream net.Conn, msg *protocol.Message) {
 	var req protocol.ClientRestartRequest
 	msg.ParsePayload(&req)
 
-	c.logf("[Client] Restart requested: %s", req.Reason)
+	c.logf("Restart requested: %s", req.Reason)
 
 	// 发送响应
 	resp := protocol.ClientRestartResponse{
@@ -771,7 +760,7 @@ func (c *Client) handleClientRestart(stream net.Conn, msg *protocol.Message) {
 	// 停止所有运行中的插件
 	c.pluginMu.Lock()
 	for key, handler := range c.runningPlugins {
-		c.logf("[Client] Stopping plugin %s for restart", key)
+		c.logf("Stopping plugin %s for restart", key)
 		handler.Stop()
 	}
 	c.runningPlugins = make(map[string]plugin.ClientPlugin)
@@ -813,7 +802,7 @@ func (c *Client) handlePluginConfigUpdate(stream net.Conn, msg *protocol.Message
 	}
 	c.pluginMu.RUnlock()
 
-	c.logf("[Client] Config update for plugin %s", key)
+	c.logf("Config update for plugin %s", key)
 
 	if !ok {
 		c.sendPluginConfigUpdateResult(stream, req.PluginName, req.RuleName, false, "plugin not running")
@@ -824,7 +813,7 @@ func (c *Client) handlePluginConfigUpdate(stream net.Conn, msg *protocol.Message
 		// 停止并重启插件
 		c.pluginMu.Lock()
 		if err := handler.Stop(); err != nil {
-			c.logErrorf("[Client] Plugin %s stop error: %v", key, err)
+			c.logErrorf("Plugin %s stop error: %v", key, err)
 		}
 		delete(c.runningPlugins, key)
 		c.pluginMu.Unlock()
@@ -845,7 +834,7 @@ func (c *Client) handlePluginConfigUpdate(stream net.Conn, msg *protocol.Message
 		c.runningPlugins[key] = handler
 		c.pluginMu.Unlock()
 
-		c.logf("[Client] Plugin %s restarted at %s with new config", key, localAddr)
+		c.logf("Plugin %s restarted at %s with new config", key, localAddr)
 	}
 
 	c.sendPluginConfigUpdateResult(stream, req.PluginName, req.RuleName, true, "")
@@ -869,17 +858,17 @@ func (c *Client) handleUpdateDownload(stream net.Conn, msg *protocol.Message) {
 
 	var req protocol.UpdateDownloadRequest
 	if err := msg.ParsePayload(&req); err != nil {
-		c.logErrorf("[Client] Parse update request error: %v", err)
+		c.logErrorf("Parse update request error: %v", err)
 		c.sendUpdateResult(stream, false, "invalid request")
 		return
 	}
 
-	c.logf("[Client] Update download requested: %s", req.DownloadURL)
+	c.logf("Update download requested: %s", req.DownloadURL)
 
 	// 异步执行更新
 	go func() {
 		if err := c.performSelfUpdate(req.DownloadURL); err != nil {
-			c.logErrorf("[Client] Update failed: %v", err)
+			c.logErrorf("Update failed: %v", err)
 		}
 	}()
 
@@ -898,7 +887,7 @@ func (c *Client) sendUpdateResult(stream net.Conn, success bool, message string)
 
 // performSelfUpdate 执行自更新
 func (c *Client) performSelfUpdate(downloadURL string) error {
-	c.logf("[Client] Starting self-update from: %s", downloadURL)
+	c.logf("Starting self-update from: %s", downloadURL)
 
 	// 使用共享的下载和解压逻辑
 	binaryPath, cleanup, err := update.DownloadAndExtract(downloadURL, "client")
@@ -945,7 +934,7 @@ func (c *Client) performSelfUpdate(downloadURL string) error {
 	// 删除备份
 	os.Remove(backupPath)
 
-	c.logf("[Client] Update completed, restarting...")
+	c.logf("Update completed, restarting...")
 
 	// 重启进程
 	restartClientProcess(currentPath, c.ServerAddr, c.Token, c.ID)
@@ -956,7 +945,7 @@ func (c *Client) performSelfUpdate(downloadURL string) error {
 func (c *Client) stopAllPlugins() {
 	c.pluginMu.Lock()
 	for key, handler := range c.runningPlugins {
-		c.logf("[Client] Stopping plugin %s for update", key)
+		c.logf("Stopping plugin %s for update", key)
 		handler.Stop()
 	}
 	c.runningPlugins = make(map[string]plugin.ClientPlugin)
@@ -1122,7 +1111,7 @@ func (c *Client) handlePluginAPIRequest(stream net.Conn, msg *protocol.Message)
 		return
 	}
 
-	c.logf("[Client] Plugin API request: %s %s for plugin %s (ID: %s)", req.Method, req.Path, req.PluginName, req.PluginID)
+	c.logf("Plugin API request: %s %s for plugin %s (ID: %s)", req.Method, req.Path, req.PluginName, req.PluginID)
 
 	// 查找运行中的插件
 	c.pluginMu.RLock()
@@ -1185,7 +1174,7 @@ func (c *Client) handleSystemStatsRequest(stream net.Conn, msg *protocol.Message
 
 	stats, err := utils.GetSystemStats()
 	if err != nil {
-		log.Printf("[Client] Failed to get system stats: %v", err)
+		log.Printf("Failed to get system stats: %v", err)
 		return
 	}
 

internal/client/tunnel/machine_id.go

@@ -0,0 +1,133 @@
+package tunnel
+
+import (
+	"crypto/sha256"
+	"encoding/hex"
+	"net"
+	"os"
+	"os/exec"
+	"runtime"
+	"strings"
+)
+
+// getMachineID 获取机器唯一标识
+// 优先级：系统机器ID > MAC地址哈希
+func getMachineID() string {
+	// 尝试获取系统机器 ID
+	if id := getSystemMachineID(); id != "" {
+		return hashID(id)
+	}
+
+	// 备选：使用主网卡 MAC 地址
+	if id := getMACAddress(); id != "" {
+		return hashID(id)
+	}
+
+	// 都失败则返回空，让服务端生成
+	return ""
+}
+
+// getSystemMachineID 获取系统机器 ID
+func getSystemMachineID() string {
+	switch runtime.GOOS {
+	case "linux":
+		return getLinuxMachineID()
+	case "darwin":
+		return getDarwinMachineID()
+	case "windows":
+		return getWindowsMachineID()
+	default:
+		return ""
+	}
+}
+
+// getLinuxMachineID 获取 Linux 机器 ID
+func getLinuxMachineID() string {
+	// 优先读取 /etc/machine-id
+	if data, err := os.ReadFile("/etc/machine-id"); err == nil {
+		return strings.TrimSpace(string(data))
+	}
+	// 备选 /var/lib/dbus/machine-id
+	if data, err := os.ReadFile("/var/lib/dbus/machine-id"); err == nil {
+		return strings.TrimSpace(string(data))
+	}
+	return ""
+}
+
+// getDarwinMachineID 获取 macOS 机器 ID (IOPlatformUUID)
+func getDarwinMachineID() string {
+	cmd := exec.Command("ioreg", "-rd1", "-c", "IOPlatformExpertDevice")
+	output, err := cmd.Output()
+	if err != nil {
+		return ""
+	}
+
+	// 解析 IOPlatformUUID
+	lines := strings.Split(string(output), "\n")
+	for _, line := range lines {
+		if strings.Contains(line, "IOPlatformUUID") {
+			parts := strings.Split(line, "=")
+			if len(parts) == 2 {
+				uuid := strings.TrimSpace(parts[1])
+				uuid = strings.Trim(uuid, "\"")
+				return uuid
+			}
+		}
+	}
+	return ""
+}
+
+// getWindowsMachineID 获取 Windows 机器 ID
+func getWindowsMachineID() string {
+	cmd := exec.Command("reg", "query",
+		`HKLM\SOFTWARE\Microsoft\Cryptography`,
+		"/v", "MachineGuid")
+	output, err := cmd.Output()
+	if err != nil {
+		return ""
+	}
+
+	// 解析注册表输出
+	lines := strings.Split(string(output), "\n")
+	for _, line := range lines {
+		if strings.Contains(line, "MachineGuid") {
+			fields := strings.Fields(line)
+			if len(fields) >= 3 {
+				return fields[len(fields)-1]
+			}
+		}
+	}
+	return ""
+}
+
+// getMACAddress 获取主网卡 MAC 地址
+func getMACAddress() string {
+	interfaces, err := net.Interfaces()
+	if err != nil {
+		return ""
+	}
+
+	for _, iface := range interfaces {
+		// 跳过回环和无效接口
+		if iface.Flags&net.FlagLoopback != 0 {
+			continue
+		}
+		if iface.Flags&net.FlagUp == 0 {
+			continue
+		}
+		if len(iface.HardwareAddr) == 0 {
+			continue
+		}
+
+		// 返回第一个有效的 MAC 地址
+		return iface.HardwareAddr.String()
+	}
+	return ""
+}
+
+// hashID 对 ID 进行哈希处理，生成固定长度的客户端 ID
+func hashID(id string) string {
+	hash := sha256.Sum256([]byte(id))
+	// 取前 16 个字符作为客户端 ID
+	return hex.EncodeToString(hash[:])[:16]
+}

internal/server/db/sqlite.go

@@ -397,14 +397,19 @@ func (s *SQLiteStore) Get24HourTraffic() (inbound, outbound int64, err error) {
 	return
 }
 
-// GetHourlyTraffic 获取每小时流量记录
+// GetHourlyTraffic 获取每小时流量记录（始终返回完整的 hours 小时数据）
 func (s *SQLiteStore) GetHourlyTraffic(hours int) ([]TrafficRecord, error) {
 	s.mu.RLock()
 	defer s.mu.RUnlock()
 
-	cutoff := time.Now().Add(-time.Duration(hours) * time.Hour).Unix()
+	// 计算当前小时的起始时间戳
+	now := time.Now()
+	currentHour := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location())
+
+	// 查询数据库中的记录
+	cutoff := currentHour.Add(-time.Duration(hours-1) * time.Hour).Unix()
 	rows, err := s.db.Query(`
-		SELECT hour_ts, inbound, outbound FROM traffic_stats 
+		SELECT hour_ts, inbound, outbound FROM traffic_stats
 		WHERE hour_ts >= ? ORDER BY hour_ts ASC
 	`, cutoff)
 	if err != nil {
@@ -412,13 +417,26 @@ func (s *SQLiteStore) GetHourlyTraffic(hours int) ([]TrafficRecord, error) {
 	}
 	defer rows.Close()
 
-	var records []TrafficRecord
+	// 将数据库记录放入 map 以便快速查找
+	dbRecords := make(map[int64]TrafficRecord)
 	for rows.Next() {
 		var r TrafficRecord
 		if err := rows.Scan(&r.Timestamp, &r.Inbound, &r.Outbound); err != nil {
 			return nil, err
 		}
-		records = append(records, r)
+		dbRecords[r.Timestamp] = r
 	}
+
+	// 生成完整的 hours 小时数据
+	records := make([]TrafficRecord, hours)
+	for i := 0; i < hours; i++ {
+		ts := currentHour.Add(-time.Duration(hours-1-i) * time.Hour).Unix()
+		if r, ok := dbRecords[ts]; ok {
+			records[i] = r
+		} else {
+			records[i] = TrafficRecord{Timestamp: ts, Inbound: 0, Outbound: 0}
+		}
+	}
+
 	return records, nil
 }

internal/server/router/handler/client.go

@@ -115,7 +115,7 @@ func (h *ClientHandler) Get(c *gin.Context) {
 		return
 	}
 
-	online, lastPing, remoteAddr, clientOS, clientArch, clientVersion := h.app.GetServer().GetClientStatus(clientID)
+	online, lastPing, remoteAddr, clientName, clientOS, clientArch, clientVersion := h.app.GetServer().GetClientStatus(clientID)
 
 	// 复制插件列表
 	plugins := make([]db.ClientPlugin, len(client.Plugins))
@@ -145,9 +145,15 @@ func (h *ClientHandler) Get(c *gin.Context) {
 		}
 	}
 
+	// 如果客户端在线且有名称，优先使用在线名称
+	nickname := client.Nickname
+	if online && clientName != "" && nickname == "" {
+		nickname = clientName
+	}
+
 	resp := dto.ClientResponse{
 		ID:         client.ID,
-		Nickname:   client.Nickname,
+		Nickname:   nickname,
 		Rules:      client.Rules,
 		Plugins:    plugins,
 		Online:     online,
@@ -242,8 +248,7 @@ func (h *ClientHandler) Delete(c *gin.Context) {
 func (h *ClientHandler) PushConfig(c *gin.Context) {
 	clientID := c.Param("id")
 
-	online, _, _, _, _, _ := h.app.GetServer().GetClientStatus(clientID)
-	if !online {
+	if !h.app.GetServer().IsClientOnline(clientID) {
 		ClientNotOnline(c)
 		return
 	}
@@ -311,8 +316,7 @@ func (h *ClientHandler) Restart(c *gin.Context) {
 func (h *ClientHandler) InstallPlugins(c *gin.Context) {
 	clientID := c.Param("id")
 
-	online, _, _, _, _, _ := h.app.GetServer().GetClientStatus(clientID)
-	if !online {
+	if !h.app.GetServer().IsClientOnline(clientID) {
 		ClientNotOnline(c)
 		return
 	}

internal/server/router/handler/interfaces.go

@@ -19,11 +19,13 @@ type AppInterface interface {
 
 // ServerInterface 服务端接口
 type ServerInterface interface {
-	GetClientStatus(clientID string) (online bool, lastPing, remoteAddr, clientOS, clientArch, clientVersion string)
+	IsClientOnline(clientID string) bool
+	GetClientStatus(clientID string) (online bool, lastPing, remoteAddr, clientName, clientOS, clientArch, clientVersion string)
 	GetAllClientStatus() map[string]struct {
 		Online     bool
 		LastPing   string
 		RemoteAddr string
+		Name       string
 		OS         string
 		Arch       string
 		Version    string

internal/server/router/handler/js_plugin.go

@@ -177,8 +177,7 @@ func (h *JSPluginHandler) PushToClient(c *gin.Context) {
 	c.ShouldBindJSON(&pushReq) // 忽略错误，允许空请求体
 
 	// 检查客户端是否在线
-	online, _, _, _, _, _ := h.app.GetServer().GetClientStatus(clientID)
-	if !online {
+	if !h.app.GetServer().IsClientOnline(clientID) {
 		ClientNotOnline(c)
 		return
 	}

internal/server/router/handler/log.go

@@ -35,8 +35,7 @@ func (h *LogHandler) StreamLogs(c *gin.Context) {
 	clientID := c.Param("id")
 
 	// 检查客户端是否在线
-	online, _, _, _, _, _ := h.app.GetServer().GetClientStatus(clientID)
-	if !online {
+	if !h.app.GetServer().IsClientOnline(clientID) {
 		c.JSON(400, gin.H{"code": 400, "message": "client not online"})
 		return
 	}

internal/server/router/handler/plugin.go

@@ -371,8 +371,7 @@ func (h *PluginHandler) UpdateClientConfig(c *gin.Context) {
 	}
 
 	// 如果客户端在线，同步配置
-	online, _, _, _, _, _ := h.app.GetServer().GetClientStatus(clientID)
-	if online {
+	if h.app.GetServer().IsClientOnline(clientID) {
 		if err := h.app.GetServer().SyncPluginConfigToClient(clientID, pluginName, req.Config); err != nil {
 			PartialSuccess(c, gin.H{"status": "partial", "port_changed": portChanged}, "config saved but sync failed: "+err.Error())
 			return

internal/server/router/handler/plugin_api.go

@@ -45,8 +45,7 @@ func (h *PluginAPIHandler) ProxyRequest(c *gin.Context) {
 	}
 
 	// 检查客户端是否在线
-	online, _, _, _, _, _ := h.app.GetServer().GetClientStatus(clientID)
-	if !online {
+	if !h.app.GetServer().IsClientOnline(clientID) {
 		ClientNotOnline(c)
 		return
 	}

internal/server/router/handler/store.go

@@ -82,8 +82,7 @@ func (h *StoreHandler) Install(c *gin.Context) {
 	}
 
 	// 检查客户端是否在线
-	online, _, _, _, _, _ := h.app.GetServer().GetClientStatus(req.ClientID)
-	if !online {
+	if !h.app.GetServer().IsClientOnline(req.ClientID) {
 		ClientNotOnline(c)
 		return
 	}

internal/server/tunnel/server.go

@@ -50,7 +50,8 @@ func generateClientID() string {
 // Server 隧道服务端
 type Server struct {
 	clientStore    db.ClientStore
-	jsPluginStore  db.JSPluginStore // JS 插件存储
+	jsPluginStore  db.JSPluginStore  // JS 插件存储
+	trafficStore   db.TrafficStore   // 流量存储
 	bindAddr       string
 	bindPort       int
 	token          string
@@ -83,6 +84,7 @@ type JSPluginEntry struct {
 // ClientSession 客户端会话
 type ClientSession struct {
 	ID         string
+	Name       string // 客户端名称（主机名）
 	RemoteAddr string // 客户端 IP 地址
 	OS         string // 客户端操作系统
 	Arch       string // 客户端架构
@@ -160,6 +162,11 @@ func (s *Server) SetJSPluginStore(store db.JSPluginStore) {
 	s.jsPluginStore = store
 }
 
+// SetTrafficStore 设置流量存储
+func (s *Server) SetTrafficStore(store db.TrafficStore) {
+	s.trafficStore = store
+}
+
 // LoadJSPlugins 加载 JS 插件配置
 func (s *Server) LoadJSPlugins(plugins []JSPluginEntry) {
 	s.jsPlugins = plugins
@@ -269,13 +276,22 @@ func (s *Server) handleConnection(conn net.Conn) {
 	// 检查客户端是否存在，不存在则自动创建
 	exists, err := s.clientStore.ClientExists(clientID)
 	if err != nil || !exists {
-		newClient := &db.Client{ID: clientID, Rules: []protocol.ProxyRule{}}
+		newClient := &db.Client{ID: clientID, Nickname: authReq.Name, Rules: []protocol.ProxyRule{}}
 		if err := s.clientStore.CreateClient(newClient); err != nil {
 			log.Printf("[Server] Create client error: %v", err)
 			s.sendAuthResponse(conn, false, "failed to create client", "")
 			return
 		}
-		log.Printf("[Server] New client registered: %s", clientID)
+		log.Printf("[Server] New client registered: %s (%s)", clientID, authReq.Name)
+	} else if authReq.Name != "" {
+		// 客户端已存在，仅当 Nickname 为空时才用客户端名称更新
+		// 这样服务端手动设置的名称不会被客户端覆盖
+		if client, err := s.clientStore.GetClient(clientID); err == nil {
+			if client.Nickname == "" {
+				client.Nickname = authReq.Name
+				s.clientStore.UpdateClient(client)
+			}
+		}
 	}
 
 	rules, _ := s.clientStore.GetClientRules(clientID)
@@ -290,11 +306,11 @@ func (s *Server) handleConnection(conn net.Conn) {
 	}
 
 	security.LogAuthSuccess(clientIP, clientID)
-	s.setupClientSession(conn, clientID, authReq.OS, authReq.Arch, authReq.Version, rules)
+	s.setupClientSession(conn, clientID, authReq.Name, authReq.OS, authReq.Arch, authReq.Version, rules)
 }
 
 // setupClientSession 建立客户端会话
-func (s *Server) setupClientSession(conn net.Conn, clientID, clientOS, clientArch, clientVersion string, rules []protocol.ProxyRule) {
+func (s *Server) setupClientSession(conn net.Conn, clientID, clientName, clientOS, clientArch, clientVersion string, rules []protocol.ProxyRule) {
 	session, err := yamux.Server(conn, nil)
 	if err != nil {
 		log.Printf("[Server] Yamux error: %v", err)
@@ -309,6 +325,7 @@ func (s *Server) setupClientSession(conn net.Conn, clientID, clientOS, clientArc
 
 	cs := &ClientSession{
 		ID:         clientID,
+		Name:       clientName,
 		RemoteAddr: remoteAddr,
 		OS:         clientOS,
 		Arch:       clientArch,
@@ -348,7 +365,7 @@ func (s *Server) sendAuthResponse(conn net.Conn, success bool, message, clientID
 	return protocol.WriteMessage(conn, msg)
 }
 
-// sendProxyConfig 发送代理配置
+// sendProxyConfig 发送代理配置并等待客户端确认
 func (s *Server) sendProxyConfig(session *yamux.Session, rules []protocol.ProxyRule) error {
 	stream, err := session.Open()
 	if err != nil {
@@ -361,7 +378,20 @@ func (s *Server) sendProxyConfig(session *yamux.Session, rules []protocol.ProxyR
 	if err != nil {
 		return err
 	}
-	return protocol.WriteMessage(stream, msg)
+	if err := protocol.WriteMessage(stream, msg); err != nil {
+		return err
+	}
+
+	// 等待客户端确认
+	ack, err := protocol.ReadMessage(stream)
+	if err != nil {
+		return fmt.Errorf("wait config ack: %w", err)
+	}
+	if ack.Type != protocol.MsgTypeProxyReady {
+		return fmt.Errorf("unexpected ack type: %d", ack.Type)
+	}
+
+	return nil
 }
 
 // registerClient 注册客户端
@@ -512,7 +542,7 @@ func (s *Server) handleProxyConn(cs *ClientSession, conn net.Conn, rule protocol
 		return
 	}
 
-	relay.Relay(conn, stream)
+	relay.RelayWithStats(conn, stream, s.recordTraffic)
 }
 
 // heartbeatLoop 心跳检测循环
@@ -573,16 +603,24 @@ func (s *Server) sendHeartbeat(cs *ClientSession) bool {
 }
 
 // GetClientStatus 获取客户端状态
-func (s *Server) GetClientStatus(clientID string) (online bool, lastPing, remoteAddr, clientOS, clientArch, clientVersion string) {
+func (s *Server) GetClientStatus(clientID string) (online bool, lastPing, remoteAddr, clientName, clientOS, clientArch, clientVersion string) {
 	s.mu.RLock()
 	defer s.mu.RUnlock()
 
 	if cs, ok := s.clients[clientID]; ok {
 		cs.mu.Lock()
 		defer cs.mu.Unlock()
-		return true, cs.LastPing.Format(time.RFC3339), cs.RemoteAddr, cs.OS, cs.Arch, cs.Version
+		return true, cs.LastPing.Format(time.RFC3339), cs.RemoteAddr, cs.Name, cs.OS, cs.Arch, cs.Version
 	}
-	return false, "", "", "", "", ""
+	return false, "", "", "", "", "", ""
+}
+
+// IsClientOnline 检查客户端是否在线
+func (s *Server) IsClientOnline(clientID string) bool {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	_, ok := s.clients[clientID]
+	return ok
 }
 
 // GetClientPluginStatus 获取客户端插件运行状态
@@ -633,6 +671,7 @@ func (s *Server) GetAllClientStatus() map[string]struct {
 	Online     bool
 	LastPing   string
 	RemoteAddr string
+	Name       string
 	OS         string
 	Arch       string
 	Version    string
@@ -649,6 +688,7 @@ func (s *Server) GetAllClientStatus() map[string]struct {
 		Online     bool
 		LastPing   string
 		RemoteAddr string
+		Name       string
 		OS         string
 		Arch       string
 		Version    string
@@ -660,6 +700,7 @@ func (s *Server) GetAllClientStatus() map[string]struct {
 			Online     bool
 			LastPing   string
 			RemoteAddr string
+			Name       string
 			OS         string
 			Arch       string
 			Version    string
@@ -667,6 +708,7 @@ func (s *Server) GetAllClientStatus() map[string]struct {
 			Online:     true,
 			LastPing:   cs.LastPing.Format(time.RFC3339),
 			RemoteAddr: cs.RemoteAddr,
+			Name:       cs.Name,
 			OS:         cs.OS,
 			Arch:       cs.Arch,
 			Version:    cs.Version,
@@ -1188,7 +1230,7 @@ func (s *Server) handleClientPluginConn(cs *ClientSession, conn net.Conn, rule p
 		}
 	}
 
-	relay.Relay(conn, stream)
+	relay.RelayWithStats(conn, stream, s.recordTraffic)
 }
 
 // checkHTTPBasicAuth 检查 HTTP Basic Auth
@@ -1871,6 +1913,16 @@ func (s *Server) StopClientLogStream(sessionID string) {
 	s.logSessions.RemoveSession(sessionID)
 }
 
+// recordTraffic 记录流量统计
+func (s *Server) recordTraffic(inbound, outbound int64) {
+	if s.trafficStore == nil {
+		return
+	}
+	if err := s.trafficStore.AddTraffic(inbound, outbound); err != nil {
+		log.Printf("[Server] Record traffic error: %v", err)
+	}
+}
+
 // boolPtr 返回 bool 值的指针
 func boolPtr(b bool) *bool {
 	return &b

internal/server/tunnel/websocket.go

@@ -142,5 +142,5 @@ func (s *Server) handleWebsocketProxyConn(cs *ClientSession, conn net.Conn, rule
 		return
 	}
 
-	relay.Relay(conn, stream)
+	relay.RelayWithStats(conn, stream, s.recordTraffic)
 }

pkg/protocol/message.go

@@ -87,6 +87,7 @@ type Message struct {
 type AuthRequest struct {
 	ClientID string `json:"client_id"`
 	Token    string `json:"token"`
+	Name     string `json:"name,omitempty"`    // 客户端名称（主机名）
 	OS       string `json:"os,omitempty"`      // 客户端操作系统
 	Arch     string `json:"arch,omitempty"`    // 客户端架构
 	Version  string `json:"version,omitempty"` // 客户端版本

web/src/views/ClientView.vue

@@ -660,11 +660,12 @@ const handleDeletePlugin = (plugin: ClientPlugin) => {
                 刷新
               </button>
             </div>
-            <div class="card-body">
-              <div v-if="!systemStats" class="empty-hint">
-                {{ loadingStats ? '加载中...' : '点击刷新获取状态' }}
-              </div>
-              <template v-else>
+            <div class="card-body system-stats-body">
+              <Transition name="fade-slide" mode="out-in">
+                <div v-if="!systemStats" class="empty-hint" key="empty">
+                  {{ loadingStats ? '加载中...' : '点击刷新获取状态' }}
+                </div>
+                <div v-else class="system-stats-content" key="stats">
                 <div class="system-stat-item">
                   <span class="system-stat-label">CPU</span>
                   <div class="progress-bar">
@@ -692,7 +693,8 @@ const handleDeletePlugin = (plugin: ClientPlugin) => {
                 <div class="system-stat-detail">
                   {{ formatBytes(systemStats.disk_used) }} / {{ formatBytes(systemStats.disk_total) }}
                 </div>
-              </template>
+                </div>
+              </Transition>
             </div>
           </div>
 
@@ -917,9 +919,54 @@ const handleDeletePlugin = (plugin: ClientPlugin) => {
   padding: 32px;
 }
 
-/* Hide particles */
+/* Particles */
 .particles {
-  display: none;
+  position: absolute;
+  inset: 0;
+  overflow: hidden;
+  pointer-events: none;
+  z-index: 0;
+}
+
+.particle {
+  position: absolute;
+  border-radius: 50%;
+  opacity: 0.15;
+  filter: blur(60px);
+  animation: float 20s ease-in-out infinite;
+}
+
+.particle-1 {
+  width: 350px;
+  height: 350px;
+  background: var(--color-accent);
+  top: -80px;
+  right: -80px;
+}
+
+.particle-2 {
+  width: 280px;
+  height: 280px;
+  background: #8b5cf6;
+  bottom: -40px;
+  left: -40px;
+  animation-delay: -5s;
+}
+
+.particle-3 {
+  width: 220px;
+  height: 220px;
+  background: var(--color-success);
+  top: 40%;
+  left: 30%;
+  animation-delay: -10s;
+}
+
+@keyframes float {
+  0%, 100% { transform: translate(0, 0) scale(1); }
+  25% { transform: translate(30px, -30px) scale(1.05); }
+  50% { transform: translate(-20px, 20px) scale(0.95); }
+  75% { transform: translate(-30px, -20px) scale(1.02); }
 }
 
 .client-content {
@@ -1042,6 +1089,7 @@ const handleDeletePlugin = (plugin: ClientPlugin) => {
   display: grid;
   grid-template-columns: 300px 1fr;
   gap: 24px;
+  align-items: start;
 }
 
 @media (max-width: 900px) {
@@ -1525,6 +1573,31 @@ const handleDeletePlugin = (plugin: ClientPlugin) => {
   height: 16px;
 }
 
+/* System Stats Transition */
+.system-stats-body {
+  overflow: hidden;
+}
+
+.system-stats-content {
+  display: flex;
+  flex-direction: column;
+}
+
+.fade-slide-enter-active,
+.fade-slide-leave-active {
+  transition: all 0.3s ease;
+}
+
+.fade-slide-enter-from {
+  opacity: 0;
+  transform: translateY(-10px);
+}
+
+.fade-slide-leave-to {
+  opacity: 0;
+  transform: translateY(10px);
+}
+
 /* System Stats */
 .system-stat-item {
   display: flex;

web/src/views/SettingsView.vue

@@ -243,7 +243,52 @@ onMounted(() => {
 
 /* Hide particles */
 .particles {
-  display: none;
+  position: absolute;
+  inset: 0;
+  overflow: hidden;
+  pointer-events: none;
+  z-index: 0;
+}
+
+.particle {
+  position: absolute;
+  border-radius: 50%;
+  opacity: 0.15;
+  filter: blur(60px);
+  animation: float 20s ease-in-out infinite;
+}
+
+.particle-1 {
+  width: 350px;
+  height: 350px;
+  background: var(--color-accent);
+  top: -80px;
+  right: -80px;
+}
+
+.particle-2 {
+  width: 280px;
+  height: 280px;
+  background: #8b5cf6;
+  bottom: -40px;
+  left: -40px;
+  animation-delay: -5s;
+}
+
+.particle-3 {
+  width: 220px;
+  height: 220px;
+  background: var(--color-success);
+  top: 40%;
+  left: 30%;
+  animation-delay: -10s;
+}
+
+@keyframes float {
+  0%, 100% { transform: translate(0, 0) scale(1); }
+  25% { transform: translate(30px, -30px) scale(1.05); }
+  50% { transform: translate(-20px, 20px) scale(0.95); }
+  75% { transform: translate(-30px, -20px) scale(1.02); }
 }
 
 .settings-content {