fix: group filter touch provider

adapter/outbound/hysteria.go

@@ -81,7 +81,7 @@ type HysteriaOption struct {
 	Obfs                string `proxy:"obfs,omitempty"`
 	SNI                 string `proxy:"sni,omitempty"`
 	SkipCertVerify      bool   `proxy:"skip-cert-verify,omitempty"`
-	ALPN                []string `proxy:"alpn,omitempty"`
+	ALPN                string `proxy:"alpn,omitempty"`
 	CustomCA            string `proxy:"ca,omitempty"`
 	CustomCAString      string `proxy:"ca_str,omitempty"`
 	ReceiveWindowConn   uint64 `proxy:"recv_window_conn,omitempty"`
@@ -126,7 +126,7 @@ func NewHysteria(option HysteriaOption) (*Hysteria, error) {
 		MinVersion:         tls.VersionTLS13,
 	}
 	if len(option.ALPN) > 0 {
-		tlsConfig.NextProtos = option.ALPN
+		tlsConfig.NextProtos = []string{option.ALPN}
 	} else {
 		tlsConfig.NextProtos = []string{DefaultALPN}
 	}

adapter/outboundgroup/groupbase.go

@@ -51,10 +51,9 @@ func (gb *GroupBase) GetProxies(touch bool) []C.Proxy {
 		var proxies []C.Proxy
 		for _, pd := range gb.providers {
 			if touch {
-				proxies = append(proxies, pd.ProxiesWithTouch()...)
+				pd.Touch()
-			} else {
-				proxies = append(proxies, pd.Proxies()...)
 			}
+			proxies = append(proxies, pd.Proxies()...)
 		}
 		if len(proxies) == 0 {
 			return append(proxies, tunnel.Proxies()["COMPATIBLE"])
@@ -63,13 +62,12 @@ func (gb *GroupBase) GetProxies(touch bool) []C.Proxy {
 	}
 
 	for _, pd := range gb.providers {
-		if pd.VehicleType() == types.Compatible {
 		if touch {
-				gb.proxies.Store(pd.Name(), pd.ProxiesWithTouch())
+			pd.Touch()
-			} else {
-				gb.proxies.Store(pd.Name(), pd.Proxies())
 		}
 
+		if pd.VehicleType() == types.Compatible {
+			gb.proxies.Store(pd.Name(), pd.Proxies())
 			gb.versions.Store(pd.Name(), pd.Version())
 			continue
 		}
@@ -80,11 +78,7 @@ func (gb *GroupBase) GetProxies(touch bool) []C.Proxy {
 				newProxies []C.Proxy
 			)
 
-			if touch {
-				proxies = pd.ProxiesWithTouch()
-			} else {
 			proxies = pd.Proxies()
-			}
 
 			for _, p := range proxies {
 				if mat, _ := gb.filter.FindStringMatch(p.Name()); mat != nil {

adapter/outboundgroup/parser.go

@@ -75,9 +75,11 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 			providers = append(providers, pd)
 			providersMap[groupName] = pd
 		} else {
-			if groupOption.URL == "" || groupOption.Interval == 0 {
+			if groupOption.URL == "" {
-				//return nil, errMissHealthCheck
 				groupOption.URL = "http://www.gstatic.com/generate_204"
+			}
+
+			if groupOption.Interval == 0 {
 				groupOption.Interval = 300
 			}
 

adapter/provider/healthcheck.go

@@ -32,9 +32,7 @@ func (hc *HealthCheck) process() {
 	ticker := time.NewTicker(time.Duration(hc.interval) * time.Second)
 
 	go func() {
-		t := time.NewTicker(30 * time.Second)
+		time.Sleep(30 * time.Second)
-		<-t.C
-		t.Stop()
 		hc.check()
 	}()
 

adapter/provider/provider.go

@@ -84,9 +84,8 @@ func (pp *proxySetProvider) Proxies() []C.Proxy {
 	return pp.proxies
 }
 
-func (pp *proxySetProvider) ProxiesWithTouch() []C.Proxy {
+func (pp *proxySetProvider) Touch() {
 	pp.healthCheck.touch()
-	return pp.Proxies()
 }
 
 func (pp *proxySetProvider) setProxies(proxies []C.Proxy) {
@@ -178,9 +177,8 @@ func (cp *compatibleProvider) Proxies() []C.Proxy {
 	return cp.proxies
 }
 
-func (cp *compatibleProvider) ProxiesWithTouch() []C.Proxy {
+func (cp *compatibleProvider) Touch() {
 	cp.healthCheck.touch()
-	return cp.Proxies()
 }
 
 func stopCompatibleProvider(pd *CompatibleProvider) {

constant/provider/interface.go

@@ -66,9 +66,7 @@ type Provider interface {
 type ProxyProvider interface {
 	Provider
 	Proxies() []C.Proxy
-	// ProxiesWithTouch is used to inform the provider that the proxy is actually being used while getting the list of proxies.
+	Touch()
-	// Commonly used in DialContext and DialPacketConn
-	ProxiesWithTouch() []C.Proxy
 	HealthCheck()
 	Version() uint
 }