Skip to content

Commit 84419ea

Browse files
fix: enable field in xray mux settings
1 parent 900e425 commit 84419ea

File tree

5 files changed

+21
-22
lines changed

5 files changed

+21
-22
lines changed

app/models/host.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class ClashMuxSettings(SingBoxMuxSettings):
151151

152152

153153
class XrayMuxSettings(BaseModel):
154-
enable: bool = Field(default=False)
154+
enabled: bool = Field(default=False)
155155
concurrency: int | None = Field(default=None)
156156
xudp_concurrency: int | None = Field(None, serialization_alias="xudpConcurrency")
157157
xudp_proxy_udp_443: XUDP = Field(default=XUDP.reject, serialization_alias="xudpProxyUDP443")

dashboard/src/components/dialogs/HostModal.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { getHosts, getInbounds, UserStatus } from '@/service/api'
1616
import { queryClient } from '@/utils/query-client'
1717
import { useQuery } from '@tanstack/react-query'
1818
import { Cable, ChevronsLeftRightEllipsis, GlobeLock, Info, Lock, Network, Plus, Trash2, X } from 'lucide-react'
19-
import { useState, useMemo, useCallback, memo } from 'react'
19+
import { memo, useCallback, useMemo, useState } from 'react'
2020
import { UseFormReturn } from 'react-hook-form'
2121
import { useTranslation } from 'react-i18next'
2222
import { toast } from 'sonner'
@@ -2329,7 +2329,7 @@ const HostModal: React.FC<HostModalProps> = ({ isDialogOpen, onOpenChange, onSub
23292329
<div className="space-y-4">
23302330
<FormField
23312331
control={form.control}
2332-
name="mux_settings.xray.enable"
2332+
name="mux_settings.xray.enabled"
23332333
render={({ field }) => (
23342334
<FormItem className="flex cursor-pointer flex-row items-center justify-between rounded-lg border p-4" onClick={() => field.onChange(!field.value)}>
23352335
<div className="space-y-0.5">
@@ -2353,7 +2353,7 @@ const HostModal: React.FC<HostModalProps> = ({ isDialogOpen, onOpenChange, onSub
23532353
</FormItem>
23542354
)}
23552355
/>
2356-
{form.watch('mux_settings.xray.enable') === true ? (
2356+
{form.watch('mux_settings.xray.enabled') === true ? (
23572357
<div className="grid grid-cols-1 gap-4 md:grid-cols-2">
23582358
<FormField
23592359
control={form.control}
@@ -2432,7 +2432,7 @@ const HostModal: React.FC<HostModalProps> = ({ isDialogOpen, onOpenChange, onSub
24322432
field.onChange(checked)
24332433
if (checked) {
24342434
// Disable other mux settings when enabling this one
2435-
form.setValue('mux_settings.xray.enable', false)
2435+
form.setValue('mux_settings.xray.enabled', false)
24362436
form.setValue('mux_settings.clash.enable', false)
24372437
}
24382438
}}
@@ -2602,7 +2602,7 @@ const HostModal: React.FC<HostModalProps> = ({ isDialogOpen, onOpenChange, onSub
26022602
field.onChange(checked)
26032603
if (checked) {
26042604
// Disable other mux settings when enabling this one
2605-
form.setValue('mux_settings.xray.enable', false)
2605+
form.setValue('mux_settings.xray.enabled', false)
26062606
form.setValue('mux_settings.sing_box.enable', false)
26072607
}
26082608
}}

dashboard/src/components/hosts/Hosts.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ interface Brutal {
1818
}
1919

2020
interface XrayMuxSettings {
21-
enable?: boolean
21+
enabled?: boolean
2222
concurrency: number | null
2323
xudp_concurrency: number | null
2424
xudp_proxy_443: string
@@ -355,7 +355,7 @@ export const HostFormSchema = z.object({
355355
.object({
356356
xray: z
357357
.object({
358-
enable: z.boolean().optional(),
358+
enabled: z.boolean().optional(),
359359
concurrency: z.number().nullable().optional(),
360360
xudp_concurrency: z.number().nullable().optional(),
361361
xudp_proxy_443: z.enum(['reject', 'allow', 'skip']).nullable().optional(),
@@ -364,7 +364,7 @@ export const HostFormSchema = z.object({
364364
sing_box: z
365365
.object({
366366
enable: z.boolean().optional(),
367-
protocol: z.enum(['none', 'smux', 'yamux', 'h2mux']).default("smux"),
367+
protocol: z.enum(['none', 'smux', 'yamux', 'h2mux']).default('smux'),
368368
max_connections: z.number().nullable().optional(),
369369
max_streams: z.number().nullable().optional(),
370370
min_streams: z.number().nullable().optional(),
@@ -381,7 +381,7 @@ export const HostFormSchema = z.object({
381381
clash: z
382382
.object({
383383
enable: z.boolean().optional(),
384-
protocol: z.enum(['none', 'smux', 'yamux', 'h2mux']).default("smux"),
384+
protocol: z.enum(['none', 'smux', 'yamux', 'h2mux']).default('smux'),
385385
max_connections: z.number().nullable().optional(),
386386
max_streams: z.number().nullable().optional(),
387387
min_streams: z.number().nullable().optional(),
@@ -500,7 +500,7 @@ export default function Hosts({ data, onAddHost, isDialogOpen, onSubmit, editing
500500
? {
501501
xray: host.mux_settings.xray
502502
? {
503-
enable: host.mux_settings.xray.enable ?? false,
503+
enabled: host.mux_settings.xray.enabled ?? false,
504504
concurrency: host.mux_settings.xray.concurrency ?? null,
505505
xudp_concurrency: host.mux_settings.xray.xudpConcurrency ?? null,
506506
xudp_proxy_443: host.mux_settings.xray.xudpProxyUDP443 ?? 'reject',

dashboard/src/pages/_dashboard.hosts.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1+
import MainSection, { HostFormValues } from '@/components/hosts/Hosts'
12
import PageHeader from '@/components/page-header'
3+
import { Card, CardContent } from '@/components/ui/card'
4+
import { Separator } from '@/components/ui/separator'
5+
import { BaseHost, createHost, CreateHost, getHosts, modifyHost, MultiplexProtocol, ProxyHostALPN, ProxyHostFingerprint, Xudp } from '@/service/api'
6+
import { useQuery, useQueryClient } from '@tanstack/react-query'
27
import { Plus } from 'lucide-react'
3-
import MainSection from '@/components/hosts/Hosts'
48
import { useState } from 'react'
5-
import { useQuery, useQueryClient } from '@tanstack/react-query'
6-
import { getHosts, createHost, modifyHost, CreateHost, ProxyHostALPN, ProxyHostFingerprint, MultiplexProtocol, Xudp, BaseHost } from '@/service/api'
7-
import { HostFormValues } from '@/components/hosts/Hosts'
8-
import { toast } from 'sonner'
99
import { useTranslation } from 'react-i18next'
10-
import { Separator } from '@/components/ui/separator'
11-
import { Card, CardContent } from '@/components/ui/card'
10+
import { toast } from 'sonner'
1211

1312
export default function HostsPage() {
1413
const [isDialogOpen, setIsDialogOpen] = useState(false)
@@ -106,7 +105,7 @@ export default function HostsPage() {
106105
: undefined,
107106
xray: formData.mux_settings.xray
108107
? {
109-
enable: formData.mux_settings.xray.enable || false,
108+
enable: formData.mux_settings.xray.enabled || false,
110109
concurrency: formData.mux_settings.xray.concurrency || undefined,
111110
xudp_concurrency: formData.mux_settings.xray.xudp_concurrency || undefined,
112111
xudp_proxy_udp_443: formData.mux_settings.xray.xudp_proxy_443 === 'none' ? undefined : (formData.mux_settings.xray.xudp_proxy_443 as Xudp),

dashboard/src/service/api/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Do not edit manually.
44
* PasarGuardAPI
55
* Unified GUI Censorship Resistant Solution
6-
* OpenAPI spec version: 1.0.0-rc-2
6+
* OpenAPI spec version: 1.0.0-rc-3
77
*/
88
import { useMutation, useQuery } from '@tanstack/react-query'
99
import type {
@@ -174,7 +174,7 @@ export type XrayMuxSettingsOutputXudpConcurrency = number | null
174174
export type XrayMuxSettingsOutputConcurrency = number | null
175175

176176
export interface XrayMuxSettingsOutput {
177-
enable?: boolean
177+
enabled?: boolean
178178
concurrency?: XrayMuxSettingsOutputConcurrency
179179
xudpConcurrency?: XrayMuxSettingsOutputXudpConcurrency
180180
xudpProxyUDP443?: Xudp
@@ -185,7 +185,7 @@ export type XrayMuxSettingsInputXudpConcurrency = number | null
185185
export type XrayMuxSettingsInputConcurrency = number | null
186186

187187
export interface XrayMuxSettingsInput {
188-
enable?: boolean
188+
enabled?: boolean
189189
concurrency?: XrayMuxSettingsInputConcurrency
190190
xudp_concurrency?: XrayMuxSettingsInputXudpConcurrency
191191
xudp_proxy_udp_443?: Xudp

0 commit comments

Comments
 (0)