pjandro/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-11-15 09:35:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(sub): append host serverDescription to hysteria links (#6740)

Browse Source 
* fix(sub): append host serverDescription to hysteria links

A host's Description reached vless/trojan/ss through buildEndpointLinks, but
genHysteriaLink renders the fragment in its own externalProxy loop and never
added the suffix, so Happ fell back to its "Hysteria | hysteria | TLS" caption
for every Hysteria server on a host that also serves VLESS (#6738).

Reuse appendHappServerDescription with the description the endpoint map already
carries, so no key lookup is duplicated and a host with no description emits the
same bytes as before. genTuicLink (service.go:912) has the same gap; left alone
to keep this diff to the reported protocol.

Regression test is red without the fix for both hysteria:// and hysteria2://.

* chore(sub): trim the hysteria serverDescription regression test

The no-description test passed with and without the #6738 fix: the empty
description branch is already pinned by TestAppendHappServerDescription, so
it certified nothing about this change. Also cut the remaining test's comment
block to the two-line limit CLAUDE.md sets.

---------

Co-authored-by: MHSanaei <ho3ein.sanaei@gmail.com>
This commit is contained in:
冰
2026-10-06 01:05:13 +08:00
committed by GitHub
parent b42a1c0ba1
commit e897b0957a
2 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/sub/service.go
+5 -1
View File
@@ -1535,7 +1535,11 @@ func (s *SubService) genHysteriaLink(inbound *model.Inbound, email string) strin
applyExternalProxyHysteriaParams(ep, epParams)
link := fmt.Sprintf("%s://%s@%s", protocol, auth, joinHostPort(dest, int(portF)))
links = append(links, buildLinkWithParams(link, epParams, s.endpointRemark(inbound, email, ep, "quic")))
// VLESS/Trojan/SS get the host's description through buildEndpointLinks;
// this loop renders the fragment itself, so add it here too (#6738).
remark := s.endpointRemark(inbound, email, ep, "quic")
remark = appendHappServerDescription(remark, externalProxyToEndpoint(ep).ServerDescription)
links = append(links, buildLinkWithParams(link, epParams, remark))
}
return strings.Join(links, "\n")
}