feat(node-modal): add default and internal timeout fields with validation

triplem-dev · triplem-dev · commit e6e1a99eabe4 · 2025-11-19T19:44:52.000+03:30
diff --git a/dashboard/public/statics/locales/en.json b/dashboard/public/statics/locales/en.json
@@ -1403,7 +1403,11 @@
       "viewIPs": "View IPs",
       "userNotFound": "User '{{username}}' not found or not online",
       "errorLoadingIPs": "Error loading user IP addresses"
-    }
+    },
+    "defaultTimeout": "Default Timeout",
+    "internalTimeout": "Internal Timeout",
+    "defaultTimeoutPlaceholder": "Enter default timeout (seconds)",
+    "internalTimeoutPlaceholder": "Enter internal timeout (seconds)"
   },
   "theme": {
     "title": "Theme",
diff --git a/dashboard/public/statics/locales/fa.json b/dashboard/public/statics/locales/fa.json
@@ -1244,7 +1244,11 @@
       "viewIPs": "مشاهده IP ‌ها",
       "userNotFound": "کاربر '{{username}}' یافت نشد یا آنلاین نیست",
       "errorLoadingIPs": "خطا در بارگذاری آدرس‌های IP کاربر"
-    }
+    },
+    "defaultTimeout": "مهلت پیش‌فرض",
+    "internalTimeout": "مهلت اینترنال",
+    "defaultTimeoutPlaceholder": "مهلت پیش‌فرض را وارد کنید (ثانیه)",
+    "internalTimeoutPlaceholder": "مهلت اینترنال را وارد کنید (ثانیه)"
   },
   "nodes": {
     "title": "گره‌ها",
diff --git a/dashboard/public/statics/locales/ru.json b/dashboard/public/statics/locales/ru.json
@@ -1302,7 +1302,11 @@
       "viewIPs": "Просмотр IP",
       "userNotFound": "Пользователь '{{username}}' не найден или не в сети",
       "errorLoadingIPs": "Ошибка загрузки IP адресов пользователя"
-    }
+    },
+    "defaultTimeout": "Тайм-аут по умолчанию",
+    "internalTimeout": "Внутренний тайм-аут",
+    "defaultTimeoutPlaceholder": "Введите тайм-аут по умолчанию (в секундах)",
+    "internalTimeoutPlaceholder": "Введите внутренний тайм-аут (в секундах)"
   },
   "theme": {
     "title": "Тема",
diff --git a/dashboard/public/statics/locales/zh.json b/dashboard/public/statics/locales/zh.json
@@ -1364,7 +1364,11 @@
     "coreConfig": "核心配置",
     "hours": "小时",
     "selectCoreConfig": "选择核心配置",
-    "noCoreConfig": "无核心配置"
+    "noCoreConfig": "无核心配置",
+    "defaultTimeout": "默认超时",
+    "internalTimeout": "内部超时",
+    "defaultTimeoutPlaceholder": "请输入默认超时（秒）",
+    "internalTimeoutPlaceholder": "请输入内部超时（秒）"
   },
   "theme": {
     "title": "主题",
diff --git a/dashboard/src/components/dialogs/node-modal.tsx b/dashboard/src/components/dialogs/node-modal.tsx
@@ -35,6 +35,8 @@ export const nodeFormSchema = z.object({
   data_limit: z.number().min(0).optional().nullable(),
   data_limit_reset_strategy: z.nativeEnum(DataLimitResetStrategy).optional().nullable(),
   reset_time: z.union([z.null(), z.undefined(), z.number().min(-1)]),
+  default_timeout:z.number().min(3 , 'Default timeout must be 3 or greater').max(60, 'Default timeout must be 60 or lower').optional(),
+  internal_timeout:z.number().min(3 , 'Internal timeout must be 3 or greater').max(60, 'Internal timeout must be 60 or lower').optional()
 })
 
 export type NodeFormValues = z.infer<typeof nodeFormSchema>
@@ -142,6 +144,8 @@ export default function NodeModal({ isDialogOpen, onOpenChange, form, editingNod
           data_limit: dataLimitGB,
           data_limit_reset_strategy: nodeData.data_limit_reset_strategy ?? DataLimitResetStrategy.no_reset,
           reset_time: nodeData.reset_time ?? null,
+          default_timeout: nodeData.default_timeout ?? 10,
+          internal_timeout: nodeData.internal_timeout ?? 15,
         })
         setIsFetchingNodeData(false)
       } else {
@@ -175,6 +179,8 @@ export default function NodeModal({ isDialogOpen, onOpenChange, form, editingNod
               data_limit: dataLimitGB,
               data_limit_reset_strategy: nodeData.data_limit_reset_strategy ?? DataLimitResetStrategy.no_reset,
               reset_time: nodeData.reset_time ?? null,
+              default_timeout: nodeData.default_timeout ?? 10,
+              internal_timeout: nodeData.internal_timeout ?? 15,
             })
           } catch (error) {
             console.error('Error fetching node data:', error)
@@ -201,6 +207,8 @@ export default function NodeModal({ isDialogOpen, onOpenChange, form, editingNod
         data_limit: 0,
         data_limit_reset_strategy: DataLimitResetStrategy.no_reset,
         reset_time: -1,
+        default_timeout: 10,
+        internal_timeout: 15,
       })
     }
   }, [editingNode, editingNodeId, isDialogOpen, cores, initialNodeData, form])
@@ -1042,6 +1050,48 @@ export default function NodeModal({ isDialogOpen, onOpenChange, form, editingNod
                                 )
                               }}
                             />
+                            <div className="flex flex-col sm:flex-row gap-2">
+                            <FormField
+                                control={form.control}
+                                name="default_timeout"
+                                render={({ field }) => (
+                                    <FormItem className="flex-1">
+                                      <FormLabel>{t('nodeModal.defaultTimeout')}</FormLabel>
+                                      <FormControl>
+                                        <Input
+                                            isError={!!form.formState.errors.default_timeout}
+                                            type="number"
+                                            step="1"
+                                            placeholder={t('nodeModal.defaultTimeoutPlaceholder')}
+                                            {...field}
+                                            onChange={e => field.onChange(parseInt(e.target.value))}
+                                        />
+                                      </FormControl>
+                                      <FormMessage />
+                                    </FormItem>
+                                )}
+                            />
+                            <FormField
+                                control={form.control}
+                                name="internal_timeout"
+                                render={({ field }) => (
+                                    <FormItem className="flex-1">
+                                      <FormLabel>{t('nodeModal.internalTimeout')}</FormLabel>
+                                      <FormControl>
+                                        <Input
+                                            isError={!!form.formState.errors.internal_timeout}
+                                            type="number"
+                                            step="1"
+                                              placeholder={t('nodeModal.internalTimeoutPlaceholder')}
+                                            {...field}
+                                            onChange={e => field.onChange(parseInt(e.target.value))}
+                                        />
+                                      </FormControl>
+                                      <FormMessage />
+                                    </FormItem>
+                                )}
+                            />
+                            </div>
                           </div>
                         </div>
                       </AccordionContent>
diff --git a/dashboard/src/service/api/index.ts b/dashboard/src/service/api/index.ts
@@ -181,13 +181,6 @@ export type XrayMuxSettingsOutputXudpConcurrency = number | null
 
 export type XrayMuxSettingsOutputConcurrency = number | null
 
-export interface XrayMuxSettingsOutput {
-  enabled?: boolean
-  concurrency?: XrayMuxSettingsOutputConcurrency
-  xudpConcurrency?: XrayMuxSettingsOutputXudpConcurrency
-  xudpProxyUDP443?: Xudp
-}
-
 export type XrayMuxSettingsInputXudpConcurrency = number | null
 
 export type XrayMuxSettingsInputConcurrency = number | null
@@ -217,6 +210,13 @@ export const Xudp = {
   skip: 'skip',
 } as const
 
+export interface XrayMuxSettingsOutput {
+  enabled?: boolean
+  concurrency?: XrayMuxSettingsOutputConcurrency
+  xudpConcurrency?: XrayMuxSettingsOutputXudpConcurrency
+  xudpProxyUDP443?: Xudp
+}
+
 export type XTLSFlows = (typeof XTLSFlows)[keyof typeof XTLSFlows]
 
 // eslint-disable-next-line @typescript-eslint/no-redeclare
@@ -759,6 +759,8 @@ export interface TransportSettingsOutput {
 
 export type TransportSettingsInputWebsocketSettings = WebSocketSettings | null
 
+export type TransportSettingsInputTcpSettings = TcpSettings | null
+
 export type TransportSettingsInputKcpSettings = KCPSettings | null
 
 export type TransportSettingsInputGrpcSettings = GRPCSettings | null
@@ -811,8 +813,6 @@ export interface TcpSettings {
   response?: TcpSettingsResponse
 }
 
-export type TransportSettingsInputTcpSettings = TcpSettings | null
-
 export type SystemStatsCpuUsage = number | null
 
 export type SystemStatsCpuCores = number | null
@@ -1271,6 +1271,16 @@ export interface NodeResponse {
   data_limit?: number
   data_limit_reset_strategy?: DataLimitResetStrategy
   reset_time?: number
+  /**
+   * @minimum 3
+   * @maximum 60
+   */
+  default_timeout?: number
+  /**
+   * @minimum 3
+   * @maximum 60
+   */
+  internal_timeout?: number
   id: number
   xray_version: NodeResponseXrayVersion
   node_version: NodeResponseNodeVersion
@@ -1303,6 +1313,10 @@ export interface NodeNotificationEnable {
 
 export type NodeModifyStatus = NodeStatus | null
 
+export type NodeModifyInternalTimeout = number | null
+
+export type NodeModifyDefaultTimeout = number | null
+
 export type NodeModifyResetTime = number | null
 
 export type NodeModifyDataLimitResetStrategy = DataLimitResetStrategy | null
@@ -1340,6 +1354,8 @@ export interface NodeModify {
   data_limit?: NodeModifyDataLimit
   data_limit_reset_strategy?: NodeModifyDataLimitResetStrategy
   reset_time?: NodeModifyResetTime
+  default_timeout?: NodeModifyDefaultTimeout
+  internal_timeout?: NodeModifyInternalTimeout
   status?: NodeModifyStatus
 }
 
@@ -1365,6 +1381,16 @@ export interface NodeCreate {
   data_limit?: number
   data_limit_reset_strategy?: DataLimitResetStrategy
   reset_time?: number
+  /**
+   * @minimum 3
+   * @maximum 60
+   */
+  default_timeout?: number
+  /**
+   * @minimum 3
+   * @maximum 60
+   */
+  internal_timeout?: number
 }
 
 export type NextPlanModelExpire = number | null
@@ -1884,6 +1910,16 @@ export interface ApplicationInput {
   download_links: DownloadLink[]
 }
 
+/**
+ * Response model for admins list with pagination and statistics.
+ */
+export interface AdminsResponse {
+  admins: AdminDetails[]
+  total: number
+  active: number
+  disabled: number
+}
+
 export interface AdminNotificationEnable {
   create?: boolean
   modify?: boolean
@@ -1949,13 +1985,6 @@ export type AdminDetailsTelegramId = number | null
 /**
  * Complete admin model with all fields for database representation and API responses.
  */
-export interface AdminsResponse {
-  admins: AdminDetails[]
-  total: number
-  active: number
-  disabled: number
-}
-
 export interface AdminDetails {
   username: string
   telegram_id?: AdminDetailsTelegramId
