xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: 归类规则解析代码

Browse source
This commit is contained in:
adlyq 2022-06-02 13:40:42 +08:00
parent 04e5d02ab9
commit 6709936a8f
4 changed files with 105 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
rule/logic/common.go
View file

@ -5,7 +5,7 @@ import (
"github.com/Dreamacro/clash/common/collections" "github.com/Dreamacro/clash/common/collections"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
RC "github.com/Dreamacro/clash/rule/common" RC "github.com/Dreamacro/clash/rule/common"
"github.com/Dreamacro/clash/rule/provider" "github.com/Dreamacro/clash/rule/ruleparser"
"regexp" "regexp"
"strings" "strings"
) )
@ -60,59 +60,19 @@ func payloadToRule(subPayload string) (C.Rule, error) {
return parseRule(tp, param[0], param[1:]) return parseRule(tp, param[0], param[1:])
} }
func parseRule(tp, payload string, params []string) (C.Rule, error) { func parseRule(tp, payload string, params []string) (parsed C.Rule, parseErr error) {
var ( parsed, parseErr = ruleparser.ParseSameRule(tp, payload, "", params)
parseErr error if ruleparser.IsUnsupported(parseErr) {
parsed C.Rule switch tp {
) case "AND":
parsed, parseErr = NewAND(payload, "")
switch tp { case "OR":
case "DOMAIN": parsed, parseErr = NewOR(payload, "")
parsed = RC.NewDomain(payload, "") case "NOT":
case "DOMAIN-SUFFIX": parsed, parseErr = NewNOT(payload, "")
parsed = RC.NewDomainSuffix(payload, "") default:
case "DOMAIN-KEYWORD": parseErr = ruleparser.NewUnsupportedError(tp)
parsed = RC.NewDomainKeyword(payload, "") }
case "GEOSITE":
parsed, parseErr = RC.NewGEOSITE(payload, "")
case "GEOIP":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RC.NewGEOIP(payload, "", noResolve)
case "IP-CIDR", "IP-CIDR6":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RC.NewIPCIDR(payload, "", RC.WithIPCIDRNoResolve(noResolve))
case "SRC-IP-CIDR":
parsed, parseErr = RC.NewIPCIDR(payload, "", RC.WithIPCIDRSourceIP(true), RC.WithIPCIDRNoResolve(true))
case "IP-SUFFIX":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RC.NewIPSuffix(payload, "", false, noResolve)
case "SRC-IP-SUFFIX":
parsed, parseErr = RC.NewIPSuffix(payload, "", true, true)
case "SRC-PORT":
parsed, parseErr = RC.NewPort(payload, "", true)
case "DST-PORT":
parsed, parseErr = RC.NewPort(payload, "", false)
case "PROCESS-NAME":
parsed, parseErr = RC.NewProcess(payload, "", true)
case "PROCESS-PATH":
parsed, parseErr = RC.NewProcess(payload, "", false)
case "RULE-SET":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = provider.NewRuleSet(payload, "", noResolve)
case "UID":
parsed, parseErr = RC.NewUid(payload, "")
case "IN-TYPE":
parsed, parseErr = RC.NewInType(payload, "")
case "NOT":
parsed, parseErr = NewNOT(payload, "")
case "AND":
parsed, parseErr = NewAND(payload, "")
case "OR":
parsed, parseErr = NewOR(payload, "")
case "NETWORK":
parsed, parseErr = RC.NewNetworkType(payload, "")
default:
parsed, parseErr = nil, fmt.Errorf("unsupported rule type %s", tp)
} }
if parseErr != nil { if parseErr != nil {

78
rule/parser.go
View file

@ -1,68 +1,32 @@
package rules package rules
import ( import (
"fmt"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
RC "github.com/Dreamacro/clash/rule/common" RC "github.com/Dreamacro/clash/rule/common"
"github.com/Dreamacro/clash/rule/logic" "github.com/Dreamacro/clash/rule/logic"
RP "github.com/Dreamacro/clash/rule/provider" RP "github.com/Dreamacro/clash/rule/provider"
"github.com/Dreamacro/clash/rule/ruleparser"
) )
func ParseRule(tp, payload, target string, params []string) (C.Rule, error) { func ParseRule(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) {
var ( parsed, parseErr = ruleparser.ParseSameRule(tp, payload, target, params)
parseErr error if ruleparser.IsUnsupported(parseErr) {
parsed C.Rule switch tp {
) case "AND":
parsed, parseErr = logic.NewAND(payload, target)
switch tp { case "OR":
case "DOMAIN": parsed, parseErr = logic.NewOR(payload, target)
parsed = RC.NewDomain(payload, target) case "NOT":
case "DOMAIN-SUFFIX": parsed, parseErr = logic.NewNOT(payload, target)
parsed = RC.NewDomainSuffix(payload, target) case "RULE-SET":
case "DOMAIN-KEYWORD": noResolve := RC.HasNoResolve(params)
parsed = RC.NewDomainKeyword(payload, target) parsed, parseErr = RP.NewRuleSet(payload, target, noResolve)
case "GEOSITE": case "MATCH":
parsed, parseErr = RC.NewGEOSITE(payload, target) parsed = RC.NewMatch(target)
case "GEOIP": parseErr = nil
noResolve := RC.HasNoResolve(params) default:
parsed, parseErr = RC.NewGEOIP(payload, target, noResolve) parseErr = ruleparser.NewUnsupportedError(tp)
case "IP-CIDR", "IP-CIDR6": }
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RC.NewIPCIDR(payload, target, RC.WithIPCIDRNoResolve(noResolve))
case "SRC-IP-CIDR":
parsed, parseErr = RC.NewIPCIDR(payload, target, RC.WithIPCIDRSourceIP(true), RC.WithIPCIDRNoResolve(true))
case "IP-SUFFIX":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RC.NewIPSuffix(payload, target, false, noResolve)
case "SRC-IP-SUFFIX":
parsed, parseErr = RC.NewIPSuffix(payload, target, true, true)
case "SRC-PORT":
parsed, parseErr = RC.NewPort(payload, target, true)
case "DST-PORT":
parsed, parseErr = RC.NewPort(payload, target, false)
case "PROCESS-NAME":
parsed, parseErr = RC.NewProcess(payload, target, true)
case "PROCESS-PATH":
parsed, parseErr = RC.NewProcess(payload, target, false)
case "NETWORK":
parsed, parseErr = RC.NewNetworkType(payload, target)
case "UID":
parsed, parseErr = RC.NewUid(payload, target)
case "IN-TYPE":
parsed, parseErr = RC.NewInType(payload, target)
case "AND":
parsed, parseErr = logic.NewAND(payload, target)
case "OR":
parsed, parseErr = logic.NewOR(payload, target)
case "NOT":
parsed, parseErr = logic.NewNOT(payload, target)
case "RULE-SET":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RP.NewRuleSet(payload, target, noResolve)
case "MATCH":
parsed = RC.NewMatch(target)
default:
parseErr = fmt.Errorf("unsupported rule type %s", tp)
} }
if parseErr != nil { if parseErr != nil {
@ -77,5 +41,5 @@ func ParseRule(tp, payload, target string, params []string) (C.Rule, error) {
parsed.SetRuleExtra(ruleExtra) parsed.SetRuleExtra(ruleExtra)
return parsed, nil return
} }

47
rule/provider/parse.go
View file

@ -7,6 +7,7 @@ import (
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
P "github.com/Dreamacro/clash/constant/provider" P "github.com/Dreamacro/clash/constant/provider"
RC "github.com/Dreamacro/clash/rule/common" RC "github.com/Dreamacro/clash/rule/common"
"github.com/Dreamacro/clash/rule/ruleparser"
"time" "time"
) )
@ -51,51 +52,9 @@ func ParseRuleProvider(name string, mapping map[string]interface{}) (P.RuleProvi
return NewRuleSetProvider(name, behavior, time.Duration(uint(schema.Interval))*time.Second, vehicle), nil return NewRuleSetProvider(name, behavior, time.Duration(uint(schema.Interval))*time.Second, vehicle), nil
} }
func parseRule(tp, payload, target string, params []string) (C.Rule, error) { func parseRule(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) {
var ( parsed, parseErr = ruleparser.ParseSameRule(tp, payload, target, params)
parseErr error
parsed C.Rule
)
switch tp {
case "DOMAIN":
parsed = RC.NewDomain(payload, target)
case "DOMAIN-SUFFIX":
parsed = RC.NewDomainSuffix(payload, target)
case "DOMAIN-KEYWORD":
parsed = RC.NewDomainKeyword(payload, target)
case "GEOIP":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RC.NewGEOIP(payload, target, noResolve)
case "GEOSITE":
parsed, parseErr = RC.NewGEOSITE(payload, target)
case "IP-CIDR", "IP-CIDR6":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RC.NewIPCIDR(payload, target, RC.WithIPCIDRNoResolve(noResolve))
case "SRC-IP-CIDR":
parsed, parseErr = RC.NewIPCIDR(payload, target, RC.WithIPCIDRSourceIP(true), RC.WithIPCIDRNoResolve(true))
case "IP-SUFFIX":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RC.NewIPSuffix(payload, target, false, noResolve)
case "SRC-IP-SUFFIX":
parsed, parseErr = RC.NewIPSuffix(payload, target, true, true)
case "SRC-PORT":
parsed, parseErr = RC.NewPort(payload, target, true)
case "DST-PORT":
parsed, parseErr = RC.NewPort(payload, target, false)
case "PROCESS-NAME":
parsed, parseErr = RC.NewProcess(payload, target, true)
case "PROCESS-PATH":
parsed, parseErr = RC.NewProcess(payload, target, false)
case "NETWORK":
parsed, parseErr = RC.NewNetworkType(payload, target)
case "UID":
parsed, parseErr = RC.NewUid(payload, target)
case "IN-TYPE":
parsed, parseErr = RC.NewInType(payload, target)
default:
parseErr = fmt.Errorf("unsupported rule type %s", tp)
}
if parseErr != nil { if parseErr != nil {
return nil, parseErr return nil, parseErr
} }

67
rule/ruleparser/ruleparser.go Normal file
View file

@ -0,0 +1,67 @@
package ruleparser
import (
"fmt"
C "github.com/Dreamacro/clash/constant"
RC "github.com/Dreamacro/clash/rule/common"
)
func ParseSameRule(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) {
switch tp {
case "DOMAIN":
parsed = RC.NewDomain(payload, target)
case "DOMAIN-SUFFIX":
parsed = RC.NewDomainSuffix(payload, target)
case "DOMAIN-KEYWORD":
parsed = RC.NewDomainKeyword(payload, target)
case "GEOSITE":
parsed, parseErr = RC.NewGEOSITE(payload, target)
case "GEOIP":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RC.NewGEOIP(payload, target, noResolve)
case "IP-CIDR", "IP-CIDR6":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RC.NewIPCIDR(payload, target, RC.WithIPCIDRNoResolve(noResolve))
case "SRC-IP-CIDR":
parsed, parseErr = RC.NewIPCIDR(payload, target, RC.WithIPCIDRSourceIP(true), RC.WithIPCIDRNoResolve(true))
case "IP-SUFFIX":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RC.NewIPSuffix(payload, target, false, noResolve)
case "SRC-IP-SUFFIX":
parsed, parseErr = RC.NewIPSuffix(payload, target, true, true)
case "SRC-PORT":
parsed, parseErr = RC.NewPort(payload, target, true)
case "DST-PORT":
parsed, parseErr = RC.NewPort(payload, target, false)
case "PROCESS-NAME":
parsed, parseErr = RC.NewProcess(payload, target, true)
case "PROCESS-PATH":
parsed, parseErr = RC.NewProcess(payload, target, false)
case "NETWORK":
parsed, parseErr = RC.NewNetworkType(payload, target)
case "UID":
parsed, parseErr = RC.NewUid(payload, target)
case "IN-TYPE":
parsed, parseErr = RC.NewInType(payload, target)
default:
parseErr = NewUnsupportedError(tp)
}
return
}
type UnsupportedError struct {
err string
}
func (ue UnsupportedError) Error() string {
return ue.err
}
func NewUnsupportedError(tp any) *UnsupportedError {
return &UnsupportedError{err: fmt.Sprintf("unsupported rule type %s", tp)}
}
func IsUnsupported(err error) bool {
_, ok := err.(UnsupportedError)
return ok
}