merge ss and ssu

pkg/chain/node.go

@@ -12,14 +12,14 @@ type Node struct {
 	addr      string
 	transport *Transport
 	bypass    bypass.Bypass
-	marker    *failMarker
+	marker    *FailMarker
 }
 
 func NewNode(name, addr string) *Node {
 	return &Node{
 		name:   name,
 		addr:   addr,
-		marker: &failMarker{},
+		marker: &FailMarker{},
 	}
 }
 
@@ -31,6 +31,10 @@ func (node *Node) Addr() string {
 	return node.addr
 }
 
+func (node *Node) Marker() *FailMarker {
+	return node.marker
+}
+
 func (node *Node) WithTransport(tr *Transport) *Node {
 	node.transport = tr
 	return node
@@ -80,13 +84,13 @@ func (g *NodeGroup) Next() *Node {
 	return selector.Select(g.nodes...)
 }
 
-type failMarker struct {
+type FailMarker struct {
 	failTime  int64
 	failCount uint32
 	mux       sync.RWMutex
 }
 
-func (m *failMarker) FailTime() int64 {
+func (m *FailMarker) FailTime() int64 {
 	if m == nil {
 		return 0
 	}
@@ -97,7 +101,7 @@ func (m *failMarker) FailTime() int64 {
 	return m.failTime
 }
 
-func (m *failMarker) FailCount() uint32 {
+func (m *FailMarker) FailCount() uint32 {
 	if m == nil {
 		return 0
 	}
@@ -108,7 +112,7 @@ func (m *failMarker) FailCount() uint32 {
 	return m.failCount
 }
 
-func (m *failMarker) Mark() {
+func (m *FailMarker) Mark() {
 	if m == nil {
 		return
 	}
@@ -120,7 +124,7 @@ func (m *failMarker) Mark() {
 	m.failCount++
 }
 
-func (m *failMarker) Reset() {
+func (m *FailMarker) Reset() {
 	if m == nil {
 		return
 	}

pkg/chain/route.go

@@ -26,33 +26,33 @@ 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())
 	if err != nil {
-		node.marker.Mark()
+		node.Marker().Mark()
 		return
 	}
 
 	cn, err := node.transport.Handshake(ctx, cc)
 	if err != nil {
 		cc.Close()
-		node.marker.Mark()
+		node.Marker().Mark()
 		return
 	}
-	node.marker.Reset()
+	node.Marker().Reset()
 
 	preNode := node
 	for _, node := range r.nodes[1:] {
 		cc, err = preNode.transport.Connect(ctx, cn, "tcp", node.Addr())
 		if err != nil {
 			cn.Close()
-			node.marker.Mark()
+			node.Marker().Mark()
 			return
 		}
 		cc, err = node.transport.Handshake(ctx, cc)
 		if err != nil {
 			cn.Close()
-			node.marker.Mark()
+			node.Marker().Mark()
 			return
 		}
-		node.marker.Reset()
+		node.Marker().Reset()
 
 		cn = cc
 		preNode = node
@@ -89,7 +89,7 @@ func (r *Route) dialDirect(ctx context.Context, network, address string) (net.Co
 	default:
 	}
 
-	d := &net.Dialer{}
+	d := net.Dialer{}
 	return d.DialContext(ctx, network, address)
 }
 

pkg/chain/selector.go

@@ -15,10 +15,6 @@ const (
 	DefaultFailTimeout = 30 * time.Second
 )
 
-var (
-	defaultSelector Selector = NewSelector(nil)
-)
-
 type Selector interface {
 	Select(nodes ...*Node) *Node
 }
@@ -145,8 +141,8 @@ func (f *failFilter) Filter(nodes ...*Node) []*Node {
 	}
 	var nl []*Node
 	for _, node := range nodes {
-		if node.marker.FailCount() < uint32(maxFails) ||
-			time.Since(time.Unix(node.marker.FailTime(), 0)) >= failTimeout {
+		if node.Marker().FailCount() < uint32(maxFails) ||
+			time.Since(time.Unix(node.Marker().FailTime(), 0)) >= failTimeout {
 			nl = append(nl, node)
 		}
 	}