fix: validation and remove XTLSFlow usage

Author: M03ED

app/models/stats.py

@@ -1,7 +1,7 @@
 from datetime import datetime as dt
 from enum import Enum
 
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel, Field, field_validator
 
 from app.utils.helpers import ensure_datetime_timezone
 
@@ -79,7 +79,7 @@ def validator_date(cls, v):
 
 class UserCountMetricStatsList(StatList):
     metric: UserCountMetric
-    count_during_period: int
+    count_during_period: int = Field(default=0)
     stats: dict[int, list[UserCountMetricStat]]
 
 

app/routers/node.py

@@ -1,7 +1,7 @@
 import asyncio
 from typing import Annotated, AsyncGenerator
 
-from fastapi import APIRouter, Depends, Request, status
+from fastapi import APIRouter, Depends, HTTPException, Request, status
 from PasarGuardNodeBridge import NodeAPIError
 from sse_starlette.sse import EventSourceResponse
 
@@ -36,6 +36,7 @@
     NodeUsageStatsList,
     UserCountMetric,
     UserCountMetricStatsList,
+    validate_user_count_metric_scope,
 )
 from app.nats.node_rpc import node_nats_client
 from app.operation import OperatorType
@@ -155,6 +156,11 @@ async def get_user_count_metric(
     _: AdminDetails = Depends(check_sudo_admin),
 ):
     """Retrieve one user activity/status count metric from node user usage rows."""
+    try:
+        validate_user_count_metric_scope(metric, node_id=query.node_id, group_by_node=query.group_by_node)
+    except ValueError as exc:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)) from exc
+
     return await node_operator.get_user_count_metric(db=db, metric=metric, query=query)
 
 

app/routers/user.py

@@ -9,6 +9,7 @@
     UserCountMetric,
     UserCountMetricStatsList,
     UserUsageStatsList,
+    validate_user_count_metric_scope,
 )
 from app.models.user import (
     BulkUser,
@@ -506,6 +507,15 @@ async def get_users_count_metric(
     admin: AdminDetails = Depends(get_current),
 ):
     """Get one users activity/status count metric from usage rows."""
+    try:
+        validate_user_count_metric_scope(
+            metric,
+            node_id=query.node_id if admin.is_sudo else None,
+            group_by_node=query.group_by_node if admin.is_sudo else False,
+        )
+    except ValueError as exc:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)) from exc
+
     return await user_operator.get_users_count_metric(db, admin=admin, metric=metric, query=query)
 
 

dashboard/src/features/bulk/components/bulk-flow.tsx

@@ -11,7 +11,6 @@ import {
   useBulkAddGroupsToUsers,
   useBulkRemoveUsersFromGroups,
   useBulkReallocateWireguardPeerIps,
-  XTLSFlows,
   ShadowsocksMethods,
   UserStatus,
 } from '@/service/api'
@@ -27,7 +26,7 @@ import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group'
 import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem } from '@/components/ui/command'
 import { useTranslation } from 'react-i18next'
 import { toast } from 'sonner'
-import { Settings, Group, User, Shield, CheckCircle, AlertTriangle, Plus, Minus, X, HardDrive, Calendar, Network, CheckCircle2, ChevronLeft, ChevronRight, Eye, Loader2 } from 'lucide-react'
+import { Settings, Group, User, Shield, CheckCircle, AlertTriangle, Plus, Minus, X, HardDrive, Calendar, CheckCircle2, ChevronLeft, ChevronRight, Eye, Loader2 } from 'lucide-react'
 import { BulkExpiredDateFilters } from '@/features/bulk/components/bulk-expired-date-filters'
 import { DecimalInput } from '@/components/common/decimal-input'
 import { SelectorPanel } from '@/features/bulk/components/selector-panel'
@@ -57,7 +56,6 @@ export default function BulkFlow({ operationType }: BulkFlowProps) {
 
   const [currentStep, setCurrentStep] = useState<1 | 2 | 3>(1)
 
-  const [selectedFlow, setSelectedFlow] = useState<XTLSFlows | 'none' | undefined>(undefined)
   const [selectedMethod, setSelectedMethod] = useState<ShadowsocksMethods | undefined>(undefined)
 
   const [dataLimit, setDataLimit] = useState<number | undefined>(undefined)
@@ -157,7 +155,7 @@ export default function BulkFlow({ operationType }: BulkFlowProps) {
           return true
         }
         if (operationType === 'proxy') {
-          return selectedFlow || selectedMethod
+          return selectedMethod
         }
         if (operationType === 'groups') {
           return selectedGroups.length > 0
@@ -172,7 +170,7 @@ export default function BulkFlow({ operationType }: BulkFlowProps) {
       case 2:
         switch (operationType) {
           case 'proxy':
-            return selectedFlow || selectedMethod
+            return selectedMethod
           case 'data':
             return dataLimit !== undefined
           case 'expire':
@@ -246,7 +244,6 @@ export default function BulkFlow({ operationType }: BulkFlowProps) {
         case 'proxy':
           return {
             ...basePayload,
-            flow: selectedFlow === 'none' ? ('' as XTLSFlows) : selectedFlow,
             method: selectedMethod,
             dry_run: false,
           }
@@ -348,7 +345,6 @@ export default function BulkFlow({ operationType }: BulkFlowProps) {
           toast.success(t('operationSuccess', { defaultValue: 'Operation successful!' }), { description })
 
           setCurrentStep(1)
-          setSelectedFlow(undefined)
           setSelectedMethod(undefined)
           setDataLimit(undefined)
           setExpireSeconds(undefined)
@@ -386,7 +382,6 @@ export default function BulkFlow({ operationType }: BulkFlowProps) {
         case 'proxy':
           return {
             ...basePayload,
-            flow: selectedFlow === 'none' ? ('' as XTLSFlows) : selectedFlow,
             method: selectedMethod,
             dry_run: true,
           }
@@ -541,28 +536,7 @@ export default function BulkFlow({ operationType }: BulkFlowProps) {
             <div className="space-y-3 sm:space-y-4">
               {operationType === 'proxy' && (
                 <div className="space-y-3 sm:space-y-4">
-                  <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 sm:gap-4">
-                    <div className="space-y-2">
-                      <Label htmlFor="flow" className="flex items-center gap-1.5 text-sm font-medium">
-                        <Network className="text-muted-foreground h-3.5 w-3.5" />
-                        {t('bulk.flowLabel', { defaultValue: 'Flow' })}
-                      </Label>
-                      <Select value={selectedFlow || ''} onValueChange={value => setSelectedFlow(value as XTLSFlows | 'none')}>
-                        <SelectTrigger>
-                          <SelectValue placeholder={t('bulk.selectFlowPlaceholder', { defaultValue: 'Select flow' })} />
-                        </SelectTrigger>
-                        <SelectContent>
-                          <SelectItem value="none">{t('none', { defaultValue: 'None' })}</SelectItem>
-                          {Object.values(XTLSFlows)
-                            .filter(flow => flow !== '')
-                            .map(flow => (
-                              <SelectItem key={flow} value={flow}>
-                                {flow}
-                              </SelectItem>
-                            ))}
-                        </SelectContent>
-                      </Select>
-                    </div>
+                  <div className="grid grid-cols-1 gap-3 sm:gap-4">
                     <div className="space-y-2">
                       <Label htmlFor="method" className="flex items-center gap-1.5 text-sm font-medium">
                         <Settings className="text-muted-foreground h-3.5 w-3.5" />
@@ -1019,7 +993,7 @@ export default function BulkFlow({ operationType }: BulkFlowProps) {
                   {operationType === 'proxy' && (
                     <div className="flex items-center justify-between">
                       <span className="text-muted-foreground">{t('bulk.settings', { defaultValue: 'Settings' })}:</span>
-                      <span>{t('bulk.flowMethod', { flow: selectedFlow === 'none' || !selectedFlow ? t('none') : selectedFlow, method: selectedMethod || t('none') })}</span>
+                      <span>{selectedMethod || t('none')}</span>
                     </div>
                   )}
 

dashboard/src/features/templates/dialogs/user-template-modal.tsx

@@ -20,7 +20,6 @@ import {
   useCreateUserTemplate,
   useModifyUserTemplate,
   UserStatusCreate,
-  XTLSFlows,
 } from '@/service/api'
 import { formatBytes, gbToBytes } from '@/utils/formatByte'
 import { queryClient } from '@/utils/query-client.ts'
@@ -191,10 +190,9 @@ export default function UserTemplateModal({ isDialogOpen, onOpenChange, form, ed
         data_limit_reset_strategy: hasDataLimit ? values.data_limit_reset_strategy : undefined,
         reset_usages: values.reset_usages,
         extra_settings:
-          values.method || values.flow
+          values.method
             ? {
               method: values.method,
-              flow: values.flow,
             }
             : undefined,
       }
@@ -239,7 +237,6 @@ export default function UserTemplateModal({ isDialogOpen, onOpenChange, form, ed
         'on_hold_timeout',
         'data_limit_reset_strategy',
         'method',
-        'flow',
         'reset_usages',
       ]
       handleError({ error, fields, form, contextKey: 'groups' })
@@ -527,28 +524,6 @@ export default function UserTemplateModal({ isDialogOpen, onOpenChange, form, ed
                   )}
                 />
 
-                <FormField
-                  control={form.control}
-                  name="flow"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>{t('templates.flow')}</FormLabel>
-                      <Select onValueChange={value => field.onChange(value === 'null' ? undefined : value)} value={field.value ?? 'null'}>
-                        <FormControl>
-                          <SelectTrigger>
-                            <SelectValue placeholder={t('userDialog.proxySettings.flow', { defaultValue: 'Flow' })} />
-                          </SelectTrigger>
-                        </FormControl>
-                        <SelectContent>
-                          <SelectItem value="null">{t('userDialog.proxySettings.flow.none', { defaultValue: 'None' })}</SelectItem>
-                          <SelectItem value={XTLSFlows['xtls-rprx-vision']}>xtls-rprx-vision</SelectItem>
-                          <SelectItem value={XTLSFlows['xtls-rprx-vision-udp443']}>xtls-rprx-vision-udp443</SelectItem>
-                        </SelectContent>
-                      </Select>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
                 <FormField control={form.control} name="groups" render={({ field }) => <GroupsSelector control={form.control} name="groups" onGroupsChange={field.onChange} />} />
               </div>
             </div>

dashboard/src/features/templates/forms/user-template-form.ts

@@ -1,4 +1,4 @@
-import { DataLimitResetStrategy, ShadowsocksMethods, UserStatusCreate, XTLSFlows } from '@/service/api'
+import { DataLimitResetStrategy, ShadowsocksMethods, UserStatusCreate } from '@/service/api'
 import { zodResolver } from '@hookform/resolvers/zod'
 import type { TFunction } from 'i18next'
 import type { FieldError, FieldErrors, Resolver } from 'react-hook-form'
@@ -16,7 +16,6 @@ const userTemplateFormObjectSchema = z.object({
   method: z
     .enum([ShadowsocksMethods['aes-128-gcm'], ShadowsocksMethods['aes-256-gcm'], ShadowsocksMethods['chacha20-ietf-poly1305'], ShadowsocksMethods['xchacha20-poly1305']])
     .default(ShadowsocksMethods['chacha20-ietf-poly1305']),
-  flow: z.enum([XTLSFlows[''], XTLSFlows['xtls-rprx-vision'], XTLSFlows['xtls-rprx-vision-udp443']]).default(XTLSFlows['']),
   groups: z.array(z.number()).min(1, 'validation.required'),
   data_limit_reset_strategy: z
     .enum([
@@ -57,7 +56,6 @@ export const userTemplateFormDefaultValues: Partial<UserTemplatesFromValueInput>
   hwid_limit: undefined,
   expire_duration: 0,
   method: ShadowsocksMethods['chacha20-ietf-poly1305'],
-  flow: XTLSFlows[''],
   on_hold_timeout: undefined,
   groups: [],
   reset_usages: false,