mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-22 19:07:14 +00:00
b9eda09da9
npm install was failing with ERESOLVE: the lockfile pinned storybook 10.5.7 and vitest 4.1.10 as peers while package.json asked for ^10.5.9 and ^4.1.11, and npm would not move either. Neither npm update, a targeted install, nor --package-lock-only broke the cycle, so node_modules and package-lock.json were regenerated from scratch (601 packages, 0 vulnerabilities). oxlint 1.79.0 then promoted five React Compiler rules into the correctness category, flagging 101 pre-existing sites. 1.78.0 exits 0 on the same tree, so nothing in our code changed - the rule set grew. They are fixed rather than suppressed: - refs (31): latest-value ref writes moved out of render into an effect. onlineClientsRef turned out to be write-only and is gone; expireDiffRef and trafficDiffRef were replaced by reading the values directly. - set-state-in-effect (55): reset-on-open modals now adjust state during render; where an effect mixed a synchronous reset with an async fetch, the reset moved to render and the effect kept only the request. useMediaQuery became useSyncExternalStore. - preserve-manual-memoization (11): optional-chained deps the compiler cannot match, hoisted to locals or dropped where the memo wrapped a string concat. - purity (3): Date.now() in render replaced by a state-backed clock, which also refreshes the expiry tag every 60s instead of freezing it until the next unrelated re-render. - immutability (1): applyClientStatsEvent merged websocket traffic into DBInbound rows in place; it now rebuilds only the rows it touches. Two things fell out of that. clientCount is derived with useMemo instead of an imperative rebuildClientCount() called from five sites, which also fixes a staleness bug where changing the expiry or traffic threshold left the counts alone until some later rebuild. statsVersion existed only to force a re-render after an in-place mutation, is meaningless now that rows are replaced, and nothing read it, so it is removed. Also adds a lint:fix script - oxlint --fix was previously only reachable through the lint-staged hook.
212 lines
6.1 KiB
TypeScript
212 lines
6.1 KiB
TypeScript
import { useEffect, useMemo, useState } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Collapse, Modal, Spin, Tag } from 'antd';
|
|
import { HttpUtil } from '@/utils';
|
|
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 {
|
|
buildWireguardClientConfig,
|
|
findWireguardInbound,
|
|
isWireguardClient,
|
|
} from './wireguardConfig';
|
|
|
|
interface SubSettings {
|
|
enable: boolean;
|
|
subURI: string;
|
|
subJsonURI: string;
|
|
subJsonEnable: boolean;
|
|
publicHost?: string;
|
|
}
|
|
|
|
interface ClientQrModalProps {
|
|
open: boolean;
|
|
client: ClientRecord | null;
|
|
inboundsById: Record<number, InboundOption>;
|
|
subSettings?: SubSettings;
|
|
onOpenChange: (open: boolean) => void;
|
|
}
|
|
|
|
interface ApiMsg<T = unknown> {
|
|
success?: boolean;
|
|
obj?: T;
|
|
}
|
|
|
|
const DEFAULT_SUB: SubSettings = {
|
|
enable: false,
|
|
subURI: '',
|
|
subJsonURI: '',
|
|
subJsonEnable: false,
|
|
publicHost: '',
|
|
};
|
|
|
|
export default function ClientQrModal({
|
|
open,
|
|
client,
|
|
inboundsById,
|
|
subSettings = DEFAULT_SUB,
|
|
onOpenChange,
|
|
}: ClientQrModalProps) {
|
|
const { t } = useTranslation();
|
|
const [links, setLinks] = useState<string[]>([]);
|
|
const [loading, setLoading] = useState(false);
|
|
|
|
const subId = client?.subId;
|
|
const subEnabled = !!subSettings?.enable;
|
|
const subLink = subId && subEnabled && subSettings?.subURI ? subSettings.subURI + subId : '';
|
|
const subJsonLink =
|
|
subId && subEnabled && subSettings?.subJsonEnable && subSettings?.subJsonURI
|
|
? subSettings.subJsonURI + subId
|
|
: '';
|
|
|
|
const wgInbound = useMemo(
|
|
() => findWireguardInbound(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 hasAnything = !!subLink || !!subJsonLink || !!wgConfigText || links.length > 0;
|
|
|
|
// The reset runs during render so the effect only carries the request.
|
|
const openSubId = open ? (client?.subId ?? '') : '';
|
|
const [syncedSubId, setSyncedSubId] = useState(openSubId);
|
|
if (openSubId !== syncedSubId) {
|
|
setSyncedSubId(openSubId);
|
|
setLinks([]);
|
|
setLoading(!!openSubId);
|
|
}
|
|
|
|
useEffect(() => {
|
|
if (!open || !client?.subId) return;
|
|
let cancelled = false;
|
|
(async () => {
|
|
try {
|
|
const msg = (await HttpUtil.get(
|
|
`/panel/api/clients/subLinks/${encodeURIComponent(client.subId!)}`,
|
|
)) as ApiMsg<string[]>;
|
|
if (!cancelled) {
|
|
setLinks(msg?.success && Array.isArray(msg.obj) ? msg.obj : []);
|
|
}
|
|
} finally {
|
|
if (!cancelled) setLoading(false);
|
|
}
|
|
})();
|
|
return () => {
|
|
cancelled = true;
|
|
};
|
|
}, [open, client?.subId]);
|
|
|
|
const [activeKey, setActiveKey] = useState<string[]>([]);
|
|
|
|
const items = useMemo(() => {
|
|
const out: { key: string; label: React.ReactNode; children: React.ReactNode }[] = [];
|
|
if (subLink) {
|
|
out.push({
|
|
key: 'sub',
|
|
label: t('subscription.title'),
|
|
children: (
|
|
<QrPanel value={subLink} remark={`${client?.email || ''} — ${t('subscription.title')}`} />
|
|
),
|
|
});
|
|
}
|
|
if (subJsonLink) {
|
|
out.push({
|
|
key: 'subJson',
|
|
label: `${t('subscription.title')} (JSON)`,
|
|
children: <QrPanel value={subJsonLink} remark={`${client?.email || ''} — JSON`} />,
|
|
});
|
|
}
|
|
links.forEach((link, idx) => {
|
|
const parts = parseLinkParts(link);
|
|
const meta = parts ? linkMetaText(parts) : '';
|
|
const label: React.ReactNode = parts ? (
|
|
<span style={{ display: 'inline-flex', alignItems: 'center', gap: 6, flexWrap: 'wrap' }}>
|
|
<LinkTags parts={parts} />
|
|
{meta && <span style={{ opacity: 0.6, fontSize: 12 }}>({meta})</span>}
|
|
</span>
|
|
) : (
|
|
`${t('pages.clients.link')} ${idx + 1}`
|
|
);
|
|
out.push({
|
|
key: `l${idx}`,
|
|
label,
|
|
children: (
|
|
<QrPanel
|
|
value={link}
|
|
remark={parts?.remark || `${client?.email || ''} #${idx + 1}`}
|
|
showQr={!isPostQuantumLink(link)}
|
|
/>
|
|
),
|
|
});
|
|
});
|
|
if (wgConfigText) {
|
|
out.push({
|
|
key: 'wg-config',
|
|
label: (
|
|
<Tag color="cyan" style={{ margin: 0 }}>
|
|
{t('pages.clients.wireguardConfig')}
|
|
</Tag>
|
|
),
|
|
children: (
|
|
<QrPanel
|
|
value={wgConfigText}
|
|
remark={client?.email || 'peer'}
|
|
downloadName={`${client?.email || 'peer'}.conf`}
|
|
/>
|
|
),
|
|
});
|
|
}
|
|
return out;
|
|
}, [subLink, subJsonLink, wgConfigText, 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;
|
|
const [syncedFirstKey, setSyncedFirstKey] = useState<string | null>(null);
|
|
if (firstKey !== syncedFirstKey) {
|
|
setSyncedFirstKey(firstKey);
|
|
setActiveKey(firstKey ? [firstKey] : []);
|
|
}
|
|
|
|
return (
|
|
<Modal
|
|
open={open}
|
|
title={client ? `${t('qrCode')} — ${client.email}` : t('qrCode')}
|
|
footer={null}
|
|
width={520}
|
|
centered
|
|
onCancel={() => onOpenChange(false)}
|
|
>
|
|
<Spin spinning={loading}>
|
|
{!client?.subId && !loading && (
|
|
<div style={{ padding: 24, textAlign: 'center', opacity: 0.6 }}>
|
|
{t('pages.clients.noSubId')}
|
|
</div>
|
|
)}
|
|
{client?.subId && !hasAnything && !loading && (
|
|
<div style={{ padding: 24, textAlign: 'center', opacity: 0.6 }}>
|
|
{t('pages.clients.noLinks')}
|
|
</div>
|
|
)}
|
|
{hasAnything && (
|
|
<Collapse
|
|
activeKey={activeKey}
|
|
onChange={(keys) =>
|
|
setActiveKey(typeof keys === 'string' ? [keys] : (keys as string[]))
|
|
}
|
|
items={items}
|
|
/>
|
|
)}
|
|
</Spin>
|
|
</Modal>
|
|
);
|
|
}
|