xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-09-04 17:37:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(clients): render all tunnel configs for multi-inbound client (#6346) (#6349)

Browse Source 
When a client belongs to multiple AmneziaWG or WireGuard inbounds (e.g. across
remote nodes), findAmneziaWGInbounds and findWireguardInbounds only returned the
first matching inbound. Consequently, ClientInfoModal and ClientQrModal rendered
only one config block, making other inbounds' configs unreachable.

- Add findAmneziaWGInbounds and findWireguardInbounds returning all matching inbounds
- Add formatTunnelConfigMeta helper to unify label, fileName, and qrRemark resolution
- Support addressOverride in buildWireguardClientConfig from tunnelAllowedIPs
- Render all tunnel configs in ClientInfoModal and ClientQrModal with node remarks
- Distinguish download filenames with inbound remark suffix to avoid collisions
- Add component integration tests covering multi-inbound modal rendering
This commit is contained in:
MRVX
2026-09-03 18:33:48 +03:30
committed by GitHub
parent de18c5a006
commit 47964afbc5
6 changed files with 349 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/clients/ClientQrModal.tsx
+65 -54
View File
@@ -6,14 +6,15 @@ import { isPostQuantumLink } from '@/lib/xray/inbound-link';
import { LinkTags, linkMetaText, parseLinkParts } from '@/lib/xray/link-label';
import { QrPanel } from '@/pages/inbounds/qr';
import type { ClientRecord, InboundOption } from '@/hooks/useClients';
import { formatTunnelConfigMeta } from '@/lib/inbounds/label';
import {
buildWireguardClientConfig,
findWireguardInbound,
findWireguardInbounds,
isWireguardClient,
} from './wireguardConfig';
import {
buildAmneziaWGClientConfig,
findAmneziaWGInbound,
findAmneziaWGInbounds,
isAmneziaWGClient,
} from './amneziawgConfig';
@@ -67,38 +68,50 @@ export default function ClientQrModal({
? subSettings.subJsonURI + subId
: '';
const wgInbound = useMemo(
() => findWireguardInbound(client, inboundsById),
const wgInbounds = useMemo(
() => findWireguardInbounds(client, inboundsById),
[client, inboundsById],
);
const wgConfigText = useMemo(() => {
if (!client || !wgInbound || !isWireguardClient(client)) return '';
return buildWireguardClientConfig(
client,
wgInbound,
window.location.hostname,
subSettings?.publicHost ?? '',
);
}, [client, wgInbound, subSettings?.publicHost]);
const wgConfigs = useMemo(() => {
if (!client || !isWireguardClient(client)) return [];
return wgInbounds
.map((ib) => {
const address = tunnelAllowedIPs?.[ib.id] ?? '';
const text = buildWireguardClientConfig(
client,
ib,
window.location.hostname,
subSettings?.publicHost ?? '',
address,
);
return { inbound: ib, text };
})
.filter((c) => !!c.text);
}, [client, wgInbounds, tunnelAllowedIPs, subSettings?.publicHost]);
const awgInbound = useMemo(
() => findAmneziaWGInbound(client, inboundsById),
const awgInbounds = useMemo(
() => findAmneziaWGInbounds(client, inboundsById),
[client, inboundsById],
);
const awgConfigText = useMemo(() => {
if (!client || !awgInbound || !isAmneziaWGClient(client)) return '';
const address = awgInbound ? (tunnelAllowedIPs?.[awgInbound.id] ?? '') : '';
return buildAmneziaWGClientConfig(
client,
awgInbound,
window.location.hostname,
subSettings?.publicHost ?? '',
address,
);
}, [client, awgInbound, tunnelAllowedIPs, subSettings?.publicHost]);
const awgConfigs = useMemo(() => {
if (!client || !isAmneziaWGClient(client)) return [];
return awgInbounds
.map((ib) => {
const address = tunnelAllowedIPs?.[ib.id] ?? '';
const text = buildAmneziaWGClientConfig(
client,
ib,
window.location.hostname,
subSettings?.publicHost ?? '',
address,
);
return { inbound: ib, text };
})
.filter((c) => !!c.text);
}, [client, awgInbounds, tunnelAllowedIPs, subSettings?.publicHost]);
const hasAnything =
!!subLink || !!subJsonLink || !!wgConfigText || !!awgConfigText || links.length > 0;
!!subLink || !!subJsonLink || wgConfigs.length > 0 || awgConfigs.length > 0 || links.length > 0;
// The reset runs during render so the effect only carries the request.
const openSubId = open ? (client?.subId ?? '') : '';
@@ -172,42 +185,40 @@ export default function ClientQrModal({
),
});
});
if (wgConfigText) {
out.push({
key: 'wg-config',
label: (
wgConfigs.forEach(({ inbound, text }) => {
const meta = formatTunnelConfigMeta(inbound, client?.email, wgConfigs.length);
const label = (
<span style={{ display: 'inline-flex', alignItems: 'center', gap: 6 }}>
<Tag color="cyan" style={{ margin: 0 }}>
{t('pages.clients.wireguardConfig')}
</Tag>
),
children: (
<QrPanel
value={wgConfigText}
remark={client?.email || 'peer'}
downloadName={`${client?.email || 'peer'}.conf`}
/>
),
});
}
if (awgConfigText) {
{meta.label && <span style={{ opacity: 0.85, fontSize: 12 }}>{meta.label}</span>}
</span>
);
out.push({
key: 'awg-config',
label: (
key: `wg-config-${inbound.id}`,
label,
children: <QrPanel value={text} remark={meta.qrRemark} downloadName={meta.fileName} />,
});
});
awgConfigs.forEach(({ inbound, text }) => {
const meta = formatTunnelConfigMeta(inbound, client?.email, awgConfigs.length);
const label = (
<span style={{ display: 'inline-flex', alignItems: 'center', gap: 6 }}>
<Tag color="purple" style={{ margin: 0 }}>
{t('pages.clients.amneziaWgConfig')}
</Tag>
),
children: (
<QrPanel
value={awgConfigText}
remark={client?.email || 'peer'}
downloadName={`${client?.email || 'peer'}.conf`}
/>
),
{meta.label && <span style={{ opacity: 0.85, fontSize: 12 }}>{meta.label}</span>}
</span>
);
out.push({
key: `awg-config-${inbound.id}`,
label,
children: <QrPanel value={text} remark={meta.qrRemark} downloadName={meta.fileName} />,
});
}
});
return out;
}, [subLink, subJsonLink, wgConfigText, awgConfigText, links, client?.email, t]);
}, [subLink, subJsonLink, wgConfigs, awgConfigs, links, client?.email, t]);
// Expanding the first panel is a render-time adjustment, not a side effect.
const firstKey = open && items.length > 0 ? items[0].key : null;