修复流量统计

2026-10-12 04:06:37 +08:00 · 2025-06-27 11:56:59 +08:00
parent a5e7062c15
commit a5d7be8405
24 changed files with 431 additions and 685 deletions
@@ -338,31 +338,65 @@ func (s *defaultService) observeStats(ctx context.Context) {
 	for {
 		select {
 		case <-ticker.C:
+
+			// First, try to send any pending events
 			if len(events) > 0 {
 				if err := s.options.observer.Observe(ctx, events); err == nil {
 					events = nil
 				}
-				break
+				continue
 			}

 			st := s.status.Stats()
-			if st == nil || !st.IsUpdated() {
-				break
+			if st == nil {
+				continue
 			}

-			evs := []observer.Event{
-				xstats.StatsEvent{
-					Kind:         "service",
-					Service:      s.name,
-					TotalConns:   st.Get(stats.KindTotalConns),
-					CurrentConns: st.Get(stats.KindCurrentConns),
-					InputBytes:   st.Get(stats.KindInputBytes),
-					OutputBytes:  st.Get(stats.KindOutputBytes),
-					TotalErrs:    st.Get(stats.KindTotalErrs),
-				},
-			}
-			if err := s.options.observer.Observe(ctx, evs); err != nil {
-				events = evs
+			isUpdated := st.IsUpdated()
+			if isUpdated {
+				inputBytes := st.Get(stats.KindInputBytes)
+				outputBytes := st.Get(stats.KindOutputBytes)
+
+				evs := []observer.Event{
+					xstats.StatsEvent{
+						Kind:         "service",
+						Service:      s.name,
+						TotalConns:   st.Get(stats.KindTotalConns),
+						CurrentConns: st.Get(stats.KindCurrentConns),
+						InputBytes:   inputBytes,
+						OutputBytes:  outputBytes,
+						TotalErrs:    st.Get(stats.KindTotalErrs),
+					},
+				}
+				if outputBytes > 0 || inputBytes > 0 {
+					reportItems := []TrafficReportItem{
+						{
+							N: s.name,
+							T: "cc",
+							U: int64(outputBytes),
+							D: int64(inputBytes),
+						},
+						{
+							N: s.name,
+							T: "conn",
+							U: int64(inputBytes),
+							D: int64(outputBytes),
+						},
+					}
+					success, err := sendTrafficReport(ctx, reportItems)
+					if err != nil {
+						fmt.Printf("发送流量报告失败: %v", err)
+					} else if success {
+						if xstats, ok := st.(*xstats.Stats); ok {
+							xstats.ResetTraffic(st.Get(stats.KindInputBytes)-inputBytes, st.Get(stats.KindOutputBytes)-outputBytes)
+						}
+					}
+				}
+
+				if err := s.options.observer.Observe(ctx, evs); err != nil {
+					fmt.Printf("发送观察器事件失败: %v", err)
+					events = evs
+				}
 			}

 		case <-ctx.Done():
@@ -0,0 +1,226 @@
+package service
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/go-gost/core/observer/stats"
+	"github.com/go-gost/x/config"
+	"github.com/go-gost/x/registry"
+)
+
+var httpReportURL string
+var configReportURL string
+
+// TrafficReportItem 流量报告项（压缩格式）
+type TrafficReportItem struct {
+	N string `json:"n"` // 服务名（name缩写）
+	T string `json:"t"` // 连接类型：conn, cc（type缩写）
+	U int64  `json:"u"` // 上行流量（up缩写）
+	D int64  `json:"d"` // 下行流量（down缩写）
+}
+
+func SetHTTPReportURL(addr string, secret string) {
+	httpReportURL = "http://" + addr + "/flow/upload?secret=" + secret
+	configReportURL = "http://" + addr + "/flow/config?secret=" + secret
+}
+
+// sendTrafficReport 发送流量报告到HTTP接口
+func sendTrafficReport(ctx context.Context, reportItems []TrafficReportItem) (bool, error) {
+	jsonData, err := json.Marshal(reportItems)
+	if err != nil {
+		return false, fmt.Errorf("序列化报告数据失败: %v", err)
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "POST", httpReportURL, bytes.NewBuffer(jsonData))
+	if err != nil {
+		return false, fmt.Errorf("创建HTTP请求失败: %v", err)
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("User-Agent", "GOST-Traffic-Reporter/1.0")
+
+	client := &http.Client{
+		Timeout: 5 * time.Second,
+	}
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return false, fmt.Errorf("发送HTTP请求失败: %v", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return false, fmt.Errorf("HTTP响应错误: %d %s", resp.StatusCode, resp.Status)
+	}
+
+	// 读取响应内容
+	var responseBytes bytes.Buffer
+	_, err = responseBytes.ReadFrom(resp.Body)
+	if err != nil {
+		return false, fmt.Errorf("读取响应内容失败: %v", err)
+	}
+
+	responseText := strings.TrimSpace(responseBytes.String())
+
+	// 检查响应是否为"ok"
+	if responseText == "ok" {
+		return true, nil
+	} else {
+		return false, fmt.Errorf("服务器响应: %s (期望: ok)", responseText)
+	}
+}
+
+// sendConfigReport 发送配置报告到HTTP接口
+func sendConfigReport(ctx context.Context) (bool, error) {
+	if configReportURL == "" {
+		return false, fmt.Errorf("配置上报URL未设置")
+	}
+
+	// 获取配置数据
+	configData, err := getConfigData()
+	if err != nil {
+		return false, fmt.Errorf("获取配置数据失败: %v", err)
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "POST", configReportURL, bytes.NewBuffer(configData))
+	if err != nil {
+		return false, fmt.Errorf("创建HTTP请求失败: %v", err)
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("User-Agent", "GOST-Config-Reporter/1.0")
+
+	client := &http.Client{
+		Timeout: 10 * time.Second, // 配置上报可以稍长一些
+	}
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return false, fmt.Errorf("发送HTTP请求失败: %v", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return false, fmt.Errorf("HTTP响应错误: %d %s", resp.StatusCode, resp.Status)
+	}
+
+	// 读取响应内容
+	var responseBytes bytes.Buffer
+	_, err = responseBytes.ReadFrom(resp.Body)
+	if err != nil {
+		return false, fmt.Errorf("读取响应内容失败: %v", err)
+	}
+
+	responseText := strings.TrimSpace(responseBytes.String())
+
+	// 检查响应是否为"ok"
+	if responseText == "ok" {
+		return true, nil
+	} else {
+		return false, fmt.Errorf("服务器响应: %s (期望: ok)", responseText)
+	}
+}
+
+// StartConfigReporter 启动配置定时上报器（每10分钟上报一次）
+func StartConfigReporter(ctx context.Context) {
+	if configReportURL == "" {
+		fmt.Printf("⚠️ 配置上报URL未设置，跳过定时上报\n")
+		return
+	}
+
+	fmt.Printf("🚀 配置定时上报器已启动，每10分钟上报一次（WebSocket连接稳定后启动）\n")
+
+	// 创建10分钟定时器
+	ticker := time.NewTicker(10 * time.Minute)
+	defer ticker.Stop()
+
+	// 立即执行一次配置上报
+	go func() {
+		success, err := sendConfigReport(ctx)
+		if err != nil {
+			fmt.Printf("❌ 初始配置上报失败: %v\n", err)
+		} else if success {
+			fmt.Printf("✅ 初始配置上报成功\n")
+		}
+	}()
+
+	// 定时上报循环
+	for {
+		select {
+		case <-ticker.C:
+			go func() {
+				success, err := sendConfigReport(ctx)
+				if err != nil {
+					fmt.Printf("❌ 定时配置上报失败: %v\n", err)
+				} else if success {
+					fmt.Printf("✅ 定时配置上报成功\n")
+				}
+			}()
+
+		case <-ctx.Done():
+			fmt.Printf("⏹️ 配置定时上报器已停止\n")
+			return
+		}
+	}
+}
+
+// serviceStatus 接口定义
+type serviceStatus interface {
+	Status() *Status
+}
+
+// getConfigResponse 配置响应结构
+type getConfigResponse struct {
+	Config *config.Config `json:"config"`
+}
+
+// getConfigData 获取配置数据（避免循环依赖）
+func getConfigData() ([]byte, error) {
+	config.OnUpdate(func(c *config.Config) error {
+		for _, svc := range c.Services {
+			if svc == nil {
+				continue
+			}
+			s := registry.ServiceRegistry().Get(svc.Name)
+			ss, ok := s.(serviceStatus)
+			if ok && ss != nil {
+				status := ss.Status()
+				svc.Status = &config.ServiceStatus{
+					CreateTime: status.CreateTime().Unix(),
+					State:      string(status.State()),
+				}
+				if st := status.Stats(); st != nil {
+					svc.Status.Stats = &config.ServiceStats{
+						TotalConns:   st.Get(stats.KindTotalConns),
+						CurrentConns: st.Get(stats.KindCurrentConns),
+						TotalErrs:    st.Get(stats.KindTotalErrs),
+						InputBytes:   st.Get(stats.KindInputBytes),
+						OutputBytes:  st.Get(stats.KindOutputBytes),
+					}
+				}
+				for _, ev := range status.Events() {
+					if !ev.Time.IsZero() {
+						svc.Status.Events = append(svc.Status.Events, config.ServiceEvent{
+							Time: ev.Time.Unix(),
+							Msg:  ev.Message,
+						})
+					}
+				}
+			}
+		}
+		return nil
+	})
+
+	var resp getConfigResponse
+	resp.Config = config.Global()
+
+	buf := &bytes.Buffer{}
+	resp.Config.Write(buf, "json")
+	return buf.Bytes(), nil
+}