chore: bump backend-contract version to 2.1.58 in package.json and update validation for name fields

- Updated version in package.json to 2.1.58.
- Increased maximum length for name fields from 20 to 30 characters across multiple command schemas.
- Enhanced regex validation to allow spaces in name fields for better user input flexibility.
- Added port validation to ensure it is less than 65535 in node creation and update schemas.
- Implemented UUID filtering in UsersRepository for improved query capabilities.

Author: kastov

libs/contract/commands/config-profiles/create-config-profile.command.ts

@@ -18,10 +18,10 @@ export namespace CreateConfigProfileCommand {
         name: z
             .string()
             .min(2, 'Name must be at least 2 characters')
-            .max(20, 'Name must be less than 20 characters')
+            .max(30, 'Name must be less than 30 characters')
             .regex(
-                /^[A-Za-z0-9_-]+$/,
-                'Name can only contain letters, numbers, underscores and dashes',
+                /^[A-Za-z0-9_\s-]+$/,
+                'Name can only contain letters, numbers, underscores, dashes and spaces',
             ),
         config: z.object({}).passthrough(),
     });

libs/contract/commands/config-profiles/update-config-profile.command.ts

@@ -19,10 +19,10 @@ export namespace UpdateConfigProfileCommand {
         name: z
             .string()
             .min(2, 'Name must be at least 2 characters')
-            .max(20, 'Name must be less than 20 characters')
+            .max(30, 'Name must be less than 30 characters')
             .regex(
-                /^[A-Za-z0-9_-]+$/,
-                'Name can only contain letters, numbers, underscores and dashes',
+                /^[A-Za-z0-9_\s-]+$/,
+                'Name can only contain letters, numbers, underscores, dashes and spaces',
             )
             .optional(),
         config: z.object({}).passthrough().optional(),

libs/contract/commands/internal-squads/create-internal-squad.command.ts

@@ -18,10 +18,10 @@ export namespace CreateInternalSquadCommand {
         name: z
             .string()
             .min(2, 'Name must be at least 2 characters')
-            .max(20, 'Name must be less than 20 characters')
+            .max(30, 'Name must be less than 30 characters')
             .regex(
-                /^[A-Za-z0-9_-]+$/,
-                'Name can only contain letters, numbers, underscores and dashes',
+                /^[A-Za-z0-9_\s-]+$/,
+                'Name can only contain letters, numbers, underscores, dashes and spaces',
             ),
         inbounds: z.array(z.string().uuid()),
     });

libs/contract/commands/internal-squads/update-internal-squad.command.ts

@@ -19,10 +19,10 @@ export namespace UpdateInternalSquadCommand {
         name: z
             .string()
             .min(2, 'Name must be at least 2 characters')
-            .max(20, 'Name must be less than 20 characters')
+            .max(30, 'Name must be less than 30 characters')
             .regex(
-                /^[A-Za-z0-9_-]+$/,
-                'Name can only contain letters, numbers, underscores and dashes',
+                /^[A-Za-z0-9_\s-]+$/,
+                'Name can only contain letters, numbers, underscores, dashes and spaces',
             )
             .optional(),
         inbounds: z.array(z.string().uuid()).optional(),

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

@@ -14,9 +14,14 @@ export namespace CreateNodeCommand {
     );
 
     export const RequestSchema = z.object({
-        name: z.string().min(3, 'Minimum 3 characters!'),
+        name: z.string().min(3, 'Minimum 3 characters!').max(30, 'Maximum 30 characters!'),
         address: z.string().min(2, 'Minimum 2 characters!'),
-        port: z.number().int().min(1, 'Port is required').optional(),
+        port: z
+            .number()
+            .int()
+            .min(1, 'Port is required')
+            .max(65535, 'Port must be less than 65535')
+            .optional(),
         isTrafficTrackingActive: z.boolean().optional().default(false),
         trafficLimitBytes: z.optional(
             z.number().int().min(0, 'Traffic limit must be greater than 0'),

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

@@ -13,9 +13,14 @@ export namespace UpdateNodeCommand {
     export const RequestSchema = NodesSchema.pick({
         uuid: true,
     }).extend({
-        name: z.optional(z.string().min(3, 'Min. 3 characters')),
+        name: z.optional(z.string().min(3, 'Min. 3 characters').max(30, 'Max. 30 characters')),
         address: z.optional(z.string().min(2, 'Min. 2 characters')),
-        port: z.optional(z.number()),
+        port: z.optional(
+            z
+                .number()
+                .min(1, 'Port must be greater than 0')
+                .max(65535, 'Port must be less than 65535'),
+        ),
         isTrafficTrackingActive: z.optional(z.boolean()),
         trafficLimitBytes: z.optional(z.number().min(0, 'Traffic limit must be greater than 0')),
         notifyPercent: z.optional(

libs/contract/package.json

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

src/modules/users/repositories/users.repository.ts

@@ -276,6 +276,15 @@ export class UsersRepository implements ICrud<BaseUserEntity> {
                     continue;
                 }
 
+                if (filter.id === 'uuid') {
+                    whereBuilder = whereBuilder.where(
+                        sql`"uuid"::text`,
+                        'ilike',
+                        `%${filter.value}%`,
+                    );
+                    continue;
+                }
+
                 const field = filter.id as keyof DB['users'];
 
                 switch (mode) {
@@ -379,6 +388,15 @@ export class UsersRepository implements ICrud<BaseUserEntity> {
                         continue;
                     }
 
+                    if (filter.id === 'uuid') {
+                        countBuilder = countBuilder.where(
+                            sql`"uuid"::text`,
+                            'ilike',
+                            `%${filter.value}%`,
+                        );
+                        continue;
+                    }
+
                     const field = filter.id as keyof DB['users'];
 
                     switch (mode) {