feat: proxy provider 支持V2ray格式订阅链接

adapter/provider/provider.go

@@ -4,12 +4,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/Dreamacro/clash/common/convert"
 	"github.com/dlclark/regexp2"
+	"math"
 	"runtime"
 	"time"
 
 	"github.com/Dreamacro/clash/adapter"
-	"github.com/Dreamacro/clash/common/convert"
 	C "github.com/Dreamacro/clash/constant"
 	types "github.com/Dreamacro/clash/constant/provider"
 
@@ -36,10 +37,6 @@ type proxySetProvider struct {
 	version     uint
 }
 
-func (pp *proxySetProvider) Version() uint {
-	return pp.version
-}
-
 func (pp *proxySetProvider) MarshalJSON() ([]byte, error) {
 	return json.Marshal(map[string]any{
 		"name":        pp.Name(),
@@ -50,6 +47,10 @@ func (pp *proxySetProvider) MarshalJSON() ([]byte, error) {
 	})
 }
 
+func (pp *proxySetProvider) Version() uint {
+	return pp.version
+}
+
 func (pp *proxySetProvider) Name() string {
 	return pp.name
 }
@@ -71,7 +72,6 @@ func (pp *proxySetProvider) Initial() error {
 	if err != nil {
 		return err
 	}
-
 	pp.onUpdate(elm)
 	return nil
 }
@@ -93,7 +93,7 @@ func (pp *proxySetProvider) setProxies(proxies []C.Proxy) {
 	pp.proxies = proxies
 	pp.healthCheck.setProxy(proxies)
 	if pp.healthCheck.auto() {
-		go pp.healthCheck.check()
+		defer func() { go pp.healthCheck.check() }()
 	}
 }
 
@@ -134,6 +134,7 @@ type compatibleProvider struct {
 	name        string
 	healthCheck *HealthCheck
 	proxies     []C.Proxy
+	version     uint
 }
 
 func (cp *compatibleProvider) MarshalJSON() ([]byte, error) {
@@ -145,6 +146,10 @@ func (cp *compatibleProvider) MarshalJSON() ([]byte, error) {
 	})
 }
 
+func (cp *compatibleProvider) Version() uint {
+	return cp.version
+}
+
 func (cp *compatibleProvider) Name() string {
 	return cp.name
 }
@@ -205,6 +210,11 @@ func NewCompatibleProvider(name string, proxies []C.Proxy, hc *HealthCheck) (*Co
 func proxiesOnUpdate(pd *proxySetProvider) func([]C.Proxy) {
 	return func(elm []C.Proxy) {
 		pd.setProxies(elm)
+		if pd.version == math.MaxUint {
+			pd.version = 0
+		} else {
+			pd.version++
+		}
 	}
 }
 
@@ -213,7 +223,11 @@ func proxiesParseAndFilter(filter string, filterReg *regexp2.Regexp) parser[[]C.
 		schema := &ProxySchema{}
 
 		if err := yaml.Unmarshal(buf, schema); err != nil {
-			return nil, err
+			proxies, err1 := convert.ConvertsV2Ray(buf)
+			if err1 != nil {
+				return nil, fmt.Errorf("%s, %w", err.Error(), err1)
+			}
+			schema.Proxies = proxies
 		}
 
 		if schema.Proxies == nil {
@@ -222,7 +236,9 @@ func proxiesParseAndFilter(filter string, filterReg *regexp2.Regexp) parser[[]C.
 
 		proxies := []C.Proxy{}
 		for idx, mapping := range schema.Proxies {
-			if name, ok := mapping["name"]; ok && len(filter) > 0 && !filterReg.MatchString(name.(string)) {
+			name, ok := mapping["name"]
+			mat, _ := filterReg.FindStringMatch(name.(string))
+			if ok && len(filter) > 0 && mat == nil {
 				continue
 			}
 			proxy, err := adapter.ParseProxy(mapping)