Skip to content

chore: remove vmess from core. #4952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

chore: remove vmess from core. #4952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion common/platform/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const (

UseReadV = "xray.buf.readv"
UseFreedomSplice = "xray.buf.splice"
UseVmessPadding = "xray.vmess.padding"
UseCone = "xray.cone.disabled"

BufferSize = "xray.ray.buffer.size"
Expand Down
10 changes: 5 additions & 5 deletions common/protocol/server_spec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package protocol_test

import (
"github.com/xtls/xray-core/proxy/vless"
"strings"
"testing"
"time"
Expand All @@ -9,7 +10,6 @@ import (
"github.com/xtls/xray-core/common/net"
. "github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/uuid"
"github.com/xtls/xray-core/proxy/vmess"
)

func TestAlwaysValidStrategy(t *testing.T) {
Expand Down Expand Up @@ -44,27 +44,27 @@ func TestUserInServerSpec(t *testing.T) {
uuid1 := uuid.New()
uuid2 := uuid.New()

toAccount := func(a *vmess.Account) Account {
toAccount := func(a *vless.Account) Account {
account, err := a.AsAccount()
common.Must(err)
return account
}

spec := NewServerSpec(net.Destination{}, AlwaysValid(), &MemoryUser{
Email: "[email protected]",
Account: toAccount(&vmess.Account{Id: uuid1.String()}),
Account: toAccount(&vless.Account{Id: uuid1.String()}),
})
if spec.HasUser(&MemoryUser{
Email: "[email protected]",
Account: toAccount(&vmess.Account{Id: uuid2.String()}),
Account: toAccount(&vless.Account{Id: uuid2.String()}),
}) {
t.Error("has user: ", uuid2)
}

spec.AddUser(&MemoryUser{Email: "[email protected]"})
if !spec.HasUser(&MemoryUser{
Email: "[email protected]",
Account: toAccount(&vmess.Account{Id: uuid1.String()}),
Account: toAccount(&vless.Account{Id: uuid1.String()}),
}) {
t.Error("not having user: ", uuid1)
}
Expand Down
8 changes: 4 additions & 4 deletions core/xray_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package core_test

import (
"github.com/xtls/xray-core/proxy/vless"
"github.com/xtls/xray-core/proxy/vless/outbound"
"testing"

"github.com/xtls/xray-core/app/dispatcher"
Expand All @@ -15,8 +17,6 @@ import (
"github.com/xtls/xray-core/features/dns/localdns"
_ "github.com/xtls/xray-core/main/distro/all"
"github.com/xtls/xray-core/proxy/dokodemo"
"github.com/xtls/xray-core/proxy/vmess"
"github.com/xtls/xray-core/proxy/vmess/outbound"
"github.com/xtls/xray-core/testing/servers/tcp"
"google.golang.org/protobuf/proto"
)
Expand Down Expand Up @@ -63,13 +63,13 @@ func TestXrayClose(t *testing.T) {
Outbound: []*OutboundHandlerConfig{
{
ProxySettings: serial.ToTypedMessage(&outbound.Config{
Receiver: []*protocol.ServerEndpoint{
Vnext: []*protocol.ServerEndpoint{
{
Address: net.NewIPOrDomain(net.LocalHostIP),
Port: uint32(0),
User: []*protocol.User{
{
Account: serial.ToTypedMessage(&vmess.Account{
Account: serial.ToTypedMessage(&vless.Account{
Id: userID.String(),
}),
},
Expand Down
165 changes: 0 additions & 165 deletions infra/conf/vmess.go
View file
Open in desktop

This file was deleted.

111 changes: 0 additions & 111 deletions infra/conf/vmess_test.go
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions infra/conf/xray.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ var (
"mixed": func() interface{} { return new(SocksServerConfig) },
"socks": func() interface{} { return new(SocksServerConfig) },
"vless": func() interface{} { return new(VLessInboundConfig) },
"vmess": func() interface{} { return new(VMessInboundConfig) },
"trojan": func() interface{} { return new(TrojanServerConfig) },
"wireguard": func() interface{} { return &WireGuardConfig{IsClient: false} },
}, "protocol", "settings")
Expand All @@ -40,7 +39,6 @@ var (
"shadowsocks": func() interface{} { return new(ShadowsocksClientConfig) },
"socks": func() interface{} { return new(SocksClientConfig) },
"vless": func() interface{} { return new(VLessOutboundConfig) },
"vmess": func() interface{} { return new(VMessOutboundConfig) },
"trojan": func() interface{} { return new(TrojanClientConfig) },
"dns": func() interface{} { return new(DNSOutboundConfig) },
"wireguard": func() interface{} { return &WireGuardConfig{IsClient: true} },
Expand Down
Loading
Loading