chore: enhance stats response model

kastov · kastov · commit 13acc7429a00 · 2025-11-12T23:33:51.000+03:00
diff --git a/libs/contract/commands/system/get-stats.command.ts b/libs/contract/commands/system/get-stats.command.ts
@@ -50,6 +50,7 @@ export namespace GetStatsCommand {
             }),
             nodes: z.object({
                 totalOnline: z.number(),
+                totalBytesLifetime: z.string(),
             }),
         }),
     });
diff --git a/libs/contract/package.json b/libs/contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/backend-contract",
-  "version": "2.3.5",
+  "version": "2.3.6",
   "public": true,
   "license": "AGPL-3.0-only",
   "description": "A contract library for Remnawave Backend. It can be used in backend and frontend.",
diff --git a/src/bin/cli/cli.ts b/src/bin/cli/cli.ts
@@ -1,13 +1,21 @@
 #!/usr/bin/env node
 
 import { Prisma, PrismaClient } from '@prisma/client';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import timezone from 'dayjs/plugin/timezone';
+import utc from 'dayjs/plugin/utc';
 import consola from 'consola';
 import Redis from 'ioredis';
+import dayjs from 'dayjs';
 
 import { encodeCertPayload } from '@common/utils/certs/encode-node-payload';
 import { generateNodeCert } from '@common/utils/certs';
 import { CACHE_KEYS } from '@libs/contracts/constants';
 
+dayjs.extend(utc);
+dayjs.extend(relativeTime);
+dayjs.extend(timezone);
+
 const prisma = new PrismaClient({
     datasources: {
         db: {
diff --git a/src/bin/gen-doc/gen-doc.ts b/src/bin/gen-doc/gen-doc.ts
@@ -13,8 +13,12 @@ process.env.INSTANCE_TYPE = 'api';
 
 import { utilities as nestWinstonModuleUtilities, WinstonModule } from 'nest-winston';
 import { patchNestJsSwagger, ZodValidationPipe } from 'nestjs-zod';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import timezone from 'dayjs/plugin/timezone';
 import { createLogger } from 'winston';
 import * as winston from 'winston';
+import utc from 'dayjs/plugin/utc';
+import dayjs from 'dayjs';
 
 import { ROOT } from '@contract/api';
 
@@ -25,6 +29,10 @@ import { isDevelopment } from '@common/utils/startup-app';
 
 import { AppModule } from '../../app.module';
 
+dayjs.extend(utc);
+dayjs.extend(relativeTime);
+dayjs.extend(timezone);
+
 patchNestJsSwagger();
 
 // const levels = {
diff --git a/src/bin/processors/processors.ts b/src/bin/processors/processors.ts
@@ -3,8 +3,12 @@
 };
 
 import { utilities as nestWinstonModuleUtilities, WinstonModule } from 'nest-winston';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import timezone from 'dayjs/plugin/timezone';
 import { createLogger } from 'winston';
 import * as winston from 'winston';
+import utc from 'dayjs/plugin/utc';
+import dayjs from 'dayjs';
 
 import { NestFactory } from '@nestjs/core';
 
@@ -17,6 +21,10 @@ import { METRICS_ROOT } from '@libs/contracts/api';
 
 import { ProcessorsRootModule } from './processors.root.module';
 
+dayjs.extend(utc);
+dayjs.extend(relativeTime);
+dayjs.extend(timezone);
+
 // const levels = {
 //     error: 0,
 //     warn: 1,
diff --git a/src/bin/scheduler/scheduler.ts b/src/bin/scheduler/scheduler.ts
@@ -3,11 +3,15 @@
 };
 
 import { utilities as nestWinstonModuleUtilities, WinstonModule } from 'nest-winston';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import timezone from 'dayjs/plugin/timezone';
 import { createLogger } from 'winston';
 import compression from 'compression';
 import * as winston from 'winston';
+import utc from 'dayjs/plugin/utc';
 import { json } from 'express';
 import helmet from 'helmet';
+import dayjs from 'dayjs';
 
 import { ConfigService } from '@nestjs/config';
 import { NestFactory } from '@nestjs/core';
@@ -21,6 +25,10 @@ import { BULLBOARD_ROOT, HEALTH_ROOT, METRICS_ROOT } from '@libs/contracts/api';
 
 import { SchedulerRootModule } from './scheduler.root.module';
 
+dayjs.extend(utc);
+dayjs.extend(relativeTime);
+dayjs.extend(timezone);
+
 // const levels = {
 //     error: 0,
 //     warn: 1,
diff --git a/src/common/utils/get-date-ranges.uti.ts b/src/common/utils/get-date-ranges.uti.ts
@@ -1,10 +1,5 @@
-import timezone from 'dayjs/plugin/timezone';
-import utc from 'dayjs/plugin/utc';
 import dayjs from 'dayjs';
 
-dayjs.extend(utc);
-dayjs.extend(timezone);
-
 export function getCalendarMonthRanges(timezone: string): [[Date, Date], [Date, Date]] {
     const now = dayjs().tz(timezone);
 
diff --git a/src/main.ts b/src/main.ts
@@ -4,12 +4,16 @@
 
 import { utilities as nestWinstonModuleUtilities, WinstonModule } from 'nest-winston';
 import { patchNestJsSwagger, ZodValidationPipe } from 'nestjs-zod';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import timezone from 'dayjs/plugin/timezone';
 import { createLogger } from 'winston';
 import compression from 'compression';
 import * as winston from 'winston';
+import utc from 'dayjs/plugin/utc';
 import { json } from 'express';
 import helmet from 'helmet';
 import morgan from 'morgan';
+import dayjs from 'dayjs';
 
 import { ROOT } from '@contract/api';
 
@@ -25,6 +29,10 @@ import { AxiosService } from '@common/axios';
 
 import { AppModule } from './app.module';
 
+dayjs.extend(utc);
+dayjs.extend(relativeTime);
+dayjs.extend(timezone);
+
 patchNestJsSwagger();
 
 // const levels = {
diff --git a/src/modules/nodes-usage-history/nodes-usage-history.service.ts b/src/modules/nodes-usage-history/nodes-usage-history.service.ts
@@ -1,5 +1,3 @@
-import relativeTime from 'dayjs/plugin/relativeTime';
-import utc from 'dayjs/plugin/utc';
 import dayjs from 'dayjs';
 
 import { Injectable, Logger } from '@nestjs/common';
@@ -10,9 +8,6 @@ import { ERRORS } from '@libs/contracts/constants';
 import { GetNodesUsageByRangeResponseModel } from './models/get-nodes-usage-by-range.response.model';
 import { NodesUsageHistoryRepository } from './repositories/nodes-usage-history.repository';
 
-dayjs.extend(utc);
-dayjs.extend(relativeTime);
-
 @Injectable()
 export class NodesUsageHistoryService {
     private readonly logger = new Logger(NodesUsageHistoryService.name);
diff --git a/src/modules/nodes-usage-history/queries/get-sum-lifetime/get-sum-lifetime.handler.ts b/src/modules/nodes-usage-history/queries/get-sum-lifetime/get-sum-lifetime.handler.ts
@@ -0,0 +1,32 @@
+import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
+import { Logger } from '@nestjs/common';
+
+import { ERRORS } from '@libs/contracts/constants';
+
+import { NodesUsageHistoryRepository } from '../../repositories/nodes-usage-history.repository';
+import { GetSumLifetimeQuery } from './get-sum-lifetime.query';
+
+@QueryHandler(GetSumLifetimeQuery)
+export class GetSumLifetimeHandler implements IQueryHandler<GetSumLifetimeQuery> {
+    private readonly logger = new Logger(GetSumLifetimeHandler.name);
+    constructor(private readonly nodesUsageHistoryRepository: NodesUsageHistoryRepository) {}
+
+    async execute() {
+        try {
+            const sum = await this.nodesUsageHistoryRepository.getSumLifetime();
+
+            return {
+                isOk: true,
+                response: {
+                    totalBytes: sum,
+                },
+            };
+        } catch (error) {
+            this.logger.error(error);
+            return {
+                isOk: false,
+                ...ERRORS.INTERNAL_SERVER_ERROR,
+            };
+        }
+    }
+}
diff --git a/src/modules/nodes-usage-history/queries/get-sum-lifetime/get-sum-lifetime.query.ts b/src/modules/nodes-usage-history/queries/get-sum-lifetime/get-sum-lifetime.query.ts
@@ -0,0 +1,13 @@
+import { Query } from '@nestjs/cqrs';
+
+import { ICommandResponse } from '@common/types/command-response.type';
+
+export class GetSumLifetimeQuery extends Query<
+    ICommandResponse<{
+        totalBytes: string;
+    }>
+> {
+    constructor() {
+        super();
+    }
+}
diff --git a/src/modules/nodes-usage-history/queries/get-sum-lifetime/index.ts b/src/modules/nodes-usage-history/queries/get-sum-lifetime/index.ts
@@ -0,0 +1,2 @@
+export * from './get-sum-lifetime.handler';
+export * from './get-sum-lifetime.query';
diff --git a/src/modules/nodes-usage-history/queries/index.ts b/src/modules/nodes-usage-history/queries/index.ts
@@ -1,4 +1,5 @@
 import { GetSumByDtRangeHandler } from './get-sum-by-dt-range/get-sum-by-dt-range.handler';
+import { GetSumLifetimeHandler } from './get-sum-lifetime/get-sum-lifetime.handler';
 import { Get7DaysStatsHandler } from './get-7days-stats/get-7days-stats.handler';
 
-export const QUERIES = [GetSumByDtRangeHandler, Get7DaysStatsHandler];
+export const QUERIES = [GetSumByDtRangeHandler, Get7DaysStatsHandler, GetSumLifetimeHandler];
diff --git a/src/modules/nodes-usage-history/repositories/nodes-usage-history.repository.ts b/src/modules/nodes-usage-history/repositories/nodes-usage-history.repository.ts
@@ -97,4 +97,16 @@ export class NodesUsageHistoryRepository
             ORDER BY "date" ASC
         `;
     }
+
+    public async getSumLifetime(): Promise<string> {
+        const result = await this.prisma.tx.nodesUsageHistory.aggregate({
+            _sum: { totalBytes: true },
+        });
+
+        if (!result._sum.totalBytes) {
+            return '0';
+        }
+
+        return result._sum.totalBytes.toString();
+    }
 }
diff --git a/src/modules/nodes-user-usage-history/nodes-user-usage-history.service.ts b/src/modules/nodes-user-usage-history/nodes-user-usage-history.service.ts
@@ -1,5 +1,3 @@
-import relativeTime from 'dayjs/plugin/relativeTime';
-import utc from 'dayjs/plugin/utc';
 import dayjs from 'dayjs';
 
 import { Injectable, Logger } from '@nestjs/common';
@@ -10,9 +8,6 @@ import { ERRORS } from '@libs/contracts/constants';
 import { NodesUserUsageHistoryRepository } from './repositories/nodes-user-usage-history.repository';
 import { IGetNodesRealtimeUsage, IGetNodeUserUsageByRange } from './interfaces';
 
-dayjs.extend(utc);
-dayjs.extend(relativeTime);
-
 @Injectable()
 export class NodesUserUsageHistoryService {
     private readonly logger = new Logger(NodesUserUsageHistoryService.name);
diff --git a/src/modules/system/models/get-stats.response.model.ts b/src/modules/system/models/get-stats.response.model.ts
@@ -26,6 +26,7 @@ interface IGetStatsResponseData {
     };
     nodes: {
         totalOnline: number;
+        totalBytesLifetime: string;
     };
 }
 
@@ -55,6 +56,7 @@ export class GetStatsResponseModel {
     };
     nodes: {
         totalOnline: number;
+        totalBytesLifetime: string;
     };
 
     constructor(data: IGetStatsResponseData) {
diff --git a/src/modules/system/system.service.ts b/src/modules/system/system.service.ts
@@ -28,6 +28,7 @@ import { prettyBytesUtil } from '@common/utils/bytes';
 
 import { ResponseRulesMatcherService } from '@modules/subscription-response-rules/services/response-rules-matcher.service';
 import { ResponseRulesParserService } from '@modules/subscription-response-rules/services/response-rules-parser.service';
+import { GetSumLifetimeQuery } from '@modules/nodes-usage-history/queries/get-sum-lifetime';
 import { Get7DaysStatsQuery } from '@modules/nodes-usage-history/queries/get-7days-stats';
 import { CountOnlineUsersQuery } from '@modules/nodes/queries/count-online-users';
 import { IGet7DaysStats } from '@modules/nodes-usage-history/interfaces';
@@ -64,8 +65,14 @@ export class SystemService {
         try {
             const userStats = await this.getShortUserStats();
             const onlineUsers = await this.getOnlineUsers();
-
-            if (!userStats.isOk || !userStats.response) {
+            const nodesSumLifetime = await this.queryBus.execute(new GetSumLifetimeQuery());
+
+            if (
+                !userStats.isOk ||
+                !userStats.response ||
+                !nodesSumLifetime.isOk ||
+                !nodesSumLifetime.response
+            ) {
                 return {
                     isOk: false,
                     ...ERRORS.GET_USER_STATS_ERROR,
@@ -94,6 +101,7 @@ export class SystemService {
                     onlineStats: userStats.response.onlineStats,
                     nodes: {
                         totalOnline: onlineUsers.response?.usersOnline || 0,
+                        totalBytesLifetime: nodesSumLifetime.response.totalBytes,
                     },
                 }),
             };
diff --git a/src/modules/users/repositories/users.repository.ts b/src/modules/users/repositories/users.repository.ts
@@ -1,6 +1,5 @@
 import { SelectExpression, sql, ExpressionBuilder } from 'kysely';
 import { jsonArrayFrom } from 'kysely/helpers/postgres';
-import utc from 'dayjs/plugin/utc';
 import dayjs from 'dayjs';
 
 import { TResetPeriods, TUsersStatus, USERS_STATUS } from '@contract/constants';
@@ -37,8 +36,6 @@ import { TriggerThresholdNotificationsBuilder } from '../builders/trigger-thresh
 import { UserTrafficEntity } from '../entities/user-traffic.entity';
 import { UserConverter } from '../users.converter';
 
-dayjs.extend(utc);
-
 @Injectable()
 export class UsersRepository {
     private readonly logger = new Logger(UsersRepository.name);
diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts
@@ -1,8 +1,6 @@
-import relativeTime from 'dayjs/plugin/relativeTime';
 import { randomUUID } from 'node:crypto';
 import { Prisma } from '@prisma/client';
 import { customAlphabet } from 'nanoid';
-import utc from 'dayjs/plugin/utc';
 import dayjs from 'dayjs';
 
 import { CommandBus, EventBus, QueryBus } from '@nestjs/cqrs';
@@ -49,9 +47,6 @@ import { IGetUserByUnique, IGetUsersByTelegramIdOrEmail, IGetUserUsageByRange }
 import { UsersRepository } from './repositories/users.repository';
 import { BaseUserEntity, UserEntity } from './entities';
 
-dayjs.extend(utc);
-dayjs.extend(relativeTime);
-
 @Injectable()
 export class UsersService {
     private readonly logger = new Logger(UsersService.name);

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@remnawave/backend-contract",`
`3`		`- "version": "2.3.5",`
	`3`	`+ "version": "2.3.6",`
`4`	`4`	`"public": true,`
`5`	`5`	`"license": "AGPL-3.0-only",`
`6`	`6`	`"description": "A contract library for Remnawave Backend. It can be used in backend and frontend.",`