mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-20 10:00:58 +00:00
5c7ca5b579
* feat(clients): give each client its own traffic reset cycle Traffic reset is configured on the inbound, so every client sharing an inbound resets together. An operator running a monthly 1000GB plan and a weekly 200GB plan side by side has to press Reset Traffic by hand. Clients now carry the same trafficReset / trafficResetDay pair the inbound already has, with the same vocabulary and the same monthly due-day rule, and PeriodicTrafficResetJob makes a second pass over the clients whose own cycle matches the period it is running for. A client that leaves the field at never behaves exactly as before: only its inbound's schedule can reset it. The fields live on ClientRecord as well as in the inbound settings JSON, so an ordinary edit does not write the cycle back as empty, and an unknown period is rejected rather than coerced, since a coerced value would read as configured while no job would ever select the client. Cron expressions and a custom post-reset quota from the issue are left out: both are separate decisions, and neither has an inbound-level counterpart to stay consistent with. * fix(clients): make the per-client reset cycle editable and safe to run Review found three things wrong with the first cut, one of them mine and worse than the bug it replaced. The cycle could only be set at creation. ClientService.Update writes the columns directly only for a client with no inbounds; the normal path goes through SyncInbound and applyClientRecordMerge, which this change had not extended, so an edit updated the settings JSON while the clients column kept the old value and the job kept applying the old cycle. The earlier test passed because it asserted the value survived an unrelated edit, which it did precisely because nothing ever wrote it. Replaced with a test that changes the cycle and switches it off again. Avoiding the re-enable that ResetTrafficByEmail performs was wrong. Depletion disables clients.enable and the settings JSON as well as client_traffics.enable, so lifting only the quota gate left a depleted client out of the generated config with zeroed counters, which no longer match the depleted predicate: locked out permanently. The rule is now about cause, not state — a client the quota switched off is restored, one disabled below its quota was switched off by hand and is skipped. The bulk path also bypassed node propagation and the MTProto sidecar quota that ResetTrafficByEmail handles, so it silently did nothing on node-backed inbounds. Dropped in favour of the integrated path, whose needRestart is now collected and turned into a single SetToNeedRestart. Also adds the AutoMigrate NULL backfill, guards the merge so a stale node snapshot cannot erase a configured cycle, validates the bulk-create and import paths, normalizes the day the way the inbound path does, marks the fields omitempty so existing clients match the published contract, and shares one TRAFFIC_RESETS tuple between the three forms. * fix(clients): validate renew fields on the bulk and import paths too BulkCreate and ImportClients insert client records without going through Create, so the resetDay/resetMax checks added with the calendar renewal (#6239) and the renew cap (#6238) never ran there. An API caller could store resetDay 45 or a negative resetMax, values the renewal query then mishandles silently. Mirror Create's validation on both batch paths, next to the trafficReset check they already carry. --------- Co-authored-by: Sanaei <ho3ein.sanaei@gmail.com>
245 lines
7.0 KiB
Go
245 lines
7.0 KiB
Go
package service
|
|
|
|
import (
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/google/uuid"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/xray"
|
|
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
// ExportAll returns every client in the same {client, inboundIds} shape that
|
|
// /add and /bulkCreate accept, so an exported file round-trips straight back
|
|
// through Import. Clients with no inbound attachment are included with an empty
|
|
// inboundIds list so an export taken before DeleteOrphans can restore them.
|
|
func (s *ClientService) ExportAll() ([]ClientCreatePayload, error) {
|
|
db := database.GetDB()
|
|
var rows []model.ClientRecord
|
|
if err := db.Order("id ASC").Find(&rows).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
out := make([]ClientCreatePayload, 0, len(rows))
|
|
if len(rows) == 0 {
|
|
return out, nil
|
|
}
|
|
|
|
ids := make([]int, 0, len(rows))
|
|
for i := range rows {
|
|
ids = append(ids, rows[i].Id)
|
|
}
|
|
|
|
attachments := make(map[int][]int, len(rows))
|
|
for _, batch := range chunkInts(ids, sqlInChunk) {
|
|
var links []model.ClientInbound
|
|
if err := db.Where("client_id IN ?", batch).Order("inbound_id ASC").Find(&links).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
for _, l := range links {
|
|
attachments[l.ClientId] = append(attachments[l.ClientId], l.InboundId)
|
|
}
|
|
}
|
|
|
|
for i := range rows {
|
|
client := rows[i].ToClient()
|
|
// The per-inbound flow_override is the reliable flow for multi-inbound
|
|
// clients; the canonical column can be left stale by SyncInbound (#4792).
|
|
if flow, err := s.EffectiveFlow(db, rows[i].Id); err == nil && flow != "" {
|
|
client.Flow = flow
|
|
}
|
|
out = append(out, ClientCreatePayload{
|
|
Client: *client,
|
|
InboundIds: attachments[rows[i].Id],
|
|
LimitHwid: rows[i].LimitHwid,
|
|
})
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// ImportClients recreates clients from an exported list. Items that carry
|
|
// inboundIds go through the normal BulkCreate path (added to every inbound and
|
|
// pushed to xray); items with no inboundIds are restored as bare records so an
|
|
// orphan-inclusive export round-trips. Existing emails are never overwritten —
|
|
// they are reported in Skipped. The boolean reports whether xray needs a restart.
|
|
func (s *ClientService) ImportClients(inboundSvc *InboundService, items []ClientCreatePayload) (BulkCreateResult, bool, error) {
|
|
result := BulkCreateResult{}
|
|
if len(items) == 0 {
|
|
return result, false, nil
|
|
}
|
|
|
|
attached := make([]ClientCreatePayload, 0, len(items))
|
|
orphans := make([]ClientCreatePayload, 0)
|
|
for i := range items {
|
|
if len(items[i].InboundIds) > 0 {
|
|
attached = append(attached, items[i])
|
|
} else {
|
|
orphans = append(orphans, items[i])
|
|
}
|
|
}
|
|
|
|
skip := func(email, reason string) {
|
|
if strings.TrimSpace(email) == "" {
|
|
email = "(missing email)"
|
|
}
|
|
result.Skipped = append(result.Skipped, BulkCreateReport{Email: email, Reason: reason})
|
|
}
|
|
|
|
needRestart := false
|
|
if len(attached) > 0 {
|
|
sub, nr, err := s.BulkCreate(inboundSvc, attached)
|
|
if err != nil {
|
|
return result, needRestart, err
|
|
}
|
|
needRestart = needRestart || nr
|
|
result.Created += sub.Created
|
|
result.Skipped = append(result.Skipped, sub.Skipped...)
|
|
}
|
|
|
|
db := database.GetDB()
|
|
for i := range orphans {
|
|
client := orphans[i].Client
|
|
email := strings.TrimSpace(client.Email)
|
|
if email == "" {
|
|
skip("", "client email is required")
|
|
continue
|
|
}
|
|
if verr := validateClientEmail(email); verr != nil {
|
|
skip(email, verr.Error())
|
|
continue
|
|
}
|
|
if verr := validateClientSubID(client.SubID); verr != nil {
|
|
skip(email, verr.Error())
|
|
continue
|
|
}
|
|
if verr := validateClientResetDay(client.ResetDay); verr != nil {
|
|
skip(email, verr.Error())
|
|
continue
|
|
}
|
|
if verr := validateClientResetMax(client.ResetMax); verr != nil {
|
|
skip(email, verr.Error())
|
|
continue
|
|
}
|
|
if verr := validateClientTrafficReset(client.TrafficReset, client.TrafficResetDay); verr != nil {
|
|
skip(email, verr.Error())
|
|
continue
|
|
}
|
|
|
|
// An existing record (in the DB or just created from the attached set
|
|
// above) always wins — import never clobbers a live client.
|
|
var taken int64
|
|
if err := db.Model(&model.ClientRecord{}).Where("email = ?", email).Count(&taken).Error; err != nil {
|
|
return result, needRestart, err
|
|
}
|
|
if taken > 0 {
|
|
skip(email, "email already in use: "+email)
|
|
continue
|
|
}
|
|
|
|
client.Email = email
|
|
if client.SubID == "" {
|
|
client.SubID = uuid.NewString()
|
|
}
|
|
if client.SubID != "" {
|
|
var subTaken int64
|
|
if err := db.Model(&model.ClientRecord{}).
|
|
Where("sub_id = ? AND email <> ?", client.SubID, email).
|
|
Count(&subTaken).Error; err != nil {
|
|
return result, needRestart, err
|
|
}
|
|
if subTaken > 0 {
|
|
skip(email, "subId already in use: "+client.SubID)
|
|
continue
|
|
}
|
|
}
|
|
if !client.Enable {
|
|
client.Enable = true
|
|
}
|
|
now := time.Now().UnixMilli()
|
|
if client.CreatedAt == 0 {
|
|
client.CreatedAt = now
|
|
}
|
|
client.UpdatedAt = now
|
|
|
|
rec := client.ToRecord()
|
|
rec.LimitHwid = orphans[i].LimitHwid
|
|
if err := db.Create(rec).Error; err != nil {
|
|
skip(email, err.Error())
|
|
continue
|
|
}
|
|
result.Created++
|
|
}
|
|
|
|
return result, needRestart, nil
|
|
}
|
|
|
|
// DeleteOrphans removes every client that is not attached to any inbound,
|
|
// together with its traffic rows, IP log, and external links. It mirrors the
|
|
// cleanup the single-client Delete performs, batched into one transaction.
|
|
// Returns the number of clients deleted.
|
|
func (s *ClientService) DeleteOrphans() (int, error) {
|
|
db := database.GetDB()
|
|
sub := database.GetDB().Table("client_inbounds").Select("client_id")
|
|
var rows []model.ClientRecord
|
|
if err := db.Where("id NOT IN (?)", sub).Order("id ASC").Find(&rows).Error; err != nil {
|
|
return 0, err
|
|
}
|
|
if len(rows) == 0 {
|
|
return 0, nil
|
|
}
|
|
|
|
ids := make([]int, 0, len(rows))
|
|
emails := make([]string, 0, len(rows))
|
|
subIDs := make([]string, 0, len(rows))
|
|
for i := range rows {
|
|
ids = append(ids, rows[i].Id)
|
|
if rows[i].Email != "" {
|
|
emails = append(emails, rows[i].Email)
|
|
}
|
|
subIDs = append(subIDs, rows[i].SubID)
|
|
}
|
|
tombstoneClientEmails(emails)
|
|
|
|
if err := runSerializedTx(func(tx *gorm.DB) error {
|
|
if e := adjustGroupBaselinesForRemovedTraffic(tx, emails); e != nil {
|
|
return e
|
|
}
|
|
if e := clearClientHwidsBySubIDTx(tx, subIDs...); e != nil {
|
|
return e
|
|
}
|
|
for _, batch := range chunkInts(ids, sqlInChunk) {
|
|
if e := tx.Where("client_id IN ?", batch).Delete(&model.ClientInbound{}).Error; e != nil {
|
|
return e
|
|
}
|
|
if e := tx.Where("client_id IN ?", batch).Delete(&model.ClientExternalLink{}).Error; e != nil {
|
|
return e
|
|
}
|
|
}
|
|
if len(emails) > 0 {
|
|
for _, batch := range chunkStrings(emails, sqlInChunk) {
|
|
if e := tx.Where("email IN ?", batch).Delete(&xray.ClientTraffic{}).Error; e != nil {
|
|
return e
|
|
}
|
|
if e := tx.Where("client_email IN ?", batch).Delete(&model.InboundClientIps{}).Error; e != nil {
|
|
return e
|
|
}
|
|
}
|
|
if e := clearGlobalTraffic(tx, emails...); e != nil {
|
|
return e
|
|
}
|
|
}
|
|
for _, batch := range chunkInts(ids, sqlInChunk) {
|
|
if e := tx.Where("id IN ?", batch).Delete(&model.ClientRecord{}).Error; e != nil {
|
|
return e
|
|
}
|
|
}
|
|
return nil
|
|
}); err != nil {
|
|
return 0, err
|
|
}
|
|
return len(ids), nil
|
|
}
|