dan9i10/xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-05-08 14:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: drop socket proto browser_dialer and remove dialer init locks

Browse Source 
Agent-Logs-Url: https://github.com/XTLS/Xray-core/sessions/b6b773ed-3d59-4a25-b688-8032a496a8de

Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-26 21:07:28 +00:00
committed by GitHub
parent f1f0d5970a
commit 8939657016
3 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
transport/internet/browser_dialer/dialer.go
View File

@@ -12,7 +12,6 @@ import (
"net/url"
pathlib "path"
"strings"
"sync"
"time"
"github.com/gorilla/websocket"
@@ -33,7 +32,6 @@ type task struct {
var dialersByAddress = map[string]*dialerInstance{}
var serversByListenAddr = map[string]*dialerServer{}
var initMu sync.Mutex
var initialized bool
var pendingURLs map[string]struct{}
@@ -62,9 +60,6 @@ func IsBrowserDialerProxy(raw string) bool {
}
func BeginCollectingDialerProxyURLs() error {
initMu.Lock()
defer initMu.Unlock()
if initialized {
return errors.New("browser dialer does not support dynamic add/remove; restart is required after changing configuration")
}
@@ -79,8 +74,6 @@ func RegisterDialerProxyURL(raw string) error {
if !IsBrowserDialerProxy(raw) {
return nil
}
initMu.Lock()
defer initMu.Unlock()
if pendingURLs == nil {
return errors.New("browser dialer url collection is not initialized")
}
@@ -89,9 +82,6 @@ func RegisterDialerProxyURL(raw string) error {
}
func ConfigureCollectedDialerProxyURLs() error {
initMu.Lock()
defer initMu.Unlock()
if initialized {
return errors.New("browser dialer does not support dynamic add/remove; restart is required after changing configuration")
}

13
transport/internet/config.pb.go
View File

@@ -749,7 +749,6 @@ type SocketConfig struct {
AddressPortStrategy AddressPortStrategy `protobuf:"varint,21,opt,name=address_port_strategy,json=addressPortStrategy,proto3,enum=xray.transport.internet.AddressPortStrategy" json:"address_port_strategy,omitempty"`
HappyEyeballs *HappyEyeballsConfig `protobuf:"bytes,22,opt,name=happy_eyeballs,json=happyEyeballs,proto3" json:"happy_eyeballs,omitempty"`
TrustedXForwardedFor []string `protobuf:"bytes,23,rep,name=trusted_x_forwarded_for,json=trustedXForwardedFor,proto3" json:"trusted_x_forwarded_for,omitempty"`
BrowserDialer string `protobuf:"bytes,24,opt,name=browser_dialer,json=browserDialer,proto3" json:"browser_dialer,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -945,13 +944,6 @@ func (x *SocketConfig) GetTrustedXForwardedFor() []string {
return nil
}
func (x *SocketConfig) GetBrowserDialer() string {
if x != nil {
return x.BrowserDialer
}
return ""
}
type HappyEyeballsConfig struct {
state protoimpl.MessageState `protogen:"open.v1"`
PrioritizeIpv6 bool `protobuf:"varint,1,opt,name=prioritize_ipv6,json=prioritizeIpv6,proto3" json:"prioritize_ipv6,omitempty"`
@@ -1074,7 +1066,7 @@ const file_transport_internet_config_proto_rawDesc = "" +
"\x05level\x18\x03 \x01(\tR\x05level\x12\x10\n" +
"\x03opt\x18\x04 \x01(\tR\x03opt\x12\x14\n" +
"\x05value\x18\x05 \x01(\tR\x05value\x12\x12\n" +
"\x04type\x18\x06 \x01(\tR\x04type\"\xb0\t\n" +
"\x04type\x18\x06 \x01(\tR\x04type\"\x89\t\n" +
"\fSocketConfig\x12\x12\n" +
"\x04mark\x18\x01 \x01(\x05R\x04mark\x12\x10\n" +
"\x03tfo\x18\x02 \x01(\x05R\x03tfo\x12H\n" +
@@ -1099,8 +1091,7 @@ const file_transport_internet_config_proto_rawDesc = "" +
"\rcustomSockopt\x18\x14 \x03(\v2&.xray.transport.internet.CustomSockoptR\rcustomSockopt\x12`\n" +
"\x15address_port_strategy\x18\x15 \x01(\x0e2,.xray.transport.internet.AddressPortStrategyR\x13addressPortStrategy\x12S\n" +
"\x0ehappy_eyeballs\x18\x16 \x01(\v2,.xray.transport.internet.HappyEyeballsConfigR\rhappyEyeballs\x125\n" +
"\x17trusted_x_forwarded_for\x18\x17 \x03(\tR\x14trustedXForwardedFor\x12%\n" +
"\x0ebrowser_dialer\x18\x18 \x01(\tR\rbrowserDialer\"/\n" +
"\x17trusted_x_forwarded_for\x18\x17 \x03(\tR\x14trustedXForwardedFor\"/\n" +
"\n" +
"TProxyMode\x12\a\n" +
"\x03Off\x10\x00\x12\n" +

2
transport/internet/config.proto
View File

@@ -161,8 +161,6 @@ message SocketConfig {
HappyEyeballsConfig happy_eyeballs = 22;
repeated string trusted_x_forwarded_for = 23;
string browser_dialer = 24;
}
message HappyEyeballsConfig {