chore: get HealCheckURL from pd if groupOption URL is empty

MetaCubeX · Feb 24, 2024 · cb7e8b6 · cb7e8b6
1 parent d2a5376
commit cb7e8b6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/adapter/outboundgroup/parser.go b/adapter/outboundgroup/parser.go
@@ -119,17 +119,16 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
  }
 
  if len(groupOption.Use) != 0 {
- if groupOption.URL == "" {
- groupOption.URL = C.DefaultTestURL
- }
  list, err := getProviders(providersMap, groupOption.Use)
  if err != nil {
  return nil, fmt.Errorf("%s: %w", groupName, err)
  }
 
+ if groupOption.URL == "" {
+ groupOption.URL = list[0].HealthCheckURL()
+ }
  // different proxy groups use different test URL
  addTestUrlToProviders(list, groupOption.URL, expectedStatus, groupOption.Filter, uint(groupOption.Interval))
-
  providers = append(providers, list...)
  } else {
  groupOption.Filter = ""

diff --git a/adapter/provider/provider.go b/adapter/provider/provider.go
@@ -106,6 +106,10 @@ func (pp *proxySetProvider) Touch() {
  pp.healthCheck.touch()
 }
 
+func (pp *proxySetProvider) HealthCheckURL() string {
+ return pp.healthCheck.url
+}
+
 func (pp *proxySetProvider) RegisterHealthCheckTask(url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint) {
  pp.healthCheck.registerHealthCheckTask(url, expectedStatus, filter, interval)
 }
@@ -271,6 +275,10 @@ func (cp *compatibleProvider) Touch() {
  cp.healthCheck.touch()
 }
 
+func (cp *compatibleProvider) HealthCheckURL() string {
+ return cp.healthCheck.url
+}
+
 func (cp *compatibleProvider) RegisterHealthCheckTask(url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint) {
  cp.healthCheck.registerHealthCheckTask(url, expectedStatus, filter, interval)
 }

diff --git a/constant/provider/interface.go b/constant/provider/interface.go
@@ -73,6 +73,7 @@ type ProxyProvider interface {
  HealthCheck()
  Version() uint32
  RegisterHealthCheckTask(url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint)
+ HealthCheckURL() string
 }
 
 // RuleProvider interface