Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class VMessSettings(BaseModel):
class XTLSFlows(StrEnum):
NONE = ""
VISION = "xtls-rprx-vision"

VISION_UDP = "xtls-rprx-vision-udp443"

class VlessSettings(BaseModel):
id: UUID = Field(default_factory=uuid4)
Expand Down
6 changes: 5 additions & 1 deletion app/node/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,16 @@ def _serialize_user_for_node(id: int, username: str, user_settings: dict, inboun
shadowsocks_settings = user_settings.get("shadowsocks", {})
hysteria_settings = user_settings.get("hysteria", {})

vless_flow = vless_settings.get("flow")
if vless_flow == "xtls-rprx-vision-udp443":
vless_flow = "xtls-rprx-vision"

return create_user(
f"{id}.{username}",
create_proxy(
vmess_id=vmess_settings.get("id"),
vless_id=vless_settings.get("id"),
vless_flow=vless_settings.get("flow"),
vless_flow=vless_flow,
trojan_password=trojan_settings.get("password"),
shadowsocks_password=shadowsocks_settings.get("password"),
shadowsocks_method=shadowsocks_settings.get("method"),
Expand Down
3 changes: 2 additions & 1 deletion dashboard/src/components/dialogs/user-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,7 @@ export default function UserModal({ isDialogOpen, onOpenChange, form, editingUse
},
vless: {
id: uuidv4(),
flow: '' as '' | 'xtls-rprx-vision' | undefined,
flow: '' as '' | 'xtls-rprx-vision' | 'xtls-rprx-vision-udp443' | undefined,
},
trojan: {
password: generatePassword(),
Expand Down Expand Up @@ -1894,6 +1894,7 @@ export default function UserModal({ isDialogOpen, onOpenChange, form, editingUse
<SelectContent>
<SelectItem value="none">{t('userDialog.proxySettings.flow.none', { defaultValue: 'None' })}</SelectItem>
<SelectItem value="xtls-rprx-vision">xtls-rprx-vision</SelectItem>
<SelectItem value="xtls-rprx-vision-udp443">xtls-rprx-vision-udp443</SelectItem>
</SelectContent>
</Select>
</FormControl>
Expand Down
2 changes: 1 addition & 1 deletion dashboard/src/components/dialogs/user-template-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,7 @@ export default function UserTemplateModal({ isDialogOpen, onOpenChange, form, ed
<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 />
Expand All @@ -526,4 +527,3 @@ export default function UserTemplateModal({ isDialogOpen, onOpenChange, form, ed
</Dialog>
)
}

2 changes: 1 addition & 1 deletion dashboard/src/components/forms/user-form.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { z } from 'zod'

export const userStatusEnum = z.enum(['active', 'disabled', 'limited', 'expired', 'on_hold'])
export const userDataLimitResetStrategyEnum = z.enum(['no_reset', 'day', 'week', 'month', 'year'])
export const xtlsFlowsEnum = z.enum(['', 'xtls-rprx-vision'])
export const xtlsFlowsEnum = z.enum(['', 'xtls-rprx-vision', 'xtls-rprx-vision-udp443'])
export const shadowsocksMethodsEnum = z.enum(['aes-128-gcm', 'aes-256-gcm', 'chacha20-ietf-poly1305', 'xchacha20-poly1305'])

export const vMessSettingsSchema = z.object({
Expand Down
2 changes: 1 addition & 1 deletion dashboard/src/components/forms/user-template-form.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const userTemplateFormSchema = 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']]).default(XTLSFlows['']),
flow: z.enum([XTLSFlows[''], XTLSFlows['xtls-rprx-vision'], XTLSFlows['xtls-rprx-vision-udp443']]).default(XTLSFlows['']),
groups: z.array(z.number()).min(1, 'Groups is required'),
data_limit_reset_strategy: z
.enum([
Expand Down
1 change: 1 addition & 0 deletions dashboard/src/service/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ export type XTLSFlows = (typeof XTLSFlows)[keyof typeof XTLSFlows]
export const XTLSFlows = {
'': '',
'xtls-rprx-vision': 'xtls-rprx-vision',
'xtls-rprx-vision-udp443': 'xtls-rprx-vision-udp443',
} as const

export type XMuxSettingsOutputHKeepAlivePeriod = number | null
Expand Down
Loading