mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-10-27 00:04:59 +03:00
fix(finalmask): keep a single udphop mask last in every client finalmask
xray-core reverses finalmask.udp and refuses, at dial time, a mask that dials its own socket (udphop) anywhere but the socket end: "incorrect index". xray run -test still says Configuration OK, so the failure only shows as a client that never connects. UDPHopClientMaskFix turned a global subJsonFinalMask hop and a host hop into udphop masks; the JSON subscription then appended both, leaving two hoppers with the first one misplaced, and a host mask merged after a global hop pushed it off the end too. A hand-ordered template outbound or an imported fm= could carry the same order. maskcompat.NormalizeUDPHop keeps the last-listed udphop alone at the end of udp, and runs wherever a client finalmask is produced: each JSON subscription endpoint, share-link fm=, the Go and frontend link importers and the template outbound heal in GetXrayConfig. The JSON subscription resolves competing hop ranges most specific first: a host hop wins over the inbound's own, which wins over the global default.
This commit is contained in:
@@ -507,6 +507,23 @@ describe('parseHysteria2Link', () => {
|
||||
});
|
||||
});
|
||||
|
||||
// The core reverses the UDP masks and refuses a udphop anywhere but last ("incorrect index"),
|
||||
// so an import of a link that lists it first must reorder it like the Go importer does.
|
||||
it('moves a udphop mask listed first in fm= to the end', () => {
|
||||
const hop = {
|
||||
type: 'udphop',
|
||||
settings: { mode: 'intervalRemote', remotePorts: '20000-30000' },
|
||||
};
|
||||
const salamander = { type: 'salamander', settings: { password: 's3cr3t' } };
|
||||
const fm = encodeURIComponent(JSON.stringify({ udp: [hop, salamander] }));
|
||||
const out = parseHysteria2Link(
|
||||
`hysteria2://auth@hy.example.com:443?sni=hy.example.com&fm=${fm}#hy`,
|
||||
);
|
||||
expect((out!.streamSettings as Record<string, unknown>).finalmask).toEqual({
|
||||
udp: [salamander, hop],
|
||||
});
|
||||
});
|
||||
|
||||
it('parses a hysteria2:// link with sni', () => {
|
||||
const link = 'hysteria2://auth-secret@srv.example:443?sni=example.com#imported-hy2';
|
||||
const out = parseHysteria2Link(link);
|
||||
|
||||
Reference in New Issue
Block a user