Style: format code

3 years ago · ffc2f7c4e2
78 changed files with 112 additions and 39 deletions
--- a/app/commander/service.go
+++ b/app/commander/service.go
@ -3,9 +3,10 @@ package commander
 import (
 	"context"

-	"github.com/xtls/xray-core/common"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
+
+	"github.com/xtls/xray-core/common"
 )

 // Service is a Commander service.
--- a/app/dns/dnscommon.go
+++ b/app/dns/dnscommon.go
@ -5,11 +5,12 @@ import (
 	"strings"
 	"time"

+	"golang.org/x/net/dns/dnsmessage"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/errors"
 	"github.com/xtls/xray-core/common/net"
 	dns_feature "github.com/xtls/xray-core/features/dns"
-	"golang.org/x/net/dns/dnsmessage"
 )

 // Fqdn normalize domain make sure it ends with '.'
--- a/app/dns/dnscommon_test.go
+++ b/app/dns/dnscommon_test.go
@ -7,10 +7,11 @@ import (

 	"github.com/google/go-cmp/cmp"
 	"github.com/miekg/dns"
+	"golang.org/x/net/dns/dnsmessage"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/net"
 	dns_feature "github.com/xtls/xray-core/features/dns"
-	"golang.org/x/net/dns/dnsmessage"
 )

 func Test_parseResponse(t *testing.T) {
--- a/app/dns/dohdns.go
+++ b/app/dns/dohdns.go
@ -12,6 +12,8 @@ import (
 	"sync/atomic"
 	"time"

+	"golang.org/x/net/dns/dnsmessage"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/log"
 	"github.com/xtls/xray-core/common/net"
@ -23,7 +25,6 @@ import (
 	dns_feature "github.com/xtls/xray-core/features/dns"
 	"github.com/xtls/xray-core/features/routing"
 	"github.com/xtls/xray-core/transport/internet"
-	"golang.org/x/net/dns/dnsmessage"
 )

 // DoHNameServer implemented DNS over HTTPS (RFC8484) Wire Format,
--- a/app/dns/udpns.go
+++ b/app/dns/udpns.go
@ -7,6 +7,8 @@ import (
 	"sync/atomic"
 	"time"

+	"golang.org/x/net/dns/dnsmessage"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/log"
 	"github.com/xtls/xray-core/common/net"
@ -18,7 +20,6 @@ import (
 	dns_feature "github.com/xtls/xray-core/features/dns"
 	"github.com/xtls/xray-core/features/routing"
 	"github.com/xtls/xray-core/transport/internet/udp"
-	"golang.org/x/net/dns/dnsmessage"
 )

 type ClassicNameServer struct {
--- a/app/log/log_test.go
+++ b/app/log/log_test.go
@ -5,6 +5,7 @@ import (
 	"testing"

 	"github.com/golang/mock/gomock"
+
 	"github.com/xtls/xray-core/app/log"
 	"github.com/xtls/xray-core/common"
 	clog "github.com/xtls/xray-core/common/log"
--- a/app/reverse/bridge.go
+++ b/app/reverse/bridge.go
@ -5,6 +5,7 @@ import (
 	"time"

 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/common/mux"
 	"github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/common/session"
--- a/app/reverse/portal.go
+++ b/app/reverse/portal.go
@ -6,6 +6,7 @@ import (
 	"time"

 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/buf"
 	"github.com/xtls/xray-core/common/mux"
--- a/app/router/command/command_test.go
+++ b/app/router/command/command_test.go
@ -8,6 +8,9 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/test/bufconn"
+
 	"github.com/xtls/xray-core/app/router"
 	. "github.com/xtls/xray-core/app/router/command"
 	"github.com/xtls/xray-core/app/stats"
@ -15,8 +18,6 @@ import (
 	"github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/features/routing"
 	"github.com/xtls/xray-core/testing/mocks"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/test/bufconn"
 )

 func TestServiceSubscribeRoutingStats(t *testing.T) {
--- a/app/router/condition_geoip_test.go
+++ b/app/router/condition_geoip_test.go
@ -6,6 +6,7 @@ import (
 	"testing"

 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/app/router"
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/net"
--- a/app/router/router_test.go
+++ b/app/router/router_test.go
@ -5,6 +5,7 @@ import (
 	"testing"

 	"github.com/golang/mock/gomock"
+
 	. "github.com/xtls/xray-core/app/router"
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/net"
--- a/common/buf/buffer_test.go
+++ b/common/buf/buffer_test.go
@ -6,6 +6,7 @@ import (
 	"testing"

 	"github.com/google/go-cmp/cmp"
+
 	"github.com/xtls/xray-core/common"
 	. "github.com/xtls/xray-core/common/buf"
 )
--- a/common/buf/multi_buffer_test.go
+++ b/common/buf/multi_buffer_test.go
@ -9,6 +9,7 @@ import (
 	"testing"

 	"github.com/google/go-cmp/cmp"
+
 	"github.com/xtls/xray-core/common"
 	. "github.com/xtls/xray-core/common/buf"
 )
--- a/common/buf/readv_posix.go
+++ b/common/buf/readv_posix.go
@ -1,6 +1,5 @@
-// +build !windows
-// +build !wasm
-// +build !illumos
+//go:build !windows && !wasm && !illumos
+// +build !windows,!wasm,!illumos

 package buf

--- a/common/buf/readv_reader.go
+++ b/common/buf/readv_reader.go
@ -1,3 +1,4 @@
+//go:build !wasm
 // +build !wasm

 package buf
--- a/common/buf/readv_reader_wasm.go
+++ b/common/buf/readv_reader_wasm.go
@ -1,3 +1,4 @@
+//go:build wasm
 // +build wasm

 package buf
--- a/common/buf/readv_test.go
+++ b/common/buf/readv_test.go
@ -1,3 +1,4 @@
+//go:build !wasm
 // +build !wasm

 package buf_test
@ -9,10 +10,11 @@ import (

 	"github.com/google/go-cmp/cmp"

+	"golang.org/x/sync/errgroup"
+
 	"github.com/xtls/xray-core/common"
 	. "github.com/xtls/xray-core/common/buf"
 	"github.com/xtls/xray-core/testing/servers/tcp"
-	"golang.org/x/sync/errgroup"
 )

 func TestReadvReader(t *testing.T) {
--- a/common/buf/readv_unix.go
+++ b/common/buf/readv_unix.go
@ -1,3 +1,4 @@
+//go:build illumos
 // +build illumos

 package buf
--- a/common/crypto/internal/chacha_core_gen.go
+++ b/common/crypto/internal/chacha_core_gen.go
@ -1,3 +1,4 @@
+//go:build generate
 // +build generate

 package main
--- a/common/mux/client_test.go
+++ b/common/mux/client_test.go
@ -6,6 +6,7 @@ import (
 	"time"

 	"github.com/golang/mock/gomock"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/errors"
 	"github.com/xtls/xray-core/common/mux"
--- a/common/platform/ctlcmd/attr_other.go
+++ b/common/platform/ctlcmd/attr_other.go
@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows

 package ctlcmd
--- a/common/platform/ctlcmd/attr_windows.go
+++ b/common/platform/ctlcmd/attr_windows.go
@ -1,3 +1,4 @@
+//go:build windows
 // +build windows

 package ctlcmd
--- a/common/platform/others.go
+++ b/common/platform/others.go
@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows

 package platform
--- a/common/platform/windows.go
+++ b/common/platform/windows.go
@ -1,3 +1,4 @@
+//go:build windows
 // +build windows

 package platform
--- a/common/protocol/dns/io.go
+++ b/common/protocol/dns/io.go
@ -4,10 +4,11 @@ import (
 	"encoding/binary"
 	"sync"

+	"golang.org/x/net/dns/dnsmessage"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/buf"
 	"github.com/xtls/xray-core/common/serial"
-	"golang.org/x/net/dns/dnsmessage"
 )

 func PackMessage(msg *dnsmessage.Message) (*buf.Buffer, error) {
--- a/infra/conf/dns_proxy.go
+++ b/infra/conf/dns_proxy.go
@ -2,6 +2,7 @@ package conf

 import (
 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/proxy/dns"
 )
--- a/infra/conf/dns_test.go
+++ b/infra/conf/dns_test.go
@ -7,6 +7,7 @@ import (
 	"testing"

 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/app/dns"
 	"github.com/xtls/xray-core/app/router"
 	"github.com/xtls/xray-core/common"
--- a/infra/conf/dokodemo.go
+++ b/infra/conf/dokodemo.go
@ -2,6 +2,7 @@ package conf

 import (
 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/proxy/dokodemo"
 )

--- a/infra/conf/fakedns.go
+++ b/infra/conf/fakedns.go
@ -2,6 +2,7 @@ package conf

 import (
 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/app/dns/fakedns"
 	"github.com/xtls/xray-core/features/dns"
 )
--- a/infra/conf/freedom.go
+++ b/infra/conf/freedom.go
@ -5,6 +5,7 @@ import (
 	"strings"

 	"github.com/golang/protobuf/proto"
+
 	v2net "github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/common/protocol"
 	"github.com/xtls/xray-core/proxy/freedom"
--- a/infra/conf/general_test.go
+++ b/infra/conf/general_test.go
@ -5,6 +5,7 @@ import (
 	"testing"

 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/common"
 	. "github.com/xtls/xray-core/infra/conf"
 )
--- a/infra/conf/http.go
+++ b/infra/conf/http.go
@ -4,6 +4,7 @@ import (
 	"encoding/json"

 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/common/protocol"
 	"github.com/xtls/xray-core/common/serial"
 	"github.com/xtls/xray-core/proxy/http"
--- a/infra/conf/reverse.go
+++ b/infra/conf/reverse.go
@ -2,6 +2,7 @@ package conf

 import (
 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/app/reverse"
 )

--- a/infra/conf/serial/builder.go
+++ b/infra/conf/serial/builder.go
@ -1,10 +1,11 @@
 package serial

 import (
+	"io"
+
 	"github.com/xtls/xray-core/core"
 	"github.com/xtls/xray-core/infra/conf"
 	"github.com/xtls/xray-core/main/confloader"
-	"io"
 )

 func BuildConfig(files []string, formats []string) (*core.Config, error) {
--- a/infra/conf/socks.go
+++ b/infra/conf/socks.go
@ -4,6 +4,7 @@ import (
 	"encoding/json"

 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/common/protocol"
 	"github.com/xtls/xray-core/common/serial"
 	"github.com/xtls/xray-core/proxy/socks"
--- a/infra/conf/transport_internet.go
+++ b/infra/conf/transport_internet.go
@ -8,6 +8,7 @@ import (
 	"strings"

 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/common/platform/filesystem"
 	"github.com/xtls/xray-core/common/protocol"
 	"github.com/xtls/xray-core/common/serial"
--- a/infra/conf/transport_test.go
+++ b/infra/conf/transport_test.go
@ -5,6 +5,7 @@ import (
 	"testing"

 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/common/protocol"
 	"github.com/xtls/xray-core/common/serial"
 	. "github.com/xtls/xray-core/infra/conf"
--- a/infra/conf/xray.go
+++ b/infra/conf/xray.go
@ -2,11 +2,12 @@ package conf

 import (
 	"encoding/json"
-	"github.com/xtls/xray-core/transport/internet"
 	"log"
 	"os"
 	"strings"

+	"github.com/xtls/xray-core/transport/internet"
+
 	"github.com/xtls/xray-core/app/dispatcher"
 	"github.com/xtls/xray-core/app/proxyman"
 	"github.com/xtls/xray-core/app/stats"
--- a/infra/conf/xray_test.go
+++ b/infra/conf/xray_test.go
@ -7,6 +7,7 @@ import (

 	"github.com/golang/protobuf/proto"
 	"github.com/google/go-cmp/cmp"
+
 	"github.com/xtls/xray-core/app/dispatcher"
 	"github.com/xtls/xray-core/app/log"
 	"github.com/xtls/xray-core/app/proxyman"
--- a/main/commands/all/convert.go
+++ b/main/commands/all/convert.go
@ -11,12 +11,13 @@ import (
 	"strings"
 	"time"

+	"google.golang.org/protobuf/proto"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/buf"
 	"github.com/xtls/xray-core/infra/conf"
 	"github.com/xtls/xray-core/infra/conf/serial"
 	"github.com/xtls/xray-core/main/commands/base"
-	"google.golang.org/protobuf/proto"
 )

 var cmdConvert = &base.Command{
--- a/main/main_test.go
+++ b/main/main_test.go
@ -1,3 +1,4 @@
+//go:build coveragemain
 // +build coveragemain

 package main
--- a/proxy/dokodemo/fakeudp_linux.go
+++ b/proxy/dokodemo/fakeudp_linux.go
@ -1,3 +1,4 @@
+//go:build linux
 // +build linux

 package dokodemo
--- a/proxy/dokodemo/fakeudp_other.go
+++ b/proxy/dokodemo/fakeudp_other.go
@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux

 package dokodemo
--- a/proxy/trojan/protocol_test.go
+++ b/proxy/trojan/protocol_test.go
@ -4,6 +4,7 @@ import (
 	"testing"

 	"github.com/google/go-cmp/cmp"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/buf"
 	"github.com/xtls/xray-core/common/net"
--- a/proxy/vmess/encoding/server.go
+++ b/proxy/vmess/encoding/server.go
@ -13,6 +13,8 @@ import (
 	"sync"
 	"time"

+	"golang.org/x/crypto/chacha20poly1305"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/bitmask"
 	"github.com/xtls/xray-core/common/buf"
@ -23,7 +25,6 @@ import (
 	"github.com/xtls/xray-core/common/task"
 	"github.com/xtls/xray-core/proxy/vmess"
 	vmessaead "github.com/xtls/xray-core/proxy/vmess/aead"
-	"golang.org/x/crypto/chacha20poly1305"
 )

 type sessionID struct {
--- a/proxy/vmess/inbound/inbound.go
+++ b/proxy/vmess/inbound/inbound.go
@ -31,7 +31,7 @@ import (
 )

 var (
-	aeadForced = false
+	aeadForced     = false
 	aeadForced2022 = false
 )

--- a/testing/scenarios/common.go
+++ b/testing/scenarios/common.go
@ -14,6 +14,7 @@ import (
 	"time"

 	"github.com/golang/protobuf/proto"
+
 	"github.com/xtls/xray-core/app/dispatcher"
 	"github.com/xtls/xray-core/app/proxyman"
 	"github.com/xtls/xray-core/common"
--- a/testing/scenarios/common_coverage.go
+++ b/testing/scenarios/common_coverage.go
@ -1,3 +1,4 @@
+//go:build coverage
 // +build coverage

 package scenarios
--- a/testing/scenarios/common_regular.go
+++ b/testing/scenarios/common_regular.go
@ -1,3 +1,4 @@
+//go:build !coverage
 // +build !coverage

 package scenarios
--- a/testing/scenarios/dns_test.go
+++ b/testing/scenarios/dns_test.go
@ -5,6 +5,8 @@ import (
 	"testing"
 	"time"

+	xproxy "golang.org/x/net/proxy"
+
 	"github.com/xtls/xray-core/app/dns"
 	"github.com/xtls/xray-core/app/proxyman"
 	"github.com/xtls/xray-core/app/router"
@ -16,7 +18,6 @@ import (
 	"github.com/xtls/xray-core/proxy/freedom"
 	"github.com/xtls/xray-core/proxy/socks"
 	"github.com/xtls/xray-core/testing/servers/tcp"
-	xproxy "golang.org/x/net/proxy"
 )

 func TestResolveIP(t *testing.T) {
--- a/testing/scenarios/feature_test.go
+++ b/testing/scenarios/feature_test.go
@ -8,6 +8,8 @@ import (
 	"testing"
 	"time"

+	xproxy "golang.org/x/net/proxy"
+
 	"github.com/xtls/xray-core/app/dispatcher"
 	"github.com/xtls/xray-core/app/log"
 	"github.com/xtls/xray-core/app/proxyman"
@ -32,7 +34,6 @@ import (
 	"github.com/xtls/xray-core/testing/servers/tcp"
 	"github.com/xtls/xray-core/testing/servers/udp"
 	"github.com/xtls/xray-core/transport/internet"
-	xproxy "golang.org/x/net/proxy"
 )

 func TestPassiveConnection(t *testing.T) {
--- a/testing/scenarios/shadowsocks_test.go
+++ b/testing/scenarios/shadowsocks_test.go
@ -67,8 +67,8 @@ func TestShadowsocksChaCha20Poly1305TCP(t *testing.T) {
 					Listen:    net.NewIPOrDomain(net.LocalHostIP),
 				}),
 				ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
-					Address: net.NewIPOrDomain(dest.Address),
-					Port:    uint32(dest.Port),
+					Address:  net.NewIPOrDomain(dest.Address),
+					Port:     uint32(dest.Port),
 					Networks: []net.Network{net.Network_TCP},
 				}),
 			},
@ -163,8 +163,8 @@ func TestShadowsocksAES256GCMTCP(t *testing.T) {
 					Listen:    net.NewIPOrDomain(net.LocalHostIP),
 				}),
 				ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
-					Address: net.NewIPOrDomain(dest.Address),
-					Port:    uint32(dest.Port),
+					Address:  net.NewIPOrDomain(dest.Address),
+					Port:     uint32(dest.Port),
 					Networks: []net.Network{net.Network_TCP},
 				}),
 			},
@ -260,8 +260,8 @@ func TestShadowsocksAES128GCMUDP(t *testing.T) {
 					Listen:    net.NewIPOrDomain(net.LocalHostIP),
 				}),
 				ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
-					Address: net.NewIPOrDomain(dest.Address),
-					Port:    uint32(dest.Port),
+					Address:  net.NewIPOrDomain(dest.Address),
+					Port:     uint32(dest.Port),
 					Networks: []net.Network{net.Network_UDP},
 				}),
 			},
@ -356,8 +356,8 @@ func TestShadowsocksAES128GCMUDPMux(t *testing.T) {
 					Listen:    net.NewIPOrDomain(net.LocalHostIP),
 				}),
 				ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
-					Address: net.NewIPOrDomain(dest.Address),
-					Port:    uint32(dest.Port),
+					Address:  net.NewIPOrDomain(dest.Address),
+					Port:     uint32(dest.Port),
 					Networks: []net.Network{net.Network_UDP},
 				}),
 			},
@ -447,8 +447,8 @@ func TestShadowsocksNone(t *testing.T) {
 					Listen:    net.NewIPOrDomain(net.LocalHostIP),
 				}),
 				ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
-					Address: net.NewIPOrDomain(dest.Address),
-					Port:    uint32(dest.Port),
+					Address:  net.NewIPOrDomain(dest.Address),
+					Port:     uint32(dest.Port),
 					Networks: []net.Network{net.Network_TCP},
 				}),
 			},
--- a/testing/scenarios/vmess_test.go
+++ b/testing/scenarios/vmess_test.go
@ -5,6 +5,8 @@ import (
 	"testing"
 	"time"

+	"golang.org/x/sync/errgroup"
+
 	"github.com/xtls/xray-core/app/log"
 	"github.com/xtls/xray-core/app/proxyman"
 	"github.com/xtls/xray-core/common"
@ -23,7 +25,6 @@ import (
 	"github.com/xtls/xray-core/testing/servers/udp"
 	"github.com/xtls/xray-core/transport/internet"
 	"github.com/xtls/xray-core/transport/internet/kcp"
-	"golang.org/x/sync/errgroup"
 )

 func TestVMessDynamicPort(t *testing.T) {
--- a/transport/internet/domainsocket/dial.go
+++ b/transport/internet/domainsocket/dial.go
@ -1,5 +1,5 @@
-// +build !windows
-// +build !wasm
+//go:build !windows && !wasm
+// +build !windows,!wasm

 package domainsocket

--- a/transport/internet/domainsocket/listener.go
+++ b/transport/internet/domainsocket/listener.go
@ -1,5 +1,5 @@
-// +build !windows
-// +build !wasm
+//go:build !windows && !wasm
+// +build !windows,!wasm

 package domainsocket

--- a/transport/internet/domainsocket/listener_test.go
+++ b/transport/internet/domainsocket/listener_test.go
@ -1,5 +1,5 @@
-// +build !windows
-// +build !android
+//go:build !windows && !android
+// +build !windows,!android

 package domainsocket_test

--- a/transport/internet/filelocker_other.go
+++ b/transport/internet/filelocker_other.go
@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows

 package internet
--- a/transport/internet/http/dialer.go
+++ b/transport/internet/http/dialer.go
@ -10,6 +10,8 @@ import (

 	"github.com/xtls/xray-core/transport/internet/stat"

+	"golang.org/x/net/http2"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/buf"
 	"github.com/xtls/xray-core/common/net"
@ -18,7 +20,6 @@ import (
 	"github.com/xtls/xray-core/transport/internet"
 	"github.com/xtls/xray-core/transport/internet/tls"
 	"github.com/xtls/xray-core/transport/pipe"
-	"golang.org/x/net/http2"
 )

 type dialerConf struct {
--- a/transport/internet/kcp/xor.go
+++ b/transport/internet/kcp/xor.go
@ -1,3 +1,4 @@
+//go:build !amd64
 // +build !amd64

 package kcp
--- a/transport/internet/quic/config.go
+++ b/transport/internet/quic/config.go
@ -5,10 +5,11 @@ import (
 	"crypto/cipher"
 	"crypto/sha256"

+	"golang.org/x/crypto/chacha20poly1305"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/protocol"
 	"github.com/xtls/xray-core/transport/internet"
-	"golang.org/x/crypto/chacha20poly1305"
 )

 func getAuth(config *Config) (cipher.AEAD, error) {
--- a/transport/internet/quic/conn.go
+++ b/transport/internet/quic/conn.go
@ -7,6 +7,7 @@ import (
 	"time"

 	"github.com/lucas-clemente/quic-go"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/buf"
 	"github.com/xtls/xray-core/common/net"
--- a/transport/internet/quic/dialer.go
+++ b/transport/internet/quic/dialer.go
@ -8,6 +8,7 @@ import (
 	"github.com/xtls/xray-core/transport/internet/stat"

 	"github.com/lucas-clemente/quic-go"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/common/task"
--- a/transport/internet/quic/hub.go
+++ b/transport/internet/quic/hub.go
@ -5,6 +5,7 @@ import (
 	"time"

 	"github.com/lucas-clemente/quic-go"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/common/protocol/tls/cert"
--- a/transport/internet/sockopt_other.go
+++ b/transport/internet/sockopt_other.go
@ -1,3 +1,4 @@
+//go:build js || dragonfly || netbsd || openbsd || solaris
 // +build js dragonfly netbsd openbsd solaris

 package internet
--- a/transport/internet/sockopt_test.go
+++ b/transport/internet/sockopt_test.go
@ -5,6 +5,7 @@ import (
 	"testing"

 	"github.com/google/go-cmp/cmp"
+
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/buf"
 	"github.com/xtls/xray-core/testing/servers/tcp"
--- a/transport/internet/system_listener.go
+++ b/transport/internet/system_listener.go
@ -6,6 +6,7 @@ import (
 	"syscall"

 	"github.com/pires/go-proxyproto"
+
 	"github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/common/session"
 )
--- a/transport/internet/tcp/sockopt_freebsd.go
+++ b/transport/internet/tcp/sockopt_freebsd.go
@ -1,3 +1,4 @@
+//go:build freebsd
 // +build freebsd

 package tcp
--- a/transport/internet/tcp/sockopt_linux.go
+++ b/transport/internet/tcp/sockopt_linux.go
@ -1,3 +1,4 @@
+//go:build linux
 // +build linux

 package tcp
--- a/transport/internet/tcp/sockopt_linux_test.go
+++ b/transport/internet/tcp/sockopt_linux_test.go
@ -1,3 +1,4 @@
+//go:build linux
 // +build linux

 package tcp_test
--- a/transport/internet/tcp/sockopt_other.go
+++ b/transport/internet/tcp/sockopt_other.go
@ -1,3 +1,4 @@
+//go:build !linux && !freebsd
 // +build !linux,!freebsd

 package tcp
--- a/transport/internet/tls/config_other.go
+++ b/transport/internet/tls/config_other.go
@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows

 package tls
--- a/transport/internet/tls/config_windows.go
+++ b/transport/internet/tls/config_windows.go
@ -1,3 +1,4 @@
+//go:build windows
 // +build windows

 package tls
--- a/transport/internet/udp/hub_freebsd.go
+++ b/transport/internet/udp/hub_freebsd.go
@ -1,3 +1,4 @@
+//go:build freebsd
 // +build freebsd

 package udp
--- a/transport/internet/udp/hub_linux.go
+++ b/transport/internet/udp/hub_linux.go
@ -1,3 +1,4 @@
+//go:build linux
 // +build linux

 package udp
@ -5,8 +6,9 @@ package udp
 import (
 	"syscall"

-	"github.com/xtls/xray-core/common/net"
 	"golang.org/x/sys/unix"
+
+	"github.com/xtls/xray-core/common/net"
 )

 func RetrieveOriginalDest(oob []byte) net.Destination {
--- a/transport/internet/udp/hub_other.go
+++ b/transport/internet/udp/hub_other.go
@ -1,3 +1,4 @@
+//go:build !linux && !freebsd
 // +build !linux,!freebsd

 package udp
--- a/transport/internet/websocket/connection.go
+++ b/transport/internet/websocket/connection.go
@ -6,6 +6,7 @@ import (
 	"time"

 	"github.com/gorilla/websocket"
+
 	"github.com/xtls/xray-core/common/buf"
 	"github.com/xtls/xray-core/common/errors"
 	"github.com/xtls/xray-core/common/serial"
--- a/transport/internet/xtls/config_other.go
+++ b/transport/internet/xtls/config_other.go
@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows

 package xtls
--- a/transport/internet/xtls/config_windows.go
+++ b/transport/internet/xtls/config_windows.go
@ -1,3 +1,4 @@
+//go:build windows
 // +build windows

 package xtls