fix(traffic): re-enable quota-disabled clients on inbound and reset-all resets (#6833)

Running out of quota switches a client off in client_traffics, in its client
record and in the inbound settings JSON. The inbound's periodic reset and the
Reset All Client Traffic button only set client_traffics.enable back, so the
client showed zero usage but stayed out of the running core every period.

Both paths now read the disabled, depleted emails inside the transaction that
zeroes the counters, on the traffic writer, and re-enable them through
BulkSetEnable after the commit, like every other reset path. Reading them inside
that transaction keeps a traffic tick from disabling a client between the read
and the reset.

internal/web/job/periodic_traffic_reset_client_test.go

@@ -26,6 +26,7 @@ type seededClient struct {
 	recordEnable bool
 	quotaEnable  bool
 	total        int64
+	inboundCycle string
 }
 
 // seedClientOnCycle creates an inbound that never resets on its own, a client
@@ -43,9 +44,13 @@ func seedClientOnCycle(t *testing.T, port int, c seededClient) {
 	if err != nil {
 		t.Fatalf("marshal settings: %v", err)
 	}
+	inboundCycle := c.inboundCycle
+	if inboundCycle == "" {
+		inboundCycle = "never"
+	}
 	ib := model.Inbound{
 		UserId: 1, Enable: true, Port: port, Protocol: model.VLESS,
-		Tag: "inbound-" + c.email, TrafficReset: "never", Settings: string(settings),
+		Tag: "inbound-" + c.email, TrafficReset: inboundCycle, Settings: string(settings),
 	}
 	if err := db.Create(&ib).Error; err != nil {
 		t.Fatalf("create inbound: %v", err)
@@ -185,6 +190,46 @@ func TestPeriodicTrafficResetClients(t *testing.T) {
 	})
 }
 
+func TestPeriodicTrafficResetInboundRestoresClients(t *testing.T) {
+	t.Run("restores a client the quota switched off", func(t *testing.T) {
+		initResetJobDB(t)
+		seedClientOnCycle(t, 41101, seededClient{
+			email: "depleted-ib@example.com", cycle: "never", day: 1,
+			recordEnable: false, quotaEnable: false, total: 1000, inboundCycle: "daily",
+		})
+
+		NewPeriodicTrafficResetJob("daily", time.UTC).Run()
+
+		row := trafficFor(t, "depleted-ib@example.com")
+		if row.Up != 0 || row.Down != 0 || !row.Enable {
+			t.Fatalf("traffic not reset: up=%d down=%d enable=%v", row.Up, row.Down, row.Enable)
+		}
+		if rec := recordFor(t, "depleted-ib@example.com"); !rec.Enable {
+			t.Fatal("clients.enable still false after the inbound's reset: the client stays out of the core")
+		}
+		if enabled := settingsEnableOf(t, 41101); !enabled {
+			t.Fatal("the inbound settings JSON still has the client disabled")
+		}
+	})
+
+	t.Run("leaves a client the operator switched off", func(t *testing.T) {
+		initResetJobDB(t)
+		seedClientOnCycle(t, 41102, seededClient{
+			email: "banned-ib@example.com", cycle: "never", day: 1,
+			recordEnable: false, quotaEnable: true, total: 100000, inboundCycle: "daily",
+		})
+
+		NewPeriodicTrafficResetJob("daily", time.UTC).Run()
+
+		if rec := recordFor(t, "banned-ib@example.com"); rec.Enable {
+			t.Fatal("an operator-disabled client was switched back on by the inbound's reset")
+		}
+		if enabled := settingsEnableOf(t, 41102); enabled {
+			t.Fatal("an operator-disabled client was enabled in the inbound settings JSON")
+		}
+	})
+}
+
 func settingsEnableOf(t *testing.T, port int) bool {
 	t.Helper()
 	var stored model.Inbound

internal/web/job/periodic_traffic_reset_job.go

@@ -113,10 +113,13 @@ func (j *PeriodicTrafficResetJob) resetInboundsOnSchedule() {
 			}
 		}
 
-		resetClientErr := j.clientService.ResetAllClientTraffics(&j.inboundService, inbound.Id)
+		nr, resetClientErr := j.clientService.ResetAllClientTraffics(&j.inboundService, inbound.Id)
 		if resetClientErr != nil {
 			logger.Warning("Failed to reset traffic for all users of inbound", inbound.Id, ":", resetClientErr)
 		}
+		if nr {
+			needRestart.Store(true)
+		}
 
 		if resetInboundErr == nil && resetClientErr == nil {
 			resetCount.Add(1)