add ruleset support for ruleset

Author: JimhHan

app/router/config.go

@@ -63,7 +63,7 @@ func (r *Rule) Apply(ctx routing.Context) bool {
 	return r.Condition.Apply(ctx)
 }
 
-func (rr *RoutingRule) BuildCondition() (*ConditionChan, error) {
+func (rr *RoutingRule) BuildCondition(rsm *rsManager) (*ConditionChan, error) {
 	conds := NewConditionChan()
 
 	if len(rr.Domain) > 0 {
@@ -138,6 +138,14 @@ func (rr *RoutingRule) BuildCondition() (*ConditionChan, error) {
 		conds.Add(cond)
 	}
 
+	if rr.RuleSet != "" {
+		if rsCond, err := rsm.getRuleSet(rr.RuleSet); err != nil {
+			return nil, err
+		} else {
+			conds.Add(rsCond)
+		}
+	}
+
 	if conds.Len() == 0 && rr.RuleSet == "" {
 		return nil, newError("this rule has no effective fields").AtWarning()
 	}
@@ -153,14 +161,18 @@ func (br *BalancingRule) Build(ohm outbound.Manager) (*Balancer, error) {
 	}, nil
 }
 
-func (rrs *RoutingRules) BuildCondition() (Condition, error) {
+func (rrs *RoutingRules) BuildCondition(rsm *rsManager) (Condition, error) {
 	conds := NewOrConditionChan()
 
 	for _, rr := range rrs.Rules {
 		if rr.GetTag() != "" || rr.GetBalancingTag() != "" {
 			newError("ignoring tag in rule set").AtWarning().WriteToLog()
 		}
-		cond, err := rr.BuildCondition()
+
+		if rr.RuleSet == rrs.Identifier {
+			return nil, newError("import cycle found for tag: " + rrs.Identifier)
+		}
+		cond, err := rr.BuildCondition(rsm)
 		if err != nil {
 			return nil, err
 		}

app/router/router.go

@@ -28,6 +28,26 @@ type Route struct {
 	outboundTag       string
 }
 
+type rsManager struct {
+	ruleSets    map[string]Condition
+	rawRuleSets map[string]*RoutingRules
+}
+
+func (m *rsManager) getRuleSet(tag string) (Condition, error) {
+	if cond, found := m.ruleSets[tag]; found {
+		return cond, nil
+	}
+	if rCond, found := m.rawRuleSets[tag]; found {
+		cond, err := rCond.BuildCondition(m)
+		if err != nil {
+			return nil, err
+		}
+		m.ruleSets[tag] = cond
+		return cond, nil
+	}
+	return nil, newError("ruleset not exist: " + tag)
+}
+
 // Init initializes the Router.
 func (r *Router) Init(config *Config, d dns.Client, ohm outbound.Manager) error {
 	r.domainStrategy = config.DomainStrategy
@@ -42,30 +62,19 @@ func (r *Router) Init(config *Config, d dns.Client, ohm outbound.Manager) error
 		r.balancers[rule.Tag] = balancer
 	}
 
-	var rulSets = make(map[string]Condition)
+	var rsm = &rsManager{make(map[string]Condition), make(map[string]*RoutingRules)}
+
 	for _, rs := range config.RuleSets {
-		cond, err := rs.BuildCondition()
-		if err != nil {
-			return err
-		}
-		rulSets[rs.Identifier] = cond
+		rsm.rawRuleSets[rs.Identifier] = rs
 	}
 
 	r.rules = make([]*Rule, 0, len(config.Rule))
 	for _, rule := range config.Rule {
-		cond, err := rule.BuildCondition()
+		cond, err := rule.BuildCondition(rsm)
 		if err != nil {
 			return err
 		}
 
-		if rule.RuleSet != "" {
-			if ruleset, found := rulSets[rule.RuleSet]; found {
-				cond.Add(ruleset)
-			} else {
-				return newError("undefined rule set: " + rule.RuleSet).AtError()
-			}
-		}
-
 		rr := &Rule{
 			Condition: cond,
 			Tag:       rule.GetTag(),