mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-04 13:07:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1089 from apernet/fix-mod-name

Browse source 
fix: mod name major version suffix v2
This commit is contained in:
Toby 2024-05-18 15:59:10 -07:00 • committed by GitHub
commit 396dd0a68c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
71 changed files with 230 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

104
.github/workflows/autotag.yaml vendored Normal file
View file

@ -0,0 +1,104 @@
name: "Create release tags for nested modules"
on:
push:
tags:
- app/v*.*.*
permissions:
contents: write
jobs:
tag:
name: "Create tags"
runs-on: ubuntu-latest
steps:
- name: "Extract tagbase"
id: extract_tagbase
uses: actions/github-script@v7
with:
script: |
const ref = context.ref;
core.info(`context.ref: ${ref}`);
const refPrefix = 'refs/tags/app/';
if (!ref.startsWith(refPrefix)) {
core.setFailed(`context.ref does not start with ${refPrefix}: ${ref}`);
return;
}
const tagbase = ref.slice(refPrefix.length);
core.info(`tagbase: ${tagbase}`);
core.setOutput('tagbase', tagbase);
- name: "Tagging core/*"
uses: actions/github-script@v7
env:
INPUT_TAGPREFIX: "core/"
INPUT_TAGBASE: ${{ steps.extract_tagbase.outputs.tagbase }}
with:
script: |
const tagbase = core.getInput('tagbase', { required: true });
const tagprefix = core.getInput('tagprefix', { required: true });
const refname = `tags/${tagprefix}${tagbase}`;
core.info(`creating ref ${refname}`);
try {
await github.rest.git.createRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: `refs/${refname}`,
sha: context.sha
});
core.info(`created ref ${refname}`);
return;
} catch (error) {
core.info(`failed to create ref ${refname}: ${error}`);
}
core.info(`updating ref ${refname}`)
try {
await github.rest.git.updateRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: refname,
sha: context.sha
});
core.info(`updated ref ${refname}`);
return;
} catch (error) {
core.setFailed(`failed to update ref ${refname}: ${error}`);
}
- name: "Tagging extras/*"
uses: actions/github-script@v7
env:
INPUT_TAGPREFIX: "extras/"
INPUT_TAGBASE: ${{ steps.extract_tagbase.outputs.tagbase }}
with:
script: |
const tagbase = core.getInput('tagbase', { required: true });
const tagprefix = core.getInput('tagprefix', { required: true });
const refname = `tags/${tagprefix}${tagbase}`;
core.info(`creating ref ${refname}`);
try {
await github.rest.git.createRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: `refs/${refname}`,
sha: context.sha
});
core.info(`created ref ${refname}`);
return;
} catch (error) {
core.info(`failed to create ref ${refname}: ${error}`);
}
core.info(`updating ref ${refname}`)
try {
await github.rest.git.updateRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: refname,
sha: context.sha
});
core.info(`updated ref ${refname}`);
return;
} catch (error) {
core.setFailed(`failed to update ref ${refname}: ${error}`);
}

28
app/cmd/client.go
View file

@ -21,20 +21,20 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
"go.uber.org/zap" "go.uber.org/zap"
"github.com/apernet/hysteria/app/internal/forwarding" "github.com/apernet/hysteria/app/v2/internal/forwarding"
"github.com/apernet/hysteria/app/internal/http" "github.com/apernet/hysteria/app/v2/internal/http"
"github.com/apernet/hysteria/app/internal/proxymux" "github.com/apernet/hysteria/app/v2/internal/proxymux"
"github.com/apernet/hysteria/app/internal/redirect" "github.com/apernet/hysteria/app/v2/internal/redirect"
"github.com/apernet/hysteria/app/internal/sockopts" "github.com/apernet/hysteria/app/v2/internal/sockopts"
"github.com/apernet/hysteria/app/internal/socks5" "github.com/apernet/hysteria/app/v2/internal/socks5"
"github.com/apernet/hysteria/app/internal/tproxy" "github.com/apernet/hysteria/app/v2/internal/tproxy"
"github.com/apernet/hysteria/app/internal/tun" "github.com/apernet/hysteria/app/v2/internal/tun"
"github.com/apernet/hysteria/app/internal/url" "github.com/apernet/hysteria/app/v2/internal/url"
"github.com/apernet/hysteria/app/internal/utils" "github.com/apernet/hysteria/app/v2/internal/utils"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
"github.com/apernet/hysteria/extras/correctnet" "github.com/apernet/hysteria/extras/v2/correctnet"
"github.com/apernet/hysteria/extras/obfs" "github.com/apernet/hysteria/extras/v2/obfs"
"github.com/apernet/hysteria/extras/transport/udphop" "github.com/apernet/hysteria/extras/v2/transport/udphop"
) )
// Client flags // Client flags

2
app/cmd/ping.go
View file

@ -7,7 +7,7 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
"go.uber.org/zap" "go.uber.org/zap"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
// pingCmd represents the ping command // pingCmd represents the ping command

16
app/cmd/server.go
View file

@ -21,14 +21,14 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
"go.uber.org/zap" "go.uber.org/zap"
"github.com/apernet/hysteria/app/internal/utils" "github.com/apernet/hysteria/app/v2/internal/utils"
"github.com/apernet/hysteria/core/server" "github.com/apernet/hysteria/core/v2/server"
"github.com/apernet/hysteria/extras/auth" "github.com/apernet/hysteria/extras/v2/auth"
"github.com/apernet/hysteria/extras/correctnet" "github.com/apernet/hysteria/extras/v2/correctnet"
"github.com/apernet/hysteria/extras/masq" "github.com/apernet/hysteria/extras/v2/masq"
"github.com/apernet/hysteria/extras/obfs" "github.com/apernet/hysteria/extras/v2/obfs"
"github.com/apernet/hysteria/extras/outbounds" "github.com/apernet/hysteria/extras/v2/outbounds"
"github.com/apernet/hysteria/extras/trafficlogger" "github.com/apernet/hysteria/extras/v2/trafficlogger"
) )
const ( const (

8
app/cmd/speedtest.go
View file

@ -9,10 +9,10 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
"go.uber.org/zap" "go.uber.org/zap"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
hyErrors "github.com/apernet/hysteria/core/errors" hyErrors "github.com/apernet/hysteria/core/v2/errors"
"github.com/apernet/hysteria/extras/outbounds" "github.com/apernet/hysteria/extras/v2/outbounds"
"github.com/apernet/hysteria/extras/outbounds/speedtest" "github.com/apernet/hysteria/extras/v2/outbounds/speedtest"
) )
var ( var (

4
app/cmd/update.go
View file

@ -6,8 +6,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"go.uber.org/zap" "go.uber.org/zap"
"github.com/apernet/hysteria/app/internal/utils" "github.com/apernet/hysteria/app/v2/internal/utils"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
const ( const (

10
app/go.mod
View file

@ -1,11 +1,11 @@
module github.com/apernet/hysteria/app module github.com/apernet/hysteria/app/v2
go 1.21 go 1.21
require ( require (
github.com/apernet/go-tproxy v0.0.0-20230809025308-8f4723fd742f github.com/apernet/go-tproxy v0.0.0-20230809025308-8f4723fd742f
github.com/apernet/hysteria/core v0.0.0-00010101000000-000000000000 github.com/apernet/hysteria/core/v2 v2.0.0-00010101000000-000000000000
github.com/apernet/hysteria/extras v0.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/apernet/sing-tun v0.2.6-0.20240323130332-b9f6511036ad
github.com/caddyserver/certmagic v0.17.2 github.com/caddyserver/certmagic v0.17.2
github.com/mdp/qrterminal/v3 v3.1.1 github.com/mdp/qrterminal/v3 v3.1.1
@ -66,6 +66,6 @@ require (
rsc.io/qr v0.2.0 // indirect 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

2
app/internal/forwarding/tcp.go
View file

@ -4,7 +4,7 @@ import (
"io" "io"
"net" "net"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
type TCPTunnel struct { type TCPTunnel struct {

2
app/internal/forwarding/tcp_test.go
View file

@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/assert" "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) { func TestTCPTunnel(t *testing.T) {

2
app/internal/forwarding/udp.go
View file

@ -6,7 +6,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
const ( const (

2
app/internal/forwarding/udp_test.go
View file

@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/assert" "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) { func TestUDPTunnel(t *testing.T) {

2
app/internal/http/server.go
View file

@ -12,7 +12,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
const ( const (

2
app/internal/http/server_test.go
View file

@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
const ( const (

2
app/internal/proxymux/manager.go
View file

@ -4,7 +4,7 @@ import (
"net" "net"
"sync" "sync"
"github.com/apernet/hysteria/extras/correctnet" "github.com/apernet/hysteria/extras/v2/correctnet"
) )
type muxManager struct { type muxManager struct {

2
app/internal/proxymux/mux_test.go
View file

@ -7,7 +7,7 @@ import (
"testing" "testing"
"time" "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/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"

2
app/internal/redirect/tcp_linux.go
View file

@ -8,7 +8,7 @@ import (
"syscall" "syscall"
"unsafe" "unsafe"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
const ( const (

2
app/internal/redirect/tcp_others.go
View file

@ -6,7 +6,7 @@ import (
"errors" "errors"
"net" "net"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
type TCPRedirect struct { type TCPRedirect struct {

2
app/internal/socks5/server.go
View file

@ -7,7 +7,7 @@ import (
"github.com/txthinking/socks5" "github.com/txthinking/socks5"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
const udpBufferSize = 4096 const udpBufferSize = 4096

2
app/internal/socks5/server_test.go
View file

@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/assert" "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) { func TestServer(t *testing.T) {

2
app/internal/tproxy/tcp_linux.go
View file

@ -5,7 +5,7 @@ import (
"net" "net"
"github.com/apernet/go-tproxy" "github.com/apernet/go-tproxy"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
type TCPTProxy struct { type TCPTProxy struct {

2
app/internal/tproxy/tcp_others.go
View file

@ -6,7 +6,7 @@ import (
"errors" "errors"
"net" "net"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
type TCPTProxy struct { type TCPTProxy struct {

2
app/internal/tproxy/udp_linux.go
View file

@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/apernet/go-tproxy" "github.com/apernet/go-tproxy"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
const ( const (

2
app/internal/tproxy/udp_others.go
View file

@ -7,7 +7,7 @@ import (
"net" "net"
"time" "time"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
type UDPTProxy struct { type UDPTProxy struct {

2
app/internal/tun/server.go
View file

@ -14,7 +14,7 @@ import (
"github.com/sagernet/sing/common/network" "github.com/sagernet/sing/common/network"
"go.uber.org/zap" "go.uber.org/zap"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
type Server struct { type Server struct {

4
app/internal/utils/geoloader.go
View file

@ -7,8 +7,8 @@ import (
"os" "os"
"time" "time"
"github.com/apernet/hysteria/extras/outbounds/acl" "github.com/apernet/hysteria/extras/v2/outbounds/acl"
"github.com/apernet/hysteria/extras/outbounds/acl/v2geo" "github.com/apernet/hysteria/extras/v2/outbounds/acl/v2geo"
) )
const ( const (

2
app/internal/utils/update.go
View file

@ -8,7 +8,7 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
const ( const (

2
app/internal/utils_test/mock.go
View file

@ -5,7 +5,7 @@ import (
"net" "net"
"time" "time"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
) )
type MockEchoHyClient struct{} type MockEchoHyClient struct{}

2
app/main.go
View file

@ -1,6 +1,6 @@
package main package main
import "github.com/apernet/hysteria/app/cmd" import "github.com/apernet/hysteria/app/v2/cmd"
func main() { func main() {
cmd.Execute() cmd.Execute()

2
core/client/.mockery.yaml
View file

@ -2,7 +2,7 @@ with-expecter: true
inpackage: true inpackage: true
dir: . dir: .
packages: packages:
github.com/apernet/hysteria/core/client: github.com/apernet/hysteria/core/v2/client:
interfaces: interfaces:
udpIO: udpIO:
config: config:

8
core/client/client.go
View file

@ -8,10 +8,10 @@ import (
"net/url" "net/url"
"time" "time"
coreErrs "github.com/apernet/hysteria/core/errors" coreErrs "github.com/apernet/hysteria/core/v2/errors"
"github.com/apernet/hysteria/core/internal/congestion" "github.com/apernet/hysteria/core/v2/internal/congestion"
"github.com/apernet/hysteria/core/internal/protocol" "github.com/apernet/hysteria/core/v2/internal/protocol"
"github.com/apernet/hysteria/core/internal/utils" "github.com/apernet/hysteria/core/v2/internal/utils"
"github.com/apernet/quic-go" "github.com/apernet/quic-go"
"github.com/apernet/quic-go/http3" "github.com/apernet/quic-go/http3"

4
core/client/config.go
View file

@ -5,8 +5,8 @@ import (
"net" "net"
"time" "time"
"github.com/apernet/hysteria/core/errors" "github.com/apernet/hysteria/core/v2/errors"
"github.com/apernet/hysteria/core/internal/pmtud" "github.com/apernet/hysteria/core/v2/internal/pmtud"
) )
const ( const (

2
core/client/mock_udpIO.go
View file

@ -3,7 +3,7 @@
package client package client
import ( import (
protocol "github.com/apernet/hysteria/core/internal/protocol" protocol "github.com/apernet/hysteria/core/v2/internal/protocol"
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
) )

2
core/client/reconnect.go
View file

@ -4,7 +4,7 @@ import (
"net" "net"
"sync" "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, // reconnectableClientImpl is a wrapper of Client, which can reconnect when the connection is closed,

6
core/client/udp.go
View file

@ -8,9 +8,9 @@ import (
"github.com/apernet/quic-go" "github.com/apernet/quic-go"
coreErrs "github.com/apernet/hysteria/core/errors" coreErrs "github.com/apernet/hysteria/core/v2/errors"
"github.com/apernet/hysteria/core/internal/frag" "github.com/apernet/hysteria/core/v2/internal/frag"
"github.com/apernet/hysteria/core/internal/protocol" "github.com/apernet/hysteria/core/v2/internal/protocol"
) )
const ( const (

4
core/client/udp_test.go
View file

@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"go.uber.org/goleak" "go.uber.org/goleak"
coreErrs "github.com/apernet/hysteria/core/errors" coreErrs "github.com/apernet/hysteria/core/v2/errors"
"github.com/apernet/hysteria/core/internal/protocol" "github.com/apernet/hysteria/core/v2/internal/protocol"
) )
func TestUDPSessionManager(t *testing.T) { func TestUDPSessionManager(t *testing.T) {

2
core/go.mod
View file

@ -1,4 +1,4 @@
module github.com/apernet/hysteria/core module github.com/apernet/hysteria/core/v2
go 1.21 go 1.21

2
core/internal/congestion/bbr/bbr_sender.go
View file

@ -8,7 +8,7 @@ import (
"github.com/apernet/quic-go/congestion" "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 // BbrSender implements BBR congestion control algorithm. BBR aims to estimate

2
core/internal/congestion/brutal/brutal.go
View file

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/apernet/hysteria/core/internal/congestion/common" "github.com/apernet/hysteria/core/v2/internal/congestion/common"
"github.com/apernet/quic-go/congestion" "github.com/apernet/quic-go/congestion"
) )

4
core/internal/congestion/utils.go
View file

@ -1,8 +1,8 @@
package congestion package congestion
import ( import (
"github.com/apernet/hysteria/core/internal/congestion/bbr" "github.com/apernet/hysteria/core/v2/internal/congestion/bbr"
"github.com/apernet/hysteria/core/internal/congestion/brutal" "github.com/apernet/hysteria/core/v2/internal/congestion/brutal"
"github.com/apernet/quic-go" "github.com/apernet/quic-go"
) )

2
core/internal/frag/frag.go
View file

@ -1,7 +1,7 @@
package frag package frag
import ( 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 { func FragUDPMessage(m *protocol.UDPMessage, maxSize int) []protocol.UDPMessage {

2
core/internal/frag/frag_test.go
View file

@ -4,7 +4,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/apernet/hysteria/core/internal/protocol" "github.com/apernet/hysteria/core/v2/internal/protocol"
) )
func TestFragUDPMessage(t *testing.T) { func TestFragUDPMessage(t *testing.T) {

2
core/internal/integration_tests/.mockery.yaml
View file

@ -7,7 +7,7 @@ packages:
Conn: Conn:
config: config:
mockname: MockConn mockname: MockConn
github.com/apernet/hysteria/core/server: github.com/apernet/hysteria/core/v2/server:
interfaces: interfaces:
Outbound: Outbound:
config: config:

8
core/internal/integration_tests/close_test.go
View file

@ -9,10 +9,10 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
"github.com/apernet/hysteria/core/errors" "github.com/apernet/hysteria/core/v2/errors"
"github.com/apernet/hysteria/core/internal/integration_tests/mocks" "github.com/apernet/hysteria/core/v2/internal/integration_tests/mocks"
"github.com/apernet/hysteria/core/server" "github.com/apernet/hysteria/core/v2/server"
) )
// TestClientServerTCPClose tests whether the client/server propagates the close of a connection correctly. // TestClientServerTCPClose tests whether the client/server propagates the close of a connection correctly.

6
core/internal/integration_tests/masq_test.go
View file

@ -12,9 +12,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/apernet/hysteria/core/internal/integration_tests/mocks" "github.com/apernet/hysteria/core/v2/internal/integration_tests/mocks"
"github.com/apernet/hysteria/core/internal/protocol" "github.com/apernet/hysteria/core/v2/internal/protocol"
"github.com/apernet/hysteria/core/server" "github.com/apernet/hysteria/core/v2/server"
"github.com/apernet/quic-go" "github.com/apernet/quic-go"
"github.com/apernet/quic-go/http3" "github.com/apernet/quic-go/http3"

2
core/internal/integration_tests/mocks/mock_Outbound.go
View file

@ -7,7 +7,7 @@ import (
mock "github.com/stretchr/testify/mock" 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 // MockOutbound is an autogenerated mock type for the Outbound type

8
core/internal/integration_tests/smoke_test.go
View file

@ -8,10 +8,10 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
coreErrs "github.com/apernet/hysteria/core/errors" coreErrs "github.com/apernet/hysteria/core/v2/errors"
"github.com/apernet/hysteria/core/internal/integration_tests/mocks" "github.com/apernet/hysteria/core/v2/internal/integration_tests/mocks"
"github.com/apernet/hysteria/core/server" "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. // Smoke tests that act as a sanity check for client & server to ensure they can talk to each other correctly.

6
core/internal/integration_tests/stress_test.go
View file

@ -13,9 +13,9 @@ import (
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"golang.org/x/time/rate" "golang.org/x/time/rate"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
"github.com/apernet/hysteria/core/internal/integration_tests/mocks" "github.com/apernet/hysteria/core/v2/internal/integration_tests/mocks"
"github.com/apernet/hysteria/core/server" "github.com/apernet/hysteria/core/v2/server"
) )
type tcpStressor struct { type tcpStressor struct {

6
core/internal/integration_tests/trafficlogger_test.go
View file

@ -9,9 +9,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/apernet/hysteria/core/client" "github.com/apernet/hysteria/core/v2/client"
"github.com/apernet/hysteria/core/internal/integration_tests/mocks" "github.com/apernet/hysteria/core/v2/internal/integration_tests/mocks"
"github.com/apernet/hysteria/core/server" "github.com/apernet/hysteria/core/v2/server"
) )
// TestClientServerTrafficLoggerTCP tests that the traffic logger is correctly called for TCP connections, // TestClientServerTrafficLoggerTCP tests that the traffic logger is correctly called for TCP connections,

2
core/internal/integration_tests/utils_test.go
View file

@ -5,7 +5,7 @@ import (
"io" "io"
"net" "net"
"github.com/apernet/hysteria/core/server" "github.com/apernet/hysteria/core/v2/server"
) )
// This file provides utilities for the integration tests. // This file provides utilities for the integration tests.

2
core/internal/protocol/proxy.go
View file

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/apernet/hysteria/core/errors" "github.com/apernet/hysteria/core/v2/errors"
"github.com/apernet/quic-go/quicvarint" "github.com/apernet/quic-go/quicvarint"
) )

2
core/server/.mockery.yaml
View file

@ -2,7 +2,7 @@ with-expecter: true
inpackage: true inpackage: true
dir: . dir: .
packages: packages:
github.com/apernet/hysteria/core/server: github.com/apernet/hysteria/core/v2/server:
interfaces: interfaces:
udpIO: udpIO:
config: config:

4
core/server/config.go
View file

@ -6,8 +6,8 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/apernet/hysteria/core/errors" "github.com/apernet/hysteria/core/v2/errors"
"github.com/apernet/hysteria/core/internal/pmtud" "github.com/apernet/hysteria/core/v2/internal/pmtud"
) )
const ( const (

2
core/server/mock_udpIO.go
View file

@ -3,7 +3,7 @@
package server package server
import ( import (
protocol "github.com/apernet/hysteria/core/internal/protocol" protocol "github.com/apernet/hysteria/core/v2/internal/protocol"
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
) )

6
core/server/server.go
View file

@ -9,9 +9,9 @@ import (
"github.com/apernet/quic-go" "github.com/apernet/quic-go"
"github.com/apernet/quic-go/http3" "github.com/apernet/quic-go/http3"
"github.com/apernet/hysteria/core/internal/congestion" "github.com/apernet/hysteria/core/v2/internal/congestion"
"github.com/apernet/hysteria/core/internal/protocol" "github.com/apernet/hysteria/core/v2/internal/protocol"
"github.com/apernet/hysteria/core/internal/utils" "github.com/apernet/hysteria/core/v2/internal/utils"
) )
const ( const (

6
core/server/udp.go
View file

@ -8,9 +8,9 @@ import (
"github.com/apernet/quic-go" "github.com/apernet/quic-go"
"github.com/apernet/hysteria/core/internal/frag" "github.com/apernet/hysteria/core/v2/internal/frag"
"github.com/apernet/hysteria/core/internal/protocol" "github.com/apernet/hysteria/core/v2/internal/protocol"
"github.com/apernet/hysteria/core/internal/utils" "github.com/apernet/hysteria/core/v2/internal/utils"
) )
const ( const (

2
core/server/udp_test.go
View file

@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"go.uber.org/goleak" "go.uber.org/goleak"
"github.com/apernet/hysteria/core/internal/protocol" "github.com/apernet/hysteria/core/v2/internal/protocol"
) )
func TestUDPSessionManager(t *testing.T) { func TestUDPSessionManager(t *testing.T) {

2
extras/auth/command.go
View file

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/apernet/hysteria/core/server" "github.com/apernet/hysteria/core/v2/server"
) )
var _ server.Authenticator = &CommandAuthenticator{} var _ server.Authenticator = &CommandAuthenticator{}

2
extras/auth/http.go
View file

@ -10,7 +10,7 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/apernet/hysteria/core/server" "github.com/apernet/hysteria/core/v2/server"
) )
const ( const (

2
extras/auth/password.go
View file

@ -3,7 +3,7 @@ package auth
import ( import (
"net" "net"
"github.com/apernet/hysteria/core/server" "github.com/apernet/hysteria/core/v2/server"
) )
var _ server.Authenticator = &PasswordAuthenticator{} var _ server.Authenticator = &PasswordAuthenticator{}

2
extras/auth/userpass.go
View file

@ -4,7 +4,7 @@ import (
"net" "net"
"strings" "strings"
"github.com/apernet/hysteria/core/server" "github.com/apernet/hysteria/core/v2/server"
) )
const ( const (

6
extras/go.mod
View file

@ -1,9 +1,9 @@
module github.com/apernet/hysteria/extras module github.com/apernet/hysteria/extras/v2
go 1.21 go 1.21
require ( 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/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6
github.com/hashicorp/golang-lru/v2 v2.0.5 github.com/hashicorp/golang-lru/v2 v2.0.5
github.com/miekg/dns v1.1.55 github.com/miekg/dns v1.1.55
@ -34,4 +34,4 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect
) )
replace github.com/apernet/hysteria/core => ../core replace github.com/apernet/hysteria/core/v2 => ../core

2
extras/masq/server.go
View file

@ -7,7 +7,7 @@ import (
"net" "net"
"net/http" "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). // MasqTCPServer covers the TCP parts of a standard web server (TCP based HTTP/HTTPS).

2
extras/outbounds/.mockery.yaml
View file

@ -2,7 +2,7 @@ with-expecter: true
inpackage: true inpackage: true
dir: . dir: .
packages: packages:
github.com/apernet/hysteria/extras/outbounds: github.com/apernet/hysteria/extras/v2/outbounds:
interfaces: interfaces:
PluggableOutbound: PluggableOutbound:
config: config:

2
extras/outbounds/acl.go
View file

@ -6,7 +6,7 @@ import (
"os" "os"
"strings" "strings"
"github.com/apernet/hysteria/extras/outbounds/acl" "github.com/apernet/hysteria/extras/v2/outbounds/acl"
) )
const ( const (

2
extras/outbounds/acl/compile.go
View file

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"strings" "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" lru "github.com/hashicorp/golang-lru/v2"
) )

2
extras/outbounds/acl/compile_test.go
View file

@ -4,7 +4,7 @@ import (
"net" "net"
"testing" "testing"
"github.com/apernet/hysteria/extras/outbounds/acl/v2geo" "github.com/apernet/hysteria/extras/v2/outbounds/acl/v2geo"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

2
extras/outbounds/acl/matchers_v2geo.go
View file

@ -8,7 +8,7 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/apernet/hysteria/extras/outbounds/acl/v2geo" "github.com/apernet/hysteria/extras/v2/outbounds/acl/v2geo"
) )
var _ hostMatcher = (*geoipMatcher)(nil) var _ hostMatcher = (*geoipMatcher)(nil)

2
extras/outbounds/acl/matchers_v2geo_test.go
View file

@ -4,7 +4,7 @@ import (
"net" "net"
"testing" "testing"
"github.com/apernet/hysteria/extras/outbounds/acl/v2geo" "github.com/apernet/hysteria/extras/v2/outbounds/acl/v2geo"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

2
extras/outbounds/interface.go
View file

@ -4,7 +4,7 @@ import (
"net" "net"
"strconv" "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. // The PluggableOutbound system is designed to function in a chain-like manner.

2
extras/outbounds/speedtest.go
View file

@ -3,7 +3,7 @@ package outbounds
import ( import (
"net" "net"
"github.com/apernet/hysteria/extras/outbounds/speedtest" "github.com/apernet/hysteria/extras/v2/outbounds/speedtest"
) )
const ( const (

2
extras/trafficlogger/http.go
View file

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"sync" "sync"
"github.com/apernet/hysteria/core/server" "github.com/apernet/hysteria/core/v2/server"
) )
const ( const (