pjandro/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-10-27 16:25:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(hosts): advertise Hosts in every WireGuard, AmneziaWG and TUIC config

Browse Source 
Invariant: an inbound's enabled Hosts are the endpoints every client config
for it advertises, whichever surface renders that config.

WireGuard and AmneziaWG broke it. Their raw generators ignored the
externalProxy entries Hosts are injected as and always emitted
resolveInboundAddress, so the raw subscription, the sub page .conf, the
clients links API and "export all links" gave out the panel address while
the JSON and Clash formats of the same inbound used the Host.
advertisedEndpoints now states the fan-out once for mtproto, wireguard and
amneziawg.

The browser-built configs had the same gap. The Clients page WireGuard and
AmneziaWG config blocks and QR panels, and its TUIC Clash config, used the
panel hostname next to server links that already used Hosts; the Inbounds
page peer configs, QR and export ignored them too. withMtprotoHostEndpoints
becomes withHostEndpoints over a shared hostEndpointsFor mirror of the
backend, the tunnel fan-outs render one config per Host, and the clients
page waits for the hosts list the way the inbounds page does, so an empty
list means "no hosts" rather than "not loaded yet".
This commit is contained in:
MHSanaei
2026-09-30 15:03:16 +02:00
parent 8c023d13dc
commit aee45ca3fe
20 changed files with 876 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/lib/xray/inbound-link.ts
+79 -59
View File
@@ -1117,44 +1117,43 @@ export interface GenAmneziaWGFanoutInput {
fallbackHostname: string;
}
export function genAmneziaWGLinks(input: GenAmneziaWGFanoutInput): string {
function amneziaWGFanout(
input: GenAmneziaWGFanoutInput,
render: (input: GenAmneziaWGLinkInput) => string,
): string[][] {
const { inbound, remark = '', hostOverride = '', fallbackHostname } = input;
if (inbound.protocol !== 'amneziawg') return '';
const addr = resolveAddr(inbound, hostOverride, fallbackHostname);
const sep = '-';
if (inbound.protocol !== 'amneziawg') return [];
const endpoints = tunnelEndpoints(inbound, resolveAddr(inbound, hostOverride, fallbackHostname));
const settings = inbound.settings as AmneziawgInboundSettings;
const clients = settings.clients ?? [];
return clients
.map((c, i) =>
genAmneziaWGLink({
return clients.map((c, i) =>
endpoints.map((e) =>
render({
settings,
address: addr,
port: inbound.port,
remark: `${remark}${sep}${i + 1}${wgPeerCommentSuffix(c)}`,
address: e.address,
port: e.port,
remark: tunnelPeerRemark(remark, e.remark, i, c),
peerIndex: i,
}),
)
.join('\r\n');
),
);
}
// Per-peer lists with one entry per advertised endpoint (Host), peer-major.
export function genAmneziaWGPeerLinks(input: GenAmneziaWGFanoutInput): string[][] {
return amneziaWGFanout(input, genAmneziaWGLink);
}
export function genAmneziaWGPeerConfigs(input: GenAmneziaWGFanoutInput): string[][] {
return amneziaWGFanout(input, genAmneziaWGConfig);
}
export function genAmneziaWGLinks(input: GenAmneziaWGFanoutInput): string {
return genAmneziaWGPeerLinks(input).flat().join('\r\n');
}
export function genAmneziaWGConfigs(input: GenAmneziaWGFanoutInput): string {
const { inbound, remark = '', hostOverride = '', fallbackHostname } = input;
if (inbound.protocol !== 'amneziawg') return '';
const addr = resolveAddr(inbound, hostOverride, fallbackHostname);
const sep = '-';
const settings = inbound.settings as AmneziawgInboundSettings;
const clients = settings.clients ?? [];
return clients
.map((c, i) =>
genAmneziaWGConfig({
settings,
address: addr,
port: inbound.port,
remark: `${remark}${sep}${i + 1}${wgPeerCommentSuffix(c)}`,
peerIndex: i,
}),
)
.join('\r\n');
return genAmneziaWGPeerConfigs(input).flat().join('\r\n');
}
export function wireguardConfigFromLink(link: string, fallbackRemark = ''): string {
@@ -1624,46 +1623,67 @@ function wgRenderPeers(settings: WireguardInboundSettings): WireguardInboundPeer
return settings.peers;
}
export function genWireguardLinks(input: GenWireguardFanoutInput): string {
// Hosts reach wireguard/amneziawg as externalProxy entries (withHostEndpoints);
// with none, every peer is advertised on the inbound's own address.
function tunnelEndpoints(
inbound: Inbound,
addr: string,
): Array<{ address: string; port: number; remark: string }> {
const externals = inbound.streamSettings?.externalProxy;
if (Array.isArray(externals) && externals.length > 0) {
return externals.map((ep) => ({ address: ep.dest, port: ep.port, remark: ep.remark ?? '' }));
}
return [{ address: addr, port: inbound.port, remark: '' }];
}
function tunnelPeerRemark(
remark: string,
endpointRemark: string,
index: number,
peer: unknown,
): string {
const base = [remark, endpointRemark].filter((x) => x.length > 0).join('-');
return `${base}-${index + 1}${wgPeerCommentSuffix(peer)}`;
}
function wireguardFanout(
input: GenWireguardFanoutInput,
render: (input: GenWireguardLinkInput) => string,
): string[][] {
const { inbound, remark = '', hostOverride = '', fallbackHostname } = input;
if (inbound.protocol !== 'wireguard') return '';
const addr = resolveAddr(inbound, hostOverride, fallbackHostname);
const sep = '-';
if (inbound.protocol !== 'wireguard') return [];
const endpoints = tunnelEndpoints(inbound, resolveAddr(inbound, hostOverride, fallbackHostname));
const baseSettings = inbound.settings as WireguardInboundSettings;
const peers = wgRenderPeers(baseSettings);
const settings: WireguardInboundSettings = { ...baseSettings, peers };
return peers
.map((p, i) =>
genWireguardLink({
return peers.map((p, i) =>
endpoints.map((e) =>
render({
settings,
address: addr,
port: inbound.port,
remark: `${remark}${sep}${i + 1}${wgPeerCommentSuffix(p)}`,
address: e.address,
port: e.port,
remark: tunnelPeerRemark(remark, e.remark, i, p),
peerIndex: i,
}),
)
.join('\r\n');
),
);
}
// Per-peer lists with one entry per advertised endpoint (Host), peer-major.
export function genWireguardPeerLinks(input: GenWireguardFanoutInput): string[][] {
return wireguardFanout(input, genWireguardLink);
}
export function genWireguardPeerConfigs(input: GenWireguardFanoutInput): string[][] {
return wireguardFanout(input, genWireguardConfig);
}
export function genWireguardLinks(input: GenWireguardFanoutInput): string {
return genWireguardPeerLinks(input).flat().join('\r\n');
}
export function genWireguardConfigs(input: GenWireguardFanoutInput): string {
const { inbound, remark = '', hostOverride = '', fallbackHostname } = input;
if (inbound.protocol !== 'wireguard') return '';
const addr = resolveAddr(inbound, hostOverride, fallbackHostname);
const sep = '-';
const baseSettings = inbound.settings as WireguardInboundSettings;
const peers = wgRenderPeers(baseSettings);
const settings: WireguardInboundSettings = { ...baseSettings, peers };
return peers
.map((p, i) =>
genWireguardConfig({
settings,
address: addr,
port: inbound.port,
remark: `${remark}${sep}${i + 1}${wgPeerCommentSuffix(p)}`,
peerIndex: i,
}),
)
.join('\r\n');
return genWireguardPeerConfigs(input).flat().join('\r\n');
}
// Peer comments (#5168) are panel-side annotations; when present they ride