diff --git a/apps/admin/app/dashboard/nodes/node-form.tsx b/apps/admin/app/dashboard/nodes/node-form.tsx index 4a8064d..b0abadb 100644 --- a/apps/admin/app/dashboard/nodes/node-form.tsx +++ b/apps/admin/app/dashboard/nodes/node-form.tsx @@ -36,9 +36,13 @@ export type ProtocolName = | 'vmess' | 'vless' | 'trojan' - | 'hysteria2' + | 'hysteria' | 'tuic' - | 'anytls'; + | 'anytls' + | 'naive' + | 'http' + | 'socks' + | 'mieru'; const buildSchema = (t: ReturnType) => z.object({ diff --git a/apps/admin/app/dashboard/servers/form-schema/constants.ts b/apps/admin/app/dashboard/servers/form-schema/constants.ts index 1afe64e..dafb143 100644 --- a/apps/admin/app/dashboard/servers/form-schema/constants.ts +++ b/apps/admin/app/dashboard/servers/form-schema/constants.ts @@ -3,7 +3,7 @@ export const protocols = [ 'vmess', 'vless', 'trojan', - 'hysteria2', + 'hysteria', 'tuic', 'anytls', 'socks', @@ -64,7 +64,7 @@ export const SECURITY = { vmess: ['none', 'tls'] as const, vless: ['none', 'tls', 'reality'] as const, trojan: ['tls'] as const, - hysteria2: ['tls'] as const, + hysteria: ['tls'] as const, tuic: ['tls'] as const, anytls: ['tls'] as const, naive: ['none', 'tls'] as const, diff --git a/apps/admin/app/dashboard/servers/form-schema/defaults.ts b/apps/admin/app/dashboard/servers/form-schema/defaults.ts index 774c7d2..27778e6 100644 --- a/apps/admin/app/dashboard/servers/form-schema/defaults.ts +++ b/apps/admin/app/dashboard/servers/form-schema/defaults.ts @@ -90,9 +90,9 @@ export function getProtocolDefaultConfig(proto: ProtocolType) { cert_dns_env: null, ratio: 1, } as any; - case 'hysteria2': + case 'hysteria': return { - type: 'hysteria2', + type: 'hysteria', enable: false, port: null, hop_ports: null, diff --git a/apps/admin/app/dashboard/servers/form-schema/fields.ts b/apps/admin/app/dashboard/servers/form-schema/fields.ts index 90b4dee..e185a8d 100644 --- a/apps/admin/app/dashboard/servers/form-schema/fields.ts +++ b/apps/admin/app/dashboard/servers/form-schema/fields.ts @@ -603,7 +603,7 @@ export const PROTOCOL_FIELDS: Record = { condition: (p) => p.security === 'tls' && p.cert_mode === 'dns', }, ], - hysteria2: [ + hysteria: [ { name: 'ratio', type: 'number', diff --git a/apps/admin/app/dashboard/servers/form-schema/schemas.ts b/apps/admin/app/dashboard/servers/form-schema/schemas.ts index fdb957a..e023e45 100644 --- a/apps/admin/app/dashboard/servers/form-schema/schemas.ts +++ b/apps/admin/app/dashboard/servers/form-schema/schemas.ts @@ -104,16 +104,16 @@ const trojan = z.object({ cert_dns_env: nullableString, }); -const hysteria2 = z.object({ +const hysteria = z.object({ ratio: nullableRatio, - type: z.literal('hysteria2'), + type: z.literal('hysteria'), enable: nullableBool, hop_ports: nullableString, hop_interval: z.number().nullish(), obfs_password: nullableString, obfs: z.enum(['none', 'salamander'] as const).nullish(), port: nullablePort, - security: z.enum(SECURITY.hysteria2).nullish(), + security: z.enum(SECURITY.hysteria).nullish(), sni: nullableString, allow_insecure: nullableBool, fingerprint: nullableString, @@ -207,7 +207,7 @@ export const protocolApiScheme = z.discriminatedUnion('type', [ vmess, vless, trojan, - hysteria2, + hysteria, tuic, anytls, socks, diff --git a/apps/admin/app/dashboard/servers/server-config.tsx b/apps/admin/app/dashboard/servers/server-config.tsx index b76af8c..9a04dfb 100644 --- a/apps/admin/app/dashboard/servers/server-config.tsx +++ b/apps/admin/app/dashboard/servers/server-config.tsx @@ -53,23 +53,6 @@ const dnsConfigSchema = z.object({ const outboundConfigSchema = z.object({ name: z.string(), protocol: z.string(), - // z.enum([ - // 'http', - // 'https', - // 'socks5', - // 'shadowsocks', - // 'vmess', - // 'vless', - // 'trojan', - // 'hysteria2', - // 'tuic', - // 'naive', - // 'brook', - // 'snell', - // 'wireguard', - // 'direct', - // 'reject', - // ]), address: z.string(), port: z.number(), password: z.string().optional(), diff --git a/apps/admin/services/admin/typings.d.ts b/apps/admin/services/admin/typings.d.ts index 30087ab..3ccce61 100644 --- a/apps/admin/services/admin/typings.d.ts +++ b/apps/admin/services/admin/typings.d.ts @@ -1272,7 +1272,7 @@ declare namespace API { has_migrate: boolean; }; - type Hysteria2 = { + type Hysteria = { port: number; hop_ports: string; hop_interval: number; diff --git a/apps/admin/services/common/typings.d.ts b/apps/admin/services/common/typings.d.ts index 7a5c186..ac579d4 100644 --- a/apps/admin/services/common/typings.d.ts +++ b/apps/admin/services/common/typings.d.ts @@ -324,7 +324,7 @@ declare namespace API { state: string; }; - type Hysteria2 = { + type Hysteria = { port: number; hop_ports: string; hop_interval: number; diff --git a/apps/user/services/common/typings.d.ts b/apps/user/services/common/typings.d.ts index 7a5c186..ac579d4 100644 --- a/apps/user/services/common/typings.d.ts +++ b/apps/user/services/common/typings.d.ts @@ -324,7 +324,7 @@ declare namespace API { state: string; }; - type Hysteria2 = { + type Hysteria = { port: number; hop_ports: string; hop_interval: number; diff --git a/apps/user/services/user/typings.d.ts b/apps/user/services/user/typings.d.ts index 5fc016b..60499b8 100644 --- a/apps/user/services/user/typings.d.ts +++ b/apps/user/services/user/typings.d.ts @@ -343,7 +343,7 @@ declare namespace API { list: Ticket[]; }; - type Hysteria2 = { + type Hysteria = { port: number; hop_ports: string; hop_interval: number;