pjandro/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-11-03 11:45:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(sync): preserve shared client lifecycle across nodes (#7038)

Browse Source 
A client on inbounds of several nodes has one traffic row homed on one inbound, but the lifecycle merge looked it up in a node-scoped map. A node that was not the home therefore looked like it had no master state, so its stale enable or disable overwrote the shared record and adopted settings, flipping the client every tick, and a renewal on that node was missed. The merge now uses the global per-email traffic lookup, including clients reported only in settings.
This commit is contained in:
Seyed Mahdi
2026-11-02 17:57:44 +03:30
committed by GitHub
parent a712bf1413
commit 81059edc91
4 changed files with 217 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/service/inbound_node.go
+14 -7
View File
@@ -613,6 +613,7 @@ func (s *InboundService) setRemoteTrafficLocked(nodeID int, snap *runtime.Traffi
// email to its per-field max (nodeEmailTotals) so divergent copies can't make
// the reset clamp re-add a lower sibling as fresh traffic (#5274).
snapEmailsAll := make(map[string]struct{})
reportedEmails := make(map[string]struct{})
nodeEmailTotals := make(map[string]nodeTrafficCounter)
for _, snapIb := range snap.Inbounds {
if snapIb == nil {
@@ -621,6 +622,7 @@ func (s *InboundService) setRemoteTrafficLocked(nodeID int, snap *runtime.Traffi
for i := range snapIb.ClientStats {
email := snapIb.ClientStats[i].Email
snapEmailsAll[email] = struct{}{}
reportedEmails[email] = struct{}{}
cur := nodeEmailTotals[email]
if snapIb.ClientStats[i].Up > cur.Up {
cur.Up = snapIb.ClientStats[i].Up
@@ -630,14 +632,19 @@ func (s *InboundService) setRemoteTrafficLocked(nodeID int, snap *runtime.Traffi
}
nodeEmailTotals[email] = cur
}
if clients, err := s.GetClients(snapIb); err == nil {
for _, client := range clients {
reportedEmails[client.Email] = struct{}{}
}
}
}
// The stored row of every reported email, wherever it is homed, so the merge
// can skip a write that would leave it unchanged. Homed rows share centralCS's pointer.
statByEmail := make(map[string]*xray.ClientTraffic, len(snapEmailsAll))
if len(snapEmailsAll) > 0 {
snapEmailList := make([]string, 0, len(snapEmailsAll))
for email := range snapEmailsAll {
statByEmail := make(map[string]*xray.ClientTraffic, len(reportedEmails))
if len(reportedEmails) > 0 {
snapEmailList := make([]string, 0, len(reportedEmails))
for email := range reportedEmails {
snapEmailList = append(snapEmailList, email)
}
for _, batch := range chunkStrings(snapEmailList, sqliteMaxVars) {
@@ -1129,7 +1136,7 @@ func (s *InboundService) setRemoteTrafficLocked(nodeID int, snap *runtime.Traffi
continue
}
existing := centralCSByEmail[cs.Email]
existing := statByEmail[cs.Email]
if existing != nil {
expiryChanged := !clientFrozen && existing.ExpiryTime != mergeActivationExpiry(existing.ExpiryTime, cs.ExpiryTime)
// Only a real latch to disabled is structural; one-way merge never
@@ -1272,7 +1279,7 @@ func (s *InboundService) setRemoteTrafficLocked(nodeID int, snap *runtime.Traffi
var perInboundOld []oldSet
syncFailedInbounds := map[int]struct{}{}
for _, p := range pendingAdopts {
lifted, liftChanged := liftClientLifecycleInSettings(p.wireSettings, centralCSByEmail)
lifted, liftChanged := liftClientLifecycleInSettings(p.wireSettings, statByEmail)
adoptedSettings := p.wireSettings
if liftChanged {
adoptedSettings = lifted
@@ -1334,7 +1341,7 @@ func (s *InboundService) setRemoteTrafficLocked(nodeID int, snap *runtime.Traffi
if isClientEmailTombstoned(clients[i].Email) {
continue
}
existing := centralCSByEmail[clients[i].Email]
existing := statByEmail[clients[i].Email]
var csPtr *xray.ClientTraffic
if cs, hit := csByEmail[clients[i].Email]; hit {
csCopy := cs