mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-28 22:17:13 +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.
180 lines
5.6 KiB
TypeScript
180 lines
5.6 KiB
TypeScript
import { useCallback, useEffect, useState } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Alert, Button, Collapse, Modal, Radio, Spin, Tag, Tooltip } from 'antd';
|
|
import { ReloadOutlined } from '@ant-design/icons';
|
|
|
|
import { HttpUtil } from '@/utils';
|
|
import { activateOnKey } from '@/utils/a11y';
|
|
import type { Status } from '@/models/status';
|
|
import GeodataSection from './GeodataSection';
|
|
import './VersionModal.css';
|
|
|
|
interface BusyEvent {
|
|
busy: boolean;
|
|
tip?: string;
|
|
}
|
|
|
|
interface VersionModalProps {
|
|
open: boolean;
|
|
status: Status;
|
|
onClose: () => void;
|
|
onBusy: (e: BusyEvent) => void;
|
|
}
|
|
|
|
const GEOFILES = [
|
|
'geosite.dat',
|
|
'geoip.dat',
|
|
'geosite_IR.dat',
|
|
'geoip_IR.dat',
|
|
'geosite_RU.dat',
|
|
'geoip_RU.dat',
|
|
];
|
|
|
|
export default function VersionModal({ open, status, onClose, onBusy }: VersionModalProps) {
|
|
const { t } = useTranslation();
|
|
const [modal, modalContextHolder] = Modal.useModal();
|
|
const [activeKey, setActiveKey] = useState<string | string[]>('1');
|
|
const [versions, setVersions] = useState<string[]>([]);
|
|
const [loading, setLoading] = useState(false);
|
|
|
|
const fetchVersions = useCallback(async () => {
|
|
try {
|
|
const msg = await HttpUtil.get<string[]>('/panel/api/server/getXrayVersion');
|
|
if (msg?.success) setVersions(msg.obj || []);
|
|
} finally {
|
|
setLoading(false);
|
|
}
|
|
}, []);
|
|
|
|
const [wasOpen, setWasOpen] = useState(false);
|
|
if (open !== wasOpen) {
|
|
setWasOpen(open);
|
|
if (open) setLoading(true);
|
|
}
|
|
|
|
useEffect(() => {
|
|
if (open) void fetchVersions();
|
|
}, [open, fetchVersions]);
|
|
|
|
function switchXrayVersion(version: string) {
|
|
modal.confirm({
|
|
title: t('pages.index.xraySwitchVersionDialog'),
|
|
content: t('pages.index.xraySwitchVersionDialogDesc').replace('#version#', version),
|
|
okText: t('confirm'),
|
|
cancelText: t('cancel'),
|
|
onOk: async () => {
|
|
onClose();
|
|
onBusy({ busy: true, tip: t('pages.index.dontRefresh') });
|
|
try {
|
|
await HttpUtil.post(`/panel/api/server/installXray/${version}`);
|
|
} finally {
|
|
onBusy({ busy: false });
|
|
}
|
|
},
|
|
});
|
|
}
|
|
|
|
function updateGeofile(fileName: string) {
|
|
const isSingle = !!fileName;
|
|
modal.confirm({
|
|
title: t('pages.index.geofileUpdateDialog'),
|
|
content: isSingle
|
|
? t('pages.index.geofileUpdateDialogDesc').replace('#filename#', fileName)
|
|
: t('pages.index.geofilesUpdateDialogDesc'),
|
|
okText: t('confirm'),
|
|
cancelText: t('cancel'),
|
|
onOk: async () => {
|
|
onClose();
|
|
onBusy({ busy: true, tip: t('pages.index.dontRefresh') });
|
|
const url = isSingle
|
|
? `/panel/api/server/updateGeofile/${fileName}`
|
|
: '/panel/api/server/updateGeofile';
|
|
try {
|
|
await HttpUtil.post(url);
|
|
} finally {
|
|
onBusy({ busy: false });
|
|
}
|
|
},
|
|
});
|
|
}
|
|
|
|
const activeKeyStr = Array.isArray(activeKey) ? activeKey[0] : activeKey;
|
|
|
|
return (
|
|
<Modal open={open} title={t('pages.index.xrayUpdates')} footer={null} onCancel={onClose}>
|
|
{modalContextHolder}
|
|
<Spin spinning={loading}>
|
|
<Collapse
|
|
accordion
|
|
activeKey={activeKey}
|
|
onChange={setActiveKey}
|
|
items={[
|
|
{
|
|
key: '1',
|
|
label: 'Xray',
|
|
children: (
|
|
<>
|
|
<Alert
|
|
type="warning"
|
|
className="mb-12"
|
|
title={t('pages.index.xraySwitchClickDesk')}
|
|
showIcon
|
|
/>
|
|
<div className="version-list">
|
|
{versions.map((version, index) => (
|
|
<div key={version} className="version-list-item">
|
|
<Tag color={index % 2 === 0 ? 'purple' : 'green'}>{version}</Tag>
|
|
<Radio
|
|
checked={version === `v${status?.xray?.version}`}
|
|
onClick={() => switchXrayVersion(version)}
|
|
/>
|
|
</div>
|
|
))}
|
|
</div>
|
|
</>
|
|
),
|
|
},
|
|
{
|
|
key: '2',
|
|
label: 'Geofiles',
|
|
children: (
|
|
<>
|
|
<div className="version-list">
|
|
{GEOFILES.map((file, index) => (
|
|
<div key={file} className="version-list-item">
|
|
<Tag color={index % 2 === 0 ? 'purple' : 'green'}>{file}</Tag>
|
|
<Tooltip title={t('update')}>
|
|
<ReloadOutlined
|
|
className="reload-icon"
|
|
role="button"
|
|
tabIndex={0}
|
|
aria-label={t('update')}
|
|
onClick={() => updateGeofile(file)}
|
|
onKeyDown={activateOnKey(() => updateGeofile(file))}
|
|
/>
|
|
</Tooltip>
|
|
</div>
|
|
))}
|
|
</div>
|
|
<div className="actions-row">
|
|
<Button onClick={() => updateGeofile('')}>
|
|
{t('pages.index.geofilesUpdateAll')}
|
|
</Button>
|
|
</div>
|
|
</>
|
|
),
|
|
},
|
|
{
|
|
key: '3',
|
|
label: t('pages.index.geodataTitle'),
|
|
children: (
|
|
<GeodataSection active={activeKeyStr === '3'} onBusy={onBusy} onClose={onClose} />
|
|
),
|
|
},
|
|
]}
|
|
/>
|
|
</Spin>
|
|
</Modal>
|
|
);
|
|
}
|