feat: update Hosts model to support excludedInternalSquads

- Bumped version to 2.3.16 in package.json.
- Added excludedInternalSquads field to Hosts model and related schemas.
- Enhanced create and update host commands to handle excludedInternalSquads.
- Updated service methods to manage excluded internal squads for hosts.
- Refactored response models to include excludedInternalSquads data.
- Introduced repository methods for adding and clearing excluded internal squads.

Author: kastov

libs/contract/commands/hosts/create.command.ts

@@ -78,6 +78,9 @@ export namespace CreateHostCommand {
         mihomoX25519: z.optional(z.boolean().default(false)),
         nodes: z.optional(z.array(z.string().uuid())),
         xrayJsonTemplateUuid: z.optional(z.string().uuid().nullable()),
+        excludedInternalSquads: z
+            .optional(z.array(z.string().uuid()))
+            .describe('Optional. Internal squads from which the host will be excluded.'),
     });
 
     export type Request = z.infer<typeof RequestSchema>;

libs/contract/commands/hosts/update.command.ts

@@ -82,6 +82,9 @@ export namespace UpdateHostCommand {
         mihomoX25519: z.optional(z.boolean()),
         nodes: z.optional(z.array(z.string().uuid())),
         xrayJsonTemplateUuid: z.optional(z.string().uuid().nullable()),
+        excludedInternalSquads: z
+            .optional(z.array(z.string().uuid()))
+            .describe('Optional. Internal squads from which the host will be excluded.'),
     });
     export type Request = z.infer<typeof RequestSchema>;
 

libs/contract/models/hosts.schema.ts

@@ -35,4 +35,5 @@ export const HostsSchema = z.object({
 
     nodes: z.array(z.string().uuid()),
     xrayJsonTemplateUuid: z.string().uuid().nullable(),
+    excludedInternalSquads: z.array(z.string().uuid()),
 });

libs/contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/backend-contract",
-  "version": "2.3.14",
+  "version": "2.3.16",
   "public": true,
   "license": "AGPL-3.0-only",
   "description": "A contract library for Remnawave Backend. It can be used in backend and frontend.",

prisma/migrations/20251118174347_internal_squad_host_exclusions/migration.sql

@@ -0,0 +1,13 @@
+-- CreateTable
+CREATE TABLE "public"."internal_squad_host_exclusions" (
+    "host_uuid" UUID NOT NULL,
+    "squad_uuid" UUID NOT NULL,
+
+    CONSTRAINT "internal_squad_host_exclusions_pkey" PRIMARY KEY ("host_uuid","squad_uuid")
+);
+
+-- AddForeignKey
+ALTER TABLE "public"."internal_squad_host_exclusions" ADD CONSTRAINT "internal_squad_host_exclusions_host_uuid_fkey" FOREIGN KEY ("host_uuid") REFERENCES "public"."hosts"("uuid") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."internal_squad_host_exclusions" ADD CONSTRAINT "internal_squad_host_exclusions_squad_uuid_fkey" FOREIGN KEY ("squad_uuid") REFERENCES "public"."internal_squads"("uuid") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/schema.prisma

@@ -315,11 +315,23 @@ model Hosts {
   configProfiles        ConfigProfiles?        @relation(fields: [configProfileUuid], references: [uuid], onDelete: SetNull)
   xrayJsonTemplate      SubscriptionTemplate?  @relation(fields: [xrayJsonTemplateUuid], references: [uuid], onDelete: SetNull)
 
-  nodes HostsToNodes[]
+  nodes                  HostsToNodes[]
+  excludedInternalSquads InternalSquadHostExclusions[]
 
   @@map("hosts")
 }
 
+model InternalSquadHostExclusions {
+  hostUuid  String @map("host_uuid") @db.Uuid
+  squadUuid String @map("squad_uuid") @db.Uuid
+
+  host  Hosts          @relation(fields: [hostUuid], references: [uuid], onDelete: Cascade)
+  squad InternalSquads @relation(fields: [squadUuid], references: [uuid], onDelete: Cascade)
+
+  @@id([hostUuid, squadUuid])
+  @@map("internal_squad_host_exclusions")
+}
+
 model SubscriptionTemplate {
   uuid         String  @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
   viewPosition Int     @default(autoincrement()) @map("view_position")
@@ -390,6 +402,7 @@ model InternalSquads {
 
   internalSquadMembers  InternalSquadMembers[]
   internalSquadInbounds InternalSquadInbounds[]
+  excludedHosts         InternalSquadHostExclusions[]
 
   @@map("internal_squads")
 }

src/modules/hosts/controllers/hosts-bulk-actions.controller.ts

@@ -14,8 +14,7 @@ import {
     SetInboundToManyHostsCommand,
     SetPortToManyHostsCommand,
 } from '@libs/contracts/commands';
-import { HOSTS_CONTROLLER } from '@libs/contracts/api/controllers';
-import { CONTROLLERS_INFO } from '@libs/contracts/api';
+import { CONTROLLERS_INFO, HOSTS_CONTROLLER } from '@libs/contracts/api';
 import { ROLE } from '@libs/contracts/constants';
 
 import {
@@ -30,8 +29,8 @@ import {
     SetPortToManyHostsRequestDto,
     SetPortToManyHostsResponseDto,
 } from '../dtos/bulk-operations.dto';
-import { GetAllHostsResponseModel } from '../models/get-all-hosts.response.model';
 import { HostsService } from '../hosts.service';
+import { HostResponseModel } from '../models';
 
 @ApiBearerAuth('Authorization')
 @ApiTags(CONTROLLERS_INFO.HOSTS_BULK_ACTIONS.tag)
@@ -57,7 +56,7 @@ export class HostsBulkActionsController {
 
         const data = errorHandler(result);
         return {
-            response: data.map((host) => new GetAllHostsResponseModel(host)),
+            response: data.map((host) => new HostResponseModel(host)),
         };
     }
 
@@ -76,7 +75,7 @@ export class HostsBulkActionsController {
 
         const data = errorHandler(result);
         return {
-            response: data.map((host) => new GetAllHostsResponseModel(host)),
+            response: data.map((host) => new HostResponseModel(host)),
         };
     }
 
@@ -95,7 +94,7 @@ export class HostsBulkActionsController {
 
         const data = errorHandler(result);
         return {
-            response: data.map((host) => new GetAllHostsResponseModel(host)),
+            response: data.map((host) => new HostResponseModel(host)),
         };
     }
 
@@ -118,7 +117,7 @@ export class HostsBulkActionsController {
 
         const data = errorHandler(result);
         return {
-            response: data.map((host) => new GetAllHostsResponseModel(host)),
+            response: data.map((host) => new HostResponseModel(host)),
         };
     }
 
@@ -137,7 +136,7 @@ export class HostsBulkActionsController {
 
         const data = errorHandler(result);
         return {
-            response: data.map((host) => new GetAllHostsResponseModel(host)),
+            response: data.map((host) => new HostResponseModel(host)),
         };
     }
 }

src/modules/hosts/controllers/hosts.controller.ts

@@ -23,24 +23,24 @@ import {
     ReorderHostCommand,
     UpdateHostCommand,
 } from '@libs/contracts/commands';
-import { HOSTS_CONTROLLER } from '@libs/contracts/api/controllers';
-import { CONTROLLERS_INFO } from '@libs/contracts/api';
+import { CONTROLLERS_INFO, HOSTS_CONTROLLER } from '@libs/contracts/api';
 import { ROLE } from '@libs/contracts/constants';
 
-import { ReorderHostRequestDto, ReorderHostResponseDto } from '../dtos/reorder-hosts.dto';
-import { CreateHostRequestDto, CreateHostResponseDto } from '../dtos/create-host.dto';
-import { DeleteHostRequestDto, DeleteHostResponseDto } from '../dtos/delete-host.dto';
-import { GetAllHostTagsResponseModel } from '../models/get-all-tags.response.model';
-import { GetAllHostsResponseModel } from '../models/get-all-hosts.response.model';
-import { GetOneHostResponseModel } from '../models/get-one-host.response.model';
-import { CreateHostResponseModel } from '../models/create-host.response.model';
-import { UpdateHostResponseModel } from '../models/update-host.response.model';
-import { GetAllHostTagsResponseDto } from '../dtos/get-all-host-tags.dto';
-import { GetAllHostsResponseDto } from '../dtos/get-all-hosts.dto';
-import { UpdateHostResponseDto } from '../dtos/update-host.dto';
-import { UpdateHostRequestDto } from '../dtos/update-host.dto';
-import { GetOneHostResponseDto } from '../dtos/get-one.dto';
-import { GetOneHostRequestDto } from '../dtos/get-one.dto';
+import {
+    ReorderHostRequestDto,
+    ReorderHostResponseDto,
+    GetAllHostTagsResponseDto,
+    CreateHostResponseDto,
+    CreateHostRequestDto,
+    DeleteHostRequestDto,
+    DeleteHostResponseDto,
+    GetAllHostsResponseDto,
+    UpdateHostResponseDto,
+    UpdateHostRequestDto,
+    GetOneHostResponseDto,
+    GetOneHostRequestDto,
+} from '../dtos';
+import { GetAllHostTagsResponseModel, HostResponseModel } from '../models';
 import { HostsService } from '../hosts.service';
 
 @ApiBearerAuth('Authorization')
@@ -83,7 +83,7 @@ export class HostsController {
 
         const data = errorHandler(result);
         return {
-            response: new CreateHostResponseModel(data),
+            response: new HostResponseModel(data),
         };
     }
 
@@ -101,7 +101,7 @@ export class HostsController {
 
         const data = errorHandler(result);
         return {
-            response: new UpdateHostResponseModel(data),
+            response: new HostResponseModel(data),
         };
     }
 
@@ -118,7 +118,7 @@ export class HostsController {
 
         const data = errorHandler(result);
         return {
-            response: data.map((host) => new GetAllHostsResponseModel(host)),
+            response: data.map((host) => new HostResponseModel(host)),
         };
     }
 
@@ -136,7 +136,7 @@ export class HostsController {
 
         const data = errorHandler(result);
         return {
-            response: new GetOneHostResponseModel(data),
+            response: new HostResponseModel(data),
         };
     }
 

src/modules/hosts/entities/hosts.entity.ts

@@ -38,6 +38,10 @@ export class HostsEntity implements Hosts {
         nodeUuid: string;
     }[];
 
+    excludedInternalSquads: {
+        squadUuid: string;
+    }[];
+
     constructor(data: Partial<Hosts>) {
         Object.assign(this, data);
     }

src/modules/hosts/hosts.service.ts

@@ -88,7 +88,7 @@ export class HostsService {
                 serverDescription = undefined;
             }
 
-            const { inbound: inboundObj, nodes, ...rest } = dto;
+            const { inbound: inboundObj, nodes, excludedInternalSquads, ...rest } = dto;
 
             const configProfile = await this.queryBus.execute(
                 new GetConfigProfileByUuidQuery(inboundObj.configProfileUuid),
@@ -134,6 +134,18 @@ export class HostsService {
                 });
             }
 
+            if (excludedInternalSquads !== undefined && excludedInternalSquads.length > 0) {
+                await this.hostsRepository.addExcludedInternalSquadsToHost(
+                    result.uuid,
+                    excludedInternalSquads,
+                );
+                result.excludedInternalSquads = excludedInternalSquads.map((squad) => {
+                    return {
+                        squadUuid: squad,
+                    };
+                });
+            }
+
             return {
                 isOk: true,
                 response: result,
@@ -147,7 +159,7 @@ export class HostsService {
 
     public async updateHost(dto: UpdateHostRequestDto): Promise<ICommandResponse<HostsEntity>> {
         try {
-            const { inbound: inboundObj, nodes, ...rest } = dto;
+            const { inbound: inboundObj, nodes, excludedInternalSquads, ...rest } = dto;
 
             const host = await this.hostsRepository.findByUUID(dto.uuid);
             if (!host) {
@@ -255,6 +267,14 @@ export class HostsService {
                 await this.hostsRepository.addNodesToHost(host.uuid, nodes);
             }
 
+            if (excludedInternalSquads !== undefined) {
+                await this.hostsRepository.clearExcludedInternalSquadsFromHost(host.uuid);
+                await this.hostsRepository.addExcludedInternalSquadsToHost(
+                    host.uuid,
+                    excludedInternalSquads,
+                );
+            }
+
             const result = await this.hostsRepository.update({
                 ...rest,
                 address: dto.address ? dto.address.trim() : undefined,