performance optimization

2026-02-04 12:40:11 +00:00 · 2022-09-13 10:39:53 +08:00
parent 5fd09079e3
commit 53b330b4e8
4 changed files with 66 additions and 73 deletions
--- a/core/app/dispatcher/limiter.go
+++ b/core/app/dispatcher/limiter.go
@@ -11,19 +11,20 @@ import (
 	"time"
 )

-type UserInfo struct {
-	UID         int
-	SpeedLimit  uint64
-	ExpireTime  int64
-	DeviceLimit int
+type UserLimitInfo struct {
+	UID        int
+	SpeedLimit uint64
+	ExpireTime int64
+	//DeviceLimit int
 }

 type InboundInfo struct {
-	Tag            string
-	NodeSpeedLimit uint64
-	UserInfo       *sync.Map // Key: Uid value: UserInfo
-	SpeedLimiter   *sync.Map // key: Uid, value: *ratelimit.Bucket
-	UserOnlineIP   *sync.Map // Key: Uid Value: *sync.Map: Key: IP, Value: bool
+	Tag             string
+	NodeSpeedLimit  uint64
+	NodeDeviceLimit int
+	UserLimitInfo   *sync.Map // Key: Uid value: UserLimitInfo
+	SpeedLimiter    *sync.Map // key: Uid, value: *ratelimit.Bucket
+	UserOnlineIP    *sync.Map // Key: Uid Value: *sync.Map: Key: IP, Value: bool
 }

 type Limiter struct {
@@ -36,47 +37,24 @@ func NewLimiter() *Limiter {
 	}
 }

-func (l *Limiter) AddInboundLimiter(tag string, nodeInfo *panel.NodeInfo, userList []panel.UserInfo) error {
+func (l *Limiter) AddInboundLimiter(tag string, nodeInfo *panel.NodeInfo) error {
 	inboundInfo := &InboundInfo{
-		Tag:            tag,
-		NodeSpeedLimit: nodeInfo.SpeedLimit,
-		SpeedLimiter:   new(sync.Map),
-		UserOnlineIP:   new(sync.Map),
+		Tag:             tag,
+		NodeSpeedLimit:  nodeInfo.SpeedLimit,
+		NodeDeviceLimit: nodeInfo.DeviceLimit,
+		SpeedLimiter:    new(sync.Map),
+		UserOnlineIP:    new(sync.Map),
 	}
-	userMap := new(sync.Map)
-	for i := range userList {
-		/*if (*userList)[i].SpeedLimit == 0 {
-			(*userList)[i].SpeedLimit = nodeInfo.SpeedLimit
-		}
-		if (*userList)[i].DeviceLimit == 0 {
-			(*userList)[i].DeviceLimit = nodeInfo.DeviceLimit
-		}*/
-		userMap.Store(fmt.Sprintf("%s|%s|%d", tag, (userList)[i].V2rayUser.Email, (userList)[i].UID),
-			&UserInfo{
-				UID:         (userList)[i].UID,
-				SpeedLimit:  nodeInfo.SpeedLimit,
-				DeviceLimit: nodeInfo.DeviceLimit,
-			})
-	}
-	inboundInfo.UserInfo = userMap
+	inboundInfo.UserLimitInfo = new(sync.Map)
 	l.InboundInfo.Store(tag, inboundInfo) // Replace the old inbound info
 	return nil
 }

-func (l *Limiter) UpdateInboundLimiter(tag string, nodeInfo *panel.NodeInfo, added, deleted []panel.UserInfo) error {
+func (l *Limiter) UpdateInboundLimiter(tag string, deleted []panel.UserInfo) error {
 	if value, ok := l.InboundInfo.Load(tag); ok {
 		inboundInfo := value.(*InboundInfo)
-		// Update User info
-		for i := range added {
-			inboundInfo.UserInfo.Store(fmt.Sprintf("%s|%s|%d", tag,
-				(added)[i].V2rayUser.Email, (added)[i].UID), &UserInfo{
-				UID:         (added)[i].UID,
-				SpeedLimit:  nodeInfo.SpeedLimit,
-				DeviceLimit: nodeInfo.DeviceLimit,
-			})
-		}
 		for i := range deleted {
-			inboundInfo.UserInfo.Delete(fmt.Sprintf("%s|%s|%d", tag,
+			inboundInfo.UserLimitInfo.Delete(fmt.Sprintf("%s|%s|%d", tag,
 				(deleted)[i].V2rayUser.Email, (deleted)[i].UID))
 			inboundInfo.SpeedLimiter.Delete(fmt.Sprintf("%s|%s|%d", tag,
 				(deleted)[i].V2rayUser.Email, (deleted)[i].UID)) // Delete limiter bucket
@@ -92,16 +70,14 @@ func (l *Limiter) DeleteInboundLimiter(tag string) error {
 	return nil
 }

-func (l *Limiter) UpdateUserSpeedLimit(tag string, userInfo *panel.UserInfo, limit uint64, expire int64) error {
+func (l *Limiter) AddUserSpeedLimit(tag string, userInfo *panel.UserInfo, limit uint64, expire int64) error {
 	if value, ok := l.InboundInfo.Load(tag); ok {
 		inboundInfo := value.(*InboundInfo)
-		if user, ok := inboundInfo.UserInfo.Load(fmt.Sprintf("%s|%s|%d", tag, userInfo.GetUserEmail(), userInfo.UID)); ok {
-			user.(*UserInfo).SpeedLimit = limit
-			user.(*UserInfo).ExpireTime = time.Now().Add(time.Duration(expire) * time.Second).Unix()
-			inboundInfo.SpeedLimiter.Delete(fmt.Sprintf("%s|%s|%d", tag, userInfo.GetUserEmail(), userInfo.UID))
-		} else {
-			return fmt.Errorf("no such user in limiter: %s", userInfo.GetUserEmail())
+		userLimit := &UserLimitInfo{
+			SpeedLimit: limit,
+			ExpireTime: time.Now().Add(time.Duration(expire) * time.Second).Unix(),
 		}
+		inboundInfo.UserLimitInfo.Store(fmt.Sprintf("%s|%s|%d", tag, userInfo.GetUserEmail(), userInfo.UID), userLimit)
 		return nil
 	} else {
 		return fmt.Errorf("no such inbound in limiter: %s", tag)
@@ -128,9 +104,9 @@ func (l *Limiter) ListOnlineUserIp(tag string) ([]UserIpList, error) {
 				return true
 			})
 			if len(ip) > 0 {
-				if u, ok := inboundInfo.UserInfo.Load(key.(string)); ok {
+				if u, ok := inboundInfo.UserLimitInfo.Load(key.(string)); ok {
 					onlineUser = append(onlineUser, UserIpList{
-						Uid:    u.(*UserInfo).UID,
+						Uid:    u.(*UserLimitInfo).UID,
 						IpList: ip,
 					})
 				}
@@ -192,17 +168,15 @@ func (l *Limiter) CheckSpeedAndDeviceLimit(tag string, email string, ip string)
 		inboundInfo := value.(*InboundInfo)
 		nodeLimit := inboundInfo.NodeSpeedLimit
 		var userLimit uint64 = 0
-		var deviceLimit = 0
 		expired := false
-		if v, ok := inboundInfo.UserInfo.Load(email); ok {
-			u := v.(*UserInfo)
+		if v, ok := inboundInfo.UserLimitInfo.Load(email); ok {
+			u := v.(*UserLimitInfo)
 			if u.ExpireTime < time.Now().Unix() && u.ExpireTime != 0 {
 				userLimit = 0
 				expired = true
 			} else {
 				userLimit = u.SpeedLimit
 			}
-			deviceLimit = u.DeviceLimit
 		}
 		ipMap := new(sync.Map)
 		ipMap.Store(ip, true)
@@ -216,7 +190,7 @@ func (l *Limiter) CheckSpeedAndDeviceLimit(tag string, email string, ip string)
 					counter++
 					return true
 				})
-				if counter > deviceLimit && deviceLimit > 0 {
+				if counter > inboundInfo.NodeDeviceLimit && inboundInfo.NodeDeviceLimit > 0 {
 					ipMap.Delete(ip)
 					return nil, false, true
 				}
@@ -226,12 +200,13 @@ func (l *Limiter) CheckSpeedAndDeviceLimit(tag string, email string, ip string)
 				}
 			}
 		}
-		limit := determineRate(nodeLimit, userLimit) // If need the Speed limit
+		limit := determineSpeedLimit(nodeLimit, userLimit) // If you need the Speed limit
 		if limit > 0 {
 			limiter := ratelimit.NewBucketWithQuantum(time.Second, int64(limit), int64(limit)) // Byte/s
 			if v, ok := inboundInfo.SpeedLimiter.LoadOrStore(email, limiter); ok {
 				if expired {
 					inboundInfo.SpeedLimiter.Store(email, limiter)
+					inboundInfo.UserLimitInfo.Delete(email)
 					return limiter, true, false
 				}
 				bucket := v.(*ratelimit.Bucket)
@@ -270,8 +245,28 @@ func (w *Writer) WriteMultiBuffer(mb buf.MultiBuffer) error {
 	return w.writer.WriteMultiBuffer(mb)
 }

-// determineRate returns the minimum non-zero rate
-func determineRate(nodeLimit, userLimit uint64) (limit uint64) {
+// determineSpeedLimit returns the minimum non-zero rate
+func determineSpeedLimit(nodeLimit, userLimit uint64) (limit uint64) {
+	if nodeLimit == 0 || userLimit == 0 {
+		if nodeLimit > userLimit {
+			return nodeLimit
+		} else if nodeLimit < userLimit {
+			return userLimit
+		} else {
+			return 0
+		}
+	} else {
+		if nodeLimit > userLimit {
+			return userLimit
+		} else if nodeLimit < userLimit {
+			return nodeLimit
+		} else {
+			return nodeLimit
+		}
+	}
+}
+
+func determineDeviceLimit(nodeLimit, userLimit int) (limit int) {
 	if nodeLimit == 0 || userLimit == 0 {
 		if nodeLimit > userLimit {
 			return nodeLimit