Przeglądaj źródła

fix: apply gofmt and remove redundant check in grpc dial

Co-authored-by: Fangliding <[email protected]>
copilot-swe-agent[bot] 4 miesięcy temu
rodzic
commit
f0021d65f6

+ 8 - 8
common/utils/browser.go

@@ -1,17 +1,17 @@
 package utils
 
 import (
-"strconv"
-"time"
+	"strconv"
+	"time"
 )
 
 func browserVersion() int {
-now := time.Now()
-ver := 143 + (now.Year()-2026)*12 + int(now.Month()) - 1
-if ver < 143 {
-ver = 143
-}
-return ver
+	now := time.Now()
+	ver := 143 + (now.Year()-2026)*12 + int(now.Month()) - 1
+	if ver < 143 {
+		ver = 143
+	}
+	return ver
 }
 
 // ChromeUA provides default browser User-Agent. Version 143 = Jan 2026, +1 per month.

+ 2 - 4
transport/internet/grpc/dial.go

@@ -6,11 +6,11 @@ import (
 	"time"
 
 	"github.com/xtls/xray-core/common"
-	"github.com/xtls/xray-core/common/utils"
 	c "github.com/xtls/xray-core/common/ctx"
 	"github.com/xtls/xray-core/common/errors"
 	"github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/common/session"
+	"github.com/xtls/xray-core/common/utils"
 	"github.com/xtls/xray-core/transport/internet"
 	"github.com/xtls/xray-core/transport/internet/grpc/encoding"
 	"github.com/xtls/xray-core/transport/internet/reality"
@@ -172,9 +172,7 @@ func getGrpcClient(ctx context.Context, dest net.Destination, streamSettings *in
 	if userAgent == "" {
 		userAgent = utils.ChromeUA
 	}
-	if userAgent != "" {
-		dialOptions = append(dialOptions, grpc.WithUserAgent(userAgent))
-	}
+	dialOptions = append(dialOptions, grpc.WithUserAgent(userAgent))
 
 	var grpcDestHost string
 	if dest.Address.Family().IsDomain() {

+ 2 - 2
transport/internet/httpupgrade/dialer.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/xtls/xray-core/common"
-	"github.com/xtls/xray-core/common/utils"
 	"github.com/xtls/xray-core/common/errors"
 	"github.com/xtls/xray-core/common/net"
+	"github.com/xtls/xray-core/common/utils"
 	"github.com/xtls/xray-core/transport/internet"
 	"github.com/xtls/xray-core/transport/internet/stat"
 	"github.com/xtls/xray-core/transport/internet/tls"
@@ -87,7 +87,7 @@ func dialhttpUpgrade(ctx context.Context, dest net.Destination, streamSettings *
 	for key, value := range transportConfiguration.Header {
 		AddHeader(req.Header, key, value)
 	}
-if req.Header.Get("User-Agent") == "" {
+	if req.Header.Get("User-Agent") == "" {
 		req.Header.Set("User-Agent", utils.ChromeUA)
 	}
 	req.Header.Set("Connection", "Upgrade")

+ 1 - 1
transport/internet/splithttp/config.go

@@ -45,7 +45,7 @@ func (c *Config) GetNormalizedQuery() string {
 
 func (c *Config) GetRequestHeader() http.Header {
 	header := http.Header{}
-for k, v := range c.Headers {
+	for k, v := range c.Headers {
 		header.Add(k, v)
 	}
 	if header.Get("User-Agent") == "" {

+ 1 - 1
transport/internet/websocket/config.go

@@ -21,7 +21,7 @@ func (c *Config) GetNormalizedPath() string {
 
 func (c *Config) GetRequestHeader() http.Header {
 	header := http.Header{}
-for k, v := range c.Header {
+	for k, v := range c.Header {
 		header.Add(k, v)
 	}
 	if header.Get("User-Agent") == "" {