From dccab9084348dd1f2f770245defd7f05529bd6db Mon Sep 17 00:00:00 2001 From: Larvan2 <78135608+Larvan2@users.noreply.github.com> Date: Sun, 21 Jan 2024 23:37:22 +0800 Subject: [PATCH] fix: delay --- core/src/main/golang/native/tunnel/proxies.go | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/core/src/main/golang/native/tunnel/proxies.go b/core/src/main/golang/native/tunnel/proxies.go index a4a57e2ba..8a4021859 100644 --- a/core/src/main/golang/native/tunnel/proxies.go +++ b/core/src/main/golang/native/tunnel/proxies.go @@ -96,8 +96,8 @@ func QueryProxyGroup(name string, sortMode SortMode, uiSubtitlePattern *regexp2. return nil } - proxies := convertProxies(g.Proxies(), uiSubtitlePattern) -// proxies := collectProviders(g.Providers(), uiSubtitlePattern) + proxies := convertProxies(g.Proxies(), uiSubtitlePattern) + // proxies := collectProviders(g.Providers(), uiSubtitlePattern) switch sortMode { case Title: @@ -181,13 +181,20 @@ func convertProxies(proxies []C.Proxy, uiSubtitlePattern *regexp2.Regexp) []*Pro } } } + testURL := "https://www.gstatic.com/generate_204" + for k := range p.ExtraDelayHistories() { + if len(k) > 0 { + testURL = k + break + } + } result = append(result, &Proxy{ Name: name, Title: strings.TrimSpace(title), Subtitle: strings.TrimSpace(subtitle), Type: p.Type().String(), - Delay: int(p.LastDelayForTestUrl("https://www.gstatic.com/generate_204")), + Delay: int(p.LastDelayForTestUrl(testURL)), }) } return result @@ -213,12 +220,20 @@ func collectProviders(providers []provider.ProxyProvider, uiSubtitlePattern *reg } } + testURL := "https://www.gstatic.com/generate_204" + for k := range px.ExtraDelayHistories() { + if len(k) > 0 { + testURL = k + break + } + } + result = append(result, &Proxy{ Name: name, Title: strings.TrimSpace(title), Subtitle: strings.TrimSpace(subtitle), Type: px.Type().String(), - Delay: int(px.LastDelayForTestUrl("https://www.gstatic.com/generate_204")), + Delay: int(px.LastDelayForTestUrl(testURL)), }) } }