diff --git a/app/commander/commander.go b/app/commander/commander.go index 556b84a56..49a515d72 100644 --- a/app/commander/commander.go +++ b/app/commander/commander.go @@ -4,8 +4,6 @@ package commander import ( "context" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/v5cfg" "net" "sync" @@ -13,8 +11,10 @@ import ( core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/common/signal/done" "github.com/v2fly/v2ray-core/v4/features/outbound" + "github.com/v2fly/v2ray-core/v4/infra/conf/v5cfg" ) // Commander is a V2Ray feature that provides gRPC methods to external clients. diff --git a/app/dns/dns.go b/app/dns/dns.go index 75c22b535..cddc7f834 100644 --- a/app/dns/dns.go +++ b/app/dns/dns.go @@ -9,9 +9,6 @@ package dns import ( "context" "fmt" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" "strings" "sync" @@ -19,10 +16,13 @@ import ( "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/errors" "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v4/common/platform" "github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v4/common/strmatcher" "github.com/v2fly/v2ray-core/v4/features" "github.com/v2fly/v2ray-core/v4/features/dns" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" ) // DNS is a DNS rely server. diff --git a/app/dns/dns_test.go b/app/dns/dns_test.go index 69d7139d7..2b461b95a 100644 --- a/app/dns/dns_test.go +++ b/app/dns/dns_test.go @@ -1,13 +1,12 @@ package dns_test import ( - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "google.golang.org/protobuf/types/known/anypb" "testing" "time" "github.com/google/go-cmp/cmp" "github.com/miekg/dns" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dispatcher" @@ -15,6 +14,7 @@ import ( "github.com/v2fly/v2ray-core/v4/app/policy" "github.com/v2fly/v2ray-core/v4/app/proxyman" _ "github.com/v2fly/v2ray-core/v4/app/proxyman/outbound" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/serial" diff --git a/app/instman/command/command.go b/app/instman/command/command.go index 0d8bc39ff..465c7fe51 100644 --- a/app/instman/command/command.go +++ b/app/instman/command/command.go @@ -3,10 +3,12 @@ package command import ( "context" "encoding/base64" + + "google.golang.org/grpc" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/features/extension" - "google.golang.org/grpc" ) type service struct { diff --git a/app/instman/instman.go b/app/instman/instman.go index 965d2c476..d703cf885 100644 --- a/app/instman/instman.go +++ b/app/instman/instman.go @@ -2,6 +2,7 @@ package instman import ( "context" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/features/extension" @@ -28,7 +29,7 @@ func (i InstanceMgr) Close() error { func (i InstanceMgr) ListInstance(ctx context.Context) ([]string, error) { var instanceNames []string - for k, _ := range i.instances { + for k := range i.instances { instanceNames = append(instanceNames, k) } return instanceNames, nil diff --git a/app/log/command/command_test.go b/app/log/command/command_test.go index 84b034235..d8d551c87 100644 --- a/app/log/command/command_test.go +++ b/app/log/command/command_test.go @@ -2,9 +2,10 @@ package command_test import ( "context" - "google.golang.org/protobuf/types/known/anypb" "testing" + "google.golang.org/protobuf/types/known/anypb" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dispatcher" "github.com/v2fly/v2ray-core/v4/app/log" diff --git a/app/observatory/burst/burstobserver.go b/app/observatory/burst/burstobserver.go index a1bf45455..16590031f 100644 --- a/app/observatory/burst/burstobserver.go +++ b/app/observatory/burst/burstobserver.go @@ -2,14 +2,16 @@ package burst import ( "context" + "sync" + "github.com/golang/protobuf/proto" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/observatory" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/signal/done" "github.com/v2fly/v2ray-core/v4/features/extension" "github.com/v2fly/v2ray-core/v4/features/outbound" - "sync" ) type Observer struct { diff --git a/app/observatory/burst/healthping_result_test.go b/app/observatory/burst/healthping_result_test.go index 8dae359a3..1b4fdc3ca 100644 --- a/app/observatory/burst/healthping_result_test.go +++ b/app/observatory/burst/healthping_result_test.go @@ -1,11 +1,12 @@ package burst_test import ( - "github.com/v2fly/v2ray-core/v4/app/observatory/burst" "math" reflect "reflect" "testing" "time" + + "github.com/v2fly/v2ray-core/v4/app/observatory/burst" ) func TestHealthPingResults(t *testing.T) { diff --git a/app/observatory/burst/ping.go b/app/observatory/burst/ping.go index 41dde8da6..6641ecb7e 100644 --- a/app/observatory/burst/ping.go +++ b/app/observatory/burst/ping.go @@ -2,11 +2,11 @@ package burst import ( "context" - "github.com/v2fly/v2ray-core/v4/transport/internet/tagged" "net/http" "time" "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v4/transport/internet/tagged" ) type pingClient struct { diff --git a/app/observatory/command/command.go b/app/observatory/command/command.go index aa1962bd9..50243c059 100644 --- a/app/observatory/command/command.go +++ b/app/observatory/command/command.go @@ -7,14 +7,14 @@ package command import ( "context" - "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/golang/protobuf/proto" "google.golang.org/grpc" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/observatory" "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v4/features" "github.com/v2fly/v2ray-core/v4/features/extension" ) diff --git a/app/observatory/multiObservatory/muti.go b/app/observatory/multiObservatory/muti.go index c8baa6d20..fcca37937 100644 --- a/app/observatory/multiObservatory/muti.go +++ b/app/observatory/multiObservatory/muti.go @@ -2,8 +2,10 @@ package multiObservatory import ( "context" + "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/taggedfeatures" "github.com/v2fly/v2ray-core/v4/features" diff --git a/app/proxyman/command/command.go b/app/proxyman/command/command.go index 762eddf60..fd9a907ff 100644 --- a/app/proxyman/command/command.go +++ b/app/proxyman/command/command.go @@ -2,12 +2,12 @@ package command import ( "context" - "github.com/v2fly/v2ray-core/v4/common/serial" grpc "google.golang.org/grpc" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/features/inbound" "github.com/v2fly/v2ray-core/v4/features/outbound" "github.com/v2fly/v2ray-core/v4/proxy" diff --git a/app/proxyman/outbound/handler.go b/app/proxyman/outbound/handler.go index 6451def2a..ad6d4ed13 100644 --- a/app/proxyman/outbound/handler.go +++ b/app/proxyman/outbound/handler.go @@ -2,13 +2,13 @@ package outbound import ( "context" - "github.com/v2fly/v2ray-core/v4/common/serial" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/proxyman" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/mux" "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v4/features/outbound" "github.com/v2fly/v2ray-core/v4/features/policy" diff --git a/app/proxyman/outbound/handler_test.go b/app/proxyman/outbound/handler_test.go index ebc9fed78..815e9d622 100644 --- a/app/proxyman/outbound/handler_test.go +++ b/app/proxyman/outbound/handler_test.go @@ -2,10 +2,11 @@ package outbound_test import ( "context" - "google.golang.org/protobuf/types/known/anypb" "testing" _ "unsafe" + "google.golang.org/protobuf/types/known/anypb" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/policy" . "github.com/v2fly/v2ray-core/v4/app/proxyman/outbound" diff --git a/app/restful-api/config.go b/app/restful-api/config.go index f5ddf6cae..eb089ba1c 100644 --- a/app/restful-api/config.go +++ b/app/restful-api/config.go @@ -2,6 +2,7 @@ package restful_api import ( "context" + "github.com/v2fly/v2ray-core/v4/common" ) diff --git a/app/restful-api/restful-api.go b/app/restful-api/restful-api.go index 8526d16f2..afcdb5457 100644 --- a/app/restful-api/restful-api.go +++ b/app/restful-api/restful-api.go @@ -1,16 +1,17 @@ package restful_api import ( + "net/http" + "strings" + "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "github.com/go-chi/render" "github.com/go-playground/validator/v10" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/transport/internet" - - "net/http" - "strings" ) var validate *validator.Validate diff --git a/app/restful-api/service.go b/app/restful-api/service.go index 101a04676..9b0fc6683 100644 --- a/app/restful-api/service.go +++ b/app/restful-api/service.go @@ -2,11 +2,12 @@ package restful_api import ( "context" + "net" + "sync" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/features" feature_stats "github.com/v2fly/v2ray-core/v4/features/stats" - "net" - "sync" ) //go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen diff --git a/app/restful-api/service_test.go b/app/restful-api/service_test.go index f05953297..850d918e7 100644 --- a/app/restful-api/service_test.go +++ b/app/restful-api/service_test.go @@ -1,9 +1,10 @@ package restful_api import ( - "github.com/stretchr/testify/assert" "reflect" "testing" + + "github.com/stretchr/testify/assert" ) func TestTypeReturnAnonymousType(t *testing.T) { diff --git a/app/router/command/command.go b/app/router/command/command.go index 2fc24872c..b18a5b654 100644 --- a/app/router/command/command.go +++ b/app/router/command/command.go @@ -6,11 +6,12 @@ import ( "context" "time" + "google.golang.org/grpc" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/features/routing" "github.com/v2fly/v2ray-core/v4/features/stats" - "google.golang.org/grpc" ) // routingServer is an implementation of RoutingService. diff --git a/app/router/command/command_test.go b/app/router/command/command_test.go index c9889bb62..1d305e712 100644 --- a/app/router/command/command_test.go +++ b/app/router/command/command_test.go @@ -2,7 +2,6 @@ package command_test import ( "context" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "testing" "time" @@ -14,6 +13,7 @@ import ( "github.com/v2fly/v2ray-core/v4/app/router" . "github.com/v2fly/v2ray-core/v4/app/router/command" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/app/stats" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" diff --git a/app/router/condition.go b/app/router/condition.go index ec53ca802..eea61d3bd 100644 --- a/app/router/condition.go +++ b/app/router/condition.go @@ -1,12 +1,12 @@ package router import ( - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "strings" "go.starlark.net/starlark" "go.starlark.net/syntax" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/strmatcher" "github.com/v2fly/v2ray-core/v4/features/routing" diff --git a/app/router/condition_geoip.go b/app/router/condition_geoip.go index 536dbf2e5..3dd8d92d6 100644 --- a/app/router/condition_geoip.go +++ b/app/router/condition_geoip.go @@ -1,9 +1,9 @@ package router import ( - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "inet.af/netaddr" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common/net" ) diff --git a/app/router/condition_geoip_test.go b/app/router/condition_geoip_test.go index 00c5ff37c..bfbef8afb 100644 --- a/app/router/condition_geoip_test.go +++ b/app/router/condition_geoip_test.go @@ -2,7 +2,6 @@ package router_test import ( "errors" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "io/fs" "os" "path/filepath" @@ -12,6 +11,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/v2fly/v2ray-core/v4/app/router" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" diff --git a/app/router/condition_test.go b/app/router/condition_test.go index 08787de1c..ae3732f66 100644 --- a/app/router/condition_test.go +++ b/app/router/condition_test.go @@ -2,7 +2,6 @@ package router_test import ( "errors" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "io/fs" "os" "path/filepath" @@ -13,6 +12,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/v2fly/v2ray-core/v4/app/router" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" diff --git a/app/router/config.go b/app/router/config.go index 3cf798e0e..cf943771b 100644 --- a/app/router/config.go +++ b/app/router/config.go @@ -6,7 +6,9 @@ package router import ( "context" "encoding/json" + "github.com/golang/protobuf/jsonpb" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/serial" diff --git a/app/router/router.go b/app/router/router.go index 35c158f7f..8073c2440 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -4,6 +4,7 @@ package router import ( "context" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" diff --git a/app/router/router_test.go b/app/router/router_test.go index afc7bc88f..49d6efcb6 100644 --- a/app/router/router_test.go +++ b/app/router/router_test.go @@ -2,12 +2,12 @@ package router_test import ( "context" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "testing" "github.com/golang/mock/gomock" . "github.com/v2fly/v2ray-core/v4/app/router" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/session" diff --git a/app/router/strategy_leastload.go b/app/router/strategy_leastload.go index 24a758b52..4b33c0392 100644 --- a/app/router/strategy_leastload.go +++ b/app/router/strategy_leastload.go @@ -2,17 +2,18 @@ package router import ( "context" - "github.com/golang/protobuf/proto" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/observatory" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features" - "github.com/v2fly/v2ray-core/v4/features/extension" "math" "sort" "time" + "github.com/golang/protobuf/proto" + + core "github.com/v2fly/v2ray-core/v4" + "github.com/v2fly/v2ray-core/v4/app/observatory" + "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/dice" + "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v4/features/extension" ) // LeastLoadStrategy represents a least load balancing strategy diff --git a/app/router/strategy_leastping.go b/app/router/strategy_leastping.go index 2e1a88f54..10a8b3990 100644 --- a/app/router/strategy_leastping.go +++ b/app/router/strategy_leastping.go @@ -5,11 +5,11 @@ package router import ( "context" - "github.com/v2fly/v2ray-core/v4/features" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/observatory" "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v4/features" "github.com/v2fly/v2ray-core/v4/features/extension" ) diff --git a/common/net/address.go b/common/net/address.go index 6d522522a..677449571 100644 --- a/common/net/address.go +++ b/common/net/address.go @@ -3,9 +3,10 @@ package net import ( "bytes" "encoding/json" - "github.com/golang/protobuf/jsonpb" "net" "strings" + + "github.com/golang/protobuf/jsonpb" ) var ( diff --git a/common/platform/filesystem/file.go b/common/platform/filesystem/file.go index 58997adfc..73689e31d 100644 --- a/common/platform/filesystem/file.go +++ b/common/platform/filesystem/file.go @@ -1,12 +1,12 @@ package filesystem import ( - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem/fsifce" "io" "os" "github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v4/common/platform" + "github.com/v2fly/v2ray-core/v4/common/platform/filesystem/fsifce" ) var NewFileSeeker fsifce.FileSeekerFunc = func(path string) (io.ReadSeekCloser, error) { diff --git a/common/protoext/testing/extension_test.go b/common/protoext/testing/extension_test.go index 4fce62556..82c1561e2 100644 --- a/common/protoext/testing/extension_test.go +++ b/common/protoext/testing/extension_test.go @@ -1,10 +1,12 @@ package testing import ( - "github.com/stretchr/testify/assert" - "github.com/v2fly/v2ray-core/v4/common/protoext" - "google.golang.org/protobuf/reflect/protoreflect" "testing" + + "github.com/stretchr/testify/assert" + "google.golang.org/protobuf/reflect/protoreflect" + + "github.com/v2fly/v2ray-core/v4/common/protoext" ) func TestMessageOpt(t *testing.T) { diff --git a/common/protofilter/filter.go b/common/protofilter/filter.go index 5ff1c061e..b834791b9 100644 --- a/common/protofilter/filter.go +++ b/common/protofilter/filter.go @@ -2,13 +2,15 @@ package protofilter import ( "context" + "io" + "net" + + "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/reflect/protoreflect" + "github.com/v2fly/v2ray-core/v4/common/environment/envctx" "github.com/v2fly/v2ray-core/v4/common/environment/filesystemcap" "github.com/v2fly/v2ray-core/v4/common/protoext" - "google.golang.org/protobuf/proto" - "google.golang.org/protobuf/reflect/protoreflect" - "io" - "net" ) //go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen diff --git a/common/registry/implementation_set.go b/common/registry/implementation_set.go index e707ec14d..51468ee4f 100644 --- a/common/registry/implementation_set.go +++ b/common/registry/implementation_set.go @@ -2,6 +2,7 @@ package registry import ( "github.com/golang/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/common/protoext" ) diff --git a/common/registry/registry.go b/common/registry/registry.go index 0ebc764f3..c22eea373 100644 --- a/common/registry/registry.go +++ b/common/registry/registry.go @@ -3,15 +3,17 @@ package registry import ( "bytes" "context" - "github.com/golang/protobuf/jsonpb" - "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/protoext" - "github.com/v2fly/v2ray-core/v4/common/protofilter" - "github.com/v2fly/v2ray-core/v4/common/serial" - protov2 "google.golang.org/protobuf/proto" "reflect" "strings" "sync" + + "github.com/golang/protobuf/jsonpb" + "github.com/golang/protobuf/proto" + protov2 "google.golang.org/protobuf/proto" + + "github.com/v2fly/v2ray-core/v4/common/protoext" + "github.com/v2fly/v2ray-core/v4/common/protofilter" + "github.com/v2fly/v2ray-core/v4/common/serial" ) type implementationRegistry struct { diff --git a/common/serial/typed_message.go b/common/serial/typed_message.go index 38738644f..b3102fb80 100644 --- a/common/serial/typed_message.go +++ b/common/serial/typed_message.go @@ -2,11 +2,11 @@ package serial import ( "errors" - "google.golang.org/protobuf/types/known/anypb" "reflect" "strings" "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/types/known/anypb" ) const V2RayTypeURLHeader = "types.v2fly.org/" diff --git a/common/taggedfeatures/configloader.go b/common/taggedfeatures/configloader.go index 14728bf23..dc2f844ae 100644 --- a/common/taggedfeatures/configloader.go +++ b/common/taggedfeatures/configloader.go @@ -3,9 +3,11 @@ package taggedfeatures import ( "context" "encoding/json" + + "google.golang.org/protobuf/types/known/anypb" + "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/infra/conf/v5cfg" - "google.golang.org/protobuf/types/known/anypb" ) func LoadJsonConfig(ctx context.Context, interfaceType, defaultImpl string, message json.RawMessage) (*Config, error) { diff --git a/common/taggedfeatures/creator.go b/common/taggedfeatures/creator.go index d31a0d785..818ac15d4 100644 --- a/common/taggedfeatures/creator.go +++ b/common/taggedfeatures/creator.go @@ -2,6 +2,7 @@ package taggedfeatures import ( "context" + "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/features" diff --git a/common/taggedfeatures/holder.go b/common/taggedfeatures/holder.go index e8057b5e9..3abcec2ef 100644 --- a/common/taggedfeatures/holder.go +++ b/common/taggedfeatures/holder.go @@ -2,10 +2,11 @@ package taggedfeatures import ( "context" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features" "reflect" "sync" + + "github.com/v2fly/v2ray-core/v4/common/task" + "github.com/v2fly/v2ray-core/v4/features" ) type Holder struct { @@ -56,7 +57,7 @@ func (h *Holder) GetFeaturesTag() ([]string, error) { h.access.RLock() defer h.access.RUnlock() var ret []string - for key, _ := range h.features { + for key := range h.features { ret = append(ret, key) } return ret, nil diff --git a/features/extension/instance.go b/features/extension/instance.go index ec57aac68..3cde039d5 100644 --- a/features/extension/instance.go +++ b/features/extension/instance.go @@ -2,6 +2,7 @@ package extension import ( "context" + "github.com/v2fly/v2ray-core/v4/features" ) diff --git a/features/extension/storage.go b/features/extension/storage.go index 85ed90fef..076bfe338 100644 --- a/features/extension/storage.go +++ b/features/extension/storage.go @@ -2,6 +2,7 @@ package extension import ( "context" + "github.com/v2fly/v2ray-core/v4/features" ) diff --git a/functions_test.go b/functions_test.go index e36cce86a..291b16719 100644 --- a/functions_test.go +++ b/functions_test.go @@ -3,13 +3,13 @@ package core_test import ( "context" "crypto/rand" - "google.golang.org/protobuf/types/known/anypb" "io" "testing" "time" "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dispatcher" diff --git a/infra/conf/cfgcommon/buildable.go b/infra/conf/cfgcommon/buildable.go index 38d88796c..e5bcf4997 100644 --- a/infra/conf/cfgcommon/buildable.go +++ b/infra/conf/cfgcommon/buildable.go @@ -2,6 +2,7 @@ package cfgcommon import ( "context" + "github.com/golang/protobuf/proto" ) diff --git a/infra/conf/cfgcommon/session.go b/infra/conf/cfgcommon/session.go index 2fcf73882..0bd18be77 100644 --- a/infra/conf/cfgcommon/session.go +++ b/infra/conf/cfgcommon/session.go @@ -2,6 +2,7 @@ package cfgcommon import ( "context" + "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" ) diff --git a/infra/conf/cfgcommon/sniffer/sniffer.go b/infra/conf/cfgcommon/sniffer/sniffer.go index 9cf246c1b..84654cc54 100644 --- a/infra/conf/cfgcommon/sniffer/sniffer.go +++ b/infra/conf/cfgcommon/sniffer/sniffer.go @@ -1,9 +1,10 @@ package sniffer import ( + "strings" + "github.com/v2fly/v2ray-core/v4/app/proxyman" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "strings" ) //go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen diff --git a/infra/conf/cfgcommon/socketcfg/socket.go b/infra/conf/cfgcommon/socketcfg/socket.go index eb1bdb918..12c4a95d2 100644 --- a/infra/conf/cfgcommon/socketcfg/socket.go +++ b/infra/conf/cfgcommon/socketcfg/socket.go @@ -1,8 +1,9 @@ package socketcfg import ( - "github.com/v2fly/v2ray-core/v4/transport/internet" "strings" + + "github.com/v2fly/v2ray-core/v4/transport/internet" ) type SocketConfig struct { diff --git a/infra/conf/cfgcommon/testassist/general.go b/infra/conf/cfgcommon/testassist/general.go index 534520d4d..7fe26c8d5 100644 --- a/infra/conf/cfgcommon/testassist/general.go +++ b/infra/conf/cfgcommon/testassist/general.go @@ -2,12 +2,12 @@ package testassist import ( "encoding/json" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "testing" "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" ) func LoadJSON(creator func() cfgcommon.Buildable) func(string) (proto.Message, error) { diff --git a/infra/conf/cfgcommon/tlscfg/tls.go b/infra/conf/cfgcommon/tlscfg/tls.go index 1280d7d1d..b5a5a7d74 100644 --- a/infra/conf/cfgcommon/tlscfg/tls.go +++ b/infra/conf/cfgcommon/tlscfg/tls.go @@ -2,11 +2,13 @@ package tlscfg import ( "encoding/base64" + "strings" + "github.com/golang/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/transport/internet/tls" - "strings" ) //go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen diff --git a/infra/conf/geodata/geodata.go b/infra/conf/geodata/geodata.go index 8f05e6017..1c82fcd18 100644 --- a/infra/conf/geodata/geodata.go +++ b/infra/conf/geodata/geodata.go @@ -1,8 +1,9 @@ package geodata import ( - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "strings" + + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" ) type loader struct { diff --git a/infra/conf/geodata/memconservative/cache.go b/infra/conf/geodata/memconservative/cache.go index 43b6eaa3b..b197bd03e 100644 --- a/infra/conf/geodata/memconservative/cache.go +++ b/infra/conf/geodata/memconservative/cache.go @@ -1,12 +1,12 @@ package memconservative import ( - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "io/ioutil" "strings" "google.golang.org/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common/platform" ) diff --git a/infra/conf/geodata/memconservative/memc.go b/infra/conf/geodata/memconservative/memc.go index 82bfc509e..218f812c2 100644 --- a/infra/conf/geodata/memconservative/memc.go +++ b/infra/conf/geodata/memconservative/memc.go @@ -1,9 +1,9 @@ package memconservative import ( - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "runtime" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" ) diff --git a/infra/conf/geodata/standard/standard.go b/infra/conf/geodata/standard/standard.go index 4ce003b84..4cd456380 100644 --- a/infra/conf/geodata/standard/standard.go +++ b/infra/conf/geodata/standard/standard.go @@ -1,11 +1,11 @@ package standard import ( - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "strings" "google.golang.org/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" ) diff --git a/infra/conf/jsonpb/jsonpb.go b/infra/conf/jsonpb/jsonpb.go index 0d15de6da..c10ee3571 100644 --- a/infra/conf/jsonpb/jsonpb.go +++ b/infra/conf/jsonpb/jsonpb.go @@ -2,14 +2,16 @@ package jsonpb import ( "bytes" + "io" + "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v4/common/cmdarg" "github.com/v2fly/v2ray-core/v4/common/serial" - "io" ) //go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen diff --git a/infra/conf/rule/rule.go b/infra/conf/rule/rule.go index ebe71de7d..045ade964 100644 --- a/infra/conf/rule/rule.go +++ b/infra/conf/rule/rule.go @@ -3,11 +3,11 @@ package rule import ( "context" "encoding/json" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "strconv" "strings" "github.com/v2fly/v2ray-core/v4/app/router" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" ) diff --git a/infra/conf/serial/loader.go b/infra/conf/serial/loader.go index 6d1472753..f36541514 100644 --- a/infra/conf/serial/loader.go +++ b/infra/conf/serial/loader.go @@ -3,12 +3,12 @@ package serial import ( "bytes" "encoding/json" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "io" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common/errors" json_reader "github.com/v2fly/v2ray-core/v4/infra/conf/json" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" ) type offset struct { diff --git a/infra/conf/synthetic/dns/dns.go b/infra/conf/synthetic/dns/dns.go index 88f2d9b52..5e9f85855 100644 --- a/infra/conf/synthetic/dns/dns.go +++ b/infra/conf/synthetic/dns/dns.go @@ -5,11 +5,11 @@ package dns import ( "context" "encoding/json" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "sort" "strings" "github.com/v2fly/v2ray-core/v4/app/dns" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/platform" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" @@ -148,7 +148,7 @@ type DNSConfig struct { DisableCache bool `json:"disableCache"` DisableFallback bool `json:"disableFallback"` DisableFallbackIfMatch bool `json:"disableFallbackIfMatch"` - cfgctx context.Context + cfgctx context.Context } type HostAddress struct { diff --git a/infra/conf/synthetic/dns/dns_test.go b/infra/conf/synthetic/dns/dns_test.go index 8616e7dd8..d20e1efea 100644 --- a/infra/conf/synthetic/dns/dns_test.go +++ b/infra/conf/synthetic/dns/dns_test.go @@ -3,7 +3,6 @@ package dns_test import ( "encoding/json" "errors" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" "io/fs" "os" "path/filepath" @@ -15,8 +14,8 @@ import ( "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard" - dns2 "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/dns" ) diff --git a/infra/conf/synthetic/router/router_strategy.go b/infra/conf/synthetic/router/router_strategy.go index 3412e197b..613ce612c 100644 --- a/infra/conf/synthetic/router/router_strategy.go +++ b/infra/conf/synthetic/router/router_strategy.go @@ -2,11 +2,11 @@ package router import ( "github.com/golang/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/app/observatory/burst" + "github.com/v2fly/v2ray-core/v4/app/router" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/duration" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/loader" - - "github.com/v2fly/v2ray-core/v4/app/router" ) const ( diff --git a/infra/conf/synthetic/router/router_test.go b/infra/conf/synthetic/router/router_test.go index 1c0fd6fd3..26b9e249f 100644 --- a/infra/conf/synthetic/router/router_test.go +++ b/infra/conf/synthetic/router/router_test.go @@ -2,9 +2,6 @@ package router_test import ( "encoding/json" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - router2 "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/router" "testing" "time" _ "unsafe" @@ -12,12 +9,15 @@ import ( "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/app/router" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" // Geo loaders _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/memconservative" _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard" + router2 "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/router" ) func TestRouterConfig(t *testing.T) { diff --git a/infra/conf/v2jsonpb/follower.go b/infra/conf/v2jsonpb/follower.go index c4a3e2ed5..5d7512c10 100644 --- a/infra/conf/v2jsonpb/follower.go +++ b/infra/conf/v2jsonpb/follower.go @@ -1,10 +1,11 @@ package v2jsonpb import ( - "github.com/v2fly/v2ray-core/v4/common/serial" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/types/known/anypb" + + "github.com/v2fly/v2ray-core/v4/common/serial" ) type V2JsonProtobufFollowerFieldDescriptor struct { diff --git a/infra/conf/v2jsonpb/v2jsonpb.go b/infra/conf/v2jsonpb/v2jsonpb.go index 06ce8c679..cf8b2b597 100644 --- a/infra/conf/v2jsonpb/v2jsonpb.go +++ b/infra/conf/v2jsonpb/v2jsonpb.go @@ -1,7 +1,8 @@ package v2jsonpb import ( - "github.com/v2fly/v2ray-core/v4/common/serial" + "io" + "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" @@ -9,7 +10,7 @@ import ( "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v4/common/cmdarg" - "io" + "github.com/v2fly/v2ray-core/v4/common/serial" ) //go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen diff --git a/infra/conf/v4/api.go b/infra/conf/v4/api.go index 03df347f2..5aa0c9499 100644 --- a/infra/conf/v4/api.go +++ b/infra/conf/v4/api.go @@ -1,11 +1,11 @@ package v4 import ( - "google.golang.org/protobuf/types/known/anypb" "strings" "github.com/jhump/protoreflect/desc" "github.com/jhump/protoreflect/dynamic" + "google.golang.org/protobuf/types/known/anypb" "github.com/v2fly/v2ray-core/v4/app/commander" loggerservice "github.com/v2fly/v2ray-core/v4/app/log/command" diff --git a/infra/conf/v4/blackhole.go b/infra/conf/v4/blackhole.go index 24db6441a..bb19f8fc7 100644 --- a/infra/conf/v4/blackhole.go +++ b/infra/conf/v4/blackhole.go @@ -2,12 +2,12 @@ package v4 import ( "encoding/json" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/loader" "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/loader" "github.com/v2fly/v2ray-core/v4/proxy/blackhole" ) diff --git a/infra/conf/v4/blackhole_test.go b/infra/conf/v4/blackhole_test.go index 068098609..9d3f7c9b3 100644 --- a/infra/conf/v4/blackhole_test.go +++ b/infra/conf/v4/blackhole_test.go @@ -1,12 +1,12 @@ package v4_test import ( - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "testing" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "github.com/v2fly/v2ray-core/v4/proxy/blackhole" ) diff --git a/infra/conf/v4/dns_proxy_test.go b/infra/conf/v4/dns_proxy_test.go index b8ce44993..f99cf9583 100644 --- a/infra/conf/v4/dns_proxy_test.go +++ b/infra/conf/v4/dns_proxy_test.go @@ -1,12 +1,12 @@ package v4_test import ( - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "testing" "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "github.com/v2fly/v2ray-core/v4/proxy/dns" ) diff --git a/infra/conf/v4/dokodemo_test.go b/infra/conf/v4/dokodemo_test.go index d79459eab..ce2298138 100644 --- a/infra/conf/v4/dokodemo_test.go +++ b/infra/conf/v4/dokodemo_test.go @@ -1,12 +1,12 @@ package v4_test import ( - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "testing" "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" ) diff --git a/infra/conf/v4/freedom_test.go b/infra/conf/v4/freedom_test.go index 39177a723..22e54faf0 100644 --- a/infra/conf/v4/freedom_test.go +++ b/infra/conf/v4/freedom_test.go @@ -1,13 +1,13 @@ package v4_test import ( - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "testing" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "github.com/v2fly/v2ray-core/v4/proxy/freedom" ) diff --git a/infra/conf/v4/http_test.go b/infra/conf/v4/http_test.go index 15f14a6cd..d4f91f53a 100644 --- a/infra/conf/v4/http_test.go +++ b/infra/conf/v4/http_test.go @@ -1,11 +1,11 @@ package v4_test import ( + "testing" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "testing" - "github.com/v2fly/v2ray-core/v4/proxy/http" ) diff --git a/infra/conf/v4/observatory.go b/infra/conf/v4/observatory.go index 134d7ce76..e7f2acf57 100644 --- a/infra/conf/v4/observatory.go +++ b/infra/conf/v4/observatory.go @@ -2,16 +2,17 @@ package v4 import ( "encoding/json" + "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/types/known/anypb" + + "github.com/v2fly/v2ray-core/v4/app/observatory" "github.com/v2fly/v2ray-core/v4/app/observatory/burst" "github.com/v2fly/v2ray-core/v4/app/observatory/multiObservatory" "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/common/taggedfeatures" - "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/router" - "google.golang.org/protobuf/types/known/anypb" - - "github.com/v2fly/v2ray-core/v4/app/observatory" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/duration" + "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/router" ) type ObservatoryConfig struct { diff --git a/infra/conf/v4/policy_test.go b/infra/conf/v4/policy_test.go index b711b2ce3..12f1b714b 100644 --- a/infra/conf/v4/policy_test.go +++ b/infra/conf/v4/policy_test.go @@ -1,10 +1,10 @@ package v4_test import ( - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "testing" "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" ) func TestBufferSize(t *testing.T) { diff --git a/infra/conf/v4/reverse_test.go b/infra/conf/v4/reverse_test.go index 2da40daea..ddb0fafec 100644 --- a/infra/conf/v4/reverse_test.go +++ b/infra/conf/v4/reverse_test.go @@ -1,12 +1,12 @@ package v4_test import ( - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "testing" "github.com/v2fly/v2ray-core/v4/app/reverse" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" ) func TestReverseConfig(t *testing.T) { diff --git a/infra/conf/v4/services.go b/infra/conf/v4/services.go index 2f427d768..c5bc9c5f6 100644 --- a/infra/conf/v4/services.go +++ b/infra/conf/v4/services.go @@ -2,11 +2,11 @@ package v4 import ( "encoding/json" - "google.golang.org/protobuf/types/known/anypb" "github.com/golang/protobuf/jsonpb" "github.com/jhump/protoreflect/desc" "github.com/jhump/protoreflect/dynamic" + "google.golang.org/protobuf/types/known/anypb" "github.com/v2fly/v2ray-core/v4/common/serial" ) diff --git a/infra/conf/v4/shadowsocks_test.go b/infra/conf/v4/shadowsocks_test.go index b8c7566b5..b4bfbb48a 100644 --- a/infra/conf/v4/shadowsocks_test.go +++ b/infra/conf/v4/shadowsocks_test.go @@ -1,14 +1,14 @@ package v4_test import ( - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "testing" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks" ) diff --git a/infra/conf/v4/socks_test.go b/infra/conf/v4/socks_test.go index 6e4d0d2f4..7250efad9 100644 --- a/infra/conf/v4/socks_test.go +++ b/infra/conf/v4/socks_test.go @@ -1,14 +1,14 @@ package v4_test import ( - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "testing" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "github.com/v2fly/v2ray-core/v4/proxy/socks" ) diff --git a/infra/conf/v4/transport_internet.go b/infra/conf/v4/transport_internet.go index b79fcbe53..d560108e8 100644 --- a/infra/conf/v4/transport_internet.go +++ b/infra/conf/v4/transport_internet.go @@ -2,9 +2,6 @@ package v4 import ( "encoding/json" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/loader" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/socketcfg" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/tlscfg" "strings" "github.com/golang/protobuf/proto" @@ -12,6 +9,9 @@ import ( "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/loader" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/socketcfg" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/tlscfg" "github.com/v2fly/v2ray-core/v4/transport/internet" "github.com/v2fly/v2ray-core/v4/transport/internet/domainsocket" httpheader "github.com/v2fly/v2ray-core/v4/transport/internet/headers/http" diff --git a/infra/conf/v4/transport_test.go b/infra/conf/v4/transport_test.go index e3b0ec85f..116097386 100644 --- a/infra/conf/v4/transport_test.go +++ b/infra/conf/v4/transport_test.go @@ -2,15 +2,15 @@ package v4_test import ( "encoding/json" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/socketcfg" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "testing" "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/socketcfg" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "github.com/v2fly/v2ray-core/v4/transport" "github.com/v2fly/v2ray-core/v4/transport/internet" "github.com/v2fly/v2ray-core/v4/transport/internet/headers/http" diff --git a/infra/conf/v4/v2ray.go b/infra/conf/v4/v2ray.go index c41832ade..7b02713c9 100644 --- a/infra/conf/v4/v2ray.go +++ b/infra/conf/v4/v2ray.go @@ -2,22 +2,23 @@ package v4 import ( "encoding/json" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/loader" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/muxcfg" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/proxycfg" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/sniffer" - "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/dns" - "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/log" - "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/router" - "google.golang.org/protobuf/types/known/anypb" "strings" + "google.golang.org/protobuf/types/known/anypb" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dispatcher" "github.com/v2fly/v2ray-core/v4/app/proxyman" "github.com/v2fly/v2ray-core/v4/app/stats" "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/loader" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/muxcfg" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/proxycfg" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/sniffer" + "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/dns" + "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/log" + "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/router" ) var ( diff --git a/infra/conf/v4/v2ray_test.go b/infra/conf/v4/v2ray_test.go index 417099851..a110c8884 100644 --- a/infra/conf/v4/v2ray_test.go +++ b/infra/conf/v4/v2ray_test.go @@ -2,26 +2,30 @@ package v4_test import ( "encoding/json" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/muxcfg" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "google.golang.org/protobuf/types/known/anypb" "reflect" "testing" "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dispatcher" "github.com/v2fly/v2ray-core/v4/app/log" "github.com/v2fly/v2ray-core/v4/app/proxyman" "github.com/v2fly/v2ray-core/v4/app/router" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common" clog "github.com/v2fly/v2ray-core/v4/common/log" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/muxcfg" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + + // Geo loaders + _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/memconservative" + _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "github.com/v2fly/v2ray-core/v4/proxy/blackhole" dns_proxy "github.com/v2fly/v2ray-core/v4/proxy/dns" "github.com/v2fly/v2ray-core/v4/proxy/freedom" @@ -31,10 +35,6 @@ import ( "github.com/v2fly/v2ray-core/v4/transport/internet/http" "github.com/v2fly/v2ray-core/v4/transport/internet/tls" "github.com/v2fly/v2ray-core/v4/transport/internet/websocket" - - // Geo loaders - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/memconservative" - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard" ) func TestV2RayConfig(t *testing.T) { diff --git a/infra/conf/v4/vless_test.go b/infra/conf/v4/vless_test.go index dc14648ef..9b1ca47bf 100644 --- a/infra/conf/v4/vless_test.go +++ b/infra/conf/v4/vless_test.go @@ -1,14 +1,14 @@ package v4_test import ( - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "testing" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "github.com/v2fly/v2ray-core/v4/proxy/vless" "github.com/v2fly/v2ray-core/v4/proxy/vless/inbound" "github.com/v2fly/v2ray-core/v4/proxy/vless/outbound" diff --git a/infra/conf/v4/vmess_test.go b/infra/conf/v4/vmess_test.go index 2a030845d..c84fadda2 100644 --- a/infra/conf/v4/vmess_test.go +++ b/infra/conf/v4/vmess_test.go @@ -1,14 +1,14 @@ package v4_test import ( - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "testing" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "github.com/v2fly/v2ray-core/v4/proxy/vmess" "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" diff --git a/infra/conf/v5cfg/common.go b/infra/conf/v5cfg/common.go index 116d604d3..49aaae3b0 100644 --- a/infra/conf/v5cfg/common.go +++ b/infra/conf/v5cfg/common.go @@ -3,7 +3,9 @@ package v5cfg import ( "context" "encoding/json" + "github.com/golang/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/common/environment/envctx" "github.com/v2fly/v2ray-core/v4/common/environment/envimpl" "github.com/v2fly/v2ray-core/v4/common/registry" diff --git a/infra/conf/v5cfg/inbound.go b/infra/conf/v5cfg/inbound.go index 5f6d8e94f..f26241af5 100644 --- a/infra/conf/v5cfg/inbound.go +++ b/infra/conf/v5cfg/inbound.go @@ -2,7 +2,9 @@ package v5cfg import ( "context" + "github.com/golang/protobuf/proto" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/proxyman" "github.com/v2fly/v2ray-core/v4/common/serial" diff --git a/infra/conf/v5cfg/init.go b/infra/conf/v5cfg/init.go index 424f6c8fb..aa4b69893 100644 --- a/infra/conf/v5cfg/init.go +++ b/infra/conf/v5cfg/init.go @@ -1,11 +1,12 @@ package v5cfg import ( + "io" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v4/common/cmdarg" - "io" ) const jsonV5 = "jsonv5" diff --git a/infra/conf/v5cfg/outbound.go b/infra/conf/v5cfg/outbound.go index 1e5fa3822..889c1bb0d 100644 --- a/infra/conf/v5cfg/outbound.go +++ b/infra/conf/v5cfg/outbound.go @@ -2,7 +2,9 @@ package v5cfg import ( "context" + "github.com/golang/protobuf/proto" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/proxyman" "github.com/v2fly/v2ray-core/v4/common/serial" diff --git a/infra/conf/v5cfg/root.go b/infra/conf/v5cfg/root.go index bfe95ed64..2ea64c2a0 100644 --- a/infra/conf/v5cfg/root.go +++ b/infra/conf/v5cfg/root.go @@ -3,7 +3,10 @@ package v5cfg import ( "context" "encoding/json" + "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/types/known/anypb" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dispatcher" "github.com/v2fly/v2ray-core/v4/app/proxyman" @@ -12,7 +15,6 @@ import ( "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/log" - "google.golang.org/protobuf/types/known/anypb" ) func (c RootConfig) BuildV5(ctx context.Context) (proto.Message, error) { diff --git a/infra/conf/v5cfg/skeleton.go b/infra/conf/v5cfg/skeleton.go index a302fe5b1..f03ec55f5 100644 --- a/infra/conf/v5cfg/skeleton.go +++ b/infra/conf/v5cfg/skeleton.go @@ -2,6 +2,7 @@ package v5cfg import ( "encoding/json" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/muxcfg" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/proxycfg" diff --git a/infra/conf/v5cfg/stream.go b/infra/conf/v5cfg/stream.go index 30bc60f9b..14c6a438e 100644 --- a/infra/conf/v5cfg/stream.go +++ b/infra/conf/v5cfg/stream.go @@ -2,7 +2,9 @@ package v5cfg import ( "context" + "github.com/golang/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/transport/internet" ) diff --git a/main/commands/all/api/shared.go b/main/commands/all/api/shared.go index 019c76a61..64d8b6e49 100644 --- a/main/commands/all/api/shared.go +++ b/main/commands/all/api/shared.go @@ -3,12 +3,12 @@ package api import ( "context" "fmt" - "google.golang.org/protobuf/encoding/protojson" "os" "strings" "time" "google.golang.org/grpc" + "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" core "github.com/v2fly/v2ray-core/v4" diff --git a/main/commands/all/engineering/convertpb.go b/main/commands/all/engineering/convertpb.go index 3de4e5670..3786099e1 100644 --- a/main/commands/all/engineering/convertpb.go +++ b/main/commands/all/engineering/convertpb.go @@ -3,12 +3,14 @@ package engineering import ( "bytes" "fmt" + "io" + "os" + + "google.golang.org/protobuf/proto" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common/cmdarg" "github.com/v2fly/v2ray-core/v4/main/commands/base" - "google.golang.org/protobuf/proto" - "io" - "os" ) var ( diff --git a/main/commands/all/engineering/reversepb.go b/main/commands/all/engineering/reversepb.go index 4df5d4b7a..91c58fb6b 100644 --- a/main/commands/all/engineering/reversepb.go +++ b/main/commands/all/engineering/reversepb.go @@ -3,13 +3,15 @@ package engineering import ( "bytes" "flag" + "io" + "os" + "github.com/golang/protobuf/proto" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/infra/conf/jsonpb" "github.com/v2fly/v2ray-core/v4/infra/conf/v2jsonpb" "github.com/v2fly/v2ray-core/v4/main/commands/base" - "io" - "os" ) var cmdReversePb = &base.Command{ diff --git a/main/commands/all/jsonv4/convert.go b/main/commands/all/jsonv4/convert.go index 6924e536e..c549a9773 100644 --- a/main/commands/all/jsonv4/convert.go +++ b/main/commands/all/jsonv4/convert.go @@ -3,8 +3,6 @@ package jsonv4 import ( "bytes" "encoding/json" - "github.com/v2fly/v2ray-core/v4/infra/conf/jsonpb" - "github.com/v2fly/v2ray-core/v4/infra/conf/v2jsonpb" "os" "strings" @@ -13,7 +11,9 @@ import ( "gopkg.in/yaml.v2" core "github.com/v2fly/v2ray-core/v4" + "github.com/v2fly/v2ray-core/v4/infra/conf/jsonpb" "github.com/v2fly/v2ray-core/v4/infra/conf/merge" + "github.com/v2fly/v2ray-core/v4/infra/conf/v2jsonpb" "github.com/v2fly/v2ray-core/v4/main/commands/base" "github.com/v2fly/v2ray-core/v4/main/commands/helpers" ) diff --git a/main/commands/helpers/config_load.go b/main/commands/helpers/config_load.go index 131eed550..f486fbb50 100644 --- a/main/commands/helpers/config_load.go +++ b/main/commands/helpers/config_load.go @@ -2,12 +2,12 @@ package helpers import ( "bytes" - "github.com/v2fly/v2ray-core/v4/infra/conf/v4" "os" "github.com/v2fly/v2ray-core/v4/infra/conf/merge" "github.com/v2fly/v2ray-core/v4/infra/conf/mergers" "github.com/v2fly/v2ray-core/v4/infra/conf/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/v4" ) // LoadConfig load config files to *conf.Config, it will: diff --git a/main/v2binding/v2api/api.go b/main/v2binding/v2api/api.go index 7e9719732..958457009 100644 --- a/main/v2binding/v2api/api.go +++ b/main/v2binding/v2api/api.go @@ -1,8 +1,9 @@ package main import ( - "github.com/v2fly/v2ray-core/v4/main/v2binding" "time" + + "github.com/v2fly/v2ray-core/v4/main/v2binding" ) func main() { diff --git a/main/v2binding/v2binding.go b/main/v2binding/v2binding.go index 6bc3d722b..70d2e6685 100644 --- a/main/v2binding/v2binding.go +++ b/main/v2binding/v2binding.go @@ -1,6 +1,8 @@ package v2binding import ( + "google.golang.org/protobuf/types/known/anypb" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/commander" "github.com/v2fly/v2ray-core/v4/app/dispatcher" @@ -13,7 +15,6 @@ import ( _ "github.com/v2fly/v2ray-core/v4/main/distro/all" "github.com/v2fly/v2ray-core/v4/proxy/blackhole" "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "google.golang.org/protobuf/types/known/anypb" ) type bindingInstance struct { diff --git a/proxy/dns/dns_test.go b/proxy/dns/dns_test.go index cc40b6016..4291ca984 100644 --- a/proxy/dns/dns_test.go +++ b/proxy/dns/dns_test.go @@ -1,13 +1,13 @@ package dns_test import ( - "google.golang.org/protobuf/types/known/anypb" "strconv" "testing" "time" "github.com/google/go-cmp/cmp" "github.com/miekg/dns" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dispatcher" diff --git a/proxy/socks/simplified/config.go b/proxy/socks/simplified/config.go index 30dcdf4b7..4e871ad5c 100644 --- a/proxy/socks/simplified/config.go +++ b/proxy/socks/simplified/config.go @@ -2,6 +2,7 @@ package simplified import ( "context" + "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/proxy/socks" diff --git a/proxy/vmess/inbound/inbound.go b/proxy/vmess/inbound/inbound.go index f6b8c6d06..5acda0809 100644 --- a/proxy/vmess/inbound/inbound.go +++ b/proxy/vmess/inbound/inbound.go @@ -4,7 +4,6 @@ package inbound import ( "context" - "github.com/v2fly/v2ray-core/v4/common/serial" "io" "strings" "sync" @@ -18,6 +17,7 @@ import ( "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/platform" "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v4/common/signal" "github.com/v2fly/v2ray-core/v4/common/task" diff --git a/proxy/vmess/outbound/outbound.go b/proxy/vmess/outbound/outbound.go index 274d9b384..a8435fb4a 100644 --- a/proxy/vmess/outbound/outbound.go +++ b/proxy/vmess/outbound/outbound.go @@ -6,7 +6,6 @@ import ( "context" "crypto/hmac" "crypto/sha256" - "github.com/v2fly/v2ray-core/v4/common/serial" "hash/crc64" "time" @@ -17,6 +16,7 @@ import ( "github.com/v2fly/v2ray-core/v4/common/platform" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/retry" + "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v4/common/signal" "github.com/v2fly/v2ray-core/v4/common/task" diff --git a/testing/scenarios/command_test.go b/testing/scenarios/command_test.go index 84f3afcb4..0868e7aa7 100644 --- a/testing/scenarios/command_test.go +++ b/testing/scenarios/command_test.go @@ -3,7 +3,6 @@ package scenarios import ( "context" "fmt" - "google.golang.org/protobuf/types/known/anypb" "io" "strings" "testing" @@ -12,6 +11,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "google.golang.org/grpc" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/commander" diff --git a/testing/scenarios/dns_test.go b/testing/scenarios/dns_test.go index b23d0b13e..5411a5a78 100644 --- a/testing/scenarios/dns_test.go +++ b/testing/scenarios/dns_test.go @@ -2,17 +2,17 @@ package scenarios import ( "fmt" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "google.golang.org/protobuf/types/known/anypb" "testing" "time" xproxy "golang.org/x/net/proxy" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dns" "github.com/v2fly/v2ray-core/v4/app/proxyman" "github.com/v2fly/v2ray-core/v4/app/router" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/serial" diff --git a/testing/scenarios/dokodemo_test.go b/testing/scenarios/dokodemo_test.go index 24ec0f83b..c8751405e 100644 --- a/testing/scenarios/dokodemo_test.go +++ b/testing/scenarios/dokodemo_test.go @@ -1,11 +1,11 @@ package scenarios import ( - "google.golang.org/protobuf/types/known/anypb" "testing" "time" "golang.org/x/sync/errgroup" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/log" diff --git a/testing/scenarios/feature_test.go b/testing/scenarios/feature_test.go index 10a5f5788..4704760ee 100644 --- a/testing/scenarios/feature_test.go +++ b/testing/scenarios/feature_test.go @@ -2,7 +2,6 @@ package scenarios import ( "context" - "google.golang.org/protobuf/types/known/anypb" "io" "net/http" "net/url" @@ -10,6 +9,7 @@ import ( "time" xproxy "golang.org/x/net/proxy" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dispatcher" diff --git a/testing/scenarios/policy_test.go b/testing/scenarios/policy_test.go index 469105097..1ad87c47e 100644 --- a/testing/scenarios/policy_test.go +++ b/testing/scenarios/policy_test.go @@ -1,12 +1,12 @@ package scenarios import ( - "google.golang.org/protobuf/types/known/anypb" "io" "testing" "time" "golang.org/x/sync/errgroup" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/log" diff --git a/testing/scenarios/reverse_test.go b/testing/scenarios/reverse_test.go index c394bdec0..9b6f53e08 100644 --- a/testing/scenarios/reverse_test.go +++ b/testing/scenarios/reverse_test.go @@ -1,12 +1,11 @@ package scenarios import ( - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "google.golang.org/protobuf/types/known/anypb" "testing" "time" "golang.org/x/sync/errgroup" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/log" @@ -14,6 +13,7 @@ import ( "github.com/v2fly/v2ray-core/v4/app/proxyman" "github.com/v2fly/v2ray-core/v4/app/reverse" "github.com/v2fly/v2ray-core/v4/app/router" + "github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v4/common" clog "github.com/v2fly/v2ray-core/v4/common/log" "github.com/v2fly/v2ray-core/v4/common/net" diff --git a/testing/scenarios/shadowsocks_test.go b/testing/scenarios/shadowsocks_test.go index 9d6c24d10..1bd4308b6 100644 --- a/testing/scenarios/shadowsocks_test.go +++ b/testing/scenarios/shadowsocks_test.go @@ -1,11 +1,11 @@ package scenarios import ( - "google.golang.org/protobuf/types/known/anypb" "testing" "time" "golang.org/x/sync/errgroup" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/log" diff --git a/testing/scenarios/socks_test.go b/testing/scenarios/socks_test.go index 895ca7682..ad8f61ab9 100644 --- a/testing/scenarios/socks_test.go +++ b/testing/scenarios/socks_test.go @@ -1,11 +1,11 @@ package scenarios import ( - "google.golang.org/protobuf/types/known/anypb" "testing" "time" xproxy "golang.org/x/net/proxy" + "google.golang.org/protobuf/types/known/anypb" socks4 "h12.io/socks" core "github.com/v2fly/v2ray-core/v4" diff --git a/testing/scenarios/tls_test.go b/testing/scenarios/tls_test.go index 2dee00f33..3b1c39068 100644 --- a/testing/scenarios/tls_test.go +++ b/testing/scenarios/tls_test.go @@ -2,12 +2,12 @@ package scenarios import ( "crypto/x509" - "google.golang.org/protobuf/types/known/anypb" "runtime" "testing" "time" "golang.org/x/sync/errgroup" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/proxyman" diff --git a/testing/scenarios/transport_test.go b/testing/scenarios/transport_test.go index 362403d7a..e16d99f3d 100644 --- a/testing/scenarios/transport_test.go +++ b/testing/scenarios/transport_test.go @@ -1,13 +1,13 @@ package scenarios import ( - "google.golang.org/protobuf/types/known/anypb" "os" "runtime" "testing" "time" "golang.org/x/sync/errgroup" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/log" diff --git a/testing/scenarios/vmess_test.go b/testing/scenarios/vmess_test.go index 1f88f4852..fb8300d1e 100644 --- a/testing/scenarios/vmess_test.go +++ b/testing/scenarios/vmess_test.go @@ -1,13 +1,13 @@ package scenarios import ( - "github.com/golang/protobuf/ptypes/any" - "google.golang.org/protobuf/types/known/anypb" "os" "testing" "time" + "github.com/golang/protobuf/ptypes/any" "golang.org/x/sync/errgroup" + "google.golang.org/protobuf/types/known/anypb" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/log" diff --git a/transport/internet/config.go b/transport/internet/config.go index c8eb9e143..74610063a 100644 --- a/transport/internet/config.go +++ b/transport/internet/config.go @@ -2,7 +2,9 @@ package internet import ( "context" + "github.com/golang/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/protoext" "github.com/v2fly/v2ray-core/v4/common/serial" diff --git a/transport/internet/dialer.go b/transport/internet/dialer.go index 1ea7929e0..337afdab6 100644 --- a/transport/internet/dialer.go +++ b/transport/internet/dialer.go @@ -2,6 +2,7 @@ package internet import ( "context" + "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v4/transport/internet/tagged" diff --git a/transport/internet/domainsocket/dial.go b/transport/internet/domainsocket/dial.go index 314772352..f830c7b38 100644 --- 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 diff --git a/transport/internet/domainsocket/listener.go b/transport/internet/domainsocket/listener.go index e46864de4..0c8417015 100644 --- 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 diff --git a/transport/internet/http/dialer.go b/transport/internet/http/dialer.go index 809ed7c63..919d7a3b2 100644 --- a/transport/internet/http/dialer.go +++ b/transport/internet/http/dialer.go @@ -7,10 +7,9 @@ import ( "net/url" "sync" - core "github.com/v2fly/v2ray-core/v4" - "golang.org/x/net/http2" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v4/common/net" diff --git a/transport/internet/kcp/config.go b/transport/internet/kcp/config.go index ede33b378..e0cd43834 100644 --- a/transport/internet/kcp/config.go +++ b/transport/internet/kcp/config.go @@ -2,9 +2,9 @@ package kcp import ( "crypto/cipher" - "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/transport/internet" ) diff --git a/transport/internet/quic/config.go b/transport/internet/quic/config.go index 42d2b73c3..55e322526 100644 --- a/transport/internet/quic/config.go +++ b/transport/internet/quic/config.go @@ -4,12 +4,12 @@ import ( "crypto/aes" "crypto/cipher" "crypto/sha256" - "github.com/v2fly/v2ray-core/v4/common/serial" "golang.org/x/crypto/chacha20poly1305" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/transport/internet" ) diff --git a/transport/internet/tcp/dialer.go b/transport/internet/tcp/dialer.go index 334494017..310a9b43f 100644 --- a/transport/internet/tcp/dialer.go +++ b/transport/internet/tcp/dialer.go @@ -2,10 +2,10 @@ package tcp import ( "context" - "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v4/transport/internet" "github.com/v2fly/v2ray-core/v4/transport/internet/tls" diff --git a/transport/internet/tcp/hub.go b/transport/internet/tcp/hub.go index 2b2d02e57..b80a15aa9 100644 --- a/transport/internet/tcp/hub.go +++ b/transport/internet/tcp/hub.go @@ -3,12 +3,12 @@ package tcp import ( "context" gotls "crypto/tls" - "github.com/v2fly/v2ray-core/v4/common/serial" "strings" "time" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v4/transport/internet" "github.com/v2fly/v2ray-core/v4/transport/internet/tls" diff --git a/transport/internet/tcp/sockopt_freebsd.go b/transport/internet/tcp/sockopt_freebsd.go index 69c1e9f1f..624942e0e 100644 --- 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 diff --git a/transport/internet/tcp/sockopt_linux.go b/transport/internet/tcp/sockopt_linux.go index b2ad856ee..b6ac9a0b5 100644 --- 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 diff --git a/transport/internet/tcp/sockopt_other.go b/transport/internet/tcp/sockopt_other.go index 28edcb6e7..22fabfe23 100644 --- 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 diff --git a/transport/internet/tls/config_other.go b/transport/internet/tls/config_other.go index 3a46792b6..59e0c1533 100644 --- 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 diff --git a/transport/internet/tls/config_windows.go b/transport/internet/tls/config_windows.go index 94b247629..8818befe3 100644 --- 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 diff --git a/transport/internet/tls/tls.go b/transport/internet/tls/tls.go index 9dcaf1c30..a16ad5d42 100644 --- a/transport/internet/tls/tls.go +++ b/transport/internet/tls/tls.go @@ -3,8 +3,8 @@ package tls import ( "context" "crypto/tls" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v4/common/net" )