refactor: streamline config profile update process

Author: kastov

src/modules/config-profiles/config-profile.service.ts

@@ -18,6 +18,7 @@ import { GetConfigProfilesResponseModel } from './models/get-config-profiles.res
 import { ConfigProfileInboundEntity } from './entities/config-profile-inbound.entity';
 import { ConfigProfileRepository } from './repositories/config-profile.repository';
 import { ConfigProfileEntity } from './entities/config-profile.entity';
+import { ConfigProfileWithInboundsAndNodesEntity } from './entities';
 import { GetSnippetsQuery } from './queries/get-snippets';
 
 @Injectable()
@@ -233,7 +234,6 @@ export class ConfigProfileService {
         }
     }
 
-    @Transactional()
     public async updateConfigProfile(
         uuid: string,
         name?: string,
@@ -257,42 +257,7 @@ export class ConfigProfileService {
                 };
             }
 
-            const configProfileEntity = new ConfigProfileEntity({
-                uuid,
-            });
-
-            if (name) {
-                configProfileEntity.name = name;
-            }
-
-            if (config) {
-                const existingInbounds = existingConfigProfile.inbounds;
-
-                const validatedConfig = new XRayConfig(config);
-                validatedConfig.cleanClients();
-                validatedConfig.fixIncorrectServerNames();
-                const sortedConfig = validatedConfig.getSortedConfig();
-                const inbounds = validatedConfig.getAllInbounds();
-
-                const inboundsEntities = inbounds.map(
-                    (inbound) =>
-                        new ConfigProfileInboundEntity({
-                            profileUuid: existingConfigProfile.uuid,
-                            tag: inbound.tag,
-                            type: inbound.type,
-                            network: inbound.network,
-                            security: inbound.security,
-                            port: inbound.port,
-                            rawInbound: inbound.rawInbound as unknown as object,
-                        }),
-                );
-
-                await this.syncInbounds(existingInbounds, inboundsEntities);
-
-                configProfileEntity.config = sortedConfig as object;
-            }
-
-            await this.configProfileRepository.update(configProfileEntity);
+            await this.updateConfigProfileTransactional(existingConfigProfile, uuid, name, config);
 
             if (config) {
                 // No need for now
@@ -338,6 +303,54 @@ export class ConfigProfileService {
         }
     }
 
+    @Transactional()
+    public async updateConfigProfileTransactional(
+        existingConfigProfile: ConfigProfileWithInboundsAndNodesEntity,
+        uuid: string,
+        name?: string,
+        config?: object,
+    ): Promise<boolean> {
+        try {
+            const configProfileEntity = new ConfigProfileEntity({
+                uuid,
+                name,
+            });
+
+            if (config) {
+                const existingInbounds = existingConfigProfile.inbounds;
+
+                const validatedConfig = new XRayConfig(config);
+                validatedConfig.cleanClients();
+                validatedConfig.fixIncorrectServerNames();
+                const sortedConfig = validatedConfig.getSortedConfig();
+                const inbounds = validatedConfig.getAllInbounds();
+
+                const inboundsEntities = inbounds.map(
+                    (inbound) =>
+                        new ConfigProfileInboundEntity({
+                            profileUuid: existingConfigProfile.uuid,
+                            tag: inbound.tag,
+                            type: inbound.type,
+                            network: inbound.network,
+                            security: inbound.security,
+                            port: inbound.port,
+                            rawInbound: inbound.rawInbound as unknown as object,
+                        }),
+                );
+
+                await this.syncInbounds(existingInbounds, inboundsEntities);
+
+                configProfileEntity.config = sortedConfig as object;
+            }
+
+            await this.configProfileRepository.update(configProfileEntity);
+
+            return true;
+        } catch (error) {
+            throw error;
+        }
+    }
+
     public async getInboundsByProfileUuid(
         profileUuid: string,
     ): Promise<ICommandResponse<GetAllInboundsResponseModel>> {

src/queue/start-all-nodes-by-profile/start-all-nodes-by-profile.processor.ts

@@ -101,6 +101,10 @@ export class StartAllNodesByProfileQueueProcessor extends WorkerHost {
                     continue;
                 }
 
+                this.logger.log(
+                    `Node ${node.uuid} has ${node.activeInbounds.length} active inbounds.`,
+                );
+
                 await this.nodesRepository.update({
                     uuid: node.uuid,
                     isConnecting: true,