Revert: "fix: proxy-groups filter logic"

This reverts commit 8a85c63b08.

adapter/outbound/direct.go

@@ -12,10 +12,6 @@ type Direct struct {
 	*Base
 }
 
-func (d *Direct) IsProxyGroup() bool {
-	return false
-}
-
 // DialContext implements C.ProxyAdapter
 func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	opts = append(opts, dialer.WithDirect())

adapter/outbound/http.go

@@ -38,10 +38,6 @@ type HttpOption struct {
 	Headers        map[string]string `proxy:"headers,omitempty"`
 }
 
-func (h *Http) IsProxyGroup() bool {
-	return false
-}
-
 // StreamConn implements C.ProxyAdapter
 func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	if h.tlsConfig != nil {

adapter/outbound/reject.go

@@ -14,10 +14,6 @@ type Reject struct {
 	*Base
 }
 
-func (r *Reject) IsProxyGroup() bool {
-	return false
-}
-
 // DialContext implements C.ProxyAdapter
 func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	return NewConn(&nopConn{}, r), nil

adapter/outbound/shadowsocks.go

@@ -54,10 +54,6 @@ type v2rayObfsOption struct {
 	Mux            bool              `obfs:"mux,omitempty"`
 }
 
-func (ss *ShadowSocks) IsProxyGroup() bool {
-	return false
-}
-
 // StreamConn implements C.ProxyAdapter
 func (ss *ShadowSocks) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	switch ss.obfsMode {

adapter/outbound/shadowsocksr.go

@@ -37,10 +37,6 @@ type ShadowSocksROption struct {
 	UDP           bool   `proxy:"udp,omitempty"`
 }
 
-func (ssr *ShadowSocksR) IsProxyGroup() bool {
-	return false
-}
-
 // StreamConn implements C.ProxyAdapter
 func (ssr *ShadowSocksR) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	c = ssr.obfs.StreamConn(c)

adapter/outbound/snell.go

@@ -39,10 +39,6 @@ type streamOption struct {
 	obfsOption *simpleObfsOption
 }
 
-func (s *Snell) IsProxyGroup() bool {
-	return false
-}
-
 func streamConn(c net.Conn, option streamOption) *snell.Snell {
 	switch option.obfsOption.Mode {
 	case "tls":

adapter/outbound/socks5.go

@@ -22,6 +22,7 @@ type Socks5 struct {
 	skipCertVerify bool
 	tlsConfig      *tls.Config
 }
+
 type Socks5Option struct {
 	BasicOption
 	Name           string `proxy:"name"`
@@ -34,10 +35,6 @@ type Socks5Option struct {
 	SkipCertVerify bool   `proxy:"skip-cert-verify,omitempty"`
 }
 
-func (ss *Socks5) IsProxyGroup() bool {
-	return false
-}
-
 // StreamConn implements C.ProxyAdapter
 func (ss *Socks5) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	if ss.tls {

adapter/outbound/trojan.go

@@ -27,6 +27,7 @@ type Trojan struct {
 	gunConfig    *gun.Config
 	transport    *http2.Transport
 }
+
 type TrojanOption struct {
 	BasicOption
 	Name           string      `proxy:"name"`
@@ -44,10 +45,6 @@ type TrojanOption struct {
 	FlowShow       bool        `proxy:"flow-show,omitempty"`
 }
 
-func (t *Trojan) IsProxyGroup() bool {
-	return false
-}
-
 func (t *Trojan) plainStream(c net.Conn) (net.Conn, error) {
 	if t.option.Network == "ws" {
 		host, port, _ := net.SplitHostPort(t.addr)

adapter/outbound/vless.go

@@ -59,10 +59,6 @@ type VlessOption struct {
 	ServerName     string            `proxy:"servername,omitempty"`
 }
 
-func (v *Vless) IsProxyGroup() bool {
-	return false
-}
-
 func (v *Vless) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	var err error
 	switch v.option.Network {

adapter/outbound/vmess.go

@@ -75,10 +75,6 @@ type WSOptions struct {
 	EarlyDataHeaderName string            `proxy:"early-data-header-name,omitempty"`
 }
 
-func (v *Vmess) IsProxyGroup() bool {
-	return false
-}
-
 // StreamConn implements C.ProxyAdapter
 func (v *Vmess) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	var err error

adapter/outboundgroup/common.go

@@ -29,10 +29,6 @@ func getProvidersProxies(providers []provider.ProxyProvider, touch bool, filter
 		//filterReg = regexp.MustCompile(filter)
 		filterReg = regexp2.MustCompile(filter, 0)
 		for _, p := range proxies {
-			if p.IsProxyGroup() {
-				matchedProxies = append(matchedProxies, p)
-				continue
-			}
 
 			//if filterReg.MatchString(p.Name()) {
 			if mat, _ := filterReg.FindStringMatch(p.Name()); mat != nil {

adapter/outboundgroup/fallback.go

@@ -24,10 +24,6 @@ type Fallback struct {
 	failedTime  *atomic.Int64
 }
 
-func (f *Fallback) IsProxyGroup() bool {
-	return true
-}
-
 func (f *Fallback) Now() string {
 	proxy := f.findAliveProxy(false)
 	return proxy.Name()

adapter/outboundgroup/loadbalance.go

@@ -28,10 +28,6 @@ type LoadBalance struct {
 	strategyFn strategyFn
 }
 
-func (lb *LoadBalance) IsProxyGroup() bool {
-	return true
-}
-
 var errStrategy = errors.New("unsupported strategy")
 
 func parseStrategy(config map[string]any) string {

adapter/outboundgroup/relay.go

@@ -19,10 +19,6 @@ type Relay struct {
 	filter    string
 }
 
-func (r *Relay) IsProxyGroup() bool {
-	return true
-}
-
 // DialContext implements C.ProxyAdapter
 func (r *Relay) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	var proxies []C.Proxy

adapter/outboundgroup/selector.go

@@ -21,10 +21,6 @@ type Selector struct {
 	providers  []provider.ProxyProvider
 }
 
-func (s *Selector) IsProxyGroup() bool {
-	return true
-}
-
 // DialContext implements C.ProxyAdapter
 func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	c, err := s.selectedProxy(true).DialContext(ctx, metadata, s.Base.DialOptions(opts...)...)

adapter/outboundgroup/urltest.go

@@ -35,10 +35,6 @@ type URLTest struct {
 	failedTime  *atomic.Int64
 }
 
-func (u *URLTest) IsProxyGroup() bool {
-	return true
-}
-
 func (u *URLTest) Now() string {
 	return u.fast(false).Name()
 }

constant/adapters.go

@@ -83,7 +83,6 @@ type ProxyAdapter interface {
 	Addr() string
 	SupportUDP() bool
 	MarshalJSON() ([]byte, error)
-	IsProxyGroup() bool
 
 	// StreamConn wraps a protocol around net.Conn with Metadata.
 	//