mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-16 18:15:01 +03:00
fix(clients): zero traffic before re-enabling a client on reset
Invariant: a traffic reset leaves a quota-disabled client enabled everywhere. ResetTrafficByEmail and BulkResetTraffic enabled the client first and zeroed its counters afterwards. A traffic tick landing between the two still saw the client depleted and switched it off again in client_traffics, the record and settings. Update's direct record write then set the record back to enabled and the reset zeroed the counters, leaving the settings entry disabled: the client showed enabled with zero usage but was dropped from the runtime. The periodic reset job goes through ResetTrafficByEmail for every depleted client on its cycle, and a node push inside Update widens the window to seconds. Zero first, then enable: with the counters at zero the depletion predicate no longer matches, so the tick has nothing to undo. UpdateInboundClient re-adds the enabled user to the runtime itself.
This commit is contained in:
@@ -26,6 +26,26 @@ func (s *ClientService) ResetTrafficByEmail(inboundSvc *InboundService, email st
|
||||
}
|
||||
|
||||
needRestart := false
|
||||
if len(inboundIds) == 0 {
|
||||
if rErr := inboundSvc.ResetClientTrafficByEmail(email); rErr != nil {
|
||||
return false, rErr
|
||||
}
|
||||
} else {
|
||||
applies := make([]inboundApply, 0, len(inboundIds))
|
||||
for _, ibId := range inboundIds {
|
||||
applies = append(applies, inboundApply{id: ibId, run: func() (bool, error) {
|
||||
return inboundSvc.ResetClientTraffic(ibId, email)
|
||||
}})
|
||||
}
|
||||
nr, applyErr := fanoutInboundApplies(applies)
|
||||
if applyErr != nil {
|
||||
return nr, applyErr
|
||||
}
|
||||
needRestart = nr
|
||||
}
|
||||
|
||||
// Enable only once the counters are zero: a still-depleted client enabled
|
||||
// first is switched off again by the next traffic tick.
|
||||
if !rec.Enable {
|
||||
updated := rec.ToClient()
|
||||
updated.Enable = true
|
||||
@@ -37,22 +57,7 @@ func (s *ClientService) ResetTrafficByEmail(inboundSvc *InboundService, email st
|
||||
needRestart = true
|
||||
}
|
||||
}
|
||||
|
||||
if len(inboundIds) == 0 {
|
||||
if rErr := inboundSvc.ResetClientTrafficByEmail(email); rErr != nil {
|
||||
return false, rErr
|
||||
}
|
||||
return needRestart, nil
|
||||
}
|
||||
|
||||
applies := make([]inboundApply, 0, len(inboundIds))
|
||||
for _, ibId := range inboundIds {
|
||||
applies = append(applies, inboundApply{id: ibId, run: func() (bool, error) {
|
||||
return inboundSvc.ResetClientTraffic(ibId, email)
|
||||
}})
|
||||
}
|
||||
nr, applyErr := fanoutInboundApplies(applies)
|
||||
return needRestart || nr, applyErr
|
||||
return needRestart, nil
|
||||
}
|
||||
|
||||
func (s *ClientService) BulkResetTraffic(inboundSvc *InboundService, emails []string) (int, error) {
|
||||
@@ -68,18 +73,6 @@ func (s *ClientService) BulkResetTraffic(inboundSvc *InboundService, emails []st
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
for _, e := range cleanEmails {
|
||||
rec := recordsByEmail[e]
|
||||
if rec == nil || rec.Enable {
|
||||
continue
|
||||
}
|
||||
updated := rec.ToClient()
|
||||
updated.Enable = true
|
||||
if _, uErr := s.Update(inboundSvc, rec.Id, *updated, rec.LimitHwid); uErr != nil {
|
||||
logger.Warning("Failed to auto-enable client during bulk traffic reset:", uErr)
|
||||
}
|
||||
}
|
||||
|
||||
affected := 0
|
||||
err = submitTrafficWrite(func() error {
|
||||
db := database.GetDB()
|
||||
@@ -110,6 +103,19 @@ func (s *ClientService) BulkResetTraffic(inboundSvc *InboundService, emails []st
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
// After the zeroing, as in ResetTrafficByEmail: enabling a still-depleted
|
||||
// client first lets the next traffic tick switch it off again.
|
||||
for _, e := range cleanEmails {
|
||||
rec := recordsByEmail[e]
|
||||
if rec == nil || rec.Enable {
|
||||
continue
|
||||
}
|
||||
updated := rec.ToClient()
|
||||
updated.Enable = true
|
||||
if _, uErr := s.Update(inboundSvc, rec.Id, *updated, rec.LimitHwid); uErr != nil {
|
||||
logger.Warning("Failed to auto-enable client during bulk traffic reset:", uErr)
|
||||
}
|
||||
}
|
||||
return affected, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user