mirror of
https://github.com/XTLS/Xray-core.git
synced 2026-05-08 14:13:22 +00:00
refactor: use http:// dialerProxy scheme for browser dialer
Agent-Logs-Url: https://github.com/XTLS/Xray-core/sessions/de6da8b1-0d9b-4d56-a5a2-d0b06edc2965 Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
2ecfbcf1b6
commit
3004e1e399
@@ -53,12 +53,12 @@ func CheckLegacyEnv() error {
|
||||
if envAddress == "" {
|
||||
return nil
|
||||
}
|
||||
return errors.PrintRemovedFeatureError("env "+platform.BrowserDialerAddress, "sockopt.dialerProxy with browser://host:port/uuid")
|
||||
return errors.PrintRemovedFeatureError("env "+platform.BrowserDialerAddress, "sockopt.dialerProxy with http://host:port/uuid")
|
||||
}
|
||||
|
||||
func IsBrowserDialerProxy(raw string) bool {
|
||||
parsed, err := url.Parse(raw)
|
||||
return err == nil && strings.EqualFold(parsed.Scheme, "browser")
|
||||
return err == nil && strings.EqualFold(parsed.Scheme, "http")
|
||||
}
|
||||
|
||||
func BeginCollectingDialerProxyURLs() error {
|
||||
@@ -157,7 +157,7 @@ func parseBrowserDialerAddress(addr string) (string, string, bool) {
|
||||
}
|
||||
|
||||
parsedAddr, err := url.Parse(addr)
|
||||
if err != nil || !strings.EqualFold(parsedAddr.Scheme, "browser") || parsedAddr.Host == "" || parsedAddr.Path == "" || parsedAddr.RawQuery != "" || parsedAddr.Fragment != "" {
|
||||
if err != nil || !strings.EqualFold(parsedAddr.Scheme, "http") || parsedAddr.Host == "" || parsedAddr.Path == "" || parsedAddr.RawQuery != "" || parsedAddr.Fragment != "" {
|
||||
return "", "", false
|
||||
}
|
||||
listenAddr := parsedAddr.Host
|
||||
@@ -414,7 +414,7 @@ func dialTaskWithAddress(addr string, task task) (*websocket.Conn, error) {
|
||||
}
|
||||
|
||||
if addr == "" {
|
||||
return nil, errors.New("browser dialer is not configured; set sockopt.dialerProxy to browser://host:port/uuid")
|
||||
return nil, errors.New("browser dialer is not configured; set sockopt.dialerProxy to http://host:port/uuid")
|
||||
}
|
||||
dialer, err := getDialerByAddress(addr)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user