read domain matcher path form config

Author: hossinasaadi

app/router/config.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/xtls/xray-core/common/errors"
-	"github.com/xtls/xray-core/common/platform"
 	"github.com/xtls/xray-core/common/platform/filesystem"
 	"github.com/xtls/xray-core/features/outbound"
 	"github.com/xtls/xray-core/features/routing"
@@ -33,7 +32,7 @@ func (r *Rule) Apply(ctx routing.Context) bool {
 	return r.Condition.Apply(ctx)
 }
 
-func (rr *RoutingRule) BuildCondition() (Condition, error) {
+func (rr *RoutingRule) BuildCondition(cachedDMPath string) (Condition, error) {
 	conds := NewConditionChan()
 
 	if len(rr.InboundTag) > 0 {
@@ -110,22 +109,20 @@ func (rr *RoutingRule) BuildCondition() (Condition, error) {
 	}
 
 	if len(rr.Domain) > 0 {
-		useCachedMatcher := platform.NewEnvFlag(platform.UseCachedMatcher).GetValueAsInt(0)
-
 		var matcher *DomainMatcher
 		var err error
 
 		domains := rr.Domain
-		if runtime.GOOS != "windows" && runtime.GOOS != "wasm" && useCachedMatcher == 0 {
+		if runtime.GOOS != "windows" && runtime.GOOS != "wasm" && cachedDMPath == "" {
 			var err error
 			domains, err = GetDomainList(rr.Domain)
 			if err != nil {
 				return nil, errors.New("failed to build domains from mmap").Base(err)
 			}
 		}
 
-		if useCachedMatcher != 0 {
-			matcher, err = GetDomainMathcerWithRuleTag(rr.RuleTag)
+		if cachedDMPath != "" {
+			matcher, err = GetDomainMathcerWithRuleTag(cachedDMPath, rr.RuleTag)
 			if err != nil {
 				return nil, errors.New("failed to build domain condition from cached MphDomainMatcher").Base(err)
 			}
@@ -276,15 +273,14 @@ func GetDomainList(domains []*Domain) ([]*Domain, error) {
 	return domainList, nil
 }
 
-func GetDomainMathcerWithRuleTag(ruleTag string) (*DomainMatcher, error) {
-	file := "matcher.cache"
-	bs, err := filesystem.ReadAsset(file)
+func GetDomainMathcerWithRuleTag(cachedDMPath string, ruleTag string) (*DomainMatcher, error) {
+	bs, err := filesystem.ReadFile(cachedDMPath)
 	if err != nil {
-		return nil, errors.New("failed to load file: ", file).Base(err)
+		return nil, errors.New("failed to load file: ", cachedDMPath).Base(err)
 	}
 	g, err := LoadGeoSiteMatcher(bs, ruleTag)
 	if err != nil {
-		return nil, errors.New("failed to load file:", file).Base(err)
+		return nil, errors.New("failed to load file:", cachedDMPath).Base(err)
 	}
 	return &DomainMatcher{
 		Matchers: g,

app/router/config.pb.go

@@ -160,4 +160,6 @@ message Config {
   DomainStrategy domain_strategy = 1;
   repeated RoutingRule rule = 2;
   repeated BalancingRule balancing_rule = 3;
+
+  string domainMatcherPath = 4;
 }

app/router/config.proto

@@ -55,7 +55,7 @@ func (r *Router) Init(ctx context.Context, config *Config, d dns.Client, ohm out
 
 	r.rules = make([]*Rule, 0, len(config.Rule))
 	for _, rule := range config.Rule {
-		cond, err := rule.BuildCondition()
+		cond, err := rule.BuildCondition(config.DomainMatcherPath)
 		if err != nil {
 			return err
 		}
@@ -129,7 +129,7 @@ func (r *Router) ReloadRules(config *Config, shouldAppend bool) error {
 		if r.RuleExists(rule.GetRuleTag()) {
 			return errors.New("duplicate ruleTag ", rule.GetRuleTag())
 		}
-		cond, err := rule.BuildCondition()
+		cond, err := rule.BuildCondition(config.DomainMatcherPath)
 		if err != nil {
 			return err
 		}

app/router/router.go

@@ -17,7 +17,6 @@ const (
 	UseFreedomSplice = "xray.buf.splice"
 	UseVmessPadding  = "xray.vmess.padding"
 	UseCone          = "xray.cone.disabled"
-	UseCachedMatcher = "xray.cached.matcher"
 
 	BufferSize           = "xray.ray.buffer.size"
 	BrowserDialerAddress = "xray.browser.dialer"

common/platform/platform.go

@@ -78,6 +78,8 @@ type RouterConfig struct {
 	RuleList       []json.RawMessage `json:"rules"`
 	DomainStrategy *string           `json:"domainStrategy"`
 	Balancers      []*BalancingRule  `json:"balancers"`
+
+	DomainMatcherPath *string `json:"domainMatcherPath"`
 }
 
 func (c *RouterConfig) getDomainStrategy() router.Config_DomainStrategy {
@@ -120,6 +122,14 @@ func (c *RouterConfig) Build() (*router.Config, error) {
 		}
 		config.BalancingRule = append(config.BalancingRule, balancer)
 	}
+
+	if c.DomainMatcherPath != nil {
+		path := *c.DomainMatcherPath
+		if val := strings.Split(path, "assets:"); len(val) == 2 {
+			path = platform.GetAssetLocation(val[1])
+		}
+		config.DomainMatcherPath = path
+	}
 	return config, nil
 }
 
@@ -630,7 +640,7 @@ func (c *RouterConfig) BuildDomainMatcherCache() error {
 	defer f.Close()
 
 	var buf bytes.Buffer
-	println(len(geosite))
+
 	if err := router.SerializeGeoSiteList(geosite, &buf); err != nil {
 		return err
 	}