@remnawave/backend-contract 0.0.48 → 0.0.49

package/build/commands/nodes/create.command.js

@@ -8,28 +8,22 @@ var CreateNodeCommand;
 (function (CreateNodeCommand) {
     CreateNodeCommand.url = api_1.REST_API.NODES.CREATE;
     CreateNodeCommand.TSQ_url = CreateNodeCommand.url;
-    CreateNodeCommand.RequestSchema = models_1.NodesSchema.pick({}).extend({
+    CreateNodeCommand.RequestSchema = zod_1.z.object({
         name: zod_1.z.string().min(5, 'Name is required'),
         address: zod_1.z.string().min(2, 'Address is required'),
         port: zod_1.z.number().int().min(1, 'Port is required').optional(),
         isTrafficTrackingActive: zod_1.z.boolean().optional().default(false),
-        trafficLimitBytes: zod_1.z
-            .number()
-            .int()
-            .min(0, 'Traffic limit must be greater than 0')
-            .optional(),
-        notifyPercent: zod_1.z
+        trafficLimitBytes: zod_1.z.optional(zod_1.z.number().int().min(0, 'Traffic limit must be greater than 0')),
+        notifyPercent: zod_1.z.optional(zod_1.z
             .number()
             .int()
             .min(0, 'Notify percent must be greater than 0')
-            .max(100, 'Notify percent must be less than 100')
-            .optional(),
-        trafficResetDay: zod_1.z
+            .max(100, 'Notify percent must be less than 100')),
+        trafficResetDay: zod_1.z.optional(zod_1.z
             .number()
             .int()
             .min(1, 'Traffic reset day must be greater than 0')
-            .max(31, 'Traffic reset day must be less than 31')
-            .optional(),
+            .max(31, 'Traffic reset day must be less than 31')),
     });
     CreateNodeCommand.ResponseSchema = zod_1.z.object({
         response: models_1.NodesSchema,

package/build/commands/nodes/update.command.js

@@ -10,7 +10,8 @@ var UpdateNodeCommand;
     UpdateNodeCommand.TSQ_url = UpdateNodeCommand.url;
     UpdateNodeCommand.RequestSchema = models_1.NodesSchema.pick({
         uuid: true,
-    }).extend({
+    })
+        .extend({
         name: zod_1.z.optional(zod_1.z.string().min(5, 'Min. 5 characters')),
         address: zod_1.z.optional(zod_1.z.string().min(2, 'Min. 2 characters')),
         port: zod_1.z.optional(zod_1.z.number()),
@@ -24,6 +25,17 @@ var UpdateNodeCommand;
             .number()
             .min(1, 'Traffic reset day must be greater than 0')
             .max(31, 'Traffic reset day must be less than 31')),
+    })
+        .refine((data) => {
+        if (data.isTrafficTrackingActive) {
+            return (data.trafficLimitBytes != null &&
+                data.notifyPercent != null &&
+                data.trafficResetDay != null);
+        }
+        return true;
+    }, {
+        message: 'Traffic tracking fields are required when isTrafficTrackingActive is true',
+        path: ['trafficLimitBytes', 'notifyPercent', 'trafficResetDay'],
     });
     UpdateNodeCommand.ResponseSchema = zod_1.z.object({
         response: models_1.NodesSchema,

package/commands/nodes/create.command.ts

@@ -6,28 +6,28 @@ export namespace CreateNodeCommand {
     export const url = REST_API.NODES.CREATE;
     export const TSQ_url = url;
 
-    export const RequestSchema = NodesSchema.pick({}).extend({
+    export const RequestSchema = z.object({
         name: z.string().min(5, 'Name is required'),
         address: z.string().min(2, 'Address is required'),
         port: z.number().int().min(1, 'Port is required').optional(),
         isTrafficTrackingActive: z.boolean().optional().default(false),
-        trafficLimitBytes: z
-            .number()
-            .int()
-            .min(0, 'Traffic limit must be greater than 0')
-            .optional(),
-        notifyPercent: z
-            .number()
-            .int()
-            .min(0, 'Notify percent must be greater than 0')
-            .max(100, 'Notify percent must be less than 100')
-            .optional(),
-        trafficResetDay: z
-            .number()
-            .int()
-            .min(1, 'Traffic reset day must be greater than 0')
-            .max(31, 'Traffic reset day must be less than 31')
-            .optional(),
+        trafficLimitBytes: z.optional(
+            z.number().int().min(0, 'Traffic limit must be greater than 0'),
+        ),
+        notifyPercent: z.optional(
+            z
+                .number()
+                .int()
+                .min(0, 'Notify percent must be greater than 0')
+                .max(100, 'Notify percent must be less than 100'),
+        ),
+        trafficResetDay: z.optional(
+            z
+                .number()
+                .int()
+                .min(1, 'Traffic reset day must be greater than 0')
+                .max(31, 'Traffic reset day must be less than 31'),
+        ),
     });
 
     export type Request = z.infer<typeof RequestSchema>;

package/commands/nodes/update.command.ts

@@ -8,25 +8,45 @@ export namespace UpdateNodeCommand {
 
     export const RequestSchema = NodesSchema.pick({
         uuid: true,
-    }).extend({
-        name: z.optional(z.string().min(5, 'Min. 5 characters')),
-        address: z.optional(z.string().min(2, 'Min. 2 characters')),
-        port: z.optional(z.number()),
-        isTrafficTrackingActive: z.optional(z.boolean()),
-        trafficLimitBytes: z.optional(z.number().min(0, 'Traffic limit must be greater than 0')),
-        notifyPercent: z.optional(
-            z
-                .number()
-                .min(0, 'Notify percent must be greater than 0')
-                .max(100, 'Notify percent must be less than 100'),
-        ),
-        trafficResetDay: z.optional(
-            z
-                .number()
-                .min(1, 'Traffic reset day must be greater than 0')
-                .max(31, 'Traffic reset day must be less than 31'),
-        ),
-    });
+    })
+        .extend({
+            name: z.optional(z.string().min(5, 'Min. 5 characters')),
+            address: z.optional(z.string().min(2, 'Min. 2 characters')),
+            port: z.optional(z.number()),
+            isTrafficTrackingActive: z.optional(z.boolean()),
+            trafficLimitBytes: z.optional(
+                z.number().min(0, 'Traffic limit must be greater than 0'),
+            ),
+            notifyPercent: z.optional(
+                z
+                    .number()
+                    .min(0, 'Notify percent must be greater than 0')
+                    .max(100, 'Notify percent must be less than 100'),
+            ),
+            trafficResetDay: z.optional(
+                z
+                    .number()
+                    .min(1, 'Traffic reset day must be greater than 0')
+                    .max(31, 'Traffic reset day must be less than 31'),
+            ),
+        })
+        .refine(
+            (data) => {
+                if (data.isTrafficTrackingActive) {
+                    return (
+                        data.trafficLimitBytes != null &&
+                        data.notifyPercent != null &&
+                        data.trafficResetDay != null
+                    );
+                }
+                return true;
+            },
+            {
+                message:
+                    'Traffic tracking fields are required when isTrafficTrackingActive is true',
+                path: ['trafficLimitBytes', 'notifyPercent', 'trafficResetDay'],
+            },
+        );
 
     export type Request = z.infer<typeof RequestSchema>;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/backend-contract",
-  "version": "0.0.48",
+  "version": "0.0.49",
   "description": "A contract library for Remnawave",
   "main": "index.js",
   "scripts": {