mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-10 05:10:58 +00:00
71aca2018a
* feat(a11y): label list, toolbar & dashboard actions for screen readers Phase 1 of #5486 (Android TalkBack support). Icon-only controls across the management surfaces previously announced only their untranslated icon name (e.g. "edit", "ellipsis") or nothing at all. - Add aria-label to icon-only row-action and toolbar buttons across inbounds, clients, groups, hosts, nodes and xray (outbounds/routing/dns/balancers) lists, plus the dashboard cards. - Make clickable bare icons and AntD Card actions keyboard-operable via role/tabIndex + Enter/Space (new activateOnKey helper); convert mobile dropdown triggers to buttons so they open from the keyboard. - Fix the sidebar hamburger's mislabeled aria-label (was the dashboard label) and translate previously-hardcoded outbound menu labels. New i18n keys in all 13 locales: sort, menu.openMenu, pages.xray.outbound.moveToTop. * feat(a11y): label modal, QR and copy/download controls for screen readers Phase 2 of #5486. Modal and overlay controls relied on tooltips (not a reliable accessible name) or were bare clickable icons with no keyboard or screen-reader support. - Add aria-label to copy/QR/download/info icon buttons in the inbound and client info modals, sub-links modal, QR panel, backup/log modals, and to the bare search/select inputs of the attach/detach client modals. - Make click-to-copy QR codes and the IP-log refresh/clear, geofile reload and log refresh icons keyboard-operable (role/tabIndex + Enter/Space) with translated labels. - Label the 2FA code input; drop the QrPanel download-image string fallback now that the key exists. New i18n key in all 13 locales: downloadImage. * feat(a11y): label form fields and shared form components for screen readers Phase 3 of #5486. Form controls and shared form widgets were largely unlabelled, and several remove controls were not keyboard-operable. - SettingListItem now ties its title to the control via aria-labelledby, giving accessible names to the ~90 settings-tab inputs at once. - InputAddon gains button semantics (role/tabIndex/Enter+Space) and an ariaLabel prop when used as an interactive remove control. - Sparkline charts expose a role="img" summary of their latest values. - Add aria-label to add/remove/regenerate icon buttons and bare inputs/selects across inbound, client and xray (dns/routing/balancer/ outbound) forms; make clickable remove icons keyboard-operable; mark decorative help/target icons aria-hidden; label the JSON editor, date-time clear button, header-map remove, notification select-all and remark token chips. New i18n keys in all 13 locales: regenerate, jsonEditor, pages.xray.balancer.{costMatch,costValue,costRegexp}. * chore(a11y): add eslint-plugin-jsx-a11y harness and fix flagged interactions Phase 4 of #5486. Adds eslint-plugin-jsx-a11y (recommended ruleset, scoped to .tsx) so screen-reader/keyboard regressions fail lint. - Make the mobile node-card header a proper keyboard disclosure (role=button, aria-expanded, Enter/Space activation that ignores clicks on the nested action buttons) and drop the now-redundant stop-propagation click handlers the linter flagged on card-action wrappers in the node, client and inbound mobile cards. - Disable jsx-a11y/no-autofocus: the autofocus on the login field and modal primary inputs is intentional focus management that helps screen-reader and keyboard users land on the right control. make lint passes with the a11y ruleset enforced. * feat(a11y): cover remaining deferred spots (settings tabs, sockopt, API docs) Completes the panel sweep for #5486 by labelling the spots previously left out of phases 1-4: - NotifyTimeField (Telegram notifications): the mode, interval, unit and custom-cron inputs now carry aria-labels. - The Sockopt toggle in transport options. - Settings category tabs in icons-only (mobile) mode now expose the tab name as the icon's aria-label instead of the raw icon name. - The Swagger API-docs view is wrapped in a labelled region landmark. New i18n keys in all 13 locales: pages.settings.notifyTime.{interval,unit}. * feat(a11y): label shared xray form components and remark field Code review surfaced frontend/src/lib/xray/forms/ — shared form components used by the host and inbound JSON forms — which the initial audit missed. - FinalMaskForm (TCP/UDP final-mask editor): label the icon-only add and regenerate buttons and make all six remove icons keyboard-operable (role/tabIndex/Enter+Space); adds useTranslation to its sub-components. - CustomSockoptList: the remove icon is now keyboard-operable. - SniffingFields: aria-label on the otherwise label-less destOverride select. - RemarkTemplateField: aria-label on the remark-variable picker button. New i18n key in all 13 locales: pages.inbounds.sniffingDestOverride. * feat(a11y): label client info modal and WireGuard config block After rebasing onto the WireGuard client-config feature, re-apply the ClientInfoModal copy/QR/IP-log aria-labels (the modal was restructured upstream, so the original labels did not carry over) and label the new ConfigBlock component's copy/download/QR actions. ConfigBlock's action wrapper keeps its stop-propagation handler (a non-interactive guard for the Collapse header) under a scoped jsx-a11y exception. * fix(frontend): let npm install jsx-a11y under ESLint 10 eslint-plugin-jsx-a11y@6.10.2 declares a peer range that stops at ESLint 9, but the panel is on ESLint 10, so `npm ci` aborts with ERESOLVE even though the plugin runs fine on ESLint 10 with flat config. Add an npm override so jsx-a11y accepts the project's ESLint version. This keeps normal peer resolution (recharts' react-is peer still auto-installs) — no global legacy-peer-deps and no manual react-is pin needed. * fix(a11y): size mobile row triggers and move node expand role to chevron Address automated review on #5652: - add size="small" to the inbound/client/node mobile-card "more" dropdown triggers so they match the adjacent small Switch and the established desktop RowActions pattern. - move the node card-head disclosure semantics (role/tabIndex/aria-expanded/ keyboard) onto the chevron affordance so the expand control is no longer a role="button" wrapping the Switch, info button and dropdown. Mouse click-anywhere-to-expand is preserved on the header div.
225 lines
8.1 KiB
TypeScript
225 lines
8.1 KiB
TypeScript
import { useCallback, useEffect, useRef, useState } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Alert, Button, Form, Input, Modal, Select, Space, Spin, Typography, message } from 'antd';
|
|
import { PlusOutlined, DeleteOutlined } from '@ant-design/icons';
|
|
|
|
import { HttpUtil } from '@/utils';
|
|
|
|
interface GeodataAssetRow {
|
|
url: string;
|
|
file: string;
|
|
}
|
|
|
|
interface GeodataSectionProps {
|
|
active: boolean;
|
|
onBusy: (e: { busy: boolean; tip?: string }) => void;
|
|
onClose: () => void;
|
|
}
|
|
|
|
const DEFAULT_CRON = '0 4 * * *';
|
|
// Xray resolves `file` inside its asset directory; plain file names only.
|
|
const FILE_NAME_PATTERN = /^[A-Za-z0-9._-]+$/;
|
|
|
|
function fileNameFromUrl(url: string): string {
|
|
try {
|
|
const seg = new URL(url).pathname.split('/').filter(Boolean).pop() || '';
|
|
return FILE_NAME_PATTERN.test(seg) ? seg : '';
|
|
} catch {
|
|
return '';
|
|
}
|
|
}
|
|
|
|
export default function GeodataSection({ active, onBusy, onClose }: GeodataSectionProps) {
|
|
const { t } = useTranslation();
|
|
const [modal, modalContextHolder] = Modal.useModal();
|
|
const [messageApi, messageContextHolder] = message.useMessage();
|
|
const [loading, setLoading] = useState(false);
|
|
const [cron, setCron] = useState(DEFAULT_CRON);
|
|
const [outbound, setOutbound] = useState<string | undefined>(undefined);
|
|
const [rows, setRows] = useState<GeodataAssetRow[]>([]);
|
|
const [outboundTags, setOutboundTags] = useState<string[]>([]);
|
|
const templateRef = useRef<Record<string, unknown> | null>(null);
|
|
const outboundTestUrlRef = useRef('');
|
|
|
|
const load = useCallback(async () => {
|
|
setLoading(true);
|
|
try {
|
|
const msg = await HttpUtil.post('/panel/api/xray/', undefined, { silent: true });
|
|
if (!msg?.success || typeof msg.obj !== 'string') return;
|
|
const payload = JSON.parse(msg.obj) as Record<string, unknown>;
|
|
const template = (payload.xraySetting || {}) as Record<string, unknown>;
|
|
templateRef.current = template;
|
|
outboundTestUrlRef.current =
|
|
typeof payload.outboundTestUrl === 'string' ? payload.outboundTestUrl : '';
|
|
|
|
const geodata = (template.geodata || {}) as Record<string, unknown>;
|
|
const assets = Array.isArray(geodata.assets) ? geodata.assets : [];
|
|
setRows(
|
|
assets
|
|
.filter((a): a is Record<string, unknown> => !!a && typeof a === 'object')
|
|
.map((a) => ({ url: String(a.url ?? ''), file: String(a.file ?? '') })),
|
|
);
|
|
setCron(typeof geodata.cron === 'string' && geodata.cron ? geodata.cron : DEFAULT_CRON);
|
|
setOutbound(
|
|
typeof geodata.outbound === 'string' && geodata.outbound ? geodata.outbound : undefined,
|
|
);
|
|
|
|
// Download outbound candidates: template outbounds + subscription outbounds.
|
|
// Skip blackhole outbounds — routing a download through one just drops it.
|
|
const tags = new Set<string>();
|
|
const outbounds = Array.isArray(template.outbounds) ? template.outbounds : [];
|
|
for (const o of outbounds) {
|
|
if (!o || typeof o !== 'object') continue;
|
|
const rec = o as Record<string, unknown>;
|
|
if (rec.protocol === 'blackhole') continue;
|
|
const tag = rec.tag;
|
|
if (typeof tag === 'string' && tag) tags.add(tag);
|
|
}
|
|
const subTags = Array.isArray(payload.subscriptionOutboundTags)
|
|
? payload.subscriptionOutboundTags
|
|
: [];
|
|
for (const tag of subTags) {
|
|
if (typeof tag === 'string' && tag) tags.add(tag);
|
|
}
|
|
setOutboundTags([...tags]);
|
|
} finally {
|
|
setLoading(false);
|
|
}
|
|
}, []);
|
|
|
|
useEffect(() => {
|
|
if (active) load();
|
|
}, [active, load]);
|
|
|
|
function setRow(index: number, patch: Partial<GeodataAssetRow>) {
|
|
setRows((prev) => prev.map((r, i) => (i === index ? { ...r, ...patch } : r)));
|
|
}
|
|
|
|
function onUrlBlur(index: number) {
|
|
setRows((prev) =>
|
|
prev.map((r, i) => (i === index && !r.file ? { ...r, file: fileNameFromUrl(r.url) } : r)),
|
|
);
|
|
}
|
|
|
|
function save() {
|
|
const template = templateRef.current;
|
|
if (!template) return;
|
|
const assets = rows
|
|
.map((r) => ({ url: r.url.trim(), file: r.file.trim() }))
|
|
.filter((r) => r.url || r.file);
|
|
for (const a of assets) {
|
|
// Xray's geodata downloader accepts HTTPS URLs only.
|
|
if (!/^https:\/\/\S+$/i.test(a.url)) {
|
|
messageApi.error(t('pages.index.geodataInvalidUrl'));
|
|
return;
|
|
}
|
|
if (!FILE_NAME_PATTERN.test(a.file)) {
|
|
messageApi.error(t('pages.index.geodataInvalidFile'));
|
|
return;
|
|
}
|
|
}
|
|
const cronValue = cron.trim();
|
|
if (assets.length > 0 && cronValue && cronValue.split(/\s+/).length !== 5) {
|
|
messageApi.error(t('pages.index.geodataInvalidCron'));
|
|
return;
|
|
}
|
|
|
|
modal.confirm({
|
|
title: t('pages.index.geodataConfirmTitle'),
|
|
content: t('pages.index.geodataConfirmContent'),
|
|
okText: t('confirm'),
|
|
cancelText: t('cancel'),
|
|
onOk: async () => {
|
|
const next: Record<string, unknown> = { ...template };
|
|
if (assets.length === 0) {
|
|
delete next.geodata;
|
|
} else {
|
|
const geodata: Record<string, unknown> = { assets };
|
|
if (cronValue) geodata.cron = cronValue;
|
|
if (outbound) geodata.outbound = outbound;
|
|
next.geodata = geodata;
|
|
}
|
|
onClose();
|
|
onBusy({ busy: true, tip: t('pages.index.dontRefresh') });
|
|
try {
|
|
const msg = await HttpUtil.post('/panel/api/xray/update', {
|
|
xraySetting: JSON.stringify(next, null, 2),
|
|
outboundTestUrl: outboundTestUrlRef.current,
|
|
});
|
|
if (msg?.success) {
|
|
await HttpUtil.post('/panel/api/server/restartXrayService');
|
|
}
|
|
} finally {
|
|
onBusy({ busy: false });
|
|
}
|
|
},
|
|
});
|
|
}
|
|
|
|
return (
|
|
<div>
|
|
{modalContextHolder}
|
|
{messageContextHolder}
|
|
<Spin spinning={loading}>
|
|
<Alert type="info" className="mb-12" title={t('pages.index.geodataHint')} showIcon />
|
|
<Form layout="vertical">
|
|
<Form.Item label={t('pages.index.geodataCron')} style={{ marginBottom: 8 }}>
|
|
<Input
|
|
value={cron}
|
|
placeholder={DEFAULT_CRON}
|
|
onChange={(e) => setCron(e.target.value)}
|
|
/>
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.index.geodataOutbound')} style={{ marginBottom: 8 }}>
|
|
<Select
|
|
style={{ width: '100%' }}
|
|
allowClear
|
|
value={outbound}
|
|
onChange={(v) => setOutbound(v)}
|
|
options={outboundTags.map((tag) => ({ label: tag, value: tag }))}
|
|
/>
|
|
</Form.Item>
|
|
</Form>
|
|
<Space orientation="vertical" style={{ width: '100%' }} size={8}>
|
|
{rows.length === 0 && (
|
|
<Typography.Text type="secondary">{t('pages.index.geodataEmpty')}</Typography.Text>
|
|
)}
|
|
{rows.map((row, i) => (
|
|
<Space.Compact key={i} style={{ width: '100%' }}>
|
|
<Input
|
|
style={{ width: '60%' }}
|
|
placeholder="https://example.com/geosite_custom.dat"
|
|
value={row.url}
|
|
onChange={(e) => setRow(i, { url: e.target.value })}
|
|
onBlur={() => onUrlBlur(i)}
|
|
/>
|
|
<Input
|
|
style={{ width: '40%' }}
|
|
placeholder={t('pages.index.geodataFile')}
|
|
value={row.file}
|
|
onChange={(e) => setRow(i, { file: e.target.value })}
|
|
/>
|
|
<Button
|
|
aria-label={t('delete')}
|
|
icon={<DeleteOutlined />}
|
|
onClick={() => setRows((p) => p.filter((_, j) => j !== i))}
|
|
/>
|
|
</Space.Compact>
|
|
))}
|
|
<div className="actions-row">
|
|
<Button
|
|
icon={<PlusOutlined />}
|
|
onClick={() => setRows((p) => [...p, { url: '', file: '' }])}
|
|
>
|
|
{t('pages.index.geodataAddFile')}
|
|
</Button>
|
|
<Button type="primary" onClick={save} disabled={loading || !templateRef.current}>
|
|
{t('pages.index.geodataSaveRestart')}
|
|
</Button>
|
|
</div>
|
|
</Space>
|
|
</Spin>
|
|
</div>
|
|
);
|
|
}
|