SagerNet/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-04-03 20:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

refactor: Modular inbounds/outbounds

Browse source
This commit is contained in:
世界 2024-11-02 00:39:02 +08:00
parent 9f7683818f
commit e233fd4fe5
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
152 changed files with 3116 additions and 2926 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/brutal_test.go
View file

@ -15,7 +15,7 @@ func TestBrutalShadowsocks(t *testing.T) {
method := shadowaead_2022.List[0]
password := mkBase64(t, 16)
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -46,7 +46,7 @@ func TestBrutalShadowsocks(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -100,7 +100,7 @@ func TestBrutalTrojan(t *testing.T) {
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
password := mkBase64(t, 16)
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -138,7 +138,7 @@ func TestBrutalTrojan(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -197,7 +197,7 @@ func TestBrutalTrojan(t *testing.T) {
func TestBrutalVMess(t *testing.T) {
user, _ := uuid.NewV4()
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -227,7 +227,7 @@ func TestBrutalVMess(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -279,7 +279,7 @@ func TestBrutalVMess(t *testing.T) {
func TestBrutalVLESS(t *testing.T) {
user, _ := uuid.NewV4()
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -326,7 +326,7 @@ func TestBrutalVLESS(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

4
test/direct_test.go
View file

@ -11,7 +11,7 @@ import (
// Since this is a feature one-off added by outsiders, I won't address these anymore.
func _TestProxyProtocol(t *testing.T) {
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -33,7 +33,7 @@ func _TestProxyProtocol(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

6
test/domain_inbound_test.go
View file

@ -6,7 +6,7 @@ import (
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-box/option"
dns "github.com/sagernet/sing-dns"
"github.com/sagernet/sing-dns"
"github.com/gofrs/uuid/v5"
)
@ -14,7 +14,7 @@ import (
func TestTUICDomainUDP(t *testing.T) {
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -49,7 +49,7 @@ func TestTUICDomainUDP(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

12
test/ech_test.go
View file

@ -16,7 +16,7 @@ func TestECH(t *testing.T) {
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
echConfig, echKey := common.Must2(tls.ECHKeygenDefault("not.example.org", false))
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -55,7 +55,7 @@ func TestECH(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -109,7 +109,7 @@ func TestECHQUIC(t *testing.T) {
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
echConfig, echKey := common.Must2(tls.ECHKeygenDefault("not.example.org", false))
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -145,7 +145,7 @@ func TestECHQUIC(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -199,7 +199,7 @@ func TestECHHysteria2(t *testing.T) {
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
echConfig, echKey := common.Must2(tls.ECHKeygenDefault("not.example.org", false))
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -235,7 +235,7 @@ func TestECHHysteria2(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

4
test/http_test.go
View file

@ -10,7 +10,7 @@ import (
func TestHTTPSelf(t *testing.T) {
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -31,7 +31,7 @@ func TestHTTPSelf(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

10
test/hysteria2_test.go
View file

@ -28,7 +28,7 @@ func testHysteria2Self(t *testing.T, salamanderPassword string) {
}
}
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -63,7 +63,7 @@ func testHysteria2Self(t *testing.T, salamanderPassword string) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -115,7 +115,7 @@ func testHysteria2Self(t *testing.T, salamanderPassword string) {
func TestHysteria2Inbound(t *testing.T) {
caPem, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeHysteria2,
Hysteria2Options: option.Hysteria2InboundOptions{
@ -167,7 +167,7 @@ func TestHysteria2Outbound(t *testing.T) {
},
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
MixedOptions: option.HTTPMixedInboundOptions{
@ -178,7 +178,7 @@ func TestHysteria2Outbound(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeHysteria2,
Hysteria2Options: option.Hysteria2OutboundOptions{

10
test/hysteria_test.go
View file

@ -11,7 +11,7 @@ import (
func TestHysteriaSelf(t *testing.T) {
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -46,7 +46,7 @@ func TestHysteriaSelf(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -98,7 +98,7 @@ func TestHysteriaSelf(t *testing.T) {
func TestHysteriaInbound(t *testing.T) {
caPem, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeHysteria,
HysteriaOptions: option.HysteriaInboundOptions{
@ -149,7 +149,7 @@ func TestHysteriaOutbound(t *testing.T) {
},
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
MixedOptions: option.HTTPMixedInboundOptions{
@ -160,7 +160,7 @@ func TestHysteriaOutbound(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeHysteria,
HysteriaOptions: option.HysteriaOutboundOptions{

4
test/inbound_detour_test.go
View file

@ -13,7 +13,7 @@ func TestChainedInbound(t *testing.T) {
method := shadowaead_2022.List[0]
password := mkBase64(t, 16)
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -49,7 +49,7 @@ func TestChainedInbound(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

10
test/mux_cool_test.go
View file

@ -37,7 +37,7 @@ func TestMuxCoolServer(t *testing.T) {
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeVMess,
VMessOptions: option.VMessInboundOptions{
@ -81,7 +81,7 @@ func TestMuxCoolClient(t *testing.T) {
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
MixedOptions: option.HTTPMixedInboundOptions{
@ -92,7 +92,7 @@ func TestMuxCoolClient(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeVMess,
VMessOptions: option.VMessOutboundOptions{
@ -112,7 +112,7 @@ func TestMuxCoolClient(t *testing.T) {
func TestMuxCoolSelf(t *testing.T) {
user := newUUID()
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -139,7 +139,7 @@ func TestMuxCoolSelf(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

8
test/mux_test.go
View file

@ -55,7 +55,7 @@ func testShadowsocksMux(t *testing.T, options option.OutboundMultiplexOptions) {
method := shadowaead_2022.List[0]
password := mkBase64(t, 16)
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -81,7 +81,7 @@ func testShadowsocksMux(t *testing.T, options option.OutboundMultiplexOptions) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -125,7 +125,7 @@ func testShadowsocksMux(t *testing.T, options option.OutboundMultiplexOptions) {
func testVMessMux(t *testing.T, options option.OutboundMultiplexOptions) {
user, _ := uuid.NewV4()
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -154,7 +154,7 @@ func testVMessMux(t *testing.T, options option.OutboundMultiplexOptions) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

6
test/naive_test.go
View file

@ -13,7 +13,7 @@ import (
func TestNaiveInboundWithNginx(t *testing.T) {
caPem, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeNaive,
NaiveOptions: option.NaiveInboundOptions{
@ -59,7 +59,7 @@ func TestNaiveInboundWithNginx(t *testing.T) {
func TestNaiveInbound(t *testing.T) {
caPem, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeNaive,
NaiveOptions: option.NaiveInboundOptions{
@ -103,7 +103,7 @@ func TestNaiveInbound(t *testing.T) {
func TestNaiveHTTP3Inbound(t *testing.T) {
caPem, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeNaive,
NaiveOptions: option.NaiveInboundOptions{

4
test/shadowsocks_legacy_test.go
View file

@ -24,7 +24,7 @@ func testShadowsocksLegacy(t *testing.T, method string) {
},
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
MixedOptions: option.HTTPMixedInboundOptions{
@ -35,7 +35,7 @@ func testShadowsocksLegacy(t *testing.T, method string) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeShadowsocks,
ShadowsocksOptions: option.ShadowsocksOutboundOptions{

18
test/shadowsocks_test.go
View file

@ -99,7 +99,7 @@ func testShadowsocksInboundWithShadowsocksRust(t *testing.T, method string, pass
Cmd: []string{"-s", F.ToString("127.0.0.1:", serverPort), "-b", F.ToString("0.0.0.0:", clientPort), "-m", method, "-k", password, "-U"},
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeShadowsocks,
ShadowsocksOptions: option.ShadowsocksInboundOptions{
@ -124,7 +124,7 @@ func testShadowsocksOutboundWithShadowsocksRust(t *testing.T, method string, pas
Cmd: []string{"-s", F.ToString("0.0.0.0:", serverPort), "-m", method, "-k", password, "-U"},
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
MixedOptions: option.HTTPMixedInboundOptions{
@ -135,7 +135,7 @@ func testShadowsocksOutboundWithShadowsocksRust(t *testing.T, method string, pas
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeShadowsocks,
ShadowsocksOptions: option.ShadowsocksOutboundOptions{
@ -154,7 +154,7 @@ func testShadowsocksOutboundWithShadowsocksRust(t *testing.T, method string, pas
func testShadowsocksSelf(t *testing.T, method string, password string) {
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -177,7 +177,7 @@ func testShadowsocksSelf(t *testing.T, method string, password string) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -221,7 +221,7 @@ func TestShadowsocksUoT(t *testing.T) {
method := shadowaead_2022.List[0]
password := mkBase64(t, 16)
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -244,7 +244,7 @@ func TestShadowsocksUoT(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -289,7 +289,7 @@ func TestShadowsocksUoT(t *testing.T) {
func testShadowsocks2022EIH(t *testing.T, method string, password string) {
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -317,7 +317,7 @@ func testShadowsocks2022EIH(t *testing.T, method string, password string) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

14
test/shadowtls_test.go
View file

@ -37,7 +37,7 @@ func testShadowTLS(t *testing.T, version int, password string, utlsEanbled bool)
method := shadowaead_2022.List[0]
ssPassword := mkBase64(t, 16)
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
MixedOptions: option.HTTPMixedInboundOptions{
@ -80,7 +80,7 @@ func testShadowTLS(t *testing.T, version int, password string, utlsEanbled bool)
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeShadowsocks,
ShadowsocksOptions: option.ShadowsocksOutboundOptions{
@ -142,7 +142,7 @@ func testShadowTLS(t *testing.T, version int, password string, utlsEanbled bool)
func TestShadowTLSFallback(t *testing.T) {
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeShadowTLS,
ShadowTLSOptions: option.ShadowTLSInboundOptions{
@ -189,7 +189,7 @@ func TestShadowTLSInbound(t *testing.T) {
Cmd: []string{"--v3", "--threads", "1", "client", "--listen", "0.0.0.0:" + F.ToString(otherPort), "--server", "127.0.0.1:" + F.ToString(serverPort), "--sni", "google.com", "--password", password},
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "in",
@ -232,7 +232,7 @@ func TestShadowTLSInbound(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -283,7 +283,7 @@ func TestShadowTLSOutbound(t *testing.T) {
Env: []string{"RUST_LOG=trace"},
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
MixedOptions: option.HTTPMixedInboundOptions{
@ -306,7 +306,7 @@ func TestShadowTLSOutbound(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeShadowsocks,
ShadowsocksOptions: option.ShadowsocksOutboundOptions{

4
test/ss_plugin_test.go
View file

@ -33,7 +33,7 @@ func testShadowsocksPlugin(t *testing.T, name string, opts string, args string)
},
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
MixedOptions: option.HTTPMixedInboundOptions{
@ -44,7 +44,7 @@ func testShadowsocksPlugin(t *testing.T, name string, opts string, args string)
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeShadowsocks,
ShadowsocksOptions: option.ShadowsocksOutboundOptions{

4
test/tfo_test.go
View file

@ -13,7 +13,7 @@ func TestTCPSlowOpen(t *testing.T) {
method := shadowaead.List[0]
password := mkBase64(t, 16)
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -37,7 +37,7 @@ func TestTCPSlowOpen(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

4
test/tls_test.go
View file

@ -11,7 +11,7 @@ import (
func TestUTLS(t *testing.T) {
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -46,7 +46,7 @@ func TestUTLS(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

12
test/trojan_test.go
View file

@ -20,7 +20,7 @@ func TestTrojanOutbound(t *testing.T) {
},
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
MixedOptions: option.HTTPMixedInboundOptions{
@ -31,7 +31,7 @@ func TestTrojanOutbound(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeTrojan,
TrojanOptions: option.TrojanOutboundOptions{
@ -57,7 +57,7 @@ func TestTrojanOutbound(t *testing.T) {
func TestTrojanSelf(t *testing.T) {
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -92,7 +92,7 @@ func TestTrojanSelf(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -140,7 +140,7 @@ func TestTrojanSelf(t *testing.T) {
func TestTrojanPlainSelf(t *testing.T) {
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -167,7 +167,7 @@ func TestTrojanPlainSelf(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

10
test/tuic_test.go
View file

@ -29,7 +29,7 @@ func testTUICSelf(t *testing.T, udpStream bool, zeroRTTHandshake bool) {
udpRelayMode = "quic"
}
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -62,7 +62,7 @@ func testTUICSelf(t *testing.T, udpStream bool, zeroRTTHandshake bool) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -113,7 +113,7 @@ func testTUICSelf(t *testing.T, udpStream bool, zeroRTTHandshake bool) {
func TestTUICInbound(t *testing.T) {
caPem, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeTUIC,
TUICOptions: option.TUICInboundOptions{
@ -160,7 +160,7 @@ func TestTUICOutbound(t *testing.T) {
},
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
MixedOptions: option.HTTPMixedInboundOptions{
@ -171,7 +171,7 @@ func TestTUICOutbound(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeTUIC,
TUICOptions: option.TUICOutboundOptions{

4
test/v2ray_api_test.go
View file

@ -14,7 +14,7 @@ import (
func TestV2RayAPI(t *testing.T) {
i := startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "in",
@ -26,7 +26,7 @@ func TestV2RayAPI(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
Tag: "out",

6
test/v2ray_grpc_test.go
View file

@ -27,7 +27,7 @@ func testV2RayGRPCInbound(t *testing.T, forceLite bool) {
require.NoError(t, err)
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeVMess,
VMessOptions: option.VMessInboundOptions{
@ -126,7 +126,7 @@ func testV2RayGRPCOutbound(t *testing.T, forceLite bool) {
},
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -138,7 +138,7 @@ func testV2RayGRPCOutbound(t *testing.T, forceLite bool) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeVMess,
Tag: "vmess-out",

16
test/v2ray_transport_test.go
View file

@ -44,7 +44,7 @@ func testVMessTransportSelf(t *testing.T, server *option.V2RayTransportOptions,
require.NoError(t, err)
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -80,7 +80,7 @@ func testVMessTransportSelf(t *testing.T, server *option.V2RayTransportOptions,
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -133,7 +133,7 @@ func testTrojanTransportSelf(t *testing.T, server *option.V2RayTransportOptions,
require.NoError(t, err)
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -169,7 +169,7 @@ func testTrojanTransportSelf(t *testing.T, server *option.V2RayTransportOptions,
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -224,7 +224,7 @@ func TestVMessQUICSelf(t *testing.T) {
require.NoError(t, err)
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -260,7 +260,7 @@ func TestVMessQUICSelf(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},
@ -312,7 +312,7 @@ func testV2RayTransportNOTLSSelf(t *testing.T, transport *option.V2RayTransportO
user, err := uuid.DefaultGenerator.NewV4()
require.NoError(t, err)
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -340,7 +340,7 @@ func testV2RayTransportNOTLSSelf(t *testing.T, transport *option.V2RayTransportO
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

6
test/v2ray_ws_test.go
View file

@ -61,7 +61,7 @@ func testV2RayWebsocketInbound(t *testing.T, maxEarlyData uint32, earlyDataHeade
require.NoError(t, err)
_, certPem, keyPem := createSelfSignedCertificate(t, "example.org")
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeVMess,
VMessOptions: option.VMessInboundOptions{
@ -158,7 +158,7 @@ func testV2RayWebsocketOutbound(t *testing.T, maxEarlyData uint32, earlyDataHead
},
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -170,7 +170,7 @@ func testV2RayWebsocketOutbound(t *testing.T, maxEarlyData uint32, earlyDataHead
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeVMess,
Tag: "vmess-out",

10
test/vmess_test.go
View file

@ -181,7 +181,7 @@ func testVMessInboundWithV2Ray(t *testing.T, security string, alterId int, authe
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeVMess,
VMessOptions: option.VMessInboundOptions{
@ -229,7 +229,7 @@ func testVMessOutboundWithV2Ray(t *testing.T, security string, globalPadding boo
})
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
MixedOptions: option.HTTPMixedInboundOptions{
@ -240,7 +240,7 @@ func testVMessOutboundWithV2Ray(t *testing.T, security string, globalPadding boo
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeVMess,
VMessOptions: option.VMessOutboundOptions{
@ -263,7 +263,7 @@ func testVMessOutboundWithV2Ray(t *testing.T, security string, globalPadding boo
func testVMessSelf(t *testing.T, security string, alterId int, globalPadding bool, authenticatedLength bool, packetAddr bool) {
user := newUUID()
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
Tag: "mixed-in",
@ -291,7 +291,7 @@ func testVMessSelf(t *testing.T, security string, alterId int, globalPadding boo
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeDirect,
},

4
test/wireguard_test.go
View file

@ -21,7 +21,7 @@ func _TestWireGuard(t *testing.T) {
})
time.Sleep(5 * time.Second)
startInstance(t, option.Options{
Inbounds: []option.Inbound{
Inbounds: []option.LegacyInbound{
{
Type: C.TypeMixed,
MixedOptions: option.HTTPMixedInboundOptions{
@ -32,7 +32,7 @@ func _TestWireGuard(t *testing.T) {
},
},
},
Outbounds: []option.Outbound{
LegacyOutbounds: []option.LegacyOutbound{
{
Type: C.TypeWireGuard,
WireGuardOptions: option.WireGuardOutboundOptions{

2
test/wrapper_test.go
View file

@ -10,7 +10,7 @@ import (
)
func TestOptionsWrapper(t *testing.T) {
inbound := option.Inbound{
inbound := option.LegacyInbound{
Type: C.TypeHTTP,
HTTPOptions: option.HTTPMixedInboundOptions{
InboundTLSOptionsContainer: option.InboundTLSOptionsContainer{