dashboard 备注 客户端管理优化 多客户端支持 流量显示支持 热更新支持 404错误页支持

client/client.go

@@ -5,12 +5,16 @@ import (
 	"log"
 	"net"
 	"sync"
+	"sync/atomic"
 	"time"
 )
 
 type TRPClient struct {
-	svrAddr string
-	tcpNum  int
+	svrAddr      string
+	tcpNum       int
+	tunnelNum    int64
+	tunnel       chan bool
+	serverStatus bool
 	sync.Mutex
 	vKey string
 }
@@ -21,6 +25,7 @@ func NewRPClient(svraddr string, tcpNum int, vKey string) *TRPClient {
 	c.svrAddr = svraddr
 	c.tcpNum = tcpNum
 	c.vKey = vKey
+	c.tunnel = make(chan bool)
 	return c
 }
 
@@ -29,12 +34,17 @@ func (s *TRPClient) Start() error {
 	for i := 0; i < s.tcpNum; i++ {
 		go s.NewConn()
 	}
+	for i := 0; i < 5; i++ {
+		go s.dealChan()
+	}
+	go s.session()
 	return nil
 }
 
 //新建
 func (s *TRPClient) NewConn() error {
 	s.Lock()
+	s.serverStatus = false
 	conn, err := net.Dial("tcp", s.svrAddr)
 	if err != nil {
 		log.Println("连接服务端失败,五秒后将重连")
@@ -44,11 +54,12 @@ func (s *TRPClient) NewConn() error {
 		return err
 	}
 	s.Unlock()
-	return s.process(utils.NewConn(conn))
+	return s.processor(utils.NewConn(conn))
 }
 
 //处理
-func (s *TRPClient) process(c *utils.Conn) error {
+func (s *TRPClient) processor(c *utils.Conn) error {
+	s.serverStatus = true
 	c.SetAlive()
 	if _, err := c.Write([]byte(utils.Getverifyval(s.vKey))); err != nil {
 		return err
@@ -58,7 +69,6 @@ func (s *TRPClient) process(c *utils.Conn) error {
 		flags, err := c.ReadFlag()
 		if err != nil {
 			log.Println("服务端断开,五秒后将重连", err)
-			time.Sleep(5 * time.Second)
 			go s.NewConn()
 			break
 		}
@@ -66,9 +76,6 @@ func (s *TRPClient) process(c *utils.Conn) error {
 		case utils.VERIFY_EER:
 			log.Fatalln("vkey:", s.vKey, "不正确,服务端拒绝连接,请检查")
 		case utils.WORK_CHAN: //隧道模式，每次开启10个，加快连接速度
-			for i := 0; i < 5; i++ {
-				go s.dealChan()
-			}
 		case utils.RES_MSG:
 			log.Println("服务端返回错误。")
 		default:
@@ -98,13 +105,16 @@ func (s *TRPClient) dealChan() {
 	//写标志
 	c.WriteChan()
 re:
+	atomic.AddInt64(&s.tunnelNum, 1)
 	//获取连接的host type(tcp or udp)
 	typeStr, host, en, de, crypt, mux, err := c.GetHostFromConn()
+	s.tunnel <- true
+	atomic.AddInt64(&s.tunnelNum, -1)
 	if err != nil {
 		c.Close()
 		return
 	}
-	Process(c, typeStr, host, en, de, crypt, mux)
+	s.ConnectAndCopy(c, typeStr, host, en, de, crypt, mux)
 	if mux {
 		utils.FlushConn(conn)
 		goto re
@@ -113,7 +123,20 @@ re:
 	}
 }
 
-func Process(c *utils.Conn, typeStr, host string, en, de int, crypt, mux bool) {
+func (s *TRPClient) session() {
+	t := time.NewTicker(time.Millisecond * 1000)
+	for {
+		select {
+		case <-s.tunnel:
+		case <-t.C:
+		}
+		if s.serverStatus && s.tunnelNum < 5 {
+			go s.dealChan()
+		}
+	}
+}
+
+func (s *TRPClient) ConnectAndCopy(c *utils.Conn, typeStr, host string, en, de int, crypt, mux bool) {
 	//与目标建立连接,超时时间为3
 	server, err := net.DialTimeout(typeStr, host, time.Second*3)
 	if err != nil {