chore: adjust testURL priority

MetaCubeX · Apr 6, 2024 · 19f7220 · 19f7220
1 parent 3249572
commit 19f7220
Showing 1 changed file with 31 additions and 29 deletions.
diff --git a/adapter/outboundgroup/parser.go b/adapter/outboundgroup/parser.go
@@ -88,6 +88,29 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
  }
  groupOption.ExpectedStatus = status
 
+ if len(groupOption.Use) != 0 {
+ PDs, err := getProviders(providersMap, groupOption.Use)
+ if err != nil {
+ return nil, fmt.Errorf("%s: %w", groupName, err)
+ }
+
+ // if test URL is empty, use the first health check URL of providers
+ if groupOption.URL == "" {
+ for _, pd := range PDs {
+ if pd.HealthCheckURL() != "" {
+ groupOption.URL = pd.HealthCheckURL()
+ break
+ }
+ }
+ if groupOption.URL == "" {
+ groupOption.URL = C.DefaultTestURL
+ }
+ } else {
+ addTestUrlToProviders(PDs, groupOption.URL, expectedStatus, groupOption.Filter, uint(groupOption.Interval))
+ }
+ providers = append(providers, PDs...)
+ }
+
  if len(groupOption.Proxies) != 0 {
  ps, err := getProxies(proxyMap, groupOption.Proxies)
  if err != nil {
@@ -98,49 +121,28 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
  return nil, fmt.Errorf("%s: %w", groupName, errDuplicateProvider)
  }
 
- if groupOption.Interval == 0 {
- groupOption.Interval = 300
- }
-
  if groupOption.URL == "" {
  groupOption.URL = C.DefaultTestURL
  }
 
+ // select don't need auto health check
+ if groupOption.Type != "select" && groupOption.Type != "relay" {
+ if groupOption.Interval == 0 {
+ groupOption.Interval = 300
+ }
+ }
+
  hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.TestTimeout), uint(groupOption.Interval), groupOption.Lazy, expectedStatus)
 
  pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
  if err != nil {
  return nil, fmt.Errorf("%s: %w", groupName, err)
  }
 
- providers = append(providers, pd)
+ providers = append([]types.ProxyProvider{pd}, providers...)
  providersMap[groupName] = pd
  }
 
- if len(groupOption.Use) != 0 {
- list, err := getProviders(providersMap, groupOption.Use)
- if err != nil {
- return nil, fmt.Errorf("%s: %w", groupName, err)
- }
-
- if groupOption.URL == "" {
- for _, p := range list {
- if p.HealthCheckURL() != "" {
- groupOption.URL = p.HealthCheckURL()
- }
- break
- }
-
- if groupOption.URL == "" {
- groupOption.URL = C.DefaultTestURL
- }
- }
-
- // different proxy groups use different test URL
- addTestUrlToProviders(list, groupOption.URL, expectedStatus, groupOption.Filter, uint(groupOption.Interval))
- providers = append(providers, list...)
- }
-
  var group C.ProxyAdapter
  switch groupOption.Type {
  case "url-test":