add router handler option

pkg/handler/forward/local/handler.go

@@ -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,

pkg/handler/forward/local/metadata.go

@@ -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
 }

pkg/handler/forward/remote/handler.go

@@ -22,6 +22,7 @@ func init() {
 type forwardHandler struct {
 	group  *chain.NodeGroup
 	bypass bypass.Bypass
+	router *chain.Router
 	logger logger.Logger
 	md     metadata
 }
@@ -34,12 +35,20 @@ func NewHandler(opts ...handler.Option) handler.Handler {
 
 	return &forwardHandler{
 		bypass: options.Bypass,
+		router: &chain.Router{
+			Retries:  options.Router.Retries,
+			Resolver: options.Resolver,
+			Logger:   options.Logger,
+		},
 		logger: options.Logger,
 	}
 }
 
 func (h *forwardHandler) Init(md md.Metadata) (err error) {
-	return h.parseMetadata(md)
+	if err = h.parseMetadata(md); err != nil {
+		return
+	}
+	return
 }
 
 // Forward implements handler.Forwarder.
@@ -80,12 +89,7 @@ func (h *forwardHandler) Handle(ctx context.Context, conn net.Conn) {
 
 	h.logger.Infof("%s >> %s", conn.RemoteAddr(), target.Addr())
 
-	// without chain
-	r := (&chain.Router{}).
-		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,

pkg/handler/forward/remote/metadata.go

@@ -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
 }

pkg/handler/forward/ssh/handler.go

@@ -31,9 +31,9 @@ func init() {
 }
 
 type forwardHandler struct {
-	chain  *chain.Chain
 	bypass bypass.Bypass
 	config *ssh.ServerConfig
+	router *chain.Router
 	logger logger.Logger
 	md     metadata
 }
@@ -46,6 +46,7 @@ func NewHandler(opts ...handler.Option) handler.Handler {
 
 	return &forwardHandler{
 		bypass: options.Bypass,
+		router: options.Router,
 		logger: options.Logger,
 	}
 }
@@ -71,11 +72,6 @@ func (h *forwardHandler) Init(md md.Metadata) (err error) {
 	return nil
 }
 
-// WithChain implements chain.Chainable interface
-func (h *forwardHandler) WithChain(chain *chain.Chain) {
-	h.chain = chain
-}
-
 func (h *forwardHandler) Handle(ctx context.Context, conn net.Conn) {
 	defer conn.Close()
 
@@ -168,11 +164,7 @@ func (h *forwardHandler) directPortForwardChannel(ctx context.Context, channel s
 		return
 	}
 
-	r := (&chain.Router{}).
-		WithChain(h.chain).
-		// WithRetry(h.md.retryCount).
-		WithLogger(h.logger)
-	conn, err := r.Dial(ctx, "tcp", raddr)
+	conn, err := h.router.Dial(ctx, "tcp", raddr)
 	if err != nil {
 		return
 	}