mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-10-29 01:04:59 +03:00
fix(runtime): drop depleted clients by email, not by stale inbound_id
Invariant: a client whose stats row is switched off is served by no local runtime of any inbound it is attached to. client_traffics is email-keyed, and AddClientStat re-points its inbound_id at the last inbound attached, yet the runtime push builder and the MTProto, TUIC and AmneziaWG desired- instance builders looked the row up by inbound_id. On every other inbound of a multi-inbound client the depletion filter saw nothing, so a depleted client stayed served there whenever its settings entry still read enabled - the state the stale settings writes left in existing databases. All four now resolve the flag through trafficDisabledEmails, keyed by the emails the inbound actually lists. GetXrayConfig already backfills sibling rows by email (backfillClientStats) and is unchanged.
This commit is contained in:
@@ -234,3 +234,21 @@ func (s *InboundService) markClientsDisabledInSettings(tx *gorm.DB, inboundID in
|
||||
}
|
||||
return &snapshot, &ib, nil
|
||||
}
|
||||
|
||||
// trafficDisabledEmails reports which emails have a switched-off stats row. The
|
||||
// table is email-keyed and its inbound_id goes stale, so never filter on it.
|
||||
func trafficDisabledEmails(db *gorm.DB, emails []string) (map[string]struct{}, error) {
|
||||
disabled := make(map[string]struct{})
|
||||
for _, batch := range chunkStrings(uniqueNonEmptyStrings(emails), sqlInChunk) {
|
||||
var page []string
|
||||
if err := db.Model(xray.ClientTraffic{}).
|
||||
Where("email IN ? AND enable = ?", batch, false).
|
||||
Pluck("email", &page).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, e := range page {
|
||||
disabled[e] = struct{}{}
|
||||
}
|
||||
}
|
||||
return disabled, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user