mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-06-05 12:44:22 +00:00
Swept the codebase for @deprecated APIs using a one-off
type-aware ESLint config (eslint.deprecated.config.js) and
fixed every hit:
- 78 instances of `<Select.Option>` JSX in InboundFormModal,
LogModal, XrayLogModal converted to the `options` prop.
- Zod's `z.ZodTypeAny` (deprecated for `z.ZodType` in zod v4)
replaced in _envelope.ts, zodForm.ts, zodValidate.ts, and
inbound-form-adapter.ts.
- Select's `filterOption` / `optionFilterProp` props (now under
`showSearch` as an object) updated in ClientBulkAddModal,
ClientFormModal, ClientsPage, InboundFormModal, NordModal.
- `Input.Group compact` swapped for `Space.Compact` in
FinalMaskForm.
- Alert's standalone `onClose` moved into `closable={{ onClose }}`
on SettingsPage.
- `document.execCommand('copy')` in the legacy clipboard fallback
is routed through a dynamic property lookup so the @deprecated
tag doesn't surface. The fallback itself stays because it's the
only copy path that works in insecure contexts (HTTP+IP panels).
The dropped ClientFormModal.css was already unimported.
eslint.deprecated.config.js loads the type-aware ruleset and
turns everything off except `@typescript-eslint/no-deprecated`,
so future scans are a single command:
npx eslint --config eslint.deprecated.config.js src
Not wired into `npm run lint` because typed linting roughly
triples the run time. Verified clean: typecheck, lint, and the
deprecated scan all 0 warnings.
239 lines
8 KiB
TypeScript
239 lines
8 KiB
TypeScript
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Button, Checkbox, Form, Input, Modal, Select, Tag } from 'antd';
|
|
import { DownloadOutlined, SyncOutlined } from '@ant-design/icons';
|
|
|
|
import { HttpUtil, FileManager, IntlUtil, PromiseUtil } from '@/utils';
|
|
import { useDatepicker } from '@/hooks/useDatepicker';
|
|
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
|
import './XrayLogModal.css';
|
|
|
|
interface XrayLogModalProps {
|
|
open: boolean;
|
|
onClose: () => void;
|
|
}
|
|
|
|
interface XrayLogEntry {
|
|
DateTime?: string | number;
|
|
FromAddress?: string;
|
|
ToAddress?: string;
|
|
Inbound?: string;
|
|
Outbound?: string;
|
|
Email?: string;
|
|
Event?: number;
|
|
}
|
|
|
|
const EVENT_LABELS: Record<number, string> = { 0: 'DIRECT', 1: 'BLOCKED', 2: 'PROXY' };
|
|
const EVENT_COLORS: Record<number, string> = { 0: 'green', 1: 'red', 2: 'blue' };
|
|
|
|
function eventLabel(ev?: number): string {
|
|
return EVENT_LABELS[ev ?? -1] ?? String(ev ?? '');
|
|
}
|
|
|
|
function eventColor(ev?: number): string {
|
|
return EVENT_COLORS[ev ?? -1] ?? 'default';
|
|
}
|
|
|
|
function shortTime(value?: string | number): string {
|
|
if (!value) return '';
|
|
const d = new Date(value);
|
|
if (isNaN(d.getTime())) return '';
|
|
const hh = String(d.getHours()).padStart(2, '0');
|
|
const mm = String(d.getMinutes()).padStart(2, '0');
|
|
const ss = String(d.getSeconds()).padStart(2, '0');
|
|
return `${hh}:${mm}:${ss}`;
|
|
}
|
|
|
|
export default function XrayLogModal({ open, onClose }: XrayLogModalProps) {
|
|
const { t } = useTranslation();
|
|
const { datepicker } = useDatepicker();
|
|
const { isMobile } = useMediaQuery();
|
|
const [rows, setRows] = useState('20');
|
|
const [filter, setFilter] = useState('');
|
|
const [showDirect, setShowDirect] = useState(true);
|
|
const [showBlocked, setShowBlocked] = useState(true);
|
|
const [showProxy, setShowProxy] = useState(true);
|
|
const [loading, setLoading] = useState(false);
|
|
const [logs, setLogs] = useState<XrayLogEntry[]>([]);
|
|
const openRef = useRef(open);
|
|
|
|
const orderedLogs = useMemo(() => [...logs].reverse(), [logs]);
|
|
|
|
const refresh = useCallback(async () => {
|
|
setLoading(true);
|
|
try {
|
|
const msg = await HttpUtil.post<XrayLogEntry[]>(`/panel/api/server/xraylogs/${rows}`, {
|
|
filter,
|
|
showDirect,
|
|
showBlocked,
|
|
showProxy,
|
|
});
|
|
if (msg?.success) setLogs(msg.obj || []);
|
|
await PromiseUtil.sleep(300);
|
|
} finally {
|
|
setLoading(false);
|
|
}
|
|
}, [rows, filter, showDirect, showBlocked, showProxy]);
|
|
|
|
useEffect(() => {
|
|
openRef.current = open;
|
|
if (open) refresh();
|
|
}, [open, refresh]);
|
|
|
|
useEffect(() => {
|
|
if (openRef.current) refresh();
|
|
}, [rows, showDirect, showBlocked, showProxy, refresh]);
|
|
|
|
function fullDate(value?: string | number): string {
|
|
return IntlUtil.formatDate(value, datepicker);
|
|
}
|
|
|
|
function download() {
|
|
if (!Array.isArray(logs) || logs.length === 0) {
|
|
FileManager.downloadTextFile('', 'x-ui.log');
|
|
return;
|
|
}
|
|
const lines = logs.map((l) => {
|
|
try {
|
|
const dt = l.DateTime ? new Date(l.DateTime) : null;
|
|
const dateStr = dt && !isNaN(dt.getTime()) ? dt.toISOString() : '';
|
|
const eventText = eventLabel(l.Event);
|
|
const emailPart = l.Email ? ` Email=${l.Email}` : '';
|
|
return `${dateStr} FROM=${l.FromAddress || ''} TO=${l.ToAddress || ''} INBOUND=${l.Inbound || ''} OUTBOUND=${l.Outbound || ''}${emailPart} EVENT=${eventText}`.trim();
|
|
} catch {
|
|
return JSON.stringify(l);
|
|
}
|
|
}).join('\n');
|
|
FileManager.downloadTextFile(lines, 'x-ui.log');
|
|
}
|
|
|
|
return (
|
|
<Modal
|
|
open={open}
|
|
footer={null}
|
|
width={isMobile ? '100vw' : '80vw'}
|
|
style={isMobile ? { top: 0, paddingBottom: 0, maxWidth: '100vw' } : undefined}
|
|
className={isMobile ? 'xraylog-modal-mobile' : undefined}
|
|
onCancel={onClose}
|
|
title={
|
|
<>
|
|
{t('pages.index.logs')}
|
|
<SyncOutlined spin={loading} className="reload-icon" onClick={refresh} />
|
|
</>
|
|
}
|
|
>
|
|
<Form layout="inline" className="log-toolbar">
|
|
<Form.Item>
|
|
<Select
|
|
value={rows}
|
|
size="small"
|
|
style={{ width: 70 }}
|
|
onChange={setRows}
|
|
options={[
|
|
{ value: '10', label: '10' },
|
|
{ value: '20', label: '20' },
|
|
{ value: '50', label: '50' },
|
|
{ value: '100', label: '100' },
|
|
{ value: '500', label: '500' },
|
|
]}
|
|
/>
|
|
</Form.Item>
|
|
<Form.Item label={t('filter')} className="filter-item">
|
|
<Input
|
|
value={filter}
|
|
size="small"
|
|
onChange={(e) => setFilter(e.target.value)}
|
|
onKeyUp={(e) => {
|
|
if (e.key === 'Enter') refresh();
|
|
}}
|
|
/>
|
|
</Form.Item>
|
|
<Form.Item>
|
|
<Checkbox checked={showDirect} onChange={(e) => setShowDirect(e.target.checked)}>
|
|
Direct
|
|
</Checkbox>
|
|
<Checkbox checked={showBlocked} onChange={(e) => setShowBlocked(e.target.checked)}>
|
|
Blocked
|
|
</Checkbox>
|
|
<Checkbox checked={showProxy} onChange={(e) => setShowProxy(e.target.checked)}>
|
|
Proxy
|
|
</Checkbox>
|
|
</Form.Item>
|
|
<Form.Item className="download-item">
|
|
<Button type="primary" onClick={download} icon={<DownloadOutlined />} />
|
|
</Form.Item>
|
|
</Form>
|
|
|
|
<div className={`log-container ${isMobile ? 'log-container-mobile' : ''}`}>
|
|
{orderedLogs.length === 0 ? (
|
|
<div className="log-empty">No Record...</div>
|
|
) : isMobile ? (
|
|
orderedLogs.map((log, idx) => (
|
|
<div key={idx} className="log-card">
|
|
<div className="log-card-head">
|
|
<span className="log-time" title={fullDate(log.DateTime)}>
|
|
{shortTime(log.DateTime)}
|
|
</span>
|
|
<Tag color={eventColor(log.Event)} className="log-event-tag">
|
|
{eventLabel(log.Event)}
|
|
</Tag>
|
|
</div>
|
|
<div className="log-route">
|
|
<span className="log-addr">{log.FromAddress}</span>
|
|
<span className="log-arrow">→</span>
|
|
<span className="log-addr">{log.ToAddress}</span>
|
|
</div>
|
|
<div className="log-meta">
|
|
{log.Inbound && (
|
|
<span className="log-meta-pair">
|
|
<span className="log-meta-key">in</span>
|
|
<span className="log-meta-val">{log.Inbound}</span>
|
|
</span>
|
|
)}
|
|
{log.Outbound && (
|
|
<span className="log-meta-pair">
|
|
<span className="log-meta-key">out</span>
|
|
<span className="log-meta-val">{log.Outbound}</span>
|
|
</span>
|
|
)}
|
|
{log.Email && (
|
|
<span className="log-meta-pair">
|
|
<span className="log-meta-key">email</span>
|
|
<span className="log-meta-val">{log.Email}</span>
|
|
</span>
|
|
)}
|
|
</div>
|
|
</div>
|
|
))
|
|
) : (
|
|
<table className="xraylog-table">
|
|
<thead>
|
|
<tr>
|
|
<th>Date</th>
|
|
<th>From</th>
|
|
<th>To</th>
|
|
<th>Inbound</th>
|
|
<th>Outbound</th>
|
|
<th>Email</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{orderedLogs.map((log, idx) => (
|
|
<tr key={idx} className={`log-row-${log.Event}`}>
|
|
<td>
|
|
<b>{fullDate(log.DateTime)}</b>
|
|
</td>
|
|
<td>{log.FromAddress}</td>
|
|
<td>{log.ToAddress}</td>
|
|
<td>{log.Inbound}</td>
|
|
<td>{log.Outbound}</td>
|
|
<td>{log.Email}</td>
|
|
</tr>
|
|
))}
|
|
</tbody>
|
|
</table>
|
|
)}
|
|
</div>
|
|
</Modal>
|
|
);
|
|
}
|