mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-23 13:06:08 +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.
371 lines
12 KiB
TypeScript
371 lines
12 KiB
TypeScript
import { useEffect, useMemo, useState } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { AutoComplete, Button, Form, Input, InputNumber, Modal, Select, Space, Switch, Tooltip, message } from 'antd';
|
|
import { ReloadOutlined } from '@ant-design/icons';
|
|
import dayjs from 'dayjs';
|
|
import type { Dayjs } from 'dayjs';
|
|
|
|
import { RandomUtil, SizeFormatter } from '@/utils';
|
|
import { formatInboundLabel } from '@/lib/inbounds/label';
|
|
import { TLS_FLOW_CONTROL } from '@/schemas/primitives';
|
|
import { DateTimePicker, SelectAllClearButtons } from '@/components/form';
|
|
import { useClients, type InboundOption } from '@/hooks/useClients';
|
|
import { useFail2banStatusQuery, getLimitIpNotice } from '@/api/queries/useFail2banStatusQuery';
|
|
import { ClientBulkAddFormSchema, type ClientBulkAddFormValues } from '@/schemas/client';
|
|
|
|
const FLOW_OPTIONS = Object.values(TLS_FLOW_CONTROL);
|
|
|
|
const MULTI_CLIENT_PROTOCOLS = new Set([
|
|
'shadowsocks', 'vless', 'vmess', 'trojan', 'hysteria', 'wireguard',
|
|
]);
|
|
|
|
interface ClientBulkAddModalProps {
|
|
open: boolean;
|
|
inbounds: InboundOption[];
|
|
groups?: string[];
|
|
onOpenChange: (open: boolean) => void;
|
|
onSaved?: () => void;
|
|
}
|
|
|
|
type FormState = ClientBulkAddFormValues;
|
|
|
|
function emptyForm(): FormState {
|
|
return {
|
|
emailMethod: 0,
|
|
firstNum: 1,
|
|
lastNum: 1,
|
|
emailPrefix: '',
|
|
emailPostfix: '',
|
|
quantity: 1,
|
|
subId: '',
|
|
group: '',
|
|
comment: '',
|
|
flow: '',
|
|
limitIp: 0,
|
|
totalGB: 0,
|
|
expiryTime: 0,
|
|
reset: 0,
|
|
inboundIds: [],
|
|
};
|
|
}
|
|
|
|
export default function ClientBulkAddModal({
|
|
open,
|
|
inbounds,
|
|
groups = [],
|
|
onOpenChange,
|
|
onSaved,
|
|
}: ClientBulkAddModalProps) {
|
|
const { t } = useTranslation();
|
|
const [messageApi, messageContextHolder] = message.useMessage();
|
|
const { bulkCreate } = useClients();
|
|
|
|
const [form, setForm] = useState<FormState>(emptyForm);
|
|
const [delayedStart, setDelayedStart] = useState(false);
|
|
const [saving, setSaving] = useState(false);
|
|
const fail2ban = useFail2banStatusQuery();
|
|
const limitIpDisabled = !fail2ban.usable;
|
|
const limitIpNotice = getLimitIpNotice(fail2ban, t);
|
|
|
|
useEffect(() => {
|
|
if (!open) return;
|
|
|
|
setForm(emptyForm());
|
|
setDelayedStart(false);
|
|
|
|
}, [open]);
|
|
|
|
function update<K extends keyof FormState>(key: K, value: FormState[K]) {
|
|
setForm((prev) => ({ ...prev, [key]: value }));
|
|
}
|
|
|
|
const flowCapableIds = useMemo(() => {
|
|
const ids = new Set<number>();
|
|
for (const row of inbounds || []) {
|
|
if (row?.tlsFlowCapable) ids.add(row.id);
|
|
}
|
|
return ids;
|
|
}, [inbounds]);
|
|
|
|
const showFlow = useMemo(
|
|
() => (form.inboundIds || []).some((id) => flowCapableIds.has(id)),
|
|
[form.inboundIds, flowCapableIds],
|
|
);
|
|
|
|
const ss2022Method = useMemo(() => {
|
|
for (const id of form.inboundIds || []) {
|
|
const ib = (inbounds || []).find((row) => row.id === id);
|
|
const method = ib?.ssMethod;
|
|
if (method && method.substring(0, 4) === '2022') return method;
|
|
}
|
|
return '';
|
|
}, [form.inboundIds, inbounds]);
|
|
|
|
useEffect(() => {
|
|
if (!showFlow && form.flow) {
|
|
|
|
update('flow', '');
|
|
}
|
|
}, [showFlow, form.flow]);
|
|
|
|
const inboundOptions = useMemo(
|
|
() => (inbounds || [])
|
|
.filter((ib) => MULTI_CLIENT_PROTOCOLS.has(ib.protocol || ''))
|
|
.map((ib) => ({
|
|
label: formatInboundLabel(ib.tag, ib.remark),
|
|
value: ib.id,
|
|
})),
|
|
[inbounds],
|
|
);
|
|
|
|
const expiryDate = useMemo<Dayjs | null>(
|
|
() => (form.expiryTime > 0 ? dayjs(form.expiryTime) : null),
|
|
[form.expiryTime],
|
|
);
|
|
|
|
const delayedExpireDays = form.expiryTime < 0 ? form.expiryTime / -86400000 : 0;
|
|
|
|
function buildEmails(): string[] {
|
|
const method = form.emailMethod;
|
|
const out: string[] = [];
|
|
let start: number;
|
|
let end: number;
|
|
if (method > 1) {
|
|
start = form.firstNum;
|
|
end = form.lastNum + 1;
|
|
} else {
|
|
start = 0;
|
|
end = form.quantity;
|
|
}
|
|
const prefix = method > 0 && form.emailPrefix.length > 0 ? form.emailPrefix : '';
|
|
const useNum = method > 1;
|
|
const postfix = method > 2 && form.emailPostfix.length > 0 ? form.emailPostfix : '';
|
|
for (let i = start; i < end; i++) {
|
|
let email = '';
|
|
if (method !== 4) email = RandomUtil.randomLowerAndNum(10);
|
|
email += useNum ? prefix + String(i) + postfix : prefix + postfix;
|
|
out.push(email);
|
|
}
|
|
return out;
|
|
}
|
|
|
|
async function submit() {
|
|
const validated = ClientBulkAddFormSchema.safeParse(form);
|
|
if (!validated.success) {
|
|
messageApi.error(t(validated.error.issues[0]?.message ?? 'somethingWentWrong'));
|
|
return;
|
|
}
|
|
const emails = buildEmails();
|
|
if (emails.length === 0) return;
|
|
|
|
setSaving(true);
|
|
try {
|
|
const payloads = emails.map((email) => ({
|
|
client: {
|
|
email,
|
|
subId: form.subId || RandomUtil.randomLowerAndNum(16),
|
|
id: RandomUtil.randomUUID(),
|
|
password: ss2022Method
|
|
? RandomUtil.randomShadowsocksPassword(ss2022Method)
|
|
: RandomUtil.randomLowerAndNum(16),
|
|
auth: RandomUtil.randomLowerAndNum(16),
|
|
flow: showFlow ? (form.flow || '') : '',
|
|
totalGB: Math.round((form.totalGB || 0) * SizeFormatter.ONE_GB),
|
|
expiryTime: form.expiryTime,
|
|
reset: Number(form.reset) || 0,
|
|
limitIp: Number(form.limitIp) || 0,
|
|
group: form.group,
|
|
comment: form.comment,
|
|
enable: true,
|
|
},
|
|
inboundIds: form.inboundIds,
|
|
}));
|
|
const msg = await bulkCreate(payloads);
|
|
const ok = msg?.obj?.created ?? 0;
|
|
const skipped = msg?.obj?.skipped ?? [];
|
|
const failed = skipped.length;
|
|
const firstError = skipped[0]?.reason ?? msg?.msg ?? '';
|
|
if (failed === 0 && msg?.success) {
|
|
messageApi.success(t('pages.clients.toasts.bulkCreated', { count: ok }));
|
|
} else {
|
|
messageApi.warning(firstError
|
|
? `${t('pages.clients.toasts.bulkCreatedMixed', { ok, failed })} — ${firstError}`
|
|
: t('pages.clients.toasts.bulkCreatedMixed', { ok, failed }));
|
|
}
|
|
onSaved?.();
|
|
onOpenChange(false);
|
|
} finally {
|
|
setSaving(false);
|
|
}
|
|
}
|
|
|
|
return (
|
|
<>
|
|
{messageContextHolder}
|
|
<Modal
|
|
open={open}
|
|
title={t('pages.clients.bulk')}
|
|
okText={t('create')}
|
|
cancelText={t('close')}
|
|
confirmLoading={saving}
|
|
mask={{ closable: false }}
|
|
width={640}
|
|
onOk={submit}
|
|
onCancel={() => onOpenChange(false)}
|
|
>
|
|
<Form colon={false} labelCol={{ sm: { span: 8 } }} wrapperCol={{ sm: { span: 14 } }}>
|
|
<Form.Item label={t('pages.clients.attachedInbounds')} required>
|
|
<SelectAllClearButtons
|
|
options={inboundOptions}
|
|
value={form.inboundIds}
|
|
onChange={(v) => update('inboundIds', v)}
|
|
/>
|
|
<Select
|
|
mode="multiple"
|
|
value={form.inboundIds}
|
|
onChange={(v) => update('inboundIds', v)}
|
|
options={inboundOptions}
|
|
placeholder={t('pages.clients.selectInbound')}
|
|
showSearch={{
|
|
filterOption: (input, option) => ((option?.label as string) || '').toLowerCase().includes(input.toLowerCase()),
|
|
}}
|
|
/>
|
|
</Form.Item>
|
|
|
|
<Form.Item label={t('pages.clients.method')}>
|
|
<Select
|
|
value={form.emailMethod}
|
|
onChange={(v) => update('emailMethod', v)}
|
|
options={[
|
|
{ value: 0, label: 'Random' },
|
|
{ value: 1, label: 'Random + Prefix' },
|
|
{ value: 2, label: 'Random + Prefix + Num' },
|
|
{ value: 3, label: 'Random + Prefix + Num + Postfix' },
|
|
{ value: 4, label: 'Prefix + Num + Postfix' },
|
|
]}
|
|
/>
|
|
</Form.Item>
|
|
|
|
{form.emailMethod > 1 && (
|
|
<>
|
|
<Form.Item label={t('pages.clients.first')}>
|
|
<InputNumber value={form.firstNum} min={1} onChange={(v) => update('firstNum', Number(v) || 1)} />
|
|
</Form.Item>
|
|
<Form.Item label={t('pages.clients.last')}>
|
|
<InputNumber value={form.lastNum} min={form.firstNum} onChange={(v) => update('lastNum', Number(v) || 1)} />
|
|
</Form.Item>
|
|
</>
|
|
)}
|
|
{form.emailMethod > 0 && (
|
|
<Form.Item label={t('pages.clients.prefix')}>
|
|
<Input value={form.emailPrefix} onChange={(e) => update('emailPrefix', e.target.value)} />
|
|
</Form.Item>
|
|
)}
|
|
{form.emailMethod > 2 && (
|
|
<Form.Item label={t('pages.clients.postfix')}>
|
|
<Input value={form.emailPostfix} onChange={(e) => update('emailPostfix', e.target.value)} />
|
|
</Form.Item>
|
|
)}
|
|
{form.emailMethod < 2 && (
|
|
<Form.Item label={t('pages.clients.clientCount')}>
|
|
<InputNumber value={form.quantity} min={1} max={1000} onChange={(v) => update('quantity', Number(v) || 1)} />
|
|
</Form.Item>
|
|
)}
|
|
|
|
<Form.Item label={t('pages.clients.subId')}>
|
|
<Space.Compact style={{ display: 'flex' }}>
|
|
<Input
|
|
value={form.subId}
|
|
onChange={(e) => update('subId', e.target.value)}
|
|
style={{ flex: 1 }}
|
|
/>
|
|
<Button
|
|
aria-label={t('regenerate')}
|
|
icon={<ReloadOutlined />}
|
|
onClick={() => update('subId', RandomUtil.randomLowerAndNum(16))}
|
|
/>
|
|
</Space.Compact>
|
|
</Form.Item>
|
|
|
|
<Form.Item label={t('pages.clients.group')} tooltip={t('pages.clients.groupDesc')}>
|
|
<AutoComplete
|
|
value={form.group}
|
|
placeholder={t('pages.clients.groupPlaceholder')}
|
|
options={groups.map((g) => ({ value: g }))}
|
|
onChange={(v) => update('group', v ?? '')}
|
|
allowClear
|
|
/>
|
|
</Form.Item>
|
|
|
|
<Form.Item label={t('comment')}>
|
|
<Input value={form.comment} onChange={(e) => update('comment', e.target.value)} />
|
|
</Form.Item>
|
|
|
|
{showFlow && (
|
|
<Form.Item label={t('pages.clients.flow')}>
|
|
<Select
|
|
value={form.flow}
|
|
onChange={(v) => update('flow', v)}
|
|
style={{ width: 220 }}
|
|
options={[
|
|
{ value: '', label: t('none') },
|
|
...FLOW_OPTIONS.map((k) => ({ value: k, label: k })),
|
|
]}
|
|
/>
|
|
</Form.Item>
|
|
)}
|
|
|
|
<Form.Item label={t('pages.clients.limitIp')}>
|
|
<Tooltip title={limitIpNotice || undefined}>
|
|
<span style={{ display: 'inline-flex' }}>
|
|
<InputNumber value={form.limitIp} min={0} disabled={limitIpDisabled}
|
|
style={limitIpDisabled ? { pointerEvents: 'none' } : undefined}
|
|
onChange={(v) => update('limitIp', Number(v) || 0)} />
|
|
</span>
|
|
</Tooltip>
|
|
</Form.Item>
|
|
|
|
<Form.Item label={t('pages.clients.totalGB')}>
|
|
<InputNumber value={form.totalGB} min={0} step={1} onChange={(v) => update('totalGB', Number(v) || 0)} />
|
|
</Form.Item>
|
|
|
|
<Form.Item label={t('pages.clients.delayedStart')}>
|
|
<Switch
|
|
checked={delayedStart}
|
|
onClick={() => { setDelayedStart(!delayedStart); update('expiryTime', 0); }}
|
|
/>
|
|
</Form.Item>
|
|
|
|
{delayedStart ? (
|
|
<Form.Item label={t('pages.clients.expireDays')}>
|
|
<InputNumber
|
|
value={delayedExpireDays}
|
|
min={0}
|
|
onChange={(v) => update('expiryTime', -86400000 * (Number(v) || 0))}
|
|
/>
|
|
</Form.Item>
|
|
) : (
|
|
<Form.Item label={t('pages.inbounds.expireDate')}>
|
|
<DateTimePicker
|
|
value={expiryDate}
|
|
onChange={(next) => update('expiryTime', next ? next.valueOf() : 0)}
|
|
/>
|
|
</Form.Item>
|
|
)}
|
|
|
|
<Form.Item
|
|
label={t('pages.clients.renew')}
|
|
tooltip={t('pages.clients.renewDesc')}
|
|
>
|
|
<InputNumber
|
|
value={form.reset}
|
|
min={0}
|
|
onChange={(v) => update('reset', Number(v) || 0)}
|
|
/>
|
|
</Form.Item>
|
|
</Form>
|
|
</Modal>
|
|
</>
|
|
);
|
|
}
|