refactor: optimize XRay configuration processing and Prometheus reporting

- Simplify XRay config validation by removing redundant commented code
- Update Prometheus reporter labels to use 'remnawave-scheduler' prefix
- Modify XRay config service to directly use repository for config retrieval
- Remove unused commented methods in XRay config controller

Author: kastov

src/common/helpers/xray-config/xray-config.validator.ts

@@ -83,9 +83,7 @@ export class XRayConfig {
             }
 
             // console.log(`Inbound ${inbound.tag} network: ${network || 'not set'}`);
-        }
 
-        for (const inbound of this.config.inbounds) {
             if (!inbound.tag) {
                 throw new Error('All inbounds must have a unique tag.');
             }
@@ -212,44 +210,6 @@ export class XRayConfig {
         }));
     }
 
-    // private includeUsers(users: UserForConfigEntity[]): IXrayConfig {
-    //     let config: IXrayConfig | null = null;
-    //     try {
-    //         config = JSON.parse(JSON.stringify(this.config)) as IXrayConfig;
-
-    //         const inboundMap = new Map(config.inbounds.map((inbound) => [inbound.tag, inbound]));
-
-    //         const usersByTag = new Map<string, UserForConfigEntity[]>();
-    //         for (const user of users) {
-    //             if (!usersByTag.has(user.tag)) {
-    //                 usersByTag.set(user.tag, []);
-    //             }
-    //             usersByTag.get(user.tag)!.push(user);
-    //         }
-
-    //         for (const [tag, tagUsers] of usersByTag) {
-    //             const inbound = inboundMap.get(tag);
-    //             if (!inbound) continue;
-
-    //             inbound.settings ??= {} as InboundSettings;
-
-    //             this.addUsersToInbound(inbound, tagUsers);
-    //         }
-
-    //         usersByTag.clear();
-
-    //         return config;
-    //     } catch (error) {
-    //         throw error;
-    //     } finally {
-    //         config = null;
-    //     }
-    // }
-
-    // public prepareConfigForNode(users: UserForConfigEntity[]): IXrayConfig {
-    //     return this.processCertificates(this.includeUsers(users));
-    // }
-
     public getSortedConfig(): IXrayConfig {
         return this.sortObjectByKeys<IXrayConfig>(this.config);
     }
@@ -290,31 +250,6 @@ export class XRayConfig {
         }
     }
 
-    // public includeUserBatch(users: UserForConfigEntity[]): IXrayConfig {
-    //     const usersByTag = new Map<string, UserForConfigEntity[]>();
-    //     for (const user of users) {
-    //         if (!usersByTag.has(user.tag)) {
-    //             usersByTag.set(user.tag, []);
-    //         }
-    //         usersByTag.get(user.tag)!.push(user);
-    //     }
-
-    //     const inboundMap = new Map(this.config.inbounds.map((inbound) => [inbound.tag, inbound]));
-
-    //     for (const [tag, tagUsers] of usersByTag) {
-    //         const inbound = inboundMap.get(tag);
-    //         if (!inbound) continue;
-
-    //         inbound.settings ??= {} as InboundSettings;
-
-    //         this.addUsersToInbound(inbound, tagUsers);
-    //     }
-
-    //     usersByTag.clear();
-
-    //     return this.config;
-    // }
-
     public includeUserBatch(users: UserForConfigEntity[]): IXrayConfig {
         const usersByTag = new Map<string, UserForConfigEntity[]>();
         for (const user of users) {
@@ -341,30 +276,4 @@ export class XRayConfig {
 
         return this.config;
     }
-
-    // public includeUserBatch(users: UserForConfigEntity[]): IXrayConfig {
-    //     console.time('indexing');
-
-    //     for (const inbound of this.config.inbounds) {
-    //         // Подготавливаем инбаунд
-    //         inbound.settings ??= {} as InboundSettings;
-
-    //         // Находим пользователей для этого инбаунда вручную
-    //         const usersForThisInbound: UserForConfigEntity[] = [];
-    //         for (const user of users) {
-    //             if (user.tags.includes(inbound.tag)) {
-    //                 usersForThisInbound.push(user);
-    //             }
-    //         }
-
-    //         // Если есть пользователи для этого инбаунда, добавляем их
-    //         if (usersForThisInbound.length > 0) {
-    //             this.addUsersToInbound(inbound, usersForThisInbound);
-    //         }
-    //     }
-
-    //     console.timeEnd('indexing');
-
-    //     return this.config;
-    // }
 }

src/intergration-modules/prometheus-reporter/prometheus-reporter.module.ts

@@ -16,9 +16,9 @@ import { BasicStrategy } from './strategies';
             controller: PrometheusReporterController,
             useFactory: () => ({
                 defaultLabels: {
-                    app: 'remnawave',
+                    app: 'remnawave-scheduler',
                 },
-                customMetricPrefix: 'remnawave',
+                customMetricPrefix: 'remnawave-scheduler',
             }),
         }),
     ],

src/modules/xray-config/xray-config.controller.ts

@@ -84,13 +84,4 @@ export class XrayConfigController {
     //         response: new KeygenResponseModel(data),
     //     };
     // }
-
-    // @Put(':uuid')
-    // @ApiOperation({ summary: 'Update Xray Config', description: 'Update xray configuration' })
-    // @ApiOkResponse({ description: 'Configuration updated successfully' })
-    // @Roles(ROLE.ADMIN)
-    // async updateConfig(@Param('uuid') uuid: string, @Body() config: object) {
-    //     const result = await this.xrayConfigService.updateConfig(uuid, config);
-    //     return errorHandler(result);
-    // }
 }

src/modules/xray-config/xray-config.service.ts

@@ -134,15 +134,16 @@ export class XrayConfigService implements OnApplicationBootstrap {
             }
 
             const validatedConfig = new XRayConfig(config);
+            const sortedConfig = validatedConfig.getSortedConfig();
 
-            const writeDBConfig = await this.updateConfig(validatedConfig.getSortedConfig());
+            const writeDBConfig = await this.updateConfig(sortedConfig);
             if (!writeDBConfig.isOk) {
                 throw new Error('Failed to write config to DB');
             }
 
             return {
                 isOk: true,
-                response: validatedConfig.getSortedConfig(),
+                response: sortedConfig,
             };
         } catch (error) {
             if (error instanceof Error) {
@@ -175,13 +176,13 @@ export class XrayConfigService implements OnApplicationBootstrap {
 
     public async syncInbounds(): Promise<void> {
         try {
-            const config = await this.getConfig();
+            const config = await this.xrayConfigRepository.findFirst();
 
-            if (!config.isOk || !config.response) {
+            if (!config) {
                 throw new Error('Failed to get config');
             }
 
-            const parsedConf = new XRayConfig(config.response);
+            const parsedConf = new XRayConfig(config);
             const configInbounds = parsedConf.getAllInbounds();
 
             const existingInbounds = await this.getAllInbounds();