xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-07-15 09:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): classify ended clients as depleted, not disabled, on inbounds page

Browse Source 
The auto-disable job flips client.enable off in the settings JSON when a
client expires or exhausts its traffic, so the inbounds-page rollup filed
every ended client under the gray Disabled badge (and double-counted it
in Depleted when stats were present). Classify with depleted-first
priority, matching computeClientsSummary and the client info modal.

Also backfill cross-inbound client_traffics rows in GetInboundsSlim:
the row is keyed on email and only preloads on the inbound the client
was created on, so on every other attached inbound the depleted/expiring
checks could never fire.
This commit is contained in:
MHSanaei
2026-06-11 14:05:02 +02:00
parent 9730561f20
commit aeb2217ae5
3 changed files with 54 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/inbounds/useInbounds.ts
+23 -13
View File
@@ -225,25 +225,35 @@ export function useInbounds() {
const inboundActive = activeForNode === undefined || !dbInbound.tag || activeForNode.has(dbInbound.tag);
if (dbInbound.enable) {
const statsByEmail = new Map<string, { email: string; total: number; up: number; down: number; expiryTime: number }>();
for (const stats of clientStats) {
if (stats.email) statsByEmail.set(stats.email.toLowerCase(), stats);
}
for (const client of clients) {
if (client.comment && client.email) comments.set(client.email, client.comment);
if (client.enable) {
if (client.email) active.push(client.email);
if (client.email && inboundActive && nodeOnline?.has(client.email)) online.push(client.email);
} else if (client.email) {
deactive.push(client.email);
}
}
for (const stats of clientStats) {
const exhausted = stats.total > 0 && stats.up + stats.down >= stats.total;
const expired = stats.expiryTime > 0 && stats.expiryTime <= now;
if (!client.email) continue;
const stats = statsByEmail.get(client.email.toLowerCase());
const exhausted = stats != null && stats.total > 0 && stats.up + stats.down >= stats.total;
const expired = stats != null && stats.expiryTime > 0 && stats.expiryTime <= now;
// Depleted wins over disabled (same priority as computeClientsSummary):
// the auto-disable job also flips client.enable off in settings when a
// client ends, so checking enable first would file every ended client
// under "Disabled".
if (expired || exhausted) {
depleted.push(stats.email);
} else {
depleted.push(client.email);
continue;
}
if (!client.enable) {
deactive.push(client.email);
continue;
}
active.push(client.email);
if (inboundActive && nodeOnline?.has(client.email)) online.push(client.email);
if (stats) {
const expiringSoon =
(stats.expiryTime > 0 && stats.expiryTime - now < expireDiffRef.current) ||
(stats.total > 0 && stats.total - (stats.up + stats.down) < trafficDiffRef.current);
if (expiringSoon) expiring.push(stats.email);
if (expiringSoon) expiring.push(client.email);
}
}
} else {