fix: update header pattern in TcpSettings and adjust default header handling in HostModal

Author: ImMohammad20000

app/core/hosts.py

@@ -177,10 +177,11 @@ async def _prepare_subscription_inbound_data(
     elif network in ("tcp", "raw", "http", "h2"):
         # TCP/HTTP/H2 all use TCP transport
         tcps = ts.tcp_settings if ts else None
+        header_type = inbound_header_type or tcps.header if tcps else inbound_header_type
         transport_config = TCPTransportConfig(
             path=path,
             host=host_list,
-            header_type=tcps.header if tcps else inbound_header_type,
+            header_type=header_type,
             request=tcps.request.model_dump(by_alias=True, exclude_none=True) if tcps and tcps.request else None,
             response=tcps.response.model_dump(by_alias=True, exclude_none=True) if tcps and tcps.response else None,
             http_headers=host.http_headers,

app/models/host.py

@@ -101,7 +101,7 @@ class HTTPRequest(HTTPBase):
 
 
 class TcpSettings(BaseModel):
-    header: str = Field("none", pattern=r"^(:?none|http)$")
+    header: str = Field("none", pattern=r"^(?:|none|http)$")
     request: HTTPRequest | None = Field(default=None)
     response: HTTPResponse | None = Field(default=None)
 

dashboard/src/components/dialogs/host-modal.tsx

@@ -1635,13 +1635,17 @@ const HostModal: React.FC<HostModalProps> = ({ isDialogOpen, onOpenChange, onSub
                               render={({ field }) => (
                                 <FormItem className="col-span-2">
                                   <FormLabel>{t('hostsDialog.tcp.header')}</FormLabel>
-                                  <Select onValueChange={field.onChange} value={field.value}>
+                                  <Select
+                                    onValueChange={value => field.onChange(value === '__default' ? '' : value)}
+                                    value={field.value === '' || field.value == null ? '__default' : field.value}
+                                  >
                                     <FormControl>
                                       <SelectTrigger>
                                         <SelectValue />
                                       </SelectTrigger>
                                     </FormControl>
                                     <SelectContent>
+                                      <SelectItem value="__default">{t('hostsDialog.tcp.defaultHeader', { defaultValue: 'Use default' })}</SelectItem>
                                       <SelectItem value="none">None</SelectItem>
                                       <SelectItem value="http">HTTP</SelectItem>
                                     </SelectContent>

dashboard/src/components/hosts/hosts-list.tsx

@@ -1,21 +1,21 @@
+import { Button } from '@/components/ui/button'
+import { Card, CardContent } from '@/components/ui/card'
+import { Input } from '@/components/ui/input'
+import useDirDetection from '@/hooks/use-dir-detection'
+import { cn } from '@/lib/utils'
 import { BaseHost, CreateHost, createHost, modifyHosts } from '@/service/api'
 import { queryClient } from '@/utils/query-client'
 import { closestCenter, DndContext, DragEndEvent, KeyboardSensor, PointerSensor, UniqueIdentifier, useSensor, useSensors } from '@dnd-kit/core'
 import { arrayMove, rectSortingStrategy, SortableContext, sortableKeyboardCoordinates } from '@dnd-kit/sortable'
 import { zodResolver } from '@hookform/resolvers/zod'
-import { useEffect, useState, useMemo } from 'react'
+import { RefreshCw, Search, X } from 'lucide-react'
+import { useEffect, useMemo, useState } from 'react'
 import { Resolver, useForm } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 import { toast } from 'sonner'
 import * as z from 'zod'
 import HostModal from '../dialogs/host-modal'
 import SortableHost from './sortable-host'
-import { Input } from '@/components/ui/input'
-import { Button } from '@/components/ui/button'
-import { RefreshCw, Search, X } from 'lucide-react'
-import useDirDetection from '@/hooks/use-dir-detection'
-import { cn } from '@/lib/utils'
-import { Card, CardContent } from '@/components/ui/card'
 
 interface Brutal {
   enable?: boolean
@@ -207,7 +207,7 @@ const transportSettingsSchema = z
       .optional(),
     tcp_settings: z
       .object({
-        header: z.enum(['none', 'http']).nullish().optional(),
+        header: z.enum(['none', 'http', '']).nullish().optional(),
         request: z
           .object({
             version: z.enum(['1.0', '1.1', '2.0', '3.0']).nullish().optional(),

dashboard/src/service/api/index.ts

@@ -3,7 +3,7 @@
  * Do not edit manually.
  * PasarGuardAPI
  * Unified GUI Censorship Resistant Solution
- * OpenAPI spec version: 1.10.1
+ * OpenAPI spec version: 1.11.0
  */
 import { useMutation, useQuery } from '@tanstack/react-query'
 import type {
@@ -815,7 +815,7 @@ export type TcpSettingsResponse = HTTPResponse | null
 export type TcpSettingsRequest = HTTPRequest | null
 
 export interface TcpSettings {
-  /** @pattern ^(:?none|http)$ */
+  /** @pattern ^(?:|none|http)$ */
   header?: string
   request?: TcpSettingsRequest
   response?: TcpSettingsResponse