go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update selector

Browse Source
This commit is contained in:
ginuerzh
2022-09-04 13:24:32 +08:00
parent 05bfeb8a0f
commit a04c8b45f3
19 changed files with 97 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
registry/chain.go
View File

@ -12,20 +12,20 @@ type chainRegistry struct {
registry
}
func (r *chainRegistry) Register(name string, v chain.SelectableChainer) error {
func (r *chainRegistry) Register(name string, v chain.Chainer) error {
return r.registry.Register(name, v)
}
func (r *chainRegistry) Get(name string) chain.SelectableChainer {
func (r *chainRegistry) Get(name string) chain.Chainer {
if name != "" {
return &chainWrapper{name: name, r: r}
}
return nil
}
func (r *chainRegistry) get(name string) chain.SelectableChainer {
func (r *chainRegistry) get(name string) chain.Chainer {
if v := r.registry.Get(name); v != nil {
return v.(chain.SelectableChainer)
return v.(chain.Chainer)
}
return nil
}
@ -40,7 +40,10 @@ func (w *chainWrapper) Marker() selector.Marker {
if v == nil {
return nil
}
return v.Marker()
if mi, ok := v.(selector.Markable); ok {
return mi.Marker()
}
return nil
}
func (w *chainWrapper) Metadata() metadata.Metadata {
@ -48,7 +51,11 @@ func (w *chainWrapper) Metadata() metadata.Metadata {
if v == nil {
return nil
}
return v.Metadata()
if mi, ok := v.(metadata.Metadatable); ok {
return mi.Metadata()
}
return nil
}
func (w *chainWrapper) Route(ctx context.Context, network, address string) chain.Route {

18
registry/registry.go
View File

@ -25,14 +25,14 @@ var (
dialerReg Registry[NewDialer] = &dialerRegistry{}
connectorReg Registry[NewConnector] = &connectorRegistry{}
serviceReg Registry[service.Service] = &serviceRegistry{}
chainReg Registry[chain.SelectableChainer] = &chainRegistry{}
autherReg Registry[auth.Authenticator] = &autherRegistry{}
admissionReg Registry[admission.Admission] = &admissionRegistry{}
bypassReg Registry[bypass.Bypass] = &bypassRegistry{}
resolverReg Registry[resolver.Resolver] = &resolverRegistry{}
hostsReg Registry[hosts.HostMapper] = &hostsRegistry{}
recorderReg Registry[recorder.Recorder] = &recorderRegistry{}
serviceReg Registry[service.Service] = &serviceRegistry{}
chainReg Registry[chain.Chainer] = &chainRegistry{}
autherReg Registry[auth.Authenticator] = &autherRegistry{}
admissionReg Registry[admission.Admission] = &admissionRegistry{}
bypassReg Registry[bypass.Bypass] = &bypassRegistry{}
resolverReg Registry[resolver.Resolver] = &resolverRegistry{}
hostsReg Registry[hosts.HostMapper] = &hostsRegistry{}
recorderReg Registry[recorder.Recorder] = &recorderRegistry{}
)
type Registry[T any] interface {
@ -99,7 +99,7 @@ func ServiceRegistry() Registry[service.Service] {
return serviceReg
}
func ChainRegistry() Registry[chain.SelectableChainer] {
func ChainRegistry() Registry[chain.Chainer] {
return chainReg
}