Skip to content

Commit

Permalink
feat: add proxy name replacement functionality for override (#1481)
Browse files Browse the repository at this point in the history
* feat: add proxy name replacement functionality for override

* style: modify `override schema` info and provider parse error message

---------

Co-authored-by: chun <[email protected]>
  • Loading branch information
pmnmq and chun authored Sep 18, 2024
1 parent 58c973e commit 3676d1b
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 0 deletions.
9 changes: 9 additions & 0 deletions adapter/provider/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ type healthCheckSchema struct {
ExpectedStatus string `provider:"expected-status,omitempty"`
}

type OverrideProxyNameSchema struct {
// matching expression for regex replacement
Pattern string `provider:"pattern"`
// the new content after regex matching
Target string `provider:"target"`
}

type OverrideSchema struct {
TFO *bool `provider:"tfo,omitempty"`
MPTcp *bool `provider:"mptcp,omitempty"`
Expand All @@ -40,6 +47,8 @@ type OverrideSchema struct {
IPVersion *string `provider:"ip-version,omitempty"`
AdditionalPrefix *string `provider:"additional-prefix,omitempty"`
AdditionalSuffix *string `provider:"additional-suffix,omitempty"`

ProxyName []OverrideProxyNameSchema `provider:"proxy-name,omitempty"`
}

type proxyProviderSchema struct {
Expand Down
18 changes: 18 additions & 0 deletions adapter/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,24 @@ func proxiesParseAndFilter(filter string, excludeFilter string, excludeTypeArray
case "additional-suffix":
name := mapping["name"].(string)
mapping["name"] = name + *field.Interface().(*string)
case "proxy-name":
exprList, ok := field.Interface().([]OverrideProxyNameSchema)
if !ok {
return nil, fmt.Errorf("can't parse proxy-provider override proxy-name, please see the docs example config")
}
// Iterate through all naming replacement rules and perform the replacements.
for _, expr := range exprList {
name := mapping["name"].(string)
nameReg, err := regexp2.Compile(expr.Pattern, regexp2.None)
if err != nil {
return nil, fmt.Errorf("parse proxy name regular expression %q error: %w", expr.Pattern, err)
}
newName, err := nameReg.Replace(name, expr.Target, 0, -1)
if err != nil {
return nil, fmt.Errorf("proxy name replace error: %w", err)
}
mapping["name"] = newName
}
default:
mapping[fieldName] = field.Elem().Interface()
}
Expand Down
7 changes: 7 additions & 0 deletions docs/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,13 @@ proxy-providers:
# ip-version: ipv4-prefer
# additional-prefix: "[provider1]"
# additional-suffix: "test"
# # 名字替换,支持正则表达式
# proxy-name:
# - pattern: "test"
# target: "TEST"
# - pattern: "IPLC-(.*?)倍"
# target: "iplc x $1"

test:
type: file
path: /test.yaml
Expand Down

0 comments on commit 3676d1b

Please sign in to comment.