chore: release v2.4.3

kastov · web-flow · commit 8dc6caded98e · 2025-12-20T19:39:28.000+03:00
Merge pull request #127 from remnawave/dev
diff --git a/libs/contract/commands/bandwidth-stats/nodes/get-stats-nodes-usage.command.ts b/libs/contract/commands/bandwidth-stats/nodes/get-stats-nodes-usage.command.ts
@@ -16,6 +16,7 @@ export namespace GetStatsNodesUsageCommand {
     export const RequestQuerySchema = z.object({
         start: z.string().date(),
         end: z.string().date(),
+        topNodesLimit: z.coerce.number().min(1).default(20),
     });
 
     export type RequestQuery = z.infer<typeof RequestQuerySchema>;
diff --git a/libs/contract/commands/bandwidth-stats/users/get-stats-user-usage.command.ts b/libs/contract/commands/bandwidth-stats/users/get-stats-user-usage.command.ts
@@ -22,6 +22,7 @@ export namespace GetStatsUserUsageCommand {
     export const RequestQuerySchema = z.object({
         start: z.string().date(),
         end: z.string().date(),
+        topNodesLimit: z.coerce.number().min(1).default(20),
     });
 
     export type RequestQuery = z.infer<typeof RequestQuerySchema>;
diff --git a/libs/contract/package.json b/libs/contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/backend-contract",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "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/libs/subscription-page/constants/button-types.constant.ts b/libs/subscription-page/constants/button-types.constant.ts
@@ -1,6 +1,7 @@
 export const BUTTON_TYPES = {
     EXTERNAL: 'external',
     SUBSCRIPTION_LINK: 'subscriptionLink',
+    COPY_BUTTON: 'copyButton',
 } as const;
 
 export type TButtonType = (typeof BUTTON_TYPES)[keyof typeof BUTTON_TYPES];
diff --git a/libs/subscription-page/constants/index.ts b/libs/subscription-page/constants/index.ts
@@ -3,5 +3,6 @@ export * from './base-translations.constant';
 export * from './button-types.constant';
 export * from './language-codes.constant';
 export * from './platform-types.constant';
+export * from './subpage-config.constant';
 export * from './template-keys.constant';
 export * from './ui-blocks-variants.constant';
diff --git a/libs/subscription-page/constants/subpage-config.constant.ts b/libs/subscription-page/constants/subpage-config.constant.ts
@@ -0,0 +1,2 @@
+export const SUBPAGE_DEFAULT_CONFIG_NAME = 'Default';
+export const SUBPAGE_DEFAULT_CONFIG_UUID = '00000000-0000-0000-0000-000000000000';
diff --git a/libs/subscription-page/constants/template-keys.constant.ts b/libs/subscription-page/constants/template-keys.constant.ts
@@ -1,3 +1,2 @@
 export const SUBSCRIPTION_PAGE_TEMPLATE_KEYS = ['USERNAME', 'SUBSCRIPTION_LINK'] as const;
 export type TSubscriptionPageTemplateKey = (typeof SUBSCRIPTION_PAGE_TEMPLATE_KEYS)[number];
-
diff --git a/libs/subscription-page/models/subscription-page-config.schema.ts b/libs/subscription-page/models/subscription-page-config.schema.ts
@@ -109,12 +109,25 @@ const SubscriptionPageTranslateKeysSchema = z.object({
     indefinitely: LocalizedTextSchema,
 });
 
+const BaseSettingsSchema = z
+    .object({
+        metaTitle: z.string().default('Remnawave Subscription Page'),
+        metaDescription: z.string().default('Remnawave Subscription Page'),
+        showConnectionKeys: z.boolean().default(false),
+    })
+    .default({
+        metaTitle: 'Remnawave Subscription Page',
+        metaDescription: 'Remnawave Subscription Page',
+        showConnectionKeys: false,
+    });
+
 export const SubscriptionPageRawConfigSchema = z
     .object({
         version: z.nativeEnum(SUBSCRIPTION_PAGE_CONFIG_VERSION),
         locales: z.array(z.enum(LANGUAGE_CODES)).min(1, 'At least one locale must be specified'),
         brandingSettings: BrandingSettingsSchema,
         uiConfig: UiConfigSchema,
+        baseSettings: BaseSettingsSchema,
         baseTranslations: SubscriptionPageTranslateKeysSchema,
         svgLibrary: SvgLibrarySchema,
         platforms: z.record(z.nativeEnum(SUBSCRIPTION_PAGE_CONFIG_PLATFORM_TYPES), PlatformSchema),
diff --git a/libs/subscription-page/package.json b/libs/subscription-page/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/subscription-page-types",
-  "version": "0.2.7",
+  "version": "0.3.3",
   "public": true,
   "license": "AGPL-3.0-only",
   "description": "A types library for Remnawave Subscription Page.",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/backend",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Remnawave Panel Backend",
   "private": false,
   "type": "commonjs",
diff --git a/prisma/seed/config.seed.ts b/prisma/seed/config.seed.ts
@@ -30,11 +30,11 @@ import {
     TTgAuthSettings,
 } from '@libs/contracts/models';
 import { getRedisConnectionOptions } from '@common/utils';
+import { DEFAULT_SUBPAGE_CONFIG } from '@modules/subscription-page-configs/constants';
 import {
-    DEFAULT_SUBPAGE_CONFIG_NAME,
-    DEFAULT_SUBPAGE_CONFIG,
-    DEFAULT_SUBPAGE_CONFIG_UUID,
-} from '@modules/subscription-page-configs/constants';
+    SUBPAGE_DEFAULT_CONFIG_NAME,
+    SUBPAGE_DEFAULT_CONFIG_UUID,
+} from '@libs/subscription-page/constants';
 
 const hash = hasher({
     trim: true,
@@ -808,15 +808,15 @@ async function seedRemnawaveSettings() {
 async function seedSubscriptionPageConfig() {
     const existingConfig = await prisma.subscriptionPageConfig.findUnique({
         where: {
-            uuid: DEFAULT_SUBPAGE_CONFIG_UUID,
+            uuid: SUBPAGE_DEFAULT_CONFIG_UUID,
         },
     });
 
     if (!existingConfig) {
         await prisma.subscriptionPageConfig.create({
             data: {
-                uuid: DEFAULT_SUBPAGE_CONFIG_UUID,
-                name: DEFAULT_SUBPAGE_CONFIG_NAME,
+                uuid: SUBPAGE_DEFAULT_CONFIG_UUID,
+                name: SUBPAGE_DEFAULT_CONFIG_NAME,
                 config: DEFAULT_SUBPAGE_CONFIG,
             },
         });
diff --git a/src/modules/nodes-usage-history/nodes-usage-history.controller.ts b/src/modules/nodes-usage-history/nodes-usage-history.controller.ts
@@ -39,16 +39,26 @@ export class NodesUsageHistoryController {
         description: 'Start date',
         required: true,
     })
+    @ApiQuery({
+        name: 'topNodesLimit',
+        type: Number,
+        description: 'Limit of top nodes to return',
+        required: true,
+    })
     @Endpoint({
         command: GetStatsNodesUsageCommand,
         httpCode: HttpStatus.OK,
     })
     async getStatsNodesUsage(
         @Query() query: GetStatsNodesUsageRequestQueryDto,
     ): Promise<GetStatsNodesUsageResponseDto> {
-        const { start, end } = query;
+        const { start, end, topNodesLimit } = query;
 
-        const result = await this.nodesUsageHistoryService.getStatsNodesUsage(start, end);
+        const result = await this.nodesUsageHistoryService.getStatsNodesUsage(
+            start,
+            end,
+            topNodesLimit,
+        );
 
         const data = errorHandler(result);
         return {
diff --git a/src/modules/nodes-usage-history/nodes-usage-history.service.ts b/src/modules/nodes-usage-history/nodes-usage-history.service.ts
@@ -17,6 +17,7 @@ export class NodesUsageHistoryService {
     async getStatsNodesUsage(
         start: string,
         end: string,
+        topNodesLimit: number,
     ): Promise<TResult<GetStatsNodesUsageResponseModel>> {
         try {
             const { startDate, endDate, dates } = getDateRangeArrayUtil(
@@ -33,6 +34,7 @@ export class NodesUsageHistoryService {
             const topNodes = await this.nodeUsageHistoryRepository.getTopNodesByTraffic(
                 startDate,
                 endDate,
+                topNodesLimit,
             );
 
             const nodesUsage = await this.nodeUsageHistoryRepository.getNodesUsageByRange(
diff --git a/src/modules/nodes-user-usage-history/bandwidth-stats-users.controller.ts b/src/modules/nodes-user-usage-history/bandwidth-stats-users.controller.ts
@@ -97,6 +97,12 @@ export class BandwidthStatsUsersController {
         description: 'Start date',
         required: true,
     })
+    @ApiQuery({
+        name: 'topNodesLimit',
+        type: Number,
+        description: 'Limit of top nodes to return',
+        required: true,
+    })
     @Endpoint({
         command: GetStatsUserUsageCommand,
         httpCode: HttpStatus.OK,
@@ -109,6 +115,7 @@ export class BandwidthStatsUsersController {
             paramData.uuid,
             query.start,
             query.end,
+            query.topNodesLimit,
         );
 
         const data = errorHandler(result);
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
@@ -91,6 +91,7 @@ export class NodesUserUsageHistoryService {
         uuid: string,
         start: string,
         end: string,
+        topNodesLimit: number,
     ): Promise<TResult<GetStatsUserUsageResponseModel>> {
         try {
             const user = await this.queryBus.execute(new GetUserByUniqueFieldQuery({ uuid }));
@@ -114,6 +115,7 @@ export class NodesUserUsageHistoryService {
                 user.response.tId,
                 startDate,
                 endDate,
+                topNodesLimit,
             );
 
             const nodesUsage = await this.nodeUserUsageHistoryRepository.getUserNodesUsageByRange(
diff --git a/src/modules/subscription-page-configs/constants/default-subpage-config.ts b/src/modules/subscription-page-configs/constants/default-subpage-config.ts
@@ -1,6 +1,3 @@
-export const DEFAULT_SUBPAGE_CONFIG_NAME = 'Default';
-export const DEFAULT_SUBPAGE_CONFIG_UUID = '00000000-0000-0000-0000-000000000000';
-
 export const DEFAULT_SUBPAGE_CONFIG = {
     version: '1',
     locales: ['en', 'ru', 'zh', 'fa', 'fr'],
@@ -13,6 +10,11 @@ export const DEFAULT_SUBPAGE_CONFIG = {
         subscriptionInfoBlockType: 'expanded',
         installationGuidesBlockType: 'cards',
     },
+    baseSettings: {
+        metaTitle: 'Remnawave Subscription Page',
+        metaDescription: 'Remnawave Subscription Page',
+        showConnectionKeys: false,
+    },
     baseTranslations: {
         installationGuideHeader: {
             en: 'Installation',
diff --git a/src/modules/subscription-page-configs/subpage-configs.service.ts b/src/modules/subscription-page-configs/subpage-configs.service.ts
@@ -4,20 +4,20 @@ import { nanoid } from 'nanoid';
 import { Injectable, Logger } from '@nestjs/common';
 
 import { fail, ok, TResult } from '@common/types';
+import {
+    SUBPAGE_DEFAULT_CONFIG_NAME,
+    SUBPAGE_DEFAULT_CONFIG_UUID,
+} from '@libs/subscription-page/constants';
 import { cleanLocalizedTexts } from '@libs/subscription-page/models/subscription-page-config.validator';
 import { SubscriptionPageRawConfigSchema } from '@libs/subscription-page/models';
 import { ERRORS } from '@libs/contracts/constants';
 
-import {
-    DEFAULT_SUBPAGE_CONFIG_NAME,
-    DEFAULT_SUBPAGE_CONFIG,
-    DEFAULT_SUBPAGE_CONFIG_UUID,
-} from './constants';
 import { GetSubscriptionPageConfigsResponseModel } from './models/get-subscripion-page-configs.response.model';
 import { BaseSubscriptionPageConfigResponseModel } from './models/base-subpage-config.response.model';
 import { SubscriptionPageConfigRepository } from './repositories/subpage-configs.repository';
 import { SubscriptionPageConfigEntity } from './entities/sub-page-config.entity';
 import { DeleteSubscriptionPageConfigResponseModel } from './models';
+import { DEFAULT_SUBPAGE_CONFIG } from './constants';
 
 @Injectable()
 export class SubscriptionPageConfigService {
@@ -67,7 +67,7 @@ export class SubscriptionPageConfigService {
                 return fail(ERRORS.SUBSCRIPTION_PAGE_CONFIG_NOT_FOUND);
             }
 
-            if (name && name === DEFAULT_SUBPAGE_CONFIG_NAME) {
+            if (name && name === SUBPAGE_DEFAULT_CONFIG_NAME) {
                 return fail(ERRORS.RESERVED_CONFIG_NAME);
             }
 
@@ -136,11 +136,11 @@ export class SubscriptionPageConfigService {
                 return fail(ERRORS.SUBSCRIPTION_PAGE_CONFIG_NOT_FOUND);
             }
 
-            if (config.name === DEFAULT_SUBPAGE_CONFIG_NAME) {
+            if (config.name === SUBPAGE_DEFAULT_CONFIG_NAME) {
                 return fail(ERRORS.RESERVED_SUBPAGE_CONFIG_CANT_BE_DELETED);
             }
 
-            if (config.uuid === DEFAULT_SUBPAGE_CONFIG_UUID) {
+            if (config.uuid === SUBPAGE_DEFAULT_CONFIG_UUID) {
                 return fail(ERRORS.RESERVED_SUBPAGE_CONFIG_CANT_BE_DELETED);
             }
 

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.4.0",`
	`3`	`+ "version": "2.4.1",`
`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.",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export const SUBPAGE_DEFAULT_CONFIG_NAME = 'Default';`
	`2`	`+export const SUBPAGE_DEFAULT_CONFIG_UUID = '00000000-0000-0000-0000-000000000000';`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`export const SUBSCRIPTION_PAGE_TEMPLATE_KEYS = ['USERNAME', 'SUBSCRIPTION_LINK'] as const;`
`2`	`2`	`export type TSubscriptionPageTemplateKey = (typeof SUBSCRIPTION_PAGE_TEMPLATE_KEYS)[number];`
`3`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@remnawave/subscription-page-types",`
`3`		`- "version": "0.2.7",`
	`3`	`+ "version": "0.3.3",`
`4`	`4`	`"public": true,`
`5`	`5`	`"license": "AGPL-3.0-only",`
`6`	`6`	`"description": "A types library for Remnawave Subscription Page.",`