From 76267c00d561c54346c1d5a3ee7625e03e235cd0 Mon Sep 17 00:00:00 2001 From: diced Date: Fri, 9 Dec 2022 19:31:35 -0800 Subject: [PATCH] fix: attempt to fix #243 --- src/server/index.ts | 7 ++++--- src/server/util.ts | 35 +++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/server/index.ts b/src/server/index.ts index e916c3e..47e4f82 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -184,15 +184,16 @@ async function start() { }` ); - clearInvites.bind(server)(); - stats.bind(server)(); + await clearInvites.bind(server)(); + await stats.bind(server)(); setInterval(() => clearInvites.bind(server)(), config.core.invites_interval * 1000); setInterval(() => stats.bind(server)(), config.core.stats_interval * 1000); } async function stats(this: FastifyInstance) { - const stats = await getStats(this.prisma, this.datasource); + const stats = await getStats.bind(this)(); + await this.prisma.stats.create({ data: { data: stats, diff --git a/src/server/util.ts b/src/server/util.ts index c58be38..4c5bdcb 100644 --- a/src/server/util.ts +++ b/src/server/util.ts @@ -1,6 +1,7 @@ import { PrismaClient } from '@prisma/client'; import { Migrate } from '@prisma/migrate/dist/Migrate'; import { ensureDatabaseExists } from '@prisma/migrate/dist/utils/ensureDatabaseExists'; +import { FastifyInstance } from 'fastify'; import { ServerResponse } from 'http'; import { Datasource } from '../lib/datasources'; import Logger from '../lib/logger'; @@ -57,19 +58,31 @@ export function redirect(res: ServerResponse, url: string) { res.end(); } -export async function getStats(prisma: PrismaClient, datasource: Datasource) { - const size = await datasource.fullSize(); - const byUser = await prisma.image.groupBy({ +export async function getStats(this: FastifyInstance) { + const logger = this.logger.child('stats'); + + const size = await this.datasource.fullSize(); + logger.debug(`full size: ${size}`); + + const byUser = await this.prisma.image.groupBy({ by: ['userId'], _count: { _all: true, }, }); - const count_users = await prisma.user.count(); + logger.debug(`by user: ${JSON.stringify(byUser)}`); + + const count_users = await this.prisma.user.count(); + logger.debug(`count users: ${count_users}`); const count_by_user = []; for (let i = 0, L = byUser.length; i !== L; ++i) { - const user = await prisma.user.findFirst({ + if (!byUser[i].userId) { + logger.debug(`skipping user ${byUser[i]}`); + continue; + } + + const user = await this.prisma.user.findFirst({ where: { id: byUser[i].userId, }, @@ -80,21 +93,25 @@ export async function getStats(prisma: PrismaClient, datasource: Datasource) { count: byUser[i]._count._all, }); } + logger.debug(`count by user: ${JSON.stringify(count_by_user)}`); - const count = await prisma.image.count(); + const count = await this.prisma.image.count(); + logger.debug(`count files: ${JSON.stringify(count)}`); - const views = await prisma.image.aggregate({ + const views = await this.prisma.image.aggregate({ _sum: { views: true, }, }); + logger.debug(`sum views: ${JSON.stringify(views)}`); - const typesCount = await prisma.image.groupBy({ + const typesCount = await this.prisma.image.groupBy({ by: ['mimetype'], _count: { mimetype: true, }, }); + logger.debug(`types count: ${JSON.stringify(typesCount)}`); const types_count = []; for (let i = 0, L = typesCount.length; i !== L; ++i) types_count.push({ @@ -102,6 +119,8 @@ export async function getStats(prisma: PrismaClient, datasource: Datasource) { count: typesCount[i]._count.mimetype, }); + logger.debug(`types count: ${JSON.stringify(types_count)}`); + return { size: bytesToHuman(size), size_num: size,