Style: format code by gofumpt (#761)

app/dispatcher/default.go

@@ -25,9 +25,7 @@ import (
 	"github.com/xtls/xray-core/transport/pipe"
 )
 
-var (
+var errSniffingTimeout = newError("timeout on sniffing")
-	errSniffingTimeout = newError("timeout on sniffing")
-)
 
 type cachedReader struct {
 	sync.Mutex

app/dns/dns_test.go

@@ -21,8 +21,7 @@ import (
 	"github.com/xtls/xray-core/testing/servers/udp"
 )
 
-type staticHandler struct {
+type staticHandler struct{}
-}
 
 func (*staticHandler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
 	ans := new(dns.Msg)

app/dns/dnscommon.go

@@ -54,9 +54,7 @@ func isNewer(baseRec *IPRecord, newRec *IPRecord) bool {
 	return baseRec.Expire.Before(newRec.Expire)
 }
 
-var (
+var errRecordNotFound = errors.New("record not found")
-	errRecordNotFound = errors.New("record not found")
-)
 
 type dnsRequest struct {
 	reqType dnsmessage.Type

app/dns/dnscommon_test.go

@@ -50,20 +50,28 @@ func Test_parseResponse(t *testing.T) {
 		want    *IPRecord
 		wantErr bool
 	}{
-		{"empty",
+		{
+			"empty",
 			&IPRecord{0, []net.Address(nil), time.Time{}, dnsmessage.RCodeSuccess},
 			false,
 		},
-		{"error",
+		{
+			"error",
 			nil,
 			true,
 		},
-		{"a record",
+		{
-			&IPRecord{1, []net.Address{net.ParseAddress("8.8.8.8"), net.ParseAddress("8.8.4.4")},
+			"a record",
-				time.Time{}, dnsmessage.RCodeSuccess},
+			&IPRecord{
+				1,
+				[]net.Address{net.ParseAddress("8.8.8.8"), net.ParseAddress("8.8.4.4")},
+				time.Time{},
+				dnsmessage.RCodeSuccess,
+			},
 			false,
 		},
-		{"aaaa record",
+		{
+			"aaaa record",
 			&IPRecord{2, []net.Address{net.ParseAddress("2001::123:8888"), net.ParseAddress("2001::123:8844")}, time.Time{}, dnsmessage.RCodeSuccess},
 			false,
 		},

app/dns/fakedns/fake.go

@@ -79,13 +79,13 @@ func (fkdns *Holder) GetFakeIPForDomain(domain string) []net.Address {
 	if v, ok := fkdns.domainToIP.Get(domain); ok {
 		return []net.Address{v.(net.Address)}
 	}
-	var currentTimeMillis = uint64(time.Now().UnixNano() / 1e6)
+	currentTimeMillis := uint64(time.Now().UnixNano() / 1e6)
 	ones, bits := fkdns.ipRange.Mask.Size()
 	rooms := bits - ones
 	if rooms < 64 {
 		currentTimeMillis %= (uint64(1) << rooms)
 	}
-	var bigIntIP = big.NewInt(0).SetBytes(fkdns.ipRange.IP)
+	bigIntIP := big.NewInt(0).SetBytes(fkdns.ipRange.IP)
 	bigIntIP = bigIntIP.Add(bigIntIP, new(big.Int).SetUint64(currentTimeMillis))
 	var ip net.Address
 	for {

app/dns/fakedns/fakedns_test.go

@@ -11,9 +11,7 @@ import (
 	"github.com/xtls/xray-core/features/dns"
 )
 
-var (
+var ipPrefix = "198.18."
-	ipPrefix = "198.18."
-)
 
 func TestNewFakeDnsHolder(_ *testing.T) {
 	_, err := NewFakeDNSHolder()

app/dns/nameserver_local.go

@@ -2,9 +2,10 @@ package dns
 
 import (
 	"context"
-	"github.com/xtls/xray-core/features/dns"
 	"strings"
 
+	"github.com/xtls/xray-core/features/dns"
+
 	"github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/features/dns/localdns"
 )

app/dns/nameserver_local_test.go

@@ -2,10 +2,11 @@ package dns_test
 
 import (
 	"context"
-	"github.com/xtls/xray-core/common/net"
 	"testing"
 	"time"
 
+	"github.com/xtls/xray-core/common/net"
+
 	. "github.com/xtls/xray-core/app/dns"
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/features/dns"

app/dns/nameserver_quic_test.go

@@ -2,11 +2,12 @@ package dns_test
 
 import (
 	"context"
-	"github.com/xtls/xray-core/features/dns"
 	"net/url"
 	"testing"
 	"time"
 
+	"github.com/xtls/xray-core/features/dns"
+
 	"github.com/google/go-cmp/cmp"
 
 	. "github.com/xtls/xray-core/app/dns"

app/log/log_creator.go

@@ -11,9 +11,7 @@ type HandlerCreatorOptions struct {
 
 type HandlerCreator func(LogType, HandlerCreatorOptions) (log.Handler, error)
 
-var (
+var handlerCreatorMap = make(map[LogType]HandlerCreator)
-	handlerCreatorMap = make(map[LogType]HandlerCreator)
-)
 
 func RegisterHandlerCreator(logType LogType, f HandlerCreator) error {
 	if f == nil {

app/proxyman/inbound/worker.go

@@ -482,6 +482,7 @@ func (w *dsWorker) Proxy() proxy.Inbound {
 func (w *dsWorker) Port() net.Port {
 	return net.Port(0)
 }
+
 func (w *dsWorker) Start() error {
 	ctx := context.Background()
 	hub, err := internet.ListenUnix(ctx, w.address, w.stream, func(conn stat.Connection) {

app/router/balancing.go

@@ -9,8 +9,7 @@ type BalancingStrategy interface {
 	PickOutbound([]string) string
 }
 
-type RandomStrategy struct {
+type RandomStrategy struct{}
-}
 
 func (s *RandomStrategy) PickOutbound(tags []string) string {
 	n := len(tags)

app/router/condition_geoip.go

@@ -186,6 +186,4 @@ func (c *GeoIPMatcherContainer) Add(geoip *GeoIP) (*GeoIPMatcher, error) {
 	return m, nil
 }
 
-var (
+var globalGeoIPContainer GeoIPMatcherContainer
-	globalGeoIPContainer GeoIPMatcherContainer
-)

app/router/condition_geoip_test.go

@@ -89,7 +89,8 @@ func TestGeoIPMatcher(t *testing.T) {
 		{
 			Input:  "192.0.1.0",
 			Output: false,
-		}, {
+		},
+		{
 			Input:  "0.1.0.0",
 			Output: true,
 		},

app/router/config.go

@@ -84,7 +84,6 @@ func (rr *RoutingRule) BuildCondition() (Condition, error) {
 			newError("MphDomainMatcher is enabled for ", len(rr.Domain), " domain rule(s)").AtDebug().WriteToLog()
 			conds.Add(matcher)
 		}
-
 	}
 
 	if len(rr.UserEmail) > 0 {

app/router/router.go

@@ -80,7 +80,6 @@ func (r *Router) PickRoute(ctx routing.Context) (routing.Route, error) {
 }
 
 func (r *Router) pickRouteInternal(ctx routing.Context) (*Rule, routing.Context, error) {
-
 	// SkipDNSResolve is set from DNS module.
 	// the DOH remote server maybe a domain name,
 	// this prevents cycle resolving dead loop

app/router/router_test.go

@@ -2,9 +2,10 @@ package router_test
 
 import (
 	"context"
-	"github.com/xtls/xray-core/features/dns"
 	"testing"
 
+	"github.com/xtls/xray-core/features/dns"
+
 	"github.com/golang/mock/gomock"
 
 	. "github.com/xtls/xray-core/app/router"

common/buf/buffer_test.go

@@ -78,6 +78,7 @@ func TestBufferByte(t *testing.T) {
 		buffer.Release()
 	}
 }
+
 func TestBufferResize(t *testing.T) {
 	buffer := New()
 	defer buffer.Release()

common/buf/io.go

@@ -121,7 +121,7 @@ func NewWriter(writer io.Writer) Writer {
 		return mw
 	}
 
-	var iConn = writer
+	iConn := writer
 	if statConn, ok := writer.(*stat.CounterConnection); ok {
 		iConn = statConn.Connection
 	}

common/common.go

@@ -14,10 +14,8 @@ import (
 
 //go:generate go run github.com/xtls/xray-core/common/errors/errorgen
 
-var (
+// ErrNoClue is for the situation that existing information is not enough to make a decision. For example, Router may return this error when there is no suitable route.
-	// ErrNoClue is for the situation that existing information is not enough to make a decision. For example, Router may return this error when there is no suitable route.
+var ErrNoClue = errors.New("not enough information for making a decision")
-	ErrNoClue = errors.New("not enough information for making a decision")
-)
 
 // Must panics if err is not nil.
 func Must(err error) {

common/crypto/auth.go

@@ -290,7 +290,6 @@ func (w *AuthenticationWriter) writeStream(mb buf.MultiBuffer) error {
 		mb = nb
 
 		eb, err := w.seal(rawBytes[:nBytes])
-
 		if err != nil {
 			buf.ReleaseMulti(mb2Write)
 			return err

common/crypto/chacha20_test.go

@@ -18,7 +18,7 @@ func mustDecodeHex(s string) []byte {
 }
 
 func TestChaCha20Stream(t *testing.T) {
-	var cases = []struct {
+	cases := []struct {
 		key    []byte
 		iv     []byte
 		output []byte

common/crypto/internal/chacha_core.generated.go

@@ -3,7 +3,7 @@ package internal
 import "encoding/binary"
 
 func ChaCha20Block(s *[16]uint32, out []byte, rounds int) {
-	var x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 = s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7], s[8], s[9], s[10], s[11], s[12], s[13], s[14], s[15]
+	x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 := s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7], s[8], s[9], s[10], s[11], s[12], s[13], s[14], s[15]
 	for i := 0; i < rounds; i += 2 {
 		var x uint32
 

common/crypto/internal/chacha_core_gen.go

@@ -56,7 +56,7 @@ func ChaCha20Block(s *[16]uint32, out []byte, rounds int) {
 }
 
 func main() {
-	file, err := os.OpenFile("chacha_core.generated.go", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
+	file, err := os.OpenFile("chacha_core.generated.go", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0o644)
 	if err != nil {
 		log.Fatalf("Failed to generate chacha_core.go: %v", err)
 	}

common/crypto/io.go

@@ -27,9 +27,7 @@ func (r *CryptionReader) Read(data []byte) (int, error) {
 	return nBytes, err
 }
 
-var (
+var _ buf.Writer = (*CryptionWriter)(nil)
-	_ buf.Writer = (*CryptionWriter)(nil)
-)
 
 type CryptionWriter struct {
 	stream    cipher.Stream

common/errors/errorgen/main.go

@@ -17,7 +17,7 @@ func main() {
 		pkg = "core"
 	}
 
-	file, err := os.OpenFile("errors.generated.go", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
+	file, err := os.OpenFile("errors.generated.go", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0o644)
 	if err != nil {
 		fmt.Printf("Failed to generate errors.generated.go: %v", err)
 		os.Exit(1)

common/log/log.go

@@ -32,9 +32,7 @@ func Record(msg Message) {
 	logHandler.Handle(msg)
 }
 
-var (
+var logHandler syncHandler
-	logHandler syncHandler
-)
 
 // RegisterHandler register a new handler as current log handler. Previous registered handler will be discarded.
 func RegisterHandler(handler Handler) {

common/log/logger.go

@@ -130,13 +130,13 @@ func CreateStderrLogWriter() WriterCreator {
 
 // CreateFileLogWriter returns a LogWriterCreator that creates LogWriter for the given file.
 func CreateFileLogWriter(path string) (WriterCreator, error) {
-	file, err := os.OpenFile(path, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
+	file, err := os.OpenFile(path, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0o600)
 	if err != nil {
 		return nil, err
 	}
 	file.Close()
 	return func() Writer {
-		file, err := os.OpenFile(path, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
+		file, err := os.OpenFile(path, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0o600)
 		if err != nil {
 			return nil
 		}

common/mux/client.go

@@ -142,7 +142,6 @@ func (f *DialingWorkerFactory) Create() (*ClientWorker, error) {
 		Reader: downlinkReader,
 		Writer: upLinkWriter,
 	}, f.Strategy)
-
 	if err != nil {
 		return nil, err
 	}
@@ -175,8 +174,10 @@ type ClientWorker struct {
 	strategy       ClientStrategy
 }
 
-var muxCoolAddress = net.DomainAddress("v1.mux.cool")
+var (
-var muxCoolPort = net.Port(9527)
+	muxCoolAddress = net.DomainAddress("v1.mux.cool")
+	muxCoolPort    = net.Port(9527)
+)
 
 // NewClientWorker creates a new mux.Client.
 func NewClientWorker(stream transport.Link, s ClientStrategy) (*ClientWorker, error) {

common/net/system.go

@@ -3,17 +3,21 @@ package net
 import "net"
 
 // DialTCP is an alias of net.DialTCP.
-var DialTCP = net.DialTCP
+var (
-var DialUDP = net.DialUDP
+	DialTCP  = net.DialTCP
-var DialUnix = net.DialUnix
+	DialUDP  = net.DialUDP
-var Dial = net.Dial
+	DialUnix = net.DialUnix
+	Dial     = net.Dial
+)
 
 type ListenConfig = net.ListenConfig
 
-var Listen = net.Listen
+var (
-var ListenTCP = net.ListenTCP
+	Listen     = net.Listen
-var ListenUDP = net.ListenUDP
+	ListenTCP  = net.ListenTCP
-var ListenUnix = net.ListenUnix
+	ListenUDP  = net.ListenUDP
+	ListenUnix = net.ListenUnix
+)
 
 var LookupIP = net.LookupIP
 
@@ -26,36 +30,54 @@ var SplitHostPort = net.SplitHostPort
 
 var CIDRMask = net.CIDRMask
 
-type Addr = net.Addr
+type (
-type Conn = net.Conn
+	Addr       = net.Addr
-type PacketConn = net.PacketConn
+	Conn       = net.Conn
+	PacketConn = net.PacketConn
+)
 
-type TCPAddr = net.TCPAddr
+type (
-type TCPConn = net.TCPConn
+	TCPAddr = net.TCPAddr
+	TCPConn = net.TCPConn
+)
 
-type UDPAddr = net.UDPAddr
+type (
-type UDPConn = net.UDPConn
+	UDPAddr = net.UDPAddr
+	UDPConn = net.UDPConn
+)
 
-type UnixAddr = net.UnixAddr
+type (
-type UnixConn = net.UnixConn
+	UnixAddr = net.UnixAddr
+	UnixConn = net.UnixConn
+)
 
 // IP is an alias for net.IP.
-type IP = net.IP
+type (
-type IPMask = net.IPMask
+	IP     = net.IP
-type IPNet = net.IPNet
+	IPMask = net.IPMask
+	IPNet  = net.IPNet
+)
 
-const IPv4len = net.IPv4len
+const (
-const IPv6len = net.IPv6len
+	IPv4len = net.IPv4len
+	IPv6len = net.IPv6len
+)
 
-type Error = net.Error
+type (
-type AddrError = net.AddrError
+	Error     = net.Error
+	AddrError = net.AddrError
+)
 
-type Dialer = net.Dialer
+type (
-type Listener = net.Listener
+	Dialer       = net.Dialer
-type TCPListener = net.TCPListener
+	Listener     = net.Listener
-type UnixListener = net.UnixListener
+	TCPListener  = net.TCPListener
+	UnixListener = net.UnixListener
+)
 
-var ResolveUnixAddr = net.ResolveUnixAddr
+var (
-var ResolveUDPAddr = net.ResolveUDPAddr
+	ResolveUnixAddr = net.ResolveUnixAddr
+	ResolveUDPAddr  = net.ResolveUDPAddr
+)
 
 type Resolver = net.Resolver

common/ocsp/ocsp.go

@@ -56,7 +56,6 @@ func GetOCSPForCert(cert [][]byte) ([]byte, error) {
 	pemBundle := bundle.Bytes()
 
 	certificates, err := parsePEMBundle(pemBundle)
-
 	if err != nil {
 		return nil, err
 	}
@@ -99,12 +98,10 @@ func GetOCSPForCert(cert [][]byte) ([]byte, error) {
 	}
 	defer req.Body.Close()
 	ocspResBytes, err := io.ReadAll(req.Body)
-
 	if err != nil {
 		return nil, newError(err)
 	}
 	return ocspResBytes, nil
-
 }
 
 // parsePEMBundle parses a certificate bundle from top to bottom and returns

common/platform/filesystem/file.go

@@ -33,7 +33,7 @@ func CopyFile(dst string, src string) error {
 	if err != nil {
 		return err
 	}
-	f, err := os.OpenFile(dst, os.O_CREATE|os.O_WRONLY, 0644)
+	f, err := os.OpenFile(dst, os.O_CREATE|os.O_WRONLY, 0o644)
 	if err != nil {
 		return err
 	}

common/protocol/bittorrent/bittorrent.go

@@ -6,8 +6,7 @@ import (
 	"github.com/xtls/xray-core/common"
 )
 
-type SniffHeader struct {
+type SniffHeader struct{}
-}
 
 func (h *SniffHeader) Protocol() string {
 	return "bittorrent"

common/protocol/tls/cert/cert_test.go

@@ -73,6 +73,7 @@ func printJSON(certificate *Certificate) {
 	os.Stdout.Write(content)
 	os.Stdout.WriteString("\n")
 }
+
 func printFile(certificate *Certificate, name string) error {
 	certPEM, keyPEM := certificate.ToPEM()
 	return task.Run(context.Background(), func() error {
@@ -81,6 +82,7 @@ func printFile(certificate *Certificate, name string) error {
 		return writeFile(keyPEM, name+"_key.pem")
 	})
 }
+
 func writeFile(content []byte, name string) error {
 	f, err := os.Create(name)
 	if err != nil {

common/protocol/tls/sniff.go

@@ -20,8 +20,10 @@ func (h *SniffHeader) Domain() string {
 	return h.domain
 }
 
-var errNotTLS = errors.New("not TLS header")
+var (
-var errNotClientHello = errors.New("not client hello")
+	errNotTLS         = errors.New("not TLS header")
+	errNotClientHello = errors.New("not client hello")
+)
 
 func IsValidTLSVersion(major, minor byte) bool {
 	return major == 3

common/retry/retry.go

@@ -6,9 +6,7 @@ import (
 	"time"
 )
 
-var (
+var ErrRetryFailed = newError("all retry attempts failed")
-	ErrRetryFailed = newError("all retry attempts failed")
-)
 
 // Strategy is a way to retry on a specific function.
 type Strategy interface {

common/retry/retry_test.go

@@ -9,9 +9,7 @@ import (
 	. "github.com/xtls/xray-core/common/retry"
 )
 
-var (
+var errorTestOnly = errors.New("this is a fake error")
-	errorTestOnly = errors.New("this is a fake error")
-)
 
 func TestNoRetry(t *testing.T) {
 	startTime := time.Now().Unix()

common/strmatcher/ac_automaton_matcher.go

@@ -122,7 +122,7 @@ var char2Index = []int{
 }
 
 func NewACAutomaton() *ACAutomaton {
-	var ac = new(ACAutomaton)
+	ac := new(ACAutomaton)
 	ac.trie = append(ac.trie, newNode())
 	ac.fail = append(ac.fail, 0)
 	ac.exists = append(ac.exists, MatchType{
@@ -133,9 +133,9 @@ func NewACAutomaton() *ACAutomaton {
 }
 
 func (ac *ACAutomaton) Add(domain string, t Type) {
-	var node = 0
+	node := 0
 	for i := len(domain) - 1; i >= 0; i-- {
-		var idx = char2Index[domain[i]]
+		idx := char2Index[domain[i]]
 		if ac.trie[node][idx].nextNode == 0 {
 			ac.count++
 			if len(ac.trie) < ac.count+1 {
@@ -163,7 +163,7 @@ func (ac *ACAutomaton) Add(domain string, t Type) {
 			matchType: Full,
 			exist:     true,
 		}
-		var idx = char2Index['.']
+		idx := char2Index['.']
 		if ac.trie[node][idx].nextNode == 0 {
 			ac.count++
 			if len(ac.trie) < ac.count+1 {
@@ -190,18 +190,18 @@ func (ac *ACAutomaton) Add(domain string, t Type) {
 }
 
 func (ac *ACAutomaton) Build() {
-	var queue = list.New()
+	queue := list.New()
 	for i := 0; i < validCharCount; i++ {
 		if ac.trie[0][i].nextNode != 0 {
 			queue.PushBack(ac.trie[0][i])
 		}
 	}
 	for {
-		var front = queue.Front()
+		front := queue.Front()
 		if front == nil {
 			break
 		} else {
-			var node = front.Value.(Edge).nextNode
+			node := front.Value.(Edge).nextNode
 			queue.Remove(front)
 			for i := 0; i < validCharCount; i++ {
 				if ac.trie[node][i].nextNode != 0 {
@@ -219,13 +219,13 @@ func (ac *ACAutomaton) Build() {
 }
 
 func (ac *ACAutomaton) Match(s string) bool {
-	var node = 0
+	node := 0
-	var fullMatch = true
+	fullMatch := true
 	// 1. the match string is all through trie edge. FULL MATCH or DOMAIN
 	// 2. the match string is through a fail edge. NOT FULL MATCH
 	// 2.1 Through a fail edge, but there exists a valid node. SUBSTR
 	for i := len(s) - 1; i >= 0; i-- {
-		var idx = char2Index[s[i]]
+		idx := char2Index[s[i]]
 		fullMatch = fullMatch && ac.trie[node][idx].edgeType
 		node = ac.trie[node][idx].nextNode
 		switch ac.exists[node].matchType {

common/strmatcher/mph_matcher.go

@@ -102,7 +102,7 @@ func (g *MphMatcherGroup) Build() {
 	g.level0Mask = len(g.level0) - 1
 	g.level1 = make([]uint32, nextPow2(keyLen))
 	g.level1Mask = len(g.level1) - 1
-	var sparseBuckets = make([][]int, len(g.level0))
+	sparseBuckets := make([][]int, len(g.level0))
 	var ruleIdx int
 	for rule, hash := range *g.ruleMap {
 		n := int(hash) & g.level0Mask
@@ -122,7 +122,7 @@ func (g *MphMatcherGroup) Build() {
 	occ := make([]bool, len(g.level1))
 	var tmpOcc []int
 	for _, bucket := range buckets {
-		var seed = uint32(0)
+		seed := uint32(0)
 		for {
 			findSeed := true
 			tmpOcc = tmpOcc[:0]
@@ -284,9 +284,11 @@ tail:
 	h ^= h >> 32
 	return uintptr(h)
 }
+
 func add(p unsafe.Pointer, x uintptr) unsafe.Pointer {
 	return unsafe.Pointer(uintptr(p) + x)
 }
+
 func readUnaligned32(p unsafe.Pointer) uint32 {
 	q := (*[4]byte)(p)
 	return uint32(q[0]) | uint32(q[1])<<8 | uint32(q[2])<<16 | uint32(q[3])<<24
@@ -295,6 +297,7 @@ func readUnaligned32(p unsafe.Pointer) uint32 {
 func rotl31(x uint64) uint64 {
 	return (x << 31) | (x >> (64 - 31))
 }
+
 func readUnaligned64(p unsafe.Pointer) uint64 {
 	q := (*[8]byte)(p)
 	return uint64(q[0]) | uint64(q[1])<<8 | uint64(q[2])<<16 | uint64(q[3])<<24 | uint64(q[4])<<32 | uint64(q[5])<<40 | uint64(q[6])<<48 | uint64(q[7])<<56

common/strmatcher/strmatcher_test.go

@@ -143,7 +143,7 @@ func TestACAutomaton(t *testing.T) {
 		},
 	}
 	for _, test := range cases1 {
-		var ac = NewACAutomaton()
+		ac := NewACAutomaton()
 		ac.Add(test.pattern, test.mType)
 		ac.Build()
 		if m := ac.Match(test.input); m != test.output {
@@ -176,7 +176,7 @@ func TestACAutomaton(t *testing.T) {
 				mType:   Substr,
 			},
 		}
-		var ac = NewACAutomaton()
+		ac := NewACAutomaton()
 		for _, test := range cases2Input {
 			ac.Add(test.pattern, test.mType)
 		}
@@ -239,7 +239,7 @@ func TestACAutomaton(t *testing.T) {
 				mType:   Domain,
 			},
 		}
-		var ac = NewACAutomaton()
+		ac := NewACAutomaton()
 		for _, test := range cases3Input {
 			ac.Add(test.pattern, test.mType)
 		}

common/type.go

@@ -8,9 +8,7 @@ import (
 // ConfigCreator is a function to create an object by a config.
 type ConfigCreator func(ctx context.Context, config interface{}) (interface{}, error)
 
-var (
+var typeCreatorRegistry = make(map[reflect.Type]ConfigCreator)
-	typeCreatorRegistry = make(map[reflect.Type]ConfigCreator)
-)
 
 // RegisterConfig registers a global config creator. The config can be nil but must have a type.
 func RegisterConfig(config interface{}, configCreator ConfigCreator) error {

common/type_test.go

@@ -16,7 +16,7 @@ type YConfig struct {
 }
 
 func TestObjectCreation(t *testing.T) {
-	var f = func(ctx context.Context, t interface{}) (interface{}, error) {
+	f := func(ctx context.Context, t interface{}) (interface{}, error) {
 		return func() int {
 			return t.(*TConfig).value
 		}, nil

common/uuid/uuid.go

@@ -10,9 +10,7 @@ import (
 	"github.com/xtls/xray-core/common/errors"
 )
 
-var (
+var byteGroups = []int{8, 4, 4, 4, 12}
-	byteGroups = []int{8, 4, 4, 4, 12}
-)
 
 type UUID [16]byte
 

core/xray.go

@@ -159,7 +159,7 @@ func RequireFeatures(ctx context.Context, callback interface{}) error {
 // The instance is not started at this point.
 // To ensure Xray instance works properly, the config must contain one Dispatcher, one InboundHandlerManager and one OutboundHandlerManager. Other features are optional.
 func New(config *Config) (*Instance, error) {
-	var server = &Instance{ctx: context.Background()}
+	server := &Instance{ctx: context.Background()}
 
 	done, err := initInstanceWithConfig(config, server)
 	if done {
@@ -170,7 +170,7 @@ func New(config *Config) (*Instance, error) {
 }
 
 func NewWithContext(ctx context.Context, config *Config) (*Instance, error) {
-	var server = &Instance{ctx: ctx}
+	server := &Instance{ctx: ctx}
 
 	done, err := initInstanceWithConfig(config, server)
 	if done {

infra/conf/blackhole.go

@@ -42,12 +42,10 @@ func (v *BlackholeConfig) Build() (proto.Message, error) {
 	return config, nil
 }
 
-var (
+var configLoader = NewJSONConfigLoader(
-	configLoader = NewJSONConfigLoader(
+	ConfigCreatorCache{
-		ConfigCreatorCache{
+		"none": func() interface{} { return new(NoneResponse) },
-			"none": func() interface{} { return new(NoneResponse) },
+		"http": func() interface{} { return new(HTTPResponse) },
-			"http": func() interface{} { return new(HTTPResponse) },
+	},
-		},
+	"type",
-		"type",
+	"")
-		"")
-)

infra/conf/dns_test.go

@@ -27,7 +27,7 @@ func init() {
 
 	geositeFilePath := filepath.Join(wd, "geosite.dat")
 	os.Setenv("xray.location.asset", wd)
-	geositeFile, err := os.OpenFile(geositeFilePath, os.O_CREATE|os.O_WRONLY, 0600)
+	geositeFile, err := os.OpenFile(geositeFilePath, os.O_CREATE|os.O_WRONLY, 0o600)
 	common.Must(err)
 	defer geositeFile.Close()
 
@@ -46,6 +46,7 @@ func init() {
 	common.Must(err)
 	common.Must2(geositeFile.Write(listBytes))
 }
+
 func TestDNSConfigParsing(t *testing.T) {
 	geositePath := platform.GetAssetLocation("geosite.dat")
 	defer func() {

infra/conf/http.go

@@ -51,6 +51,7 @@ type HTTPRemoteConfig struct {
 	Port    uint16            `json:"port"`
 	Users   []json.RawMessage `json:"users"`
 }
+
 type HTTPClientConfig struct {
 	Servers []*HTTPRemoteConfig `json:"servers"`
 }

infra/conf/json/reader_test.go

@@ -24,7 +24,8 @@ content 2`,
 			`
 content 
 
-content 2`},
+content 2`,
+		},
 		{`content`, `content`},
 		{" ", " "},
 		{`con/*abcd*/tent`, "content"},

infra/conf/mtproto.go

@@ -60,8 +60,7 @@ func (c *MTProtoServerConfig) Build() (proto.Message, error) {
 	return config, nil
 }
 
-type MTProtoClientConfig struct {
+type MTProtoClientConfig struct{}
-}
 
 func (c *MTProtoClientConfig) Build() (proto.Message, error) {
 	config := new(mtproto.ClientConfig)

infra/conf/router.go

@@ -338,7 +338,7 @@ func parseDomainRule(domain string) ([]*router.Domain, error) {
 		}
 		return domains, nil
 	}
-	var isExtDatFile = 0
+	isExtDatFile := 0
 	{
 		const prefix = "ext:"
 		if strings.HasPrefix(domain, prefix) {
@@ -417,7 +417,7 @@ func toCidrList(ips StringList) ([]*router.GeoIP, error) {
 			})
 			continue
 		}
-		var isExtDatFile = 0
+		isExtDatFile := 0
 		{
 			const prefix = "ext:"
 			if strings.HasPrefix(ip, prefix) {

infra/conf/serial/builder.go

@@ -9,7 +9,6 @@ import (
 )
 
 func BuildConfig(files []string, formats []string) (*core.Config, error) {
-
 	cf := &conf.Config{}
 	for i, file := range files {
 		newError("Reading config: ", file).AtInfo().WriteToLog()
@@ -32,9 +31,7 @@ func BuildConfig(files []string, formats []string) (*core.Config, error) {
 
 type readerDecoder func(io.Reader) (*conf.Config, error)
 
-var (
+var ReaderDecoderByFormat = make(map[string]readerDecoder)
-	ReaderDecoderByFormat = make(map[string]readerDecoder)
-)
 
 func init() {
 	ReaderDecoderByFormat["json"] = DecodeJSONConfig

infra/conf/socks.go

@@ -70,6 +70,7 @@ type SocksRemoteConfig struct {
 	Port    uint16            `json:"port"`
 	Users   []json.RawMessage `json:"users"`
 }
+
 type SocksClientConfig struct {
 	Servers []*SocksRemoteConfig `json:"servers"`
 }

infra/conf/transport_internet.go

@@ -540,7 +540,7 @@ func (c *SocketConfig) Build() (*internet.SocketConfig, error) {
 		tproxy = internet.SocketConfig_Off
 	}
 
-	var dStrategy = internet.DomainStrategy_AS_IS
+	dStrategy := internet.DomainStrategy_AS_IS
 	switch strings.ToLower(c.DomainStrategy) {
 	case "useip", "use_ip":
 		dStrategy = internet.DomainStrategy_USE_IP

infra/conf/vmess.go

@@ -127,6 +127,7 @@ type VMessOutboundTarget struct {
 	Port    uint16            `json:"port"`
 	Users   []json.RawMessage `json:"users"`
 }
+
 type VMessOutboundConfig struct {
 	Receivers []*VMessOutboundTarget `json:"vnext"`
 }

infra/conf/xray_test.go

@@ -380,7 +380,8 @@ func TestConfig_Override(t *testing.T) {
 		fn   string
 		want *Config
 	}{
-		{"combine/empty",
+		{
+			"combine/empty",
 			&Config{},
 			&Config{
 				LogConfig:    &LogConfig{},
@@ -404,40 +405,54 @@ func TestConfig_Override(t *testing.T) {
 				Reverse:      &ReverseConfig{},
 			},
 		},
-		{"combine/newattr",
+		{
+			"combine/newattr",
 			&Config{InboundConfigs: []InboundDetourConfig{{Tag: "old"}}},
 			&Config{LogConfig: &LogConfig{}}, "",
-			&Config{LogConfig: &LogConfig{}, InboundConfigs: []InboundDetourConfig{{Tag: "old"}}}},
+			&Config{LogConfig: &LogConfig{}, InboundConfigs: []InboundDetourConfig{{Tag: "old"}}},
-		{"replace/inbounds",
+		},
+		{
+			"replace/inbounds",
 			&Config{InboundConfigs: []InboundDetourConfig{{Tag: "pos0"}, {Protocol: "vmess", Tag: "pos1"}}},
 			&Config{InboundConfigs: []InboundDetourConfig{{Tag: "pos1", Protocol: "kcp"}}},
 			"",
-			&Config{InboundConfigs: []InboundDetourConfig{{Tag: "pos0"}, {Tag: "pos1", Protocol: "kcp"}}}},
+			&Config{InboundConfigs: []InboundDetourConfig{{Tag: "pos0"}, {Tag: "pos1", Protocol: "kcp"}}},
-		{"replace/inbounds-replaceall",
+		},
+		{
+			"replace/inbounds-replaceall",
 			&Config{InboundConfigs: []InboundDetourConfig{{Tag: "pos0"}, {Protocol: "vmess", Tag: "pos1"}}},
 			&Config{InboundConfigs: []InboundDetourConfig{{Tag: "pos1", Protocol: "kcp"}, {Tag: "pos2", Protocol: "kcp"}}},
 			"",
-			&Config{InboundConfigs: []InboundDetourConfig{{Tag: "pos1", Protocol: "kcp"}, {Tag: "pos2", Protocol: "kcp"}}}},
+			&Config{InboundConfigs: []InboundDetourConfig{{Tag: "pos1", Protocol: "kcp"}, {Tag: "pos2", Protocol: "kcp"}}},
-		{"replace/notag-append",
+		},
+		{
+			"replace/notag-append",
 			&Config{InboundConfigs: []InboundDetourConfig{{}, {Protocol: "vmess"}}},
 			&Config{InboundConfigs: []InboundDetourConfig{{Tag: "pos1", Protocol: "kcp"}}},
 			"",
-			&Config{InboundConfigs: []InboundDetourConfig{{}, {Protocol: "vmess"}, {Tag: "pos1", Protocol: "kcp"}}}},
+			&Config{InboundConfigs: []InboundDetourConfig{{}, {Protocol: "vmess"}, {Tag: "pos1", Protocol: "kcp"}}},
-		{"replace/outbounds",
+		},
+		{
+			"replace/outbounds",
 			&Config{OutboundConfigs: []OutboundDetourConfig{{Tag: "pos0"}, {Protocol: "vmess", Tag: "pos1"}}},
 			&Config{OutboundConfigs: []OutboundDetourConfig{{Tag: "pos1", Protocol: "kcp"}}},
 			"",
-			&Config{OutboundConfigs: []OutboundDetourConfig{{Tag: "pos0"}, {Tag: "pos1", Protocol: "kcp"}}}},
+			&Config{OutboundConfigs: []OutboundDetourConfig{{Tag: "pos0"}, {Tag: "pos1", Protocol: "kcp"}}},
-		{"replace/outbounds-prepend",
+		},
+		{
+			"replace/outbounds-prepend",
 			&Config{OutboundConfigs: []OutboundDetourConfig{{Tag: "pos0"}, {Protocol: "vmess", Tag: "pos1"}}},
 			&Config{OutboundConfigs: []OutboundDetourConfig{{Tag: "pos1", Protocol: "kcp"}, {Tag: "pos2", Protocol: "kcp"}}},
 			"config.json",
-			&Config{OutboundConfigs: []OutboundDetourConfig{{Tag: "pos1", Protocol: "kcp"}, {Tag: "pos2", Protocol: "kcp"}}}},
+			&Config{OutboundConfigs: []OutboundDetourConfig{{Tag: "pos1", Protocol: "kcp"}, {Tag: "pos2", Protocol: "kcp"}}},
-		{"replace/outbounds-append",
+		},
+		{
+			"replace/outbounds-append",
 			&Config{OutboundConfigs: []OutboundDetourConfig{{Tag: "pos0"}, {Protocol: "vmess", Tag: "pos1"}}},
 			&Config{OutboundConfigs: []OutboundDetourConfig{{Tag: "pos2", Protocol: "kcp"}}},
 			"config_tail.json",
-			&Config{OutboundConfigs: []OutboundDetourConfig{{Tag: "pos0"}, {Protocol: "vmess", Tag: "pos1"}, {Tag: "pos2", Protocol: "kcp"}}}},
+			&Config{OutboundConfigs: []OutboundDetourConfig{{Tag: "pos0"}, {Protocol: "vmess", Tag: "pos1"}, {Tag: "pos2", Protocol: "kcp"}}},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

main/commands/all/commands.go

@@ -12,7 +12,7 @@ func init() {
 	base.RootCommand.Commands = append(
 		base.RootCommand.Commands,
 		api.CmdAPI,
-		//cmdConvert,
+		// cmdConvert,
 		tls.CmdTLS,
 		cmdUUID,
 	)

main/commands/all/tls/ping.go

@@ -27,9 +27,7 @@ func init() {
 	cmdPing.Run = executePing // break init loop
 }
 
-var (
+var pingIPStr = cmdPing.Flag.String("ip", "", "")
-	pingIPStr = cmdPing.Flag.String("ip", "", "")
-)
 
 func executePing(cmd *base.Command, args []string) {
 	if cmdPing.Flag.NArg() < 1 {

main/commands/base/command.go

@@ -113,8 +113,10 @@ func ExitIfErrors() {
 	}
 }
 
-var exitStatus = 0
+var (
-var exitMu sync.Mutex
+	exitStatus = 0
+	exitMu     sync.Mutex
+)
 
 // SetExitStatus set exit status code
 func SetExitStatus(n int) {

main/confloader/confloader.go

@@ -5,8 +5,10 @@ import (
 	"os"
 )
 
-type configFileLoader func(string) (io.Reader, error)
+type (
-type extconfigLoader func([]string, io.Reader) (io.Reader, error)
+	configFileLoader func(string) (io.Reader, error)
+	extconfigLoader  func([]string, io.Reader) (io.Reader, error)
+)
 
 var (
 	EffectiveConfigFileLoader configFileLoader

main/main.go

@@ -37,20 +37,20 @@ func getArgsV4Compatible() []string {
 	fs.SetOutput(&null{})
 	err := fs.Parse(os.Args[1:])
 	if err == flag.ErrHelp {
-		//fmt.Println("DEPRECATED: -h, WILL BE REMOVED IN V5.")
+		// fmt.Println("DEPRECATED: -h, WILL BE REMOVED IN V5.")
-		//fmt.Println("PLEASE USE: xray help")
+		// fmt.Println("PLEASE USE: xray help")
-		//fmt.Println()
+		// fmt.Println()
 		return []string{os.Args[0], "help"}
 	}
 	if version {
-		//fmt.Println("DEPRECATED: -version, WILL BE REMOVED IN V5.")
+		// fmt.Println("DEPRECATED: -version, WILL BE REMOVED IN V5.")
-		//fmt.Println("PLEASE USE: xray version")
+		// fmt.Println("PLEASE USE: xray version")
-		//fmt.Println()
+		// fmt.Println()
 		return []string{os.Args[0], "version"}
 	}
-	//fmt.Println("COMPATIBLE MODE, DEPRECATED.")
+	// fmt.Println("COMPATIBLE MODE, DEPRECATED.")
-	//fmt.Println("PLEASE USE: xray run [arguments] INSTEAD.")
+	// fmt.Println("PLEASE USE: xray run [arguments] INSTEAD.")
-	//fmt.Println()
+	// fmt.Println()
 	return append([]string{os.Args[0], "run"}, os.Args[1:]...)
 }
 

main/run.go

@@ -39,7 +39,7 @@ without launching the server
 }
 
 func init() {
-	cmdRun.Run = executeRun //break init loop
+	cmdRun.Run = executeRun // break init loop
 }
 
 var (
@@ -52,7 +52,6 @@ var (
 	 * main func in this file is run.
 	 */
 	_ = func() bool {
-
 		cmdRun.Flag.Var(&configFiles, "config", "Config path for Xray.")
 		cmdRun.Flag.Var(&configFiles, "c", "Short alias of -config")
 		cmdRun.Flag.StringVar(&configDir, "confdir", "", "A dir with multiple json config")
@@ -181,10 +180,9 @@ func getConfigFormat() string {
 func startXray() (core.Server, error) {
 	configFiles := getConfigFilePath()
 
-	//config, err := core.LoadConfig(getConfigFormat(), configFiles[0], configFiles)
+	// config, err := core.LoadConfig(getConfigFormat(), configFiles[0], configFiles)
 
 	c, err := core.LoadConfig(getConfigFormat(), configFiles)
-
 	if err != nil {
 		return nil, newError("failed to load config files: [", configFiles.String(), "]").Base(err)
 	}

proxy/dns/dns_test.go

@@ -24,8 +24,7 @@ import (
 	"github.com/xtls/xray-core/testing/servers/udp"
 )
 
-type staticHandler struct {
+type staticHandler struct{}
-}
 
 func (*staticHandler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
 	ans := new(dns.Msg)

proxy/http/client.go

@@ -133,7 +133,7 @@ func (c *Client) Process(ctx context.Context, link *transport.Link, dialer inter
 		return buf.Copy(buf.NewReader(conn), link.Writer, buf.UpdateActivity(timer))
 	}
 
-	var responseDonePost = task.OnSuccess(responseFunc, task.Close(link.Writer))
+	responseDonePost := task.OnSuccess(responseFunc, task.Close(link.Writer))
 	if err := task.Run(ctx, requestFunc, responseDonePost); err != nil {
 		return newError("connection ends").Base(err)
 	}

proxy/http/server.go

@@ -206,7 +206,7 @@ func (s *Server) handleConnect(ctx context.Context, _ *http.Request, reader *buf
 		return nil
 	}
 
-	var closeWriter = task.OnSuccess(requestDone, task.Close(link.Writer))
+	closeWriter := task.OnSuccess(requestDone, task.Close(link.Writer))
 	if err := task.Run(ctx, closeWriter, responseDone); err != nil {
 		common.Interrupt(link.Reader)
 		common.Interrupt(link.Writer)

proxy/mtproto/auth.go

@@ -133,13 +133,11 @@ func Inverse(b []byte) []byte {
 	return b2
 }
 
-var (
+var authPool = sync.Pool{
-	authPool = sync.Pool{
+	New: func() interface{} {
-		New: func() interface{} {
+		return new(Authentication)
-			return new(Authentication)
+	},
-		},
+}
-	}
-)
 
 func getAuthenticationObject() *Authentication {
 	return authPool.Get().(*Authentication)

proxy/mtproto/client.go

@@ -13,8 +13,7 @@ import (
 	"github.com/xtls/xray-core/transport/internet"
 )
 
-type Client struct {
+type Client struct{}
-}
 
 func NewClient(ctx context.Context, config *ClientConfig) (*Client, error) {
 	return &Client{}, nil
@@ -62,7 +61,7 @@ func (c *Client) Process(ctx context.Context, link *transport.Link, dialer inter
 		return buf.Copy(connReader, link.Writer)
 	}
 
-	var responseDoneAndCloseWriter = task.OnSuccess(response, task.Close(link.Writer))
+	responseDoneAndCloseWriter := task.OnSuccess(response, task.Close(link.Writer))
 	if err := task.Run(ctx, request, responseDoneAndCloseWriter); err != nil {
 		return newError("connection ends").Base(err)
 	}

proxy/mtproto/server.go

@@ -20,15 +20,13 @@ import (
 	"github.com/xtls/xray-core/features/routing"
 )
 
-var (
+var dcList = []net.Address{
-	dcList = []net.Address{
+	net.ParseAddress("149.154.175.50"),
-		net.ParseAddress("149.154.175.50"),
+	net.ParseAddress("149.154.167.51"),
-		net.ParseAddress("149.154.167.51"),
+	net.ParseAddress("149.154.175.100"),
-		net.ParseAddress("149.154.175.100"),
+	net.ParseAddress("149.154.167.91"),
-		net.ParseAddress("149.154.167.91"),
+	net.ParseAddress("149.154.171.5"),
-		net.ParseAddress("149.154.171.5"),
+}
-	}
-)
 
 type Server struct {
 	user    *protocol.User
@@ -64,8 +62,10 @@ func (s *Server) Network() []net.Network {
 	return []net.Network{net.Network_TCP}
 }
 
-var ctype1 = []byte{0xef, 0xef, 0xef, 0xef}
+var (
-var ctype2 = []byte{0xee, 0xee, 0xee, 0xee}
+	ctype1 = []byte{0xef, 0xef, 0xef, 0xef}
+	ctype2 = []byte{0xee, 0xee, 0xee, 0xee}
+)
 
 func isValidConnectionType(c [4]byte) bool {
 	if bytes.Equal(c[:], ctype1) {
@@ -144,7 +144,7 @@ func (s *Server) Process(ctx context.Context, network net.Network, conn stat.Con
 		return buf.Copy(link.Reader, writer, buf.UpdateActivity(timer))
 	}
 
-	var responseDoneAndCloseWriter = task.OnSuccess(response, task.Close(link.Writer))
+	responseDoneAndCloseWriter := task.OnSuccess(response, task.Close(link.Writer))
 	if err := task.Run(ctx, request, responseDoneAndCloseWriter); err != nil {
 		common.Interrupt(link.Reader)
 		common.Interrupt(link.Writer)

proxy/shadowsocks/client.go

@@ -132,7 +132,7 @@ func (c *Client) Process(ctx context.Context, link *transport.Link, dialer inter
 			return buf.Copy(responseReader, link.Writer, buf.UpdateActivity(timer))
 		}
 
-		var responseDoneAndCloseWriter = task.OnSuccess(responseDone, task.Close(link.Writer))
+		responseDoneAndCloseWriter := task.OnSuccess(responseDone, task.Close(link.Writer))
 		if err := task.Run(ctx, requestDone, responseDoneAndCloseWriter); err != nil {
 			return newError("connection ends").Base(err)
 		}
@@ -170,7 +170,7 @@ func (c *Client) Process(ctx context.Context, link *transport.Link, dialer inter
 			return nil
 		}
 
-		var responseDoneAndCloseWriter = task.OnSuccess(responseDone, task.Close(link.Writer))
+		responseDoneAndCloseWriter := task.OnSuccess(responseDone, task.Close(link.Writer))
 		if err := task.Run(ctx, requestDone, responseDoneAndCloseWriter); err != nil {
 			return newError("connection ends").Base(err)
 		}

proxy/shadowsocks/protocol.go

@@ -54,7 +54,6 @@ func (r *FullReader) Read(p []byte) (n int, err error) {
 
 // ReadTCPSession reads a Shadowsocks TCP session from the given reader, returns its header and remaining parts.
 func ReadTCPSession(validator *Validator, reader io.Reader) (*protocol.RequestHeader, buf.Reader, error) {
-
 	hashkdf := hmac.New(sha256.New, []byte("SSBSKDF"))
 
 	behaviorSeed := crc32.ChecksumIEEE(hashkdf.Sum(nil))

proxy/shadowsocks/server.go

@@ -271,7 +271,7 @@ func (s *Server) handleConnection(ctx context.Context, conn stat.Connection, dis
 		return nil
 	}
 
-	var requestDoneAndCloseWriter = task.OnSuccess(requestDone, task.Close(link.Writer))
+	requestDoneAndCloseWriter := task.OnSuccess(requestDone, task.Close(link.Writer))
 	if err := task.Run(ctx, requestDoneAndCloseWriter, responseDone); err != nil {
 		common.Interrupt(link.Reader)
 		common.Interrupt(link.Writer)

proxy/socks/client.go

@@ -150,7 +150,7 @@ func (c *Client) Process(ctx context.Context, link *transport.Link, dialer inter
 		}
 	}
 
-	var responseDonePost = task.OnSuccess(responseFunc, task.Close(link.Writer))
+	responseDonePost := task.OnSuccess(responseFunc, task.Close(link.Writer))
 	if err := task.Run(ctx, requestFunc, responseDonePost); err != nil {
 		return newError("connection ends").Base(err)
 	}

proxy/socks/server.go

@@ -182,7 +182,7 @@ func (s *Server) transport(ctx context.Context, reader io.Reader, writer io.Writ
 		return nil
 	}
 
-	var requestDonePost = task.OnSuccess(requestDone, task.Close(link.Writer))
+	requestDonePost := task.OnSuccess(requestDone, task.Close(link.Writer))
 	if err := task.Run(ctx, requestDonePost, responseDone); err != nil {
 		common.Interrupt(link.Reader)
 		common.Interrupt(link.Writer)
@@ -237,7 +237,6 @@ func (s *Server) handleUDPPayload(ctx context.Context, conn stat.Connection, dis
 
 		for _, payload := range mpayload {
 			request, err := DecodeUDPPacket(payload)
-
 			if err != nil {
 				newError("failed to parse UDP request").Base(err).WriteToLog(session.ExportIDToError(ctx))
 				payload.Release()

proxy/trojan/client.go

@@ -204,7 +204,7 @@ func (c *Client) Process(ctx context.Context, link *transport.Link, dialer inter
 		return buf.Copy(reader, link.Writer, buf.UpdateActivity(timer))
 	}
 
-	var responseDoneAndCloseWriter = task.OnSuccess(getResponse, task.Close(link.Writer))
+	responseDoneAndCloseWriter := task.OnSuccess(getResponse, task.Close(link.Writer))
 	if err := task.Run(ctx, postRequest, responseDoneAndCloseWriter); err != nil {
 		return newError("connection ends").Base(err)
 	}

proxy/trojan/protocol.go

@@ -323,7 +323,7 @@ func ReadV(reader buf.Reader, writer buf.Writer, timer signal.ActivityUpdater, c
 							panic("XTLS Splice: not TCP inbound")
 						}
 					} else {
-						//panic("XTLS Splice: nil inbound or nil inbound.Conn")
+						// panic("XTLS Splice: nil inbound or nil inbound.Conn")
 					}
 				}
 				reader = buf.NewReadVReader(conn.Connection, rawConn, nil)

proxy/trojan/server.go

@@ -382,7 +382,7 @@ func (s *Server) handleConnection(ctx context.Context, sessionPolicy policy.Sess
 		return nil
 	}
 
-	var requestDonePost = task.OnSuccess(requestDone, task.Close(link.Writer))
+	requestDonePost := task.OnSuccess(requestDone, task.Close(link.Writer))
 	if err := task.Run(ctx, requestDonePost, responseDone); err != nil {
 		common.Must(common.Interrupt(link.Reader))
 		common.Must(common.Interrupt(link.Writer))

proxy/vless/encoding/encoding.go

@@ -210,7 +210,7 @@ func ReadV(reader buf.Reader, writer buf.Writer, timer signal.ActivityUpdater, c
 							panic("XTLS Splice: not TCP inbound")
 						}
 					} else {
-						//panic("XTLS Splice: nil inbound or nil inbound.Conn")
+						// panic("XTLS Splice: nil inbound or nil inbound.Conn")
 					}
 				}
 				reader = buf.NewReadVReader(conn.Connection, rawConn, nil)

proxy/vless/inbound/inbound.go

@@ -35,9 +35,7 @@ import (
 	"github.com/xtls/xray-core/transport/internet/xtls"
 )
 
-var (
+var xtls_show = false
-	xtls_show = false
-)
 
 func init() {
 	common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, config interface{}) (interface{}, error) {

proxy/vless/outbound/outbound.go

@@ -29,9 +29,7 @@ import (
 	"github.com/xtls/xray-core/transport/internet/xtls"
 )
 
-var (
+var xtls_show = false
-	xtls_show = false
-)
 
 func init() {
 	common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, config interface{}) (interface{}, error) {

proxy/vmess/aead/encrypt.go

@@ -40,7 +40,6 @@ func SealVMessAEADHeader(key [16]byte, data []byte) []byte {
 		}
 
 		payloadHeaderAEAD, err := cipher.NewGCM(payloadHeaderLengthAEADAESBlock)
-
 		if err != nil {
 			panic(err.Error())
 		}
@@ -61,7 +60,6 @@ func SealVMessAEADHeader(key [16]byte, data []byte) []byte {
 		}
 
 		payloadHeaderAEAD, err := cipher.NewGCM(payloadHeaderAEADAESBlock)
-
 		if err != nil {
 			panic(err.Error())
 		}
@@ -69,7 +67,7 @@ func SealVMessAEADHeader(key [16]byte, data []byte) []byte {
 		payloadHeaderAEADEncrypted = payloadHeaderAEAD.Seal(nil, payloadHeaderAEADNonce, data, generatedAuthID[:])
 	}
 
-	var outputBuffer = bytes.NewBuffer(nil)
+	outputBuffer := bytes.NewBuffer(nil)
 
 	common.Must2(outputBuffer.Write(generatedAuthID[:]))               // 16
 	common.Must2(outputBuffer.Write(payloadHeaderLengthAEADEncrypted)) // 2+16
@@ -112,7 +110,6 @@ func OpenVMessAEADHeader(key [16]byte, authid [16]byte, data io.Reader) ([]byte,
 		}
 
 		payloadHeaderLengthAEAD, err := cipher.NewGCM(payloadHeaderAEADAESBlock)
-
 		if err != nil {
 			panic(err.Error())
 		}
@@ -154,7 +151,6 @@ func OpenVMessAEADHeader(key [16]byte, authid [16]byte, data io.Reader) ([]byte,
 		}
 
 		payloadHeaderAEAD, err := cipher.NewGCM(payloadHeaderAEADAESBlock)
-
 		if err != nil {
 			panic(err.Error())
 		}

proxy/vmess/aead/encrypt_test.go

@@ -16,7 +16,7 @@ func TestOpenVMessAEADHeader(t *testing.T) {
 	copy(keyw[:], key)
 	sealed := SealVMessAEADHeader(keyw, TestHeader)
 
-	var AEADR = bytes.NewReader(sealed)
+	AEADR := bytes.NewReader(sealed)
 
 	var authid [16]byte
 
@@ -35,7 +35,7 @@ func TestOpenVMessAEADHeader2(t *testing.T) {
 	copy(keyw[:], key)
 	sealed := SealVMessAEADHeader(keyw, TestHeader)
 
-	var AEADR = bytes.NewReader(sealed)
+	AEADR := bytes.NewReader(sealed)
 
 	var authid [16]byte
 
@@ -57,7 +57,7 @@ func TestOpenVMessAEADHeader4(t *testing.T) {
 		var sealedm [16]byte
 		copy(sealedm[:], sealed)
 		sealed[i] ^= 0xff
-		var AEADR = bytes.NewReader(sealed)
+		AEADR := bytes.NewReader(sealed)
 
 		var authid [16]byte
 
@@ -85,7 +85,7 @@ func TestOpenVMessAEADHeader4Massive(t *testing.T) {
 			var sealedm [16]byte
 			copy(sealedm[:], sealed)
 			sealed[i] ^= 0xff
-			var AEADR = bytes.NewReader(sealed)
+			AEADR := bytes.NewReader(sealed)
 
 			var authid [16]byte
 

proxy/vmess/encoding/auth.go

@@ -38,8 +38,7 @@ func (NoOpAuthenticator) Open(dst, nonce, ciphertext, additionalData []byte) ([]
 }
 
 // FnvAuthenticator is an AEAD based on Fnv hash.
-type FnvAuthenticator struct {
+type FnvAuthenticator struct{}
-}
 
 // NonceSize implements AEAD.NonceSize().
 func (*FnvAuthenticator) NonceSize() int {

proxy/vmess/encoding/commands.go

@@ -77,8 +77,7 @@ type CommandFactory interface {
 	Unmarshal(data []byte) (interface{}, error)
 }
 
-type CommandSwitchAccountFactory struct {
+type CommandSwitchAccountFactory struct{}
-}
 
 func (f *CommandSwitchAccountFactory) Marshal(command interface{}, writer io.Writer) error {
 	cmd, ok := command.(*protocol.CommandSwitchAccount)

proxy/vmess/inbound/inbound.go

@@ -319,7 +319,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s
 		return transferResponse(timer, svrSession, request, response, link.Reader, writer)
 	}
 
-	var requestDonePost = task.OnSuccess(requestDone, task.Close(link.Writer))
+	requestDonePost := task.OnSuccess(requestDone, task.Close(link.Writer))
 	if err := task.Run(ctx, requestDonePost, responseDone); err != nil {
 		common.Interrupt(link.Reader)
 		common.Interrupt(link.Writer)
@@ -370,7 +370,7 @@ func init() {
 		return New(ctx, config.(*Config))
 	}))
 
-	var defaultFlagValue = "NOT_DEFINED_AT_ALL"
+	defaultFlagValue := "NOT_DEFINED_AT_ALL"
 
 	if time.Now().Year() >= 2022 {
 		defaultFlagValue = "true_by_default_2022"

proxy/vmess/outbound/outbound.go

@@ -191,7 +191,7 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
 		return buf.Copy(bodyReader, output, buf.UpdateActivity(timer))
 	}
 
-	var responseDonePost = task.OnSuccess(responseDone, task.Close(output))
+	responseDonePost := task.OnSuccess(responseDone, task.Close(output))
 	if err := task.Run(ctx, requestDone, responseDonePost); err != nil {
 		return newError("connection ends").Base(err)
 	}

testing/mocks/dns.go

@@ -5,10 +5,11 @@
 package mocks
 
 import (
-	gomock "github.com/golang/mock/gomock"
-	dns "github.com/xtls/xray-core/features/dns"
 	net "net"
 	reflect "reflect"
+
+	gomock "github.com/golang/mock/gomock"
+	dns "github.com/xtls/xray-core/features/dns"
 )
 
 // DNSClient is a mock of Client interface

testing/mocks/io.go

@@ -5,8 +5,9 @@
 package mocks
 
 import (
-	gomock "github.com/golang/mock/gomock"
 	reflect "reflect"
+
+	gomock "github.com/golang/mock/gomock"
 )
 
 // Reader is a mock of Reader interface

testing/mocks/log.go

@@ -5,9 +5,10 @@
 package mocks
 
 import (
+	reflect "reflect"
+
 	gomock "github.com/golang/mock/gomock"
 	log "github.com/xtls/xray-core/common/log"
-	reflect "reflect"
 )
 
 // LogHandler is a mock of Handler interface

testing/mocks/mux.go

@@ -5,9 +5,10 @@
 package mocks
 
 import (
+	reflect "reflect"
+
 	gomock "github.com/golang/mock/gomock"
 	mux "github.com/xtls/xray-core/common/mux"
-	reflect "reflect"
 )
 
 // MuxClientWorkerFactory is a mock of ClientWorkerFactory interface

testing/mocks/outbound.go

@@ -6,9 +6,10 @@ package mocks
 
 import (
 	context "context"
+	reflect "reflect"
+
 	gomock "github.com/golang/mock/gomock"
 	outbound "github.com/xtls/xray-core/features/outbound"
-	reflect "reflect"
 )
 
 // OutboundManager is a mock of Manager interface

testing/scenarios/vmess_test.go

@@ -108,12 +108,12 @@ func TestVMessDynamicPort(t *testing.T) {
 		}
 
 		server, _ := InitializeServerConfig(serverConfig)
-		if server != nil && tcpConnAvailableAtPort(t, serverPort + 100) {
+		if server != nil && tcpConnAvailableAtPort(t, serverPort+100) {
 			defer CloseServer(server)
 			break
 		}
 		retry += 1
-		if (retry > 5) {
+		if retry > 5 {
 			t.Fatal("All attempts failed to start server")
 		}
 		serverPort = tcp.PickPort()
@@ -174,7 +174,7 @@ func TestVMessDynamicPort(t *testing.T) {
 
 func tcpConnAvailableAtPort(t *testing.T, port net.Port) bool {
 	for i := 1; ; i++ {
-		if (i > 10) {
+		if i > 10 {
 			t.Log("All attempts failed to test tcp conn")
 			return false
 		}

testing/servers/tcp/tcp.go

@@ -97,7 +97,6 @@ func (server *Server) handleConnection(conn net.Conn) {
 			}
 		}
 	})
-
 	if err != nil {
 		fmt.Println("failed to transfer data: ", err.Error())
 	}

transport/internet/dialer.go

@@ -28,9 +28,7 @@ type Dialer interface {
 // dialFunc is an interface to dial network connection to a specific destination.
 type dialFunc func(ctx context.Context, dest net.Destination, streamSettings *MemoryStreamConfig) (stat.Connection, error)
 
-var (
+var transportDialerCache = make(map[string]dialFunc)
-	transportDialerCache = make(map[string]dialFunc)
-)
 
 // RegisterTransportDialer registers a Dialer with given name.
 func RegisterTransportDialer(protocol string, dialer dialFunc) error {
@@ -81,7 +79,7 @@ func lookupIP(domain string, strategy DomainStrategy, localAddr net.Address) ([]
 		return nil, nil
 	}
 
-	var option = dns.IPOption{
+	option := dns.IPOption{
 		IPv4Enable: true,
 		IPv6Enable: true,
 		FakeEnable: false,

transport/internet/domainsocket/config.go

@@ -6,8 +6,10 @@ import (
 	"github.com/xtls/xray-core/transport/internet"
 )
 
-const protocolName = "domainsocket"
+const (
-const sizeofSunPath = 108
+	protocolName  = "domainsocket"
+	sizeofSunPath = 108
+)
 
 func (c *Config) GetUnixAddr() (*net.UnixAddr, error) {
 	path := c.Path

transport/internet/grpc/dial.go

@@ -49,7 +49,6 @@ func dialgRPC(ctx context.Context, dest net.Destination, streamSettings *interne
 	grpcSettings := streamSettings.ProtocolSettings.(*Config)
 
 	conn, err := getGrpcClient(ctx, dest, streamSettings)
-
 	if err != nil {
 		return nil, newError("Cannot dial gRPC").Base(err)
 	}
@@ -86,7 +85,7 @@ func getGrpcClient(ctx context.Context, dest net.Destination, streamSettings *in
 		return client, nil
 	}
 
-	var dialOptions = []grpc.DialOption{
+	dialOptions := []grpc.DialOption{
 		grpc.WithConnectParams(grpc.ConnectParams{
 			Backoff: backoff.Config{
 				BaseDelay:  500 * time.Millisecond,

transport/internet/grpc/encoding/multiconn.go

@@ -92,7 +92,7 @@ func (h *MultiHunkReaderWriter) ReadMultiBuffer() (buf.MultiBuffer, error) {
 		return nil, err
 	}
 
-	var mb = make(buf.MultiBuffer, 0, len(h.buf))
+	mb := make(buf.MultiBuffer, 0, len(h.buf))
 	for _, b := range h.buf {
 		if len(b) == 0 {
 			continue

transport/internet/kcp/dialer.go

@@ -16,9 +16,7 @@ import (
 	"github.com/xtls/xray-core/transport/internet/xtls"
 )
 
-var (
+var globalConv = uint32(dice.RollUint16())
-	globalConv = uint32(dice.RollUint16())
-)
 
 func fetchInput(_ context.Context, input io.Reader, reader PacketReader, conn *Connection) {
 	cache := make(chan *buf.Buffer, 1024)

transport/internet/quic/hub.go

@@ -97,7 +97,6 @@ func Listen(ctx context.Context, address net.Address, port net.Port, streamSetti
 		IP:   address.IP(),
 		Port: int(port),
 	}, streamSettings.SocketSettings)
-
 	if err != nil {
 		return nil, err
 	}

transport/internet/quic/quic.go

@@ -13,8 +13,10 @@ import (
 //
 //
 
-const protocolName = "quic"
+const (
-const internalDomain = "quic.internal.example.com"
+	protocolName   = "quic"
+	internalDomain = "quic.internal.example.com"
+)
 
 func init() {
 	common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} {

transport/internet/sockopt_freebsd.go

@@ -45,6 +45,7 @@ func ioctl(s uintptr, ioc int, b []byte) error {
 	}
 	return nil
 }
+
 func (nl *pfiocNatlook) rdPort() int {
 	return int(binary.BigEndian.Uint16((*[2]byte)(unsafe.Pointer(&nl.Rdport))[:]))
 }

transport/internet/sockopt_windows.go

@@ -25,7 +25,6 @@ func applyOutboundSocketOptions(network string, address string, fd uintptr, conf
 		if err := setTFO(syscall.Handle(fd), config.ParseTFOValue()); err != nil {
 			return err
 		}
-
 	}
 
 	return nil