add router handler option

This commit is contained in:
ginuerzh
2021-12-31 00:03:24 +08:00
parent a430384bba
commit 9769efe33c
35 changed files with 98 additions and 281 deletions

View File

@ -22,8 +22,8 @@ func init() {
type forwardHandler struct {
group *chain.NodeGroup
chain *chain.Chain
bypass bypass.Bypass
router *chain.Router
logger logger.Logger
md metadata
}
@ -36,6 +36,7 @@ func NewHandler(opts ...handler.Option) handler.Handler {
return &forwardHandler{
bypass: options.Bypass,
router: options.Router,
logger: options.Logger,
}
}
@ -49,12 +50,8 @@ func (h *forwardHandler) Init(md md.Metadata) (err error) {
// dummy node used by relay connector.
h.group = chain.NewNodeGroup(chain.NewNode("dummy", ":0"))
}
return nil
}
// WithChain implements chain.Chainable interface
func (h *forwardHandler) WithChain(chain *chain.Chain) {
h.chain = chain
return nil
}
// Forward implements handler.Forwarder.
@ -95,12 +92,7 @@ func (h *forwardHandler) Handle(ctx context.Context, conn net.Conn) {
h.logger.Infof("%s >> %s", conn.RemoteAddr(), target.Addr())
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, network, target.Addr())
cc, err := h.router.Dial(ctx, network, target.Addr())
if err != nil {
h.logger.Error(err)
// TODO: the router itself may be failed due to the failed node in the router,

View File

@ -8,16 +8,13 @@ import (
type metadata struct {
readTimeout time.Duration
retryCount int
}
func (h *forwardHandler) parseMetadata(md mdata.Metadata) (err error) {
const (
readTimeout = "readTimeout"
retryCount = "retry"
)
h.md.readTimeout = mdata.GetDuration(md, readTimeout)
h.md.retryCount = mdata.GetInt(md, retryCount)
return
}