refactor: move GetPreparedConfigWithUsersHandler to users module and update related imports

kastov · kastov · commit 7fa89ccb1e3f · 2025-03-04T03:42:42.000+03:00
- Relocated GetPreparedConfigWithUsersHandler from xray-config to users module
diff --git a/src/common/axios/axios.service.ts b/src/common/axios/axios.service.ts
@@ -87,6 +87,9 @@ export class AxiosService {
             const response = await this.axiosInstance.post<StartXrayCommand.Response>(
                 nodeUrl,
                 data,
+                {
+                    timeout: 60_000,
+                },
             );
 
             return {
diff --git a/src/modules/nodes/events/start-all-nodes/start-all-nodes.handler.ts b/src/modules/nodes/events/start-all-nodes/start-all-nodes.handler.ts
@@ -8,7 +8,8 @@ import { ICommandResponse } from '@common/types/command-response.type';
 import { IXrayConfig } from '@common/helpers/xray-config/interfaces';
 import { AxiosService } from '@common/axios';
 
-import { GetPreparedConfigWithUsersQuery } from '../../../xray-config/queries/get-prepared-config-with-users';
+import { GetPreparedConfigWithUsersQuery } from '@modules/users/queries/get-prepared-config-with-users';
+
 import { NodesRepository } from '../../repositories/nodes.repository';
 import { StartAllNodesEvent } from './start-all-nodes.event';
 import { NodesEntity } from '../../entities/nodes.entity';
@@ -28,30 +29,51 @@ export class StartAllNodesHandler implements IEventHandler<StartAllNodesEvent> {
     }
     async handle() {
         const startTime = Date.now();
+
         try {
             const nodes = await this.nodesRepository.findByCriteria({
                 isDisabled: false,
             });
 
-            const mapper = async (node: NodesEntity) => {
-                let config: ICommandResponse<IXrayConfig> | null = null;
-
-                config = await this.getConfigForNode({
-                    excludedInbounds: node.excludedInbounds,
+            for (const node of nodes) {
+                await this.nodesRepository.update({
+                    uuid: node.uuid,
+                    isConnecting: true,
                 });
+            }
+
+            const config = await this.getConfigForNode({
+                excludedInbounds: [],
+                excludeInboundsFromConfig: false,
+            });
+
+            this.logger.log(`Config for all nodes fetched within: ${Date.now() - startTime}ms`);
+
+            if (!config.isOk || !config.response) {
+                throw new Error('Failed to get config');
+            }
 
-                if (!config.isOk || !config.response) {
-                    return;
+            const mapper = async (node: NodesEntity) => {
+                if (!config.response) {
+                    throw new Error('Failed to get config');
                 }
 
+                const excludedNodeInboundsTags = node.excludedInbounds.map(
+                    (inbound) => inbound.tag,
+                );
+
+                const nodeConfig = config.response;
+
+                nodeConfig.inbounds = nodeConfig.inbounds.filter(
+                    (inbound) => !excludedNodeInboundsTags.includes(inbound.tag),
+                );
+
                 const response = await this.axios.startXray(
-                    config.response as unknown as Record<string, unknown>,
+                    nodeConfig as unknown as Record<string, unknown>,
                     node.address,
                     node.port,
                 );
 
-                config = null;
-
                 switch (response.isOk) {
                     case false:
                         await this.nodesRepository.update({
@@ -93,7 +115,7 @@ export class StartAllNodesHandler implements IEventHandler<StartAllNodesEvent> {
 
             await pMap(nodes, mapper, { concurrency: this.CONCURRENCY });
 
-            this.logger.debug(`Started all nodes in ${Date.now() - startTime}ms`);
+            this.logger.log(`Started all nodes in ${Date.now() - startTime}ms`);
 
             return;
         } catch (error) {
diff --git a/src/modules/nodes/events/start-node/start-node.handler.ts b/src/modules/nodes/events/start-node/start-node.handler.ts
@@ -10,9 +10,9 @@ import { EVENTS } from '@libs/contracts/constants';
 
 import { NodeEvent } from '@intergration-modules/telegram-bot/events/nodes/interfaces';
 
+import { GetPreparedConfigWithUsersQuery } from '@modules/users/queries/get-prepared-config-with-users';
 import { InboundsEntity } from '@modules/inbounds/entities';
 
-import { GetPreparedConfigWithUsersQuery } from '../../../xray-config/queries/get-prepared-config-with-users';
 import { NodesRepository } from '../../repositories/nodes.repository';
 import { StartNodeEvent } from './start-node.event';
 
@@ -30,6 +30,35 @@ export class StartNodeHandler implements IEventHandler<StartNodeEvent> {
         try {
             const nodeEntity = event.node;
 
+            if (nodeEntity.isConnecting) {
+                return;
+            }
+
+            await this.nodesRepository.update({
+                uuid: nodeEntity.uuid,
+                isConnecting: true,
+            });
+
+            const xrayStatusResponse = await this.axios.getXrayStatus(
+                nodeEntity.address,
+                nodeEntity.port,
+            );
+
+            if (!xrayStatusResponse.isOk && !xrayStatusResponse.response) {
+                await this.nodesRepository.update({
+                    uuid: nodeEntity.uuid,
+                    isXrayRunning: false,
+                    isNodeOnline: false,
+                    lastStatusMessage: xrayStatusResponse.message ?? null,
+                    lastStatusChange: new Date(),
+                    isConnected: false,
+                    isConnecting: false,
+                    usersOnline: 0,
+                });
+
+                return;
+            }
+
             const startTime = Date.now();
             const config = await this.getConfigForNode(nodeEntity.excludedInbounds);
 
@@ -58,7 +87,6 @@ export class StartNodeHandler implements IEventHandler<StartNodeEvent> {
                     lastStatusChange: new Date(),
                     isConnected: false,
                     isConnecting: false,
-                    isDisabled: false,
                     usersOnline: 0,
                 });
                 return;
@@ -74,7 +102,6 @@ export class StartNodeHandler implements IEventHandler<StartNodeEvent> {
                 isConnected: nodeResponse.isStarted,
                 lastStatusMessage: nodeResponse.error ?? null,
                 lastStatusChange: new Date(),
-                isDisabled: false,
                 isConnecting: false,
                 cpuCount: nodeResponse.systemInformation?.cpuCores ?? null,
                 cpuModel: nodeResponse.systemInformation?.cpuModel ?? null,
diff --git a/src/modules/users/queries/get-prepared-config-with-users/get-prepared-config-with-users.handler.ts b/src/modules/users/queries/get-prepared-config-with-users/get-prepared-config-with-users.handler.ts
@@ -1,12 +1,13 @@
-import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
+import { IQueryHandler, QueryBus, QueryHandler } from '@nestjs/cqrs';
 import { Logger } from '@nestjs/common';
 
 import { XRayConfig } from '@common/helpers/xray-config/xray-config.validator';
 import { ICommandResponse } from '@common/types/command-response.type';
 import { IXrayConfig } from '@common/helpers/xray-config/interfaces';
 import { ERRORS } from '@libs/contracts/constants';
 
-import { XrayConfigRepository } from '@modules/xray-config/repositories/xray-config.repository';
+import { XrayConfigEntity } from '@modules/xray-config/entities/xray-config.entity';
+import { GetXrayConfigQuery } from '@modules/xray-config/queries/get-xray-config';
 import { UsersRepository } from '@modules/users/repositories/users.repository';
 
 import { GetPreparedConfigWithUsersQuery } from './get-prepared-config-with-users.query';
@@ -18,22 +19,21 @@ export class GetPreparedConfigWithUsersHandler
     private readonly logger = new Logger(GetPreparedConfigWithUsersHandler.name);
     constructor(
         private readonly usersRepository: UsersRepository,
-        private readonly xrayConfigRepository: XrayConfigRepository,
+        private readonly queryBus: QueryBus,
     ) {}
 
     async execute(query: GetPreparedConfigWithUsersQuery): Promise<ICommandResponse<IXrayConfig>> {
         let config: XRayConfig | null = null;
         try {
-            const { excludedInbounds } = query;
+            const { excludedInbounds, excludeInboundsFromConfig } = query;
 
-            const dbConfig = await this.xrayConfigRepository.findFirst();
+            const xrayConfig = await this.getXrayConfig();
 
-            if (!dbConfig || !dbConfig.config) {
-                throw new Error('No XTLS config found in DB!');
-            }
+            config = new XRayConfig(xrayConfig.config!);
 
-            config = new XRayConfig(dbConfig.config);
-            config.excludeInbounds(excludedInbounds.map((inbound) => inbound.tag));
+            if (excludeInboundsFromConfig) {
+                config.excludeInbounds(excludedInbounds.map((inbound) => inbound.tag));
+            }
 
             config.processCertificates();
 
@@ -57,4 +57,10 @@ export class GetPreparedConfigWithUsersHandler
             config = null;
         }
     }
+
+    private async getXrayConfig(): Promise<XrayConfigEntity> {
+        return this.queryBus.execute<GetXrayConfigQuery, XrayConfigEntity>(
+            new GetXrayConfigQuery(),
+        );
+    }
 }
diff --git a/src/modules/users/queries/get-prepared-config-with-users/get-prepared-config-with-users.query.ts b/src/modules/users/queries/get-prepared-config-with-users/get-prepared-config-with-users.query.ts
@@ -0,0 +1,8 @@
+import { InboundsEntity } from '@modules/inbounds/entities';
+
+export class GetPreparedConfigWithUsersQuery {
+    constructor(
+        public readonly excludedInbounds: InboundsEntity[],
+        public readonly excludeInboundsFromConfig: boolean = true,
+    ) {}
+}
diff --git a/src/modules/users/queries/get-prepared-config-with-users/index.ts b/src/modules/users/queries/get-prepared-config-with-users/index.ts
diff --git a/src/modules/users/queries/index.ts b/src/modules/users/queries/index.ts
@@ -1,5 +1,6 @@
 import { GetUsersByTrafficStrategyAndStatusHandler } from './get-users-by-traffic-strategy-and-status';
 import { GetExceededTrafficUsageUsersHandler } from './get-exceeded-traffic-usage-users';
+import { GetPreparedConfigWithUsersHandler } from './get-prepared-config-with-users';
 import { GetUsersForConfigBatchHandler } from './get-users-for-config-batch';
 import { GetUserByShortUuidHandler } from './get-user-by-short-uuid';
 import { GetUsersForConfigHandler } from './get-users-for-config';
@@ -22,4 +23,5 @@ export const QUERIES = [
     GetUsersByTrafficStrategyAndStatusHandler,
     GetUserByUuidHandler,
     GetUsersForConfigBatchHandler,
+    GetPreparedConfigWithUsersHandler,
 ];
diff --git a/src/modules/users/users.module.ts b/src/modules/users/users.module.ts
@@ -11,6 +11,6 @@ import { QUERIES } from './queries';
     imports: [CqrsModule],
     controllers: [UsersController],
     providers: [UsersRepository, UserConverter, UsersService, ...QUERIES, ...COMMANDS],
-    exports: [UsersRepository],
+    exports: [],
 })
 export class UsersModule {}
diff --git a/src/modules/xray-config/queries/get-prepared-config-with-users/get-prepared-config-with-users.query.ts b/src/modules/xray-config/queries/get-prepared-config-with-users/get-prepared-config-with-users.query.ts
diff --git a/src/modules/xray-config/queries/get-xray-config/get-xray-config.handler.ts b/src/modules/xray-config/queries/get-xray-config/get-xray-config.handler.ts
@@ -0,0 +1,29 @@
+import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
+import { Logger } from '@nestjs/common';
+
+import { XrayConfigEntity } from '@modules/xray-config/entities/xray-config.entity';
+
+import { XrayConfigRepository } from '../../repositories/xray-config.repository';
+import { GetXrayConfigQuery } from './get-xray-config.query';
+
+@QueryHandler(GetXrayConfigQuery)
+export class GetXrayConfigHandler implements IQueryHandler<GetXrayConfigQuery, XrayConfigEntity> {
+    private readonly logger = new Logger(GetXrayConfigHandler.name);
+
+    constructor(private readonly xrayConfigRepository: XrayConfigRepository) {}
+
+    async execute(): Promise<XrayConfigEntity> {
+        try {
+            const config = await this.xrayConfigRepository.findFirst();
+
+            if (!config || !config.config) {
+                throw new Error('No XTLS config found in DB!');
+            }
+
+            return config;
+        } catch (error) {
+            this.logger.error(error);
+            throw error;
+        }
+    }
+}
diff --git a/src/modules/xray-config/queries/get-xray-config/get-xray-config.query.ts b/src/modules/xray-config/queries/get-xray-config/get-xray-config.query.ts
@@ -0,0 +1,3 @@
+export class GetXrayConfigQuery {
+    constructor() {}
+}
diff --git a/src/modules/xray-config/queries/get-xray-config/index.ts b/src/modules/xray-config/queries/get-xray-config/index.ts
@@ -0,0 +1,2 @@
+export * from './get-xray-config.handler';
+export * from './get-xray-config.query';
diff --git a/src/modules/xray-config/queries/index.ts b/src/modules/xray-config/queries/index.ts
@@ -1,4 +1,4 @@
-import { GetPreparedConfigWithUsersHandler } from './get-prepared-config-with-users';
 import { GetValidatedConfigHandler } from './get-validated-config';
+import { GetXrayConfigHandler } from './get-xray-config';
 
-export const QUERIES = [GetValidatedConfigHandler, GetPreparedConfigWithUsersHandler];
+export const QUERIES = [GetValidatedConfigHandler, GetXrayConfigHandler];
diff --git a/src/modules/xray-config/xray-config.module.ts b/src/modules/xray-config/xray-config.module.ts
@@ -1,18 +1,16 @@
 import { CqrsModule } from '@nestjs/cqrs';
 import { Module } from '@nestjs/common';
 
-import { UsersModule } from '@modules/users/users.module';
-
 import { XrayConfigRepository } from './repositories/xray-config.repository';
 import { XrayConfigController } from './xray-config.controller';
 import { XrayConfigConverter } from './xray-config.converter';
 import { XrayConfigService } from './xray-config.service';
 import { QUERIES } from './queries';
 
 @Module({
-    imports: [CqrsModule, UsersModule],
+    imports: [CqrsModule],
     controllers: [XrayConfigController],
     providers: [XrayConfigService, XrayConfigRepository, XrayConfigConverter, ...QUERIES],
-    exports: [XrayConfigRepository],
+    exports: [],
 })
 export class XrayConfigModule {}
