chore: add sourceGeoIP and sourceIPASN to metadata

rules/provider/domain_set.go

@@ -1,40 +0,0 @@
-package provider
-
-import (
-	"github.com/metacubex/mihomo/component/trie"
-	C "github.com/metacubex/mihomo/constant"
-)
-
-type DomainSet struct {
-	*domainStrategy
-	adapter string
-}
-
-func (d *DomainSet) ProviderNames() []string {
-	return nil
-}
-
-func (d *DomainSet) RuleType() C.RuleType {
-	return C.DomainSet
-}
-
-func (d *DomainSet) Match(metadata *C.Metadata) (bool, string) {
-	return d.domainStrategy.Match(metadata), d.adapter
-}
-
-func (d *DomainSet) Adapter() string {
-	return d.adapter
-}
-
-func (d *DomainSet) Payload() string {
-	return ""
-}
-
-func NewDomainSet(domainSet *trie.DomainSet, adapter string) *DomainSet {
-	return &DomainSet{
-		domainStrategy: &domainStrategy{domainSet: domainSet},
-		adapter:        adapter,
-	}
-}
-
-var _ C.Rule = (*DomainSet)(nil)

rules/provider/ipcidr_set.go

@@ -1,40 +0,0 @@
-package provider
-
-import (
-	"github.com/metacubex/mihomo/component/cidr"
-	C "github.com/metacubex/mihomo/constant"
-)
-
-type IpCidrSet struct {
-	*ipcidrStrategy
-	adapter string
-}
-
-func (d *IpCidrSet) ProviderNames() []string {
-	return nil
-}
-
-func (d *IpCidrSet) RuleType() C.RuleType {
-	return C.IpCidrSet
-}
-
-func (d *IpCidrSet) Match(metadata *C.Metadata) (bool, string) {
-	return d.ipcidrStrategy.Match(metadata), d.adapter
-}
-
-func (d *IpCidrSet) Adapter() string {
-	return d.adapter
-}
-
-func (d *IpCidrSet) Payload() string {
-	return ""
-}
-
-func NewIpCidrSet(cidrSet *cidr.IpCidrSet, adapter string) *IpCidrSet {
-	return &IpCidrSet{
-		ipcidrStrategy: &ipcidrStrategy{cidrSet: cidrSet},
-		adapter:        adapter,
-	}
-}
-
-var _ C.Rule = (*IpCidrSet)(nil)

rules/provider/rule_set.go

@@ -1,6 +1,8 @@
 package provider
 
 import (
+	"net/netip"
+
 	C "github.com/metacubex/mihomo/constant"
 	P "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/rules/common"
@@ -35,6 +37,18 @@ func (rs *RuleSet) Match(metadata *C.Metadata) (bool, string) {
 	return false, ""
 }
 
+// MatchDomain implements C.DomainMatcher
+func (rs *RuleSet) MatchDomain(domain string) bool {
+	ok, _ := rs.Match(&C.Metadata{Host: domain})
+	return ok
+}
+
+// MatchIp implements C.IpMatcher
+func (rs *RuleSet) MatchIp(ip netip.Addr) bool {
+	ok, _ := rs.Match(&C.Metadata{DstIP: ip})
+	return ok
+}
+
 func (rs *RuleSet) Adapter() string {
 	return rs.adapter
 }