tcjlj/V2bX
1
0
Fork 0
mirror of https://github.com/wyx2685/V2bX.git synced 2025-01-22 18:08:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

support HTTP304 for get user list

Browse Source
This commit is contained in:
Yuzuki616 2023-07-22 02:45:08 +08:00
parent aeb8554b13
commit c48c9c65ab
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
node/task.go
View File

@ -69,6 +69,9 @@ func (c *Controller) nodeInfoMonitor() (err error) {
} }
if newNodeInfo != nil { if newNodeInfo != nil {
// nodeInfo changed // nodeInfo changed
if newUserInfo != nil {
c.userList = newUserInfo
}
c.traffic = make(map[string]int64) c.traffic = make(map[string]int64)
// Remove old tag // Remove old tag
log.WithField("tag", c.tag).Info("Node changed, reload") log.WithField("tag", c.tag).Info("Node changed, reload")
@ -84,7 +87,7 @@ func (c *Controller) nodeInfoMonitor() (err error) {
limiter.DeleteLimiter(c.tag) limiter.DeleteLimiter(c.tag)
// Add new Limiter // Add new Limiter
c.tag = c.buildNodeTag(newNodeInfo) c.tag = c.buildNodeTag(newNodeInfo)
l := limiter.AddLimiter(c.tag, &c.LimitConfig, newUserInfo) l := limiter.AddLimiter(c.tag, &c.LimitConfig, c.userList)
// check cert // check cert
if newNodeInfo.Tls || newNodeInfo.Type == "hysteria" { if newNodeInfo.Tls || newNodeInfo.Type == "hysteria" {
err = c.requestCert() err = c.requestCert()
@ -108,7 +111,7 @@ func (c *Controller) nodeInfoMonitor() (err error) {
_, err = c.server.AddUsers(&vCore.AddUsersParams{ _, err = c.server.AddUsers(&vCore.AddUsersParams{
Tag: c.tag, Tag: c.tag,
Config: c.ControllerConfig, Config: c.ControllerConfig,
UserInfo: newUserInfo, UserInfo: c.userList,
NodeInfo: newNodeInfo, NodeInfo: newNodeInfo,
}) })
if err != nil { if err != nil {
@ -140,13 +143,15 @@ func (c *Controller) nodeInfoMonitor() (err error) {
c.userReportPeriodic.Close() c.userReportPeriodic.Close()
_ = c.userReportPeriodic.Start(false) _ = c.userReportPeriodic.Start(false)
} }
c.userList = newUserInfo log.WithField("tag", c.tag).Infof("Added %d new users", len(c.userList))
log.WithField("tag", c.tag).Infof("Added %d new users", len(newUserInfo))
// exit // exit
return nil return nil
} }
// node no changed, check users // node no changed, check users
if len(newUserInfo) == 0 {
return nil
}
deleted, added := compareUserList(c.userList, newUserInfo) deleted, added := compareUserList(c.userList, newUserInfo)
if len(deleted) > 0 { if len(deleted) > 0 {
// have deleted users // have deleted users