mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-03-11 18:39:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

chore: expose netproxy dialer creator

Browse Source
This commit is contained in:
mzz2017 2023-08-14 22:48:27 +08:00
parent a32bd81637
commit d71569c419
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
component/outbound/dialer/register.go
View File

@ -23,7 +23,7 @@ func FromLinkRegister(name string, creator FromLinkCreator) {
fromLinkCreators[name] = creator
}
func NewFromLink(gOption *GlobalOption, iOption InstanceOption, link string) (*Dialer, error) {
func NewNetproxyDialerFromLink(gOption *GlobalOption, link string) (netproxy.Dialer, *Property, error) {
/// Get overwritten name.
overwrittenName, linklike := common.GetTagFromLinkLikePlaintext(link)
links := strings.Split(linklike, "->")
@ -32,22 +32,22 @@ func NewFromLink(gOption *GlobalOption, iOption InstanceOption, link string) (*D
Name: "",
Address: "",
Protocol: "",
Link: link,
Link: linklike,
}
for i := len(links) - 1; i >= 0; i-- {
link := strings.TrimSpace(links[i])
u, err := url.Parse(link)
if err != nil {
return nil, err
return nil, nil, err
}
creator, ok := fromLinkCreators[u.Scheme]
if !ok {
return nil, fmt.Errorf("unexpected link type: %v", u.Scheme)
return nil, nil, fmt.Errorf("unexpected link type: %v", u.Scheme)
}
var _property *Property
d, _property, err = creator(gOption, d, link)
if err != nil {
return nil, fmt.Errorf("create %v: %w", link, err)
return nil, nil, fmt.Errorf("create %v: %w", link, err)
}
if p.Name == "" {
p.Name = _property.Name
@ -68,10 +68,13 @@ func NewFromLink(gOption *GlobalOption, iOption InstanceOption, link string) (*D
if overwrittenName != "" {
p.Name = overwrittenName
}
node := NewDialer(d, gOption, iOption, p)
// Overwrite node name using user given tag.
if overwrittenName != "" {
node.property.Name = overwrittenName
}
return node, nil
return d, p, nil
}
func NewFromLink(gOption *GlobalOption, iOption InstanceOption, link string) (*Dialer, error) {
d, p, err := NewNetproxyDialerFromLink(gOption, link)
if err != nil {
return nil, err
}
return NewDialer(d, gOption, iOption, p), nil
}