Code optimization

lib/file/obj.go

@@ -5,13 +5,14 @@ import (
 	"github.com/pkg/errors"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"time"
 )
 
 type Flow struct {
-	ExportFlow int64 //出口流量
-	InletFlow  int64 //入口流量
-	FlowLimit  int64 //流量限制，出口+入口 /M
+	ExportFlow int64
+	InletFlow  int64
+	FlowLimit  int64
 	sync.RWMutex
 }
 
@@ -25,20 +26,21 @@ func (s *Flow) Add(in, out int64) {
 type Client struct {
 	Cnf             *Config
 	Id              int        //id
-	VerifyKey       string     //验证密钥
-	Addr            string     //客户端ip地址
-	Remark          string     //备注
-	Status          bool       //是否开启
-	IsConnect       bool       //是否连接
-	RateLimit       int        //速度限制 /kb
-	Flow            *Flow      //流量
-	Rate            *rate.Rate //速度控制
-	NoStore         bool
-	NoDisplay       bool
-	MaxConn         int //客户端最大连接数
-	NowConn         int //当前连接数
-	id              int
-	ConfigConnAllow bool
+	VerifyKey       string     //verify key
+	Addr            string     //the ip of client
+	Remark          string     //remark
+	Status          bool       //is allow connect
+	IsConnect       bool       //is the client connect
+	RateLimit       int        //rate /kb
+	Flow            *Flow      //flow setting
+	Rate            *rate.Rate //rate limit
+	NoStore         bool       //no store to file
+	NoDisplay       bool       //no display on web
+	MaxConn         int        //the max connection num of client allow
+	NowConn         int32      //the connection num of now
+	WebUserName     string     //the username of web login
+	WebPassword     string     //the password of web login
+	ConfigConnAllow bool       //is allow connected by config file
 	sync.RWMutex
 }
 
@@ -61,30 +63,21 @@ func NewClient(vKey string, noStore bool, noDisplay bool) *Client {
 }
 
 func (s *Client) CutConn() {
-	s.Lock()
-	defer s.Unlock()
-	s.NowConn++
+	atomic.AddInt32(&s.NowConn, 1)
 }
 
 func (s *Client) AddConn() {
-	s.Lock()
-	defer s.Unlock()
-	s.NowConn--
+	atomic.AddInt32(&s.NowConn, -1)
 }
 
 func (s *Client) GetConn() bool {
-	if s.MaxConn == 0 || s.NowConn < s.MaxConn {
+	if s.MaxConn == 0 || int(s.NowConn) < s.MaxConn {
 		s.CutConn()
 		return true
 	}
 	return false
 }
 
-//modify the hosts and the tunnels by health information
-func (s *Client) ModifyTarget() {
-
-}
-
 func (s *Client) HasTunnel(t *Tunnel) (exist bool) {
 	GetCsvDb().Tasks.Range(func(key, value interface{}) bool {
 		v := value.(*Tunnel)
@@ -114,13 +107,11 @@ type Tunnel struct {
 	Id         int //Id
 	Port       int //服务端监听端口
 	ServerIp   string
-	Mode       string   //启动方式
-	Target     string   //目标
-	TargetArr  []string //目标
-	Status     bool     //设置是否开启
-	RunStatus  bool     //当前运行状态
-	Client     *Client  //所属客户端id
-	Ports      string   //客户端与服务端传递
+	Mode       string  //启动方式
+	Status     bool    //设置是否开启
+	RunStatus  bool    //当前运行状态
+	Client     *Client //所属客户端id
+	Ports      string  //客户端与服务端传递
 	Flow       *Flow
 	Password   string //私密模式密码，唯一
 	Remark     string //备注
@@ -128,7 +119,7 @@ type Tunnel struct {
 	NoStore    bool
 	LocalPath  string
 	StripPre   string
-	NowIndex   int
+	Target     *Target
 	Health
 	sync.RWMutex
 }
@@ -146,9 +137,16 @@ type Health struct {
 	sync.RWMutex
 }
 
-func (s *Tunnel) GetRandomTarget() (string, error) {
+type Target struct {
+	nowIndex  int
+	TargetStr string
+	TargetArr []string //目标
+	sync.RWMutex
+}
+
+func (s *Target) GetRandomTarget() (string, error) {
 	if s.TargetArr == nil {
-		s.TargetArr = strings.Split(s.Target, "\n")
+		s.TargetArr = strings.Split(s.TargetStr, "\n")
 	}
 	if len(s.TargetArr) == 1 {
 		return s.TargetArr[0], nil
@@ -158,54 +156,33 @@ func (s *Tunnel) GetRandomTarget() (string, error) {
 	}
 	s.Lock()
 	defer s.Unlock()
-	if s.NowIndex >= len(s.TargetArr)-1 {
-		s.NowIndex = -1
+	if s.nowIndex >= len(s.TargetArr)-1 {
+		s.nowIndex = -1
 	}
-	s.NowIndex++
-	return s.TargetArr[s.NowIndex], nil
+	s.nowIndex++
+	return s.TargetArr[s.nowIndex], nil
 }
 
 type Config struct {
-	U        string //socks5验证用户名
-	P        string //socks5验证密码
-	Compress bool   //压缩方式
-	Crypt    bool   //是否加密
+	U        string
+	P        string
+	Compress bool
+	Crypt    bool
 }
 
 type Host struct {
 	Id           int
-	Host         string //启动方式
-	Target       string //目标
-	HeaderChange string //host修改
-	HostChange   string //host修改
-	Location     string //url 路由
+	Host         string //host
+	HeaderChange string //header change
+	HostChange   string //host change
+	Location     string //url router
+	Remark       string //remark
+	Scheme       string //http https all
+	NoStore      bool
+	IsClose      bool
 	Flow         *Flow
 	Client       *Client
-	Remark       string //备注
-	NowIndex     int
-	TargetArr    []string
-	NoStore      bool
-	Scheme       string //http https all
-	IsClose      bool
+	Target       *Target //目标
 	Health
 	sync.RWMutex
 }
-
-func (s *Host) GetRandomTarget() (string, error) {
-	if s.TargetArr == nil {
-		s.TargetArr = strings.Split(s.Target, "\n")
-	}
-	if len(s.TargetArr) == 1 {
-		return s.TargetArr[0], nil
-	}
-	if len(s.TargetArr) == 0 {
-		return "", errors.New("all inward-bending targets are offline")
-	}
-	s.Lock()
-	defer s.Unlock()
-	if s.NowIndex >= len(s.TargetArr)-1 {
-		s.NowIndex = -1
-	}
-	s.NowIndex++
-	return s.TargetArr[s.NowIndex], nil
-}