Refine users table and reconnect handling
This commit is contained in:
@@ -11,7 +11,12 @@ export async function getDashboardSnapshot(
|
||||
const state = await store.read();
|
||||
const previewConfig = render3proxyConfig(state, runtimePaths);
|
||||
const traffic = await readObservedTraffic(runtimePaths, state.userRecords);
|
||||
const observedUsers = deriveObservedUsers(state.userRecords, traffic.userBytesByName, traffic.recentUsers);
|
||||
const observedUsers = deriveObservedUsers(
|
||||
state.userRecords,
|
||||
traffic.userBytesByName,
|
||||
traffic.lastSeenByName,
|
||||
traffic.recentUsers,
|
||||
);
|
||||
const observed: ObservedRuntimeState = {
|
||||
totalBytes: traffic.totalBytes,
|
||||
liveConnections: traffic.liveConnections,
|
||||
@@ -26,14 +31,17 @@ export async function getDashboardSnapshot(
|
||||
function deriveObservedUsers(
|
||||
users: ProxyUserRecord[],
|
||||
userBytesByName: Map<string, number>,
|
||||
lastSeenByName: Map<string, string | null>,
|
||||
recentUsers: Set<string>,
|
||||
): ProxyUserRecord[] {
|
||||
return users.map((user) => {
|
||||
const usedBytes = userBytesByName.get(user.username) ?? 0;
|
||||
const lastSeenAt = lastSeenByName.get(user.username) ?? null;
|
||||
|
||||
if (user.paused) {
|
||||
return {
|
||||
...user,
|
||||
lastSeenAt,
|
||||
usedBytes,
|
||||
status: 'idle',
|
||||
};
|
||||
@@ -42,6 +50,7 @@ function deriveObservedUsers(
|
||||
if (user.quotaBytes !== null && usedBytes >= user.quotaBytes) {
|
||||
return {
|
||||
...user,
|
||||
lastSeenAt,
|
||||
usedBytes,
|
||||
status: 'fail',
|
||||
};
|
||||
@@ -50,6 +59,7 @@ function deriveObservedUsers(
|
||||
if (user.quotaBytes !== null && user.quotaBytes > 0 && usedBytes / user.quotaBytes >= 0.8) {
|
||||
return {
|
||||
...user,
|
||||
lastSeenAt,
|
||||
usedBytes,
|
||||
status: recentUsers.has(user.username) ? 'live' : 'warn',
|
||||
};
|
||||
@@ -57,6 +67,7 @@ function deriveObservedUsers(
|
||||
|
||||
return {
|
||||
...user,
|
||||
lastSeenAt,
|
||||
usedBytes,
|
||||
status: recentUsers.has(user.username) ? 'live' : 'idle',
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user