chore: bump backend-contract version to 2.1.62 and add shuffleHost and mihomoX25519 fields

kastov · kastov · commit c737ae7cd7bd · 2025-09-25T15:05:11.000+03:00
- Added optional shuffleHost and mihomoX25519 fields to various command schemas and response models.
- Enhanced the FormatHostsService to support shuffling hosts based on the new shuffleHost field.
diff --git a/libs/contract/commands/hosts/create.command.ts b/libs/contract/commands/hosts/create.command.ts
@@ -74,6 +74,8 @@ export namespace CreateHostCommand {
         overrideSniFromAddress: z.optional(z.boolean().default(false)),
         allowInsecure: z.optional(z.boolean().default(false)),
         vlessRouteId: z.optional(z.number().int().min(0).max(65535).nullable()),
+        shuffleHost: z.optional(z.boolean().default(false)),
+        mihomoX25519: z.optional(z.boolean().default(false)),
     });
 
     export type Request = z.infer<typeof RequestSchema>;
diff --git a/libs/contract/commands/hosts/update.command.ts b/libs/contract/commands/hosts/update.command.ts
@@ -78,6 +78,8 @@ export namespace UpdateHostCommand {
         overrideSniFromAddress: z.optional(z.boolean()),
         vlessRouteId: z.optional(z.number().int().min(0).max(65535).nullable()),
         allowInsecure: z.optional(z.boolean()),
+        shuffleHost: z.optional(z.boolean()),
+        mihomoX25519: z.optional(z.boolean()),
     });
     export type Request = z.infer<typeof RequestSchema>;
 
diff --git a/libs/contract/commands/subscriptions/get-by/get-raw-subscription-by-short-uuid.command.ts b/libs/contract/commands/subscriptions/get-by/get-raw-subscription-by-short-uuid.command.ts
@@ -77,6 +77,8 @@ export namespace GetRawSubscriptionByShortUuidCommand {
                     serverDescription: z.optional(z.nullable(z.string())),
                     flow: z.optional(z.nullable(z.string())),
                     allowInsecure: z.optional(z.nullable(z.boolean())),
+                    shuffleHost: z.optional(z.nullable(z.boolean())),
+                    mihomoX25519: z.optional(z.nullable(z.boolean())),
                     protocolOptions: z.optional(
                         z.nullable(
                             z.object({
diff --git a/libs/contract/models/hosts.schema.ts b/libs/contract/models/hosts.schema.ts
@@ -30,4 +30,6 @@ export const HostsSchema = z.object({
     overrideSniFromAddress: z.boolean().default(false),
     vlessRouteId: z.number().int().nullable(),
     allowInsecure: z.boolean().default(false),
+    shuffleHost: z.boolean(),
+    mihomoX25519: z.boolean(),
 });
diff --git a/libs/contract/package.json b/libs/contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/backend-contract",
-  "version": "2.1.60",
+  "version": "2.1.62",
   "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/prisma/migrations/20250925101912_add_shuffle_host_and_mihomo_x25519/migration.sql b/prisma/migrations/20250925101912_add_shuffle_host_and_mihomo_x25519/migration.sql
@@ -0,0 +1,67 @@
+-- AlterTable
+ALTER TABLE "public"."admin" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."api_tokens" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."config_profiles" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."hosts" ADD COLUMN     "mihomo_x25519" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN     "shuffle_host" BOOLEAN NOT NULL DEFAULT false;
+
+-- AlterTable
+ALTER TABLE "public"."hwid_user_devices" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."infra_billing_nodes" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."infra_providers" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."internal_squads" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."keygen" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."nodes" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."nodes_traffic_usage_history" ALTER COLUMN "reset_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."nodes_usage_history" ALTER COLUMN "created_at" SET DEFAULT date_trunc('hour', now()),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."nodes_user_usage_history" ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."subscription_settings" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."subscription_templates" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."user_subscription_request_history" ALTER COLUMN "request_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."user_traffic_history" ALTER COLUMN "reset_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "public"."users" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -252,6 +252,8 @@ model Hosts {
   serverDescription String? @map("server_description")
   vlessRouteId      Int?    @map("vless_route_id")
   allowInsecure     Boolean @default(false) @map("allow_insecure")
+  shuffleHost       Boolean @default(false) @map("shuffle_host")
+  mihomoX25519      Boolean @default(false) @map("mihomo_x25519")
 
   tag      String? @map("tag")
   isHidden Boolean @default(false) @map("is_hidden")
diff --git a/src/modules/hosts/entities/hosts.entity.ts b/src/modules/hosts/entities/hosts.entity.ts
@@ -26,6 +26,8 @@ export class HostsEntity implements Hosts {
 
     overrideSniFromAddress: boolean;
     vlessRouteId: number | null;
+    shuffleHost: boolean;
+    mihomoX25519: boolean;
 
     configProfileUuid: string | null;
     configProfileInboundUuid: string | null;
diff --git a/src/modules/hosts/hosts.converter.ts b/src/modules/hosts/hosts.converter.ts
@@ -30,6 +30,8 @@ const entityToModel = (entity: HostsEntity): Hosts => {
         sockoptParams: entity.sockoptParams,
         serverDescription: entity.serverDescription,
         allowInsecure: entity.allowInsecure,
+        shuffleHost: entity.shuffleHost,
+        mihomoX25519: entity.mihomoX25519,
 
         tag: entity.tag,
         isHidden: entity.isHidden,
diff --git a/src/modules/hosts/models/create-host.response.model.ts b/src/modules/hosts/models/create-host.response.model.ts
@@ -23,6 +23,9 @@ export class CreateHostResponseModel {
     public serverDescription: null | string;
     public allowInsecure: boolean;
 
+    public shuffleHost: boolean;
+    public mihomoX25519: boolean;
+
     public tag: null | string;
     public isHidden: boolean;
 
@@ -54,6 +57,8 @@ export class CreateHostResponseModel {
         this.sockoptParams = data.sockoptParams;
         this.serverDescription = data.serverDescription;
         this.allowInsecure = data.allowInsecure;
+        this.shuffleHost = data.shuffleHost;
+        this.mihomoX25519 = data.mihomoX25519;
 
         this.tag = data.tag;
         this.isHidden = data.isHidden;
diff --git a/src/modules/hosts/models/get-all-hosts.response.model.ts b/src/modules/hosts/models/get-all-hosts.response.model.ts
@@ -27,6 +27,9 @@ export class GetAllHostsResponseModel {
     public overrideSniFromAddress: boolean;
     public vlessRouteId: number | null;
 
+    public shuffleHost: boolean;
+    public mihomoX25519: boolean;
+
     public inbound: {
         configProfileUuid: string | null;
         configProfileInboundUuid: string | null;
@@ -56,6 +59,9 @@ export class GetAllHostsResponseModel {
         this.tag = data.tag;
         this.isHidden = data.isHidden;
 
+        this.shuffleHost = data.shuffleHost;
+        this.mihomoX25519 = data.mihomoX25519;
+
         this.inbound = {
             configProfileUuid: data.configProfileUuid,
             configProfileInboundUuid: data.configProfileInboundUuid,
diff --git a/src/modules/hosts/models/get-one-host.response.model.ts b/src/modules/hosts/models/get-one-host.response.model.ts
@@ -20,6 +20,9 @@ export class GetOneHostResponseModel {
     public sockoptParams: null | object;
     public allowInsecure: boolean;
 
+    public shuffleHost: boolean;
+    public mihomoX25519: boolean;
+
     public tag: null | string;
     public isHidden: boolean;
 
@@ -53,6 +56,9 @@ export class GetOneHostResponseModel {
         this.sockoptParams = data.sockoptParams;
         this.allowInsecure = data.allowInsecure;
 
+        this.shuffleHost = data.shuffleHost;
+        this.mihomoX25519 = data.mihomoX25519;
+
         this.tag = data.tag;
         this.isHidden = data.isHidden;
 
diff --git a/src/modules/hosts/models/update-host.response.model.ts b/src/modules/hosts/models/update-host.response.model.ts
@@ -21,6 +21,9 @@ export class UpdateHostResponseModel {
     public serverDescription: null | string;
     public allowInsecure: boolean;
 
+    public shuffleHost: boolean;
+    public mihomoX25519: boolean;
+
     public tag: null | string;
     public isHidden: boolean;
 
@@ -52,6 +55,8 @@ export class UpdateHostResponseModel {
         this.sockoptParams = data.sockoptParams;
         this.serverDescription = data.serverDescription;
         this.allowInsecure = data.allowInsecure;
+        this.shuffleHost = data.shuffleHost;
+        this.mihomoX25519 = data.mihomoX25519;
 
         this.tag = data.tag;
         this.isHidden = data.isHidden;
diff --git a/src/modules/subscription-template/generators/format-hosts.service.ts b/src/modules/subscription-template/generators/format-hosts.service.ts
@@ -1,4 +1,5 @@
 import { randomUUID } from 'node:crypto';
+import { filter, shuffle } from 'lodash';
 import { customAlphabet } from 'nanoid';
 
 import { ConfigService } from '@nestjs/config';
@@ -82,7 +83,7 @@ export class FormatHostsService {
             formattedHosts.push(
                 ...this.createFallbackHosts([
                     '→ Remnawave',
-                    '→ Did you forget to add hosts?',
+                    'Did you forget to add hosts?',
                     '→ No hosts found',
                     '→ Check Hosts tab',
                 ]),
@@ -95,9 +96,9 @@ export class FormatHostsService {
             formattedHosts.push(
                 ...this.createFallbackHosts([
                     '→ Remnawave',
-                    '→ Did you forget to add internal squads?',
+                    'Did you forget to add internal squads?',
                     '→ No internal squads found',
-                    '→ User has no internal squads',
+                    'User has no internal squads',
                 ]),
             );
 
@@ -108,6 +109,13 @@ export class FormatHostsService {
 
         const knownRemarks = new Map<string, number>();
 
+        if (hosts.some((h) => h.shuffleHost)) {
+            hosts = [
+                ...shuffle(filter(hosts, 'shuffleHost')),
+                ...filter(hosts, (h) => !h.shuffleHost),
+            ];
+        }
+
         for (const inputHost of hosts) {
             const remark = TemplateEngine.formatWithUser(
                 inputHost.remark,
@@ -395,6 +403,8 @@ export class FormatHostsService {
                 muxParams,
                 sockoptParams,
                 allowInsecure: inputHost.allowInsecure,
+                shuffleHost: inputHost.shuffleHost,
+                mihomoX25519: inputHost.mihomoX25519,
                 dbData,
             });
         }
diff --git a/src/modules/subscription-template/generators/interfaces/formatted-hosts.interface.ts b/src/modules/subscription-template/generators/interfaces/formatted-hosts.interface.ts
@@ -32,5 +32,7 @@ export interface IFormattedHost {
     sockoptParams?: null | object;
     serverDescription?: string;
     allowInsecure?: boolean;
+    shuffleHost?: boolean;
+    mihomoX25519?: boolean;
     dbData?: IDbHostData;
 }
diff --git a/src/modules/subscription-template/generators/interfaces/raw-host.interface.ts b/src/modules/subscription-template/generators/interfaces/raw-host.interface.ts
@@ -44,6 +44,8 @@ export interface IRawHost {
     serverDescription?: string;
     flow?: string;
     allowInsecure?: boolean;
+    shuffleHost?: boolean;
+    mihomoX25519?: boolean;
     protocolOptions?: {
         ss?: {
             method: string;
diff --git a/src/modules/subscription-template/generators/mihomo.generator.service.ts b/src/modules/subscription-template/generators/mihomo.generator.service.ts
@@ -206,6 +206,7 @@ export class MihomoGeneratorService {
             shortId: host.shortId,
             clientFingerprint: host.fingerprint,
             allowInsecure: host.allowInsecure,
+            mihomoX25519: host.mihomoX25519,
         });
 
         switch (host.protocol) {
@@ -262,6 +263,7 @@ export class MihomoGeneratorService {
         shortId?: string;
         clientFingerprint?: string;
         allowInsecure?: boolean;
+        mihomoX25519?: boolean;
     }): ProxyNode {
         const {
             server,
@@ -278,6 +280,7 @@ export class MihomoGeneratorService {
             shortId,
             clientFingerprint,
             allowInsecure,
+            mihomoX25519,
         } = params;
         let { type, network } = params;
 
@@ -357,6 +360,10 @@ export class MihomoGeneratorService {
                 'public-key': publicKey,
                 'short-id': shortId,
             };
+
+            if (mihomoX25519) {
+                node['reality-opts']['support-x25519mlkem768'] = true;
+            }
         }
 
         node['client-fingerprint'] = clientFingerprint || 'chrome';

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.1.60",`
	`3`	`+ "version": "2.1.62",`
`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.",`