mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-05-08 14:36:13 +00:00
hysteria: also accept "hysteria2" protocol string
UI stores v1 and v2 both as "hysteria" with settings.version, but inbounds that came in from imports / manual SQL can carry the literal "hysteria2" string and get silently dropped everywhere we switch on protocol. Add Hysteria2 constant + IsHysteria helper, use it in the places that gate on protocol (sub SQL, getLink, genHysteriaLink, clash buildProxy, json gen, inbound.go validation, xray AddUser). Existing "hysteria" inbounds are untouched. closes #4081
This commit is contained in:
@@ -159,13 +159,10 @@ func (s *SubClashService) getProxies(inbound *model.Inbound, client model.Client
|
||||
}
|
||||
|
||||
func (s *SubClashService) buildProxy(inbound *model.Inbound, client model.Client, stream map[string]any, extraRemark string) map[string]any {
|
||||
// Hysteria (v1 / v2) doesn't ride an xray `streamSettings.network`
|
||||
// transport and the TLS story is handled inside hysteria itself, so
|
||||
// applyTransport / applySecurity below don't model it. Build the
|
||||
// proxy directly. Without this, hysteria inbounds fell into the
|
||||
// `default: return nil` branch and silently vanished from the
|
||||
// generated Clash config.
|
||||
if inbound.Protocol == model.Hysteria {
|
||||
// Hysteria has its own transport + TLS model, applyTransport /
|
||||
// applySecurity don't fit. IsHysteria also covers the literal
|
||||
// "hysteria2" protocol string (#4081).
|
||||
if model.IsHysteria(inbound.Protocol) {
|
||||
return s.buildHysteriaProxy(inbound, client, extraRemark)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user