精简: 去掉外部流量上报(ExternalTrafficInform): 设置字段/校验/job 上报逻辑

internal/web/job/xray_traffic_job.go

@@ -1,19 +1,14 @@
 package job
 
 import (
-	"encoding/json"
-	"time"
-
 	"github.com/mhsanaei/3x-ui/v3/internal/logger"
 	"github.com/mhsanaei/3x-ui/v3/internal/web/service"
 	"github.com/mhsanaei/3x-ui/v3/internal/web/service/outbound"
 	"github.com/mhsanaei/3x-ui/v3/internal/web/websocket"
 	"github.com/mhsanaei/3x-ui/v3/internal/xray"
-
-	"github.com/valyala/fasthttp"
 )
 
-// XrayTrafficJob collects and processes traffic statistics from Xray, updating the database and optionally informing external APIs.
+// XrayTrafficJob collects and processes traffic statistics from Xray, updating the database.
 type XrayTrafficJob struct {
 	settingService  service.SettingService
 	xrayService     service.XrayService
@@ -54,15 +49,6 @@ func splitMovedClientTraffics(clientTraffics []*xray.ClientTraffic) ([]*xray.Cli
 	return moved, emails, active
 }
 
-const externalInformTimeout = 3 * time.Second
-
-var externalInformClient = &fasthttp.Client{
-	ReadTimeout:         externalInformTimeout,
-	WriteTimeout:        externalInformTimeout,
-	MaxIdleConnDuration: time.Minute,
-	MaxConnsPerHost:     4,
-}
-
 // NewXrayTrafficJob creates a new traffic collection job instance.
 func NewXrayTrafficJob() *XrayTrafficJob {
 	return new(XrayTrafficJob)
@@ -100,11 +86,6 @@ func (j *XrayTrafficJob) Run() {
 		}
 		websocket.BroadcastInvalidate(websocket.MessageTypeInbounds)
 	}
-	if ExternalTrafficInformEnable, err := j.settingService.GetExternalTrafficInformEnable(); ExternalTrafficInformEnable {
-		j.informTrafficToExternalAPI(traffics, clientTraffics)
-	} else if err != nil {
-		logger.Warning("get ExternalTrafficInformEnable failed:", err)
-	}
 	if needRestart0 || needRestart1 {
 		j.xrayService.SetToNeedRestart()
 	}
@@ -223,36 +204,3 @@ func (j *XrayTrafficJob) Run() {
 		logger.Warning("get all outbounds for websocket failed:", err)
 	}
 }
-
-func (j *XrayTrafficJob) informTrafficToExternalAPI(inboundTraffics []*xray.Traffic, clientTraffics []*xray.ClientTraffic) {
-	if len(inboundTraffics) == 0 && len(clientTraffics) == 0 {
-		return
-	}
-	informURL, err := j.settingService.GetExternalTrafficInformURI()
-	if err != nil {
-		logger.Warning("get ExternalTrafficInformURI failed:", err)
-		return
-	}
-	informURL, err = service.SanitizePublicHTTPURL(informURL, false)
-	if err != nil {
-		logger.Warning("ExternalTrafficInformURI blocked:", err)
-		return
-	}
-	requestBody, err := json.Marshal(map[string]any{"clientTraffics": clientTraffics, "inboundTraffics": inboundTraffics})
-	if err != nil {
-		logger.Warning("parse client/inbound traffic failed:", err)
-		return
-	}
-	request := fasthttp.AcquireRequest()
-	defer fasthttp.ReleaseRequest(request)
-	request.Header.SetMethod("POST")
-	request.Header.SetContentType("application/json; charset=UTF-8")
-	request.SetBody(requestBody)
-	request.SetRequestURI(informURL)
-	request.Header.SetConnectionClose()
-	response := fasthttp.AcquireResponse()
-	defer fasthttp.ReleaseResponse(response)
-	if err := externalInformClient.DoTimeout(request, response, externalInformTimeout); err != nil {
-		logger.Warning("POST ExternalTrafficInformURI failed:", err)
-	}
-}