mirror of
https://github.com/Drop-OSS/drop.git
synced 2026-01-31 15:37:09 +01:00
Adds new tile on the admin home page with system data. (#301)
* Adds new tile on the admin home page with system data. Also fixes the active users bug in the pie chart * Fixes missing parentheses * Updates user stats cache when signing in * Reads active number of users from session provider * Removes unused variable * Small improvements * Removes acl properties from system data websocket and performs initial push of data * fix: remove acl fetch --------- Co-authored-by: DecDuck <declanahofmeyr@gmail.com>
This commit is contained in:
36
server/api/v1/admin/system-data/ws.get.ts
Normal file
36
server/api/v1/admin/system-data/ws.get.ts
Normal file
@@ -0,0 +1,36 @@
|
||||
import systemManager from "~/server/internal/system-data";
|
||||
import aclManager from "~/server/internal/acls";
|
||||
import { logger } from "~/server/internal/logging";
|
||||
|
||||
// TODO add web socket sessions for horizontal scaling
|
||||
// Peer ID to user ID
|
||||
const socketSessions = new Map<string, string>();
|
||||
|
||||
export default defineWebSocketHandler({
|
||||
async open(peer) {
|
||||
const h3 = { headers: peer.request?.headers ?? new Headers() };
|
||||
const userId = await aclManager.getUserIdACL(h3, ["system-data:listen"]);
|
||||
if (!userId) {
|
||||
peer.send("unauthenticated");
|
||||
return;
|
||||
}
|
||||
|
||||
socketSessions.set(peer.id, userId);
|
||||
|
||||
systemManager.listen(userId, peer.id, (systemData) => {
|
||||
peer.send(JSON.stringify(systemData));
|
||||
});
|
||||
},
|
||||
|
||||
async close(peer, _details) {
|
||||
const userId = socketSessions.get(peer.id);
|
||||
if (!userId) {
|
||||
logger.info(`skipping websocket close for ${peer.id}`);
|
||||
return;
|
||||
}
|
||||
|
||||
systemManager.unlisten(userId, peer.id);
|
||||
systemManager.unlisten("system", peer.id); // In case we were listening as 'system'
|
||||
socketSessions.delete(peer.id);
|
||||
},
|
||||
});
|
||||
@@ -1,6 +1,7 @@
|
||||
import sessionHandler from "~/server/internal/session";
|
||||
import authManager from "~/server/internal/auth";
|
||||
import type { Session } from "~/server/internal/session/types";
|
||||
import userStatsManager from "~/server/internal/userstats";
|
||||
|
||||
defineRouteMeta({
|
||||
openAPI: {
|
||||
@@ -61,6 +62,7 @@ export default defineEventHandler(async (h3) => {
|
||||
`/auth/mfa?redirect=${result.options.redirect ? encodeURIComponent(result.options.redirect) : "/"}`,
|
||||
);
|
||||
}
|
||||
await userStatsManager.cacheUserSessions();
|
||||
|
||||
if (result.options.redirect) {
|
||||
return sendRedirect(h3, result.options.redirect);
|
||||
|
||||
Reference in New Issue
Block a user