add bypass

pkg/chain/chain.go

@@ -1,7 +1,6 @@
 package chain
 
 type Chain struct {
-	Name   string
 	groups []*NodeGroup
 }
 
@@ -9,7 +8,7 @@ func (c *Chain) AddNodeGroup(group *NodeGroup) {
 	c.groups = append(c.groups, group)
 }
 
-func (c *Chain) GetRoute() (r *Route) {
+func (c *Chain) GetRouteFor(addr string) (r *Route) {
 	if c == nil || len(c.groups) == 0 {
 		return
 	}
@@ -20,11 +19,13 @@ func (c *Chain) GetRoute() (r *Route) {
 		if node == nil {
 			return
 		}
-		// TODO: bypass
+		if node.bypass != nil && node.bypass.Contains(addr) {
+			break
+		}
 
-		if node.Transport().IsMultiplex() {
-			tr := node.Transport().WithRoute(r)
-			node = node.WithTransport(tr)
+		if node.transport.IsMultiplex() {
+			tr := node.transport.Copy().WithRoute(r)
+			node = node.Copy().WithTransport(tr)
 			r = &Route{}
 		}
 

pkg/chain/node.go

@@ -3,12 +3,15 @@ package chain
 import (
 	"sync"
 	"time"
+
+	"github.com/go-gost/gost/pkg/bypass"
 )
 
 type Node struct {
 	name      string
 	addr      string
 	transport *Transport
+	bypass    bypass.Bypass
 	marker    *failMarker
 }
 
@@ -28,15 +31,22 @@ func (node *Node) Addr() string {
 	return node.addr
 }
 
-func (node *Node) Transport() *Transport {
-	return node.transport
-}
-
 func (node *Node) WithTransport(tr *Transport) *Node {
 	node.transport = tr
 	return node
 }
 
+func (node *Node) WithBypass(bp bypass.Bypass) *Node {
+	node.bypass = bp
+	return node
+}
+
+func (node *Node) Copy() *Node {
+	n := &Node{}
+	*n = *node
+	return n
+}
+
 type NodeGroup struct {
 	nodes    []*Node
 	selector Selector

pkg/chain/route.go

@@ -20,13 +20,13 @@ func (r *Route) Connect(ctx context.Context) (conn net.Conn, err error) {
 	}
 
 	node := r.nodes[0]
-	cc, err := node.Transport().Dial(ctx, r.nodes[0].Addr())
+	cc, err := node.transport.Dial(ctx, r.nodes[0].Addr())
 	if err != nil {
 		node.marker.Mark()
 		return
 	}
 
-	cn, err := node.Transport().Handshake(ctx, cc)
+	cn, err := node.transport.Handshake(ctx, cc)
 	if err != nil {
 		cc.Close()
 		node.marker.Mark()
@@ -36,7 +36,7 @@ func (r *Route) Connect(ctx context.Context) (conn net.Conn, err error) {
 
 	preNode := node
 	for _, node := range r.nodes[1:] {
-		cc, err = preNode.Transport().Connect(ctx, cn, "tcp", node.Addr())
+		cc, err = preNode.transport.Connect(ctx, cn, "tcp", node.Addr())
 		if err != nil {
 			cn.Close()
 			node.marker.Mark()
@@ -68,7 +68,7 @@ func (r *Route) Dial(ctx context.Context, network, address string) (net.Conn, er
 		return nil, err
 	}
 
-	cc, err := r.Last().Transport().Connect(ctx, conn, network, address)
+	cc, err := r.Last().transport.Connect(ctx, conn, network, address)
 	if err != nil {
 		conn.Close()
 		return nil, err
@@ -93,9 +93,19 @@ func (r *Route) IsEmpty() bool {
 	return r == nil || len(r.nodes) == 0
 }
 
-func (r Route) Last() *Node {
+func (r *Route) Last() *Node {
 	if r.IsEmpty() {
 		return nil
 	}
 	return r.nodes[len(r.nodes)-1]
 }
+
+func (r *Route) Path() (path []*Node) {
+	for _, node := range r.nodes {
+		if node.transport != nil && node.transport.route != nil {
+			path = append(path, node.transport.route.Path()...)
+		}
+		path = append(path, node)
+	}
+	return
+}

pkg/chain/transport.go

@@ -14,6 +14,12 @@ type Transport struct {
 	connector connector.Connector
 }
 
+func (tr *Transport) Copy() *Transport {
+	tr2 := &Transport{}
+	*tr2 = *tr
+	return tr
+}
+
 func (tr *Transport) WithDialer(dialer dialer.Dialer) *Transport {
 	tr.dialer = dialer
 	return tr