diff --git a/app/cmd/client.go b/app/cmd/client.go index 355523a..8f05c1e 100644 --- a/app/cmd/client.go +++ b/app/cmd/client.go @@ -21,20 +21,20 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/apernet/hysteria/app/internal/forwarding" - "github.com/apernet/hysteria/app/internal/http" - "github.com/apernet/hysteria/app/internal/proxymux" - "github.com/apernet/hysteria/app/internal/redirect" - "github.com/apernet/hysteria/app/internal/sockopts" - "github.com/apernet/hysteria/app/internal/socks5" - "github.com/apernet/hysteria/app/internal/tproxy" - "github.com/apernet/hysteria/app/internal/tun" - "github.com/apernet/hysteria/app/internal/url" - "github.com/apernet/hysteria/app/internal/utils" - "github.com/apernet/hysteria/core/client" - "github.com/apernet/hysteria/extras/correctnet" - "github.com/apernet/hysteria/extras/obfs" - "github.com/apernet/hysteria/extras/transport/udphop" + "github.com/apernet/hysteria/app/v2/internal/forwarding" + "github.com/apernet/hysteria/app/v2/internal/http" + "github.com/apernet/hysteria/app/v2/internal/proxymux" + "github.com/apernet/hysteria/app/v2/internal/redirect" + "github.com/apernet/hysteria/app/v2/internal/sockopts" + "github.com/apernet/hysteria/app/v2/internal/socks5" + "github.com/apernet/hysteria/app/v2/internal/tproxy" + "github.com/apernet/hysteria/app/v2/internal/tun" + "github.com/apernet/hysteria/app/v2/internal/url" + "github.com/apernet/hysteria/app/v2/internal/utils" + "github.com/apernet/hysteria/core/v2/client" + "github.com/apernet/hysteria/extras/v2/correctnet" + "github.com/apernet/hysteria/extras/v2/obfs" + "github.com/apernet/hysteria/extras/v2/transport/udphop" ) // Client flags diff --git a/app/cmd/ping.go b/app/cmd/ping.go index 856595b..db45052 100644 --- a/app/cmd/ping.go +++ b/app/cmd/ping.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) // pingCmd represents the ping command diff --git a/app/cmd/server.go b/app/cmd/server.go index 9e81312..2bf4efe 100644 --- a/app/cmd/server.go +++ b/app/cmd/server.go @@ -21,14 +21,14 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/apernet/hysteria/app/internal/utils" - "github.com/apernet/hysteria/core/server" - "github.com/apernet/hysteria/extras/auth" - "github.com/apernet/hysteria/extras/correctnet" - "github.com/apernet/hysteria/extras/masq" - "github.com/apernet/hysteria/extras/obfs" - "github.com/apernet/hysteria/extras/outbounds" - "github.com/apernet/hysteria/extras/trafficlogger" + "github.com/apernet/hysteria/app/v2/internal/utils" + "github.com/apernet/hysteria/core/v2/server" + "github.com/apernet/hysteria/extras/v2/auth" + "github.com/apernet/hysteria/extras/v2/correctnet" + "github.com/apernet/hysteria/extras/v2/masq" + "github.com/apernet/hysteria/extras/v2/obfs" + "github.com/apernet/hysteria/extras/v2/outbounds" + "github.com/apernet/hysteria/extras/v2/trafficlogger" ) const ( diff --git a/app/cmd/speedtest.go b/app/cmd/speedtest.go index 86bdbdb..6195c72 100644 --- a/app/cmd/speedtest.go +++ b/app/cmd/speedtest.go @@ -9,10 +9,10 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/apernet/hysteria/core/client" - hyErrors "github.com/apernet/hysteria/core/errors" - "github.com/apernet/hysteria/extras/outbounds" - "github.com/apernet/hysteria/extras/outbounds/speedtest" + "github.com/apernet/hysteria/core/v2/client" + hyErrors "github.com/apernet/hysteria/core/v2/errors" + "github.com/apernet/hysteria/extras/v2/outbounds" + "github.com/apernet/hysteria/extras/v2/outbounds/speedtest" ) var ( diff --git a/app/cmd/update.go b/app/cmd/update.go index 3b26740..11eadd0 100644 --- a/app/cmd/update.go +++ b/app/cmd/update.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" "go.uber.org/zap" - "github.com/apernet/hysteria/app/internal/utils" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/app/v2/internal/utils" + "github.com/apernet/hysteria/core/v2/client" ) const ( diff --git a/app/go.mod b/app/go.mod index bc7ceef..dc12a22 100644 --- a/app/go.mod +++ b/app/go.mod @@ -1,11 +1,11 @@ -module github.com/apernet/hysteria/app +module github.com/apernet/hysteria/app/v2 go 1.21 require ( github.com/apernet/go-tproxy v0.0.0-20230809025308-8f4723fd742f - github.com/apernet/hysteria/core v0.0.0-00010101000000-000000000000 - github.com/apernet/hysteria/extras v0.0.0-00010101000000-000000000000 + github.com/apernet/hysteria/core/v2 v2.0.0-00010101000000-000000000000 + github.com/apernet/hysteria/extras/v2 v2.0.0-00010101000000-000000000000 github.com/apernet/sing-tun v0.2.6-0.20240323130332-b9f6511036ad github.com/caddyserver/certmagic v0.17.2 github.com/mdp/qrterminal/v3 v3.1.1 @@ -66,6 +66,6 @@ require ( rsc.io/qr v0.2.0 // indirect ) -replace github.com/apernet/hysteria/core => ../core +replace github.com/apernet/hysteria/core/v2 => ../core -replace github.com/apernet/hysteria/extras => ../extras +replace github.com/apernet/hysteria/extras/v2 => ../extras diff --git a/app/internal/forwarding/tcp.go b/app/internal/forwarding/tcp.go index 7d22d33..8936385 100644 --- a/app/internal/forwarding/tcp.go +++ b/app/internal/forwarding/tcp.go @@ -4,7 +4,7 @@ import ( "io" "net" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) type TCPTunnel struct { diff --git a/app/internal/forwarding/tcp_test.go b/app/internal/forwarding/tcp_test.go index 91ab0a1..075b233 100644 --- a/app/internal/forwarding/tcp_test.go +++ b/app/internal/forwarding/tcp_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apernet/hysteria/app/internal/utils_test" + "github.com/apernet/hysteria/app/v2/internal/utils_test" ) func TestTCPTunnel(t *testing.T) { diff --git a/app/internal/forwarding/udp.go b/app/internal/forwarding/udp.go index 2f859e9..35886a8 100644 --- a/app/internal/forwarding/udp.go +++ b/app/internal/forwarding/udp.go @@ -6,7 +6,7 @@ import ( "sync/atomic" "time" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) const ( diff --git a/app/internal/forwarding/udp_test.go b/app/internal/forwarding/udp_test.go index feb0c20..ba4f3ba 100644 --- a/app/internal/forwarding/udp_test.go +++ b/app/internal/forwarding/udp_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apernet/hysteria/app/internal/utils_test" + "github.com/apernet/hysteria/app/v2/internal/utils_test" ) func TestUDPTunnel(t *testing.T) { diff --git a/app/internal/http/server.go b/app/internal/http/server.go index 4f11d14..e5761ce 100644 --- a/app/internal/http/server.go +++ b/app/internal/http/server.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) const ( diff --git a/app/internal/http/server_test.go b/app/internal/http/server_test.go index 960bef7..43f6e16 100644 --- a/app/internal/http/server_test.go +++ b/app/internal/http/server_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) const ( diff --git a/app/internal/proxymux/manager.go b/app/internal/proxymux/manager.go index 92df918..23f4ad6 100644 --- a/app/internal/proxymux/manager.go +++ b/app/internal/proxymux/manager.go @@ -4,7 +4,7 @@ import ( "net" "sync" - "github.com/apernet/hysteria/extras/correctnet" + "github.com/apernet/hysteria/extras/v2/correctnet" ) type muxManager struct { diff --git a/app/internal/proxymux/mux_test.go b/app/internal/proxymux/mux_test.go index 46cbf95..7b57237 100644 --- a/app/internal/proxymux/mux_test.go +++ b/app/internal/proxymux/mux_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/apernet/hysteria/app/internal/proxymux/internal/mocks" + "github.com/apernet/hysteria/app/v2/internal/proxymux/internal/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/app/internal/redirect/tcp_linux.go b/app/internal/redirect/tcp_linux.go index 8445fa3..5351543 100644 --- a/app/internal/redirect/tcp_linux.go +++ b/app/internal/redirect/tcp_linux.go @@ -8,7 +8,7 @@ import ( "syscall" "unsafe" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) const ( diff --git a/app/internal/redirect/tcp_others.go b/app/internal/redirect/tcp_others.go index ddb770f..f5cf6f9 100644 --- a/app/internal/redirect/tcp_others.go +++ b/app/internal/redirect/tcp_others.go @@ -6,7 +6,7 @@ import ( "errors" "net" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) type TCPRedirect struct { diff --git a/app/internal/socks5/server.go b/app/internal/socks5/server.go index 84b58ed..0fc7de6 100644 --- a/app/internal/socks5/server.go +++ b/app/internal/socks5/server.go @@ -7,7 +7,7 @@ import ( "github.com/txthinking/socks5" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) const udpBufferSize = 4096 diff --git a/app/internal/socks5/server_test.go b/app/internal/socks5/server_test.go index 7aec82a..1290058 100644 --- a/app/internal/socks5/server_test.go +++ b/app/internal/socks5/server_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apernet/hysteria/app/internal/utils_test" + "github.com/apernet/hysteria/app/v2/internal/utils_test" ) func TestServer(t *testing.T) { diff --git a/app/internal/tproxy/tcp_linux.go b/app/internal/tproxy/tcp_linux.go index 4c922f1..4d8c1e9 100644 --- a/app/internal/tproxy/tcp_linux.go +++ b/app/internal/tproxy/tcp_linux.go @@ -5,7 +5,7 @@ import ( "net" "github.com/apernet/go-tproxy" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) type TCPTProxy struct { diff --git a/app/internal/tproxy/tcp_others.go b/app/internal/tproxy/tcp_others.go index 27e98c5..f33de6a 100644 --- a/app/internal/tproxy/tcp_others.go +++ b/app/internal/tproxy/tcp_others.go @@ -6,7 +6,7 @@ import ( "errors" "net" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) type TCPTProxy struct { diff --git a/app/internal/tproxy/udp_linux.go b/app/internal/tproxy/udp_linux.go index 03e2f42..827bea2 100644 --- a/app/internal/tproxy/udp_linux.go +++ b/app/internal/tproxy/udp_linux.go @@ -6,7 +6,7 @@ import ( "time" "github.com/apernet/go-tproxy" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) const ( diff --git a/app/internal/tproxy/udp_others.go b/app/internal/tproxy/udp_others.go index db9cedb..3d267e6 100644 --- a/app/internal/tproxy/udp_others.go +++ b/app/internal/tproxy/udp_others.go @@ -7,7 +7,7 @@ import ( "net" "time" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) type UDPTProxy struct { diff --git a/app/internal/tun/server.go b/app/internal/tun/server.go index 4ae5393..303d4ec 100644 --- a/app/internal/tun/server.go +++ b/app/internal/tun/server.go @@ -14,7 +14,7 @@ import ( "github.com/sagernet/sing/common/network" "go.uber.org/zap" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) type Server struct { diff --git a/app/internal/utils/geoloader.go b/app/internal/utils/geoloader.go index fa9775b..468c68a 100644 --- a/app/internal/utils/geoloader.go +++ b/app/internal/utils/geoloader.go @@ -7,8 +7,8 @@ import ( "os" "time" - "github.com/apernet/hysteria/extras/outbounds/acl" - "github.com/apernet/hysteria/extras/outbounds/acl/v2geo" + "github.com/apernet/hysteria/extras/v2/outbounds/acl" + "github.com/apernet/hysteria/extras/v2/outbounds/acl/v2geo" ) const ( diff --git a/app/internal/utils/update.go b/app/internal/utils/update.go index 8887cb4..60da91f 100644 --- a/app/internal/utils/update.go +++ b/app/internal/utils/update.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) const ( diff --git a/app/internal/utils_test/mock.go b/app/internal/utils_test/mock.go index 04adad6..06057d8 100644 --- a/app/internal/utils_test/mock.go +++ b/app/internal/utils_test/mock.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/apernet/hysteria/core/client" + "github.com/apernet/hysteria/core/v2/client" ) type MockEchoHyClient struct{} diff --git a/app/main.go b/app/main.go index 6d1554b..81d8168 100644 --- a/app/main.go +++ b/app/main.go @@ -1,6 +1,6 @@ package main -import "github.com/apernet/hysteria/app/cmd" +import "github.com/apernet/hysteria/app/v2/cmd" func main() { cmd.Execute() diff --git a/core/client/.mockery.yaml b/core/client/.mockery.yaml index 9500c13..299e6f9 100644 --- a/core/client/.mockery.yaml +++ b/core/client/.mockery.yaml @@ -2,7 +2,7 @@ with-expecter: true inpackage: true dir: . packages: - github.com/apernet/hysteria/core/client: + github.com/apernet/hysteria/core/v2/client: interfaces: udpIO: config: diff --git a/core/client/client.go b/core/client/client.go index 5a25d37..91d59fd 100644 --- a/core/client/client.go +++ b/core/client/client.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - coreErrs "github.com/apernet/hysteria/core/errors" - "github.com/apernet/hysteria/core/internal/congestion" - "github.com/apernet/hysteria/core/internal/protocol" - "github.com/apernet/hysteria/core/internal/utils" + coreErrs "github.com/apernet/hysteria/core/v2/errors" + "github.com/apernet/hysteria/core/v2/internal/congestion" + "github.com/apernet/hysteria/core/v2/internal/protocol" + "github.com/apernet/hysteria/core/v2/internal/utils" "github.com/apernet/quic-go" "github.com/apernet/quic-go/http3" diff --git a/core/client/config.go b/core/client/config.go index 41a72ba..7270c30 100644 --- a/core/client/config.go +++ b/core/client/config.go @@ -5,8 +5,8 @@ import ( "net" "time" - "github.com/apernet/hysteria/core/errors" - "github.com/apernet/hysteria/core/internal/pmtud" + "github.com/apernet/hysteria/core/v2/errors" + "github.com/apernet/hysteria/core/v2/internal/pmtud" ) const ( diff --git a/core/client/mock_udpIO.go b/core/client/mock_udpIO.go index a85e006..aa1444e 100644 --- a/core/client/mock_udpIO.go +++ b/core/client/mock_udpIO.go @@ -3,7 +3,7 @@ package client import ( - protocol "github.com/apernet/hysteria/core/internal/protocol" + protocol "github.com/apernet/hysteria/core/v2/internal/protocol" mock "github.com/stretchr/testify/mock" ) diff --git a/core/client/reconnect.go b/core/client/reconnect.go index 05d60b3..91c7eb4 100644 --- a/core/client/reconnect.go +++ b/core/client/reconnect.go @@ -4,7 +4,7 @@ import ( "net" "sync" - coreErrs "github.com/apernet/hysteria/core/errors" + coreErrs "github.com/apernet/hysteria/core/v2/errors" ) // reconnectableClientImpl is a wrapper of Client, which can reconnect when the connection is closed, diff --git a/core/client/udp.go b/core/client/udp.go index dfe574f..ca98095 100644 --- a/core/client/udp.go +++ b/core/client/udp.go @@ -8,9 +8,9 @@ import ( "github.com/apernet/quic-go" - coreErrs "github.com/apernet/hysteria/core/errors" - "github.com/apernet/hysteria/core/internal/frag" - "github.com/apernet/hysteria/core/internal/protocol" + coreErrs "github.com/apernet/hysteria/core/v2/errors" + "github.com/apernet/hysteria/core/v2/internal/frag" + "github.com/apernet/hysteria/core/v2/internal/protocol" ) const ( diff --git a/core/client/udp_test.go b/core/client/udp_test.go index 0ed9659..af1a6d0 100644 --- a/core/client/udp_test.go +++ b/core/client/udp_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/mock" "go.uber.org/goleak" - coreErrs "github.com/apernet/hysteria/core/errors" - "github.com/apernet/hysteria/core/internal/protocol" + coreErrs "github.com/apernet/hysteria/core/v2/errors" + "github.com/apernet/hysteria/core/v2/internal/protocol" ) func TestUDPSessionManager(t *testing.T) { diff --git a/core/go.mod b/core/go.mod index 2be1569..6c88c35 100644 --- a/core/go.mod +++ b/core/go.mod @@ -1,4 +1,4 @@ -module github.com/apernet/hysteria/core +module github.com/apernet/hysteria/core/v2 go 1.21 diff --git a/core/internal/congestion/bbr/bbr_sender.go b/core/internal/congestion/bbr/bbr_sender.go index 4afb078..e1b3654 100644 --- a/core/internal/congestion/bbr/bbr_sender.go +++ b/core/internal/congestion/bbr/bbr_sender.go @@ -8,7 +8,7 @@ import ( "github.com/apernet/quic-go/congestion" - "github.com/apernet/hysteria/core/internal/congestion/common" + "github.com/apernet/hysteria/core/v2/internal/congestion/common" ) // BbrSender implements BBR congestion control algorithm. BBR aims to estimate diff --git a/core/internal/congestion/brutal/brutal.go b/core/internal/congestion/brutal/brutal.go index 4edd45d..de591a9 100644 --- a/core/internal/congestion/brutal/brutal.go +++ b/core/internal/congestion/brutal/brutal.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/apernet/hysteria/core/internal/congestion/common" + "github.com/apernet/hysteria/core/v2/internal/congestion/common" "github.com/apernet/quic-go/congestion" ) diff --git a/core/internal/congestion/utils.go b/core/internal/congestion/utils.go index 48ddaa2..1e06060 100644 --- a/core/internal/congestion/utils.go +++ b/core/internal/congestion/utils.go @@ -1,8 +1,8 @@ package congestion import ( - "github.com/apernet/hysteria/core/internal/congestion/bbr" - "github.com/apernet/hysteria/core/internal/congestion/brutal" + "github.com/apernet/hysteria/core/v2/internal/congestion/bbr" + "github.com/apernet/hysteria/core/v2/internal/congestion/brutal" "github.com/apernet/quic-go" ) diff --git a/core/internal/frag/frag.go b/core/internal/frag/frag.go index 75c8dac..237ba06 100644 --- a/core/internal/frag/frag.go +++ b/core/internal/frag/frag.go @@ -1,7 +1,7 @@ package frag import ( - "github.com/apernet/hysteria/core/internal/protocol" + "github.com/apernet/hysteria/core/v2/internal/protocol" ) func FragUDPMessage(m *protocol.UDPMessage, maxSize int) []protocol.UDPMessage { diff --git a/core/internal/frag/frag_test.go b/core/internal/frag/frag_test.go index b77eeb3..0dc0cd7 100644 --- a/core/internal/frag/frag_test.go +++ b/core/internal/frag/frag_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/apernet/hysteria/core/internal/protocol" + "github.com/apernet/hysteria/core/v2/internal/protocol" ) func TestFragUDPMessage(t *testing.T) { diff --git a/core/internal/integration_tests/.mockery.yaml b/core/internal/integration_tests/.mockery.yaml index b1da36f..ad233ba 100644 --- a/core/internal/integration_tests/.mockery.yaml +++ b/core/internal/integration_tests/.mockery.yaml @@ -7,7 +7,7 @@ packages: Conn: config: mockname: MockConn - github.com/apernet/hysteria/core/server: + github.com/apernet/hysteria/core/v2/server: interfaces: Outbound: config: diff --git a/core/internal/integration_tests/close_test.go b/core/internal/integration_tests/close_test.go index ab6d016..ac7f84b 100644 --- a/core/internal/integration_tests/close_test.go +++ b/core/internal/integration_tests/close_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/apernet/hysteria/core/client" - "github.com/apernet/hysteria/core/errors" - "github.com/apernet/hysteria/core/internal/integration_tests/mocks" - "github.com/apernet/hysteria/core/server" + "github.com/apernet/hysteria/core/v2/client" + "github.com/apernet/hysteria/core/v2/errors" + "github.com/apernet/hysteria/core/v2/internal/integration_tests/mocks" + "github.com/apernet/hysteria/core/v2/server" ) // TestClientServerTCPClose tests whether the client/server propagates the close of a connection correctly. diff --git a/core/internal/integration_tests/masq_test.go b/core/internal/integration_tests/masq_test.go index 6f49053..e3dee14 100644 --- a/core/internal/integration_tests/masq_test.go +++ b/core/internal/integration_tests/masq_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/apernet/hysteria/core/internal/integration_tests/mocks" - "github.com/apernet/hysteria/core/internal/protocol" - "github.com/apernet/hysteria/core/server" + "github.com/apernet/hysteria/core/v2/internal/integration_tests/mocks" + "github.com/apernet/hysteria/core/v2/internal/protocol" + "github.com/apernet/hysteria/core/v2/server" "github.com/apernet/quic-go" "github.com/apernet/quic-go/http3" diff --git a/core/internal/integration_tests/mocks/mock_Outbound.go b/core/internal/integration_tests/mocks/mock_Outbound.go index 1a2d0c6..52f7178 100644 --- a/core/internal/integration_tests/mocks/mock_Outbound.go +++ b/core/internal/integration_tests/mocks/mock_Outbound.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - server "github.com/apernet/hysteria/core/server" + server "github.com/apernet/hysteria/core/v2/server" ) // MockOutbound is an autogenerated mock type for the Outbound type diff --git a/core/internal/integration_tests/smoke_test.go b/core/internal/integration_tests/smoke_test.go index ab204cb..5288b61 100644 --- a/core/internal/integration_tests/smoke_test.go +++ b/core/internal/integration_tests/smoke_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/apernet/hysteria/core/client" - coreErrs "github.com/apernet/hysteria/core/errors" - "github.com/apernet/hysteria/core/internal/integration_tests/mocks" - "github.com/apernet/hysteria/core/server" + "github.com/apernet/hysteria/core/v2/client" + coreErrs "github.com/apernet/hysteria/core/v2/errors" + "github.com/apernet/hysteria/core/v2/internal/integration_tests/mocks" + "github.com/apernet/hysteria/core/v2/server" ) // Smoke tests that act as a sanity check for client & server to ensure they can talk to each other correctly. diff --git a/core/internal/integration_tests/stress_test.go b/core/internal/integration_tests/stress_test.go index f10ac3a..cf44ad6 100644 --- a/core/internal/integration_tests/stress_test.go +++ b/core/internal/integration_tests/stress_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/mock" "golang.org/x/time/rate" - "github.com/apernet/hysteria/core/client" - "github.com/apernet/hysteria/core/internal/integration_tests/mocks" - "github.com/apernet/hysteria/core/server" + "github.com/apernet/hysteria/core/v2/client" + "github.com/apernet/hysteria/core/v2/internal/integration_tests/mocks" + "github.com/apernet/hysteria/core/v2/server" ) type tcpStressor struct { diff --git a/core/internal/integration_tests/trafficlogger_test.go b/core/internal/integration_tests/trafficlogger_test.go index 690a348..b5355ff 100644 --- a/core/internal/integration_tests/trafficlogger_test.go +++ b/core/internal/integration_tests/trafficlogger_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/apernet/hysteria/core/client" - "github.com/apernet/hysteria/core/internal/integration_tests/mocks" - "github.com/apernet/hysteria/core/server" + "github.com/apernet/hysteria/core/v2/client" + "github.com/apernet/hysteria/core/v2/internal/integration_tests/mocks" + "github.com/apernet/hysteria/core/v2/server" ) // TestClientServerTrafficLoggerTCP tests that the traffic logger is correctly called for TCP connections, diff --git a/core/internal/integration_tests/utils_test.go b/core/internal/integration_tests/utils_test.go index a1aa160..d7ecb68 100644 --- a/core/internal/integration_tests/utils_test.go +++ b/core/internal/integration_tests/utils_test.go @@ -5,7 +5,7 @@ import ( "io" "net" - "github.com/apernet/hysteria/core/server" + "github.com/apernet/hysteria/core/v2/server" ) // This file provides utilities for the integration tests. diff --git a/core/internal/protocol/proxy.go b/core/internal/protocol/proxy.go index 4a78fc2..9335c47 100644 --- a/core/internal/protocol/proxy.go +++ b/core/internal/protocol/proxy.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/apernet/hysteria/core/errors" + "github.com/apernet/hysteria/core/v2/errors" "github.com/apernet/quic-go/quicvarint" ) diff --git a/core/server/.mockery.yaml b/core/server/.mockery.yaml index b7cf743..d73136a 100644 --- a/core/server/.mockery.yaml +++ b/core/server/.mockery.yaml @@ -2,7 +2,7 @@ with-expecter: true inpackage: true dir: . packages: - github.com/apernet/hysteria/core/server: + github.com/apernet/hysteria/core/v2/server: interfaces: udpIO: config: diff --git a/core/server/config.go b/core/server/config.go index 8d5f5db..c6bf733 100644 --- a/core/server/config.go +++ b/core/server/config.go @@ -6,8 +6,8 @@ import ( "net/http" "time" - "github.com/apernet/hysteria/core/errors" - "github.com/apernet/hysteria/core/internal/pmtud" + "github.com/apernet/hysteria/core/v2/errors" + "github.com/apernet/hysteria/core/v2/internal/pmtud" ) const ( diff --git a/core/server/mock_udpIO.go b/core/server/mock_udpIO.go index 6df862b..3950cb9 100644 --- a/core/server/mock_udpIO.go +++ b/core/server/mock_udpIO.go @@ -3,7 +3,7 @@ package server import ( - protocol "github.com/apernet/hysteria/core/internal/protocol" + protocol "github.com/apernet/hysteria/core/v2/internal/protocol" mock "github.com/stretchr/testify/mock" ) diff --git a/core/server/server.go b/core/server/server.go index d38097d..bd61db0 100644 --- a/core/server/server.go +++ b/core/server/server.go @@ -9,9 +9,9 @@ import ( "github.com/apernet/quic-go" "github.com/apernet/quic-go/http3" - "github.com/apernet/hysteria/core/internal/congestion" - "github.com/apernet/hysteria/core/internal/protocol" - "github.com/apernet/hysteria/core/internal/utils" + "github.com/apernet/hysteria/core/v2/internal/congestion" + "github.com/apernet/hysteria/core/v2/internal/protocol" + "github.com/apernet/hysteria/core/v2/internal/utils" ) const ( diff --git a/core/server/udp.go b/core/server/udp.go index bea586b..320dc00 100644 --- a/core/server/udp.go +++ b/core/server/udp.go @@ -8,9 +8,9 @@ import ( "github.com/apernet/quic-go" - "github.com/apernet/hysteria/core/internal/frag" - "github.com/apernet/hysteria/core/internal/protocol" - "github.com/apernet/hysteria/core/internal/utils" + "github.com/apernet/hysteria/core/v2/internal/frag" + "github.com/apernet/hysteria/core/v2/internal/protocol" + "github.com/apernet/hysteria/core/v2/internal/utils" ) const ( diff --git a/core/server/udp_test.go b/core/server/udp_test.go index ccfb8cf..a0169e3 100644 --- a/core/server/udp_test.go +++ b/core/server/udp_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/mock" "go.uber.org/goleak" - "github.com/apernet/hysteria/core/internal/protocol" + "github.com/apernet/hysteria/core/v2/internal/protocol" ) func TestUDPSessionManager(t *testing.T) { diff --git a/extras/auth/command.go b/extras/auth/command.go index 9c4d193..a981a37 100644 --- a/extras/auth/command.go +++ b/extras/auth/command.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/apernet/hysteria/core/server" + "github.com/apernet/hysteria/core/v2/server" ) var _ server.Authenticator = &CommandAuthenticator{} diff --git a/extras/auth/http.go b/extras/auth/http.go index 0212b7c..379a8d7 100644 --- a/extras/auth/http.go +++ b/extras/auth/http.go @@ -10,7 +10,7 @@ import ( "net/http" "time" - "github.com/apernet/hysteria/core/server" + "github.com/apernet/hysteria/core/v2/server" ) const ( diff --git a/extras/auth/password.go b/extras/auth/password.go index 00fd826..c00f399 100644 --- a/extras/auth/password.go +++ b/extras/auth/password.go @@ -3,7 +3,7 @@ package auth import ( "net" - "github.com/apernet/hysteria/core/server" + "github.com/apernet/hysteria/core/v2/server" ) var _ server.Authenticator = &PasswordAuthenticator{} diff --git a/extras/auth/userpass.go b/extras/auth/userpass.go index 86f011e..8faf87a 100644 --- a/extras/auth/userpass.go +++ b/extras/auth/userpass.go @@ -4,7 +4,7 @@ import ( "net" "strings" - "github.com/apernet/hysteria/core/server" + "github.com/apernet/hysteria/core/v2/server" ) const ( diff --git a/extras/go.mod b/extras/go.mod index 5274da0..3048dc3 100644 --- a/extras/go.mod +++ b/extras/go.mod @@ -1,9 +1,9 @@ -module github.com/apernet/hysteria/extras +module github.com/apernet/hysteria/extras/v2 go 1.21 require ( - github.com/apernet/hysteria/core v0.0.0-00010101000000-000000000000 + github.com/apernet/hysteria/core/v2 v2.0.0-00010101000000-000000000000 github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6 github.com/hashicorp/golang-lru/v2 v2.0.5 github.com/miekg/dns v1.1.55 @@ -34,4 +34,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/apernet/hysteria/core => ../core +replace github.com/apernet/hysteria/core/v2 => ../core diff --git a/extras/masq/server.go b/extras/masq/server.go index 3acb177..6cd842d 100644 --- a/extras/masq/server.go +++ b/extras/masq/server.go @@ -7,7 +7,7 @@ import ( "net" "net/http" - "github.com/apernet/hysteria/extras/correctnet" + "github.com/apernet/hysteria/extras/v2/correctnet" ) // MasqTCPServer covers the TCP parts of a standard web server (TCP based HTTP/HTTPS). diff --git a/extras/outbounds/.mockery.yaml b/extras/outbounds/.mockery.yaml index c9e0b71..5f5cc6e 100644 --- a/extras/outbounds/.mockery.yaml +++ b/extras/outbounds/.mockery.yaml @@ -2,7 +2,7 @@ with-expecter: true inpackage: true dir: . packages: - github.com/apernet/hysteria/extras/outbounds: + github.com/apernet/hysteria/extras/v2/outbounds: interfaces: PluggableOutbound: config: diff --git a/extras/outbounds/acl.go b/extras/outbounds/acl.go index a4dd21c..ecdeaaa 100644 --- a/extras/outbounds/acl.go +++ b/extras/outbounds/acl.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/apernet/hysteria/extras/outbounds/acl" + "github.com/apernet/hysteria/extras/v2/outbounds/acl" ) const ( diff --git a/extras/outbounds/acl/compile.go b/extras/outbounds/acl/compile.go index cdd0a94..caee138 100644 --- a/extras/outbounds/acl/compile.go +++ b/extras/outbounds/acl/compile.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/apernet/hysteria/extras/outbounds/acl/v2geo" + "github.com/apernet/hysteria/extras/v2/outbounds/acl/v2geo" lru "github.com/hashicorp/golang-lru/v2" ) diff --git a/extras/outbounds/acl/compile_test.go b/extras/outbounds/acl/compile_test.go index a11c4e8..bf51f68 100644 --- a/extras/outbounds/acl/compile_test.go +++ b/extras/outbounds/acl/compile_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/apernet/hysteria/extras/outbounds/acl/v2geo" + "github.com/apernet/hysteria/extras/v2/outbounds/acl/v2geo" "github.com/stretchr/testify/assert" ) diff --git a/extras/outbounds/acl/matchers_v2geo.go b/extras/outbounds/acl/matchers_v2geo.go index df83105..ad79b68 100644 --- a/extras/outbounds/acl/matchers_v2geo.go +++ b/extras/outbounds/acl/matchers_v2geo.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/apernet/hysteria/extras/outbounds/acl/v2geo" + "github.com/apernet/hysteria/extras/v2/outbounds/acl/v2geo" ) var _ hostMatcher = (*geoipMatcher)(nil) diff --git a/extras/outbounds/acl/matchers_v2geo_test.go b/extras/outbounds/acl/matchers_v2geo_test.go index 4970baf..cc59512 100644 --- a/extras/outbounds/acl/matchers_v2geo_test.go +++ b/extras/outbounds/acl/matchers_v2geo_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/apernet/hysteria/extras/outbounds/acl/v2geo" + "github.com/apernet/hysteria/extras/v2/outbounds/acl/v2geo" "github.com/stretchr/testify/assert" ) diff --git a/extras/outbounds/interface.go b/extras/outbounds/interface.go index dbe89cb..1870290 100644 --- a/extras/outbounds/interface.go +++ b/extras/outbounds/interface.go @@ -4,7 +4,7 @@ import ( "net" "strconv" - "github.com/apernet/hysteria/core/server" + "github.com/apernet/hysteria/core/v2/server" ) // The PluggableOutbound system is designed to function in a chain-like manner. diff --git a/extras/outbounds/speedtest.go b/extras/outbounds/speedtest.go index b788424..162f4dc 100644 --- a/extras/outbounds/speedtest.go +++ b/extras/outbounds/speedtest.go @@ -3,7 +3,7 @@ package outbounds import ( "net" - "github.com/apernet/hysteria/extras/outbounds/speedtest" + "github.com/apernet/hysteria/extras/v2/outbounds/speedtest" ) const ( diff --git a/extras/trafficlogger/http.go b/extras/trafficlogger/http.go index d0ec0a4..9ab943a 100644 --- a/extras/trafficlogger/http.go +++ b/extras/trafficlogger/http.go @@ -6,7 +6,7 @@ import ( "strconv" "sync" - "github.com/apernet/hysteria/core/server" + "github.com/apernet/hysteria/core/v2/server" ) const (