mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-25 22:06:09 +00:00
6b16d8c37a
Add a hot-apply layer that computes a diff between the old and new generated config and applies only the changed parts through the Xray gRPC HandlerService and RoutingService, avoiding a full process restart whenever possible. A restart is still performed when sections that have no reload API (log, dns, policy, observatory, ...) actually change. Key additions: - internal/xray/hot_diff.go: ComputeHotDiff with canonical-JSON comparison (sorted keys, null=absent, full number precision) so UI reformatting never triggers a spurious restart - internal/xray/api.go: AddOutbound/DelOutbound, ApplyRoutingConfig, GetBalancerInfo, SetBalancerTarget, TestRoute gRPC wrappers - internal/web/service/xray.go: tryHotApply, ensureAPIServices, GetBalancersStatus, OverrideBalancer, TestRoute service methods - internal/web/controller/xray_setting.go: balancerStatus, balancerOverride, routeTest API endpoints - frontend: BalancersTab live-status/override columns, RouteTester component, Restart button removed (Save now hot-applies) - balancer-helpers.ts: syncObservatories never creates observatory sections for random/roundRobin balancers (no reload API → restart) - i18n: balancerLive/Override/routeTester keys added to all 13 locales
335 lines
11 KiB
TypeScript
335 lines
11 KiB
TypeScript
import { useCallback, useMemo, useRef, useState } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Button, Modal, Space, Table, Tabs } from 'antd';
|
|
import { AimOutlined, ControlOutlined, PlusOutlined, UnorderedListOutlined } from '@ant-design/icons';
|
|
|
|
import { catTabLabel } from '@/pages/settings/catTabLabel';
|
|
import RoutingBasic from './RoutingBasic';
|
|
import RouteTester from './RouteTester';
|
|
import RuleFormModal from './RuleFormModal';
|
|
import type { RoutingRule } from './RuleFormModal';
|
|
import RuleCardList from './RuleCardList';
|
|
import { useRoutingColumns } from './useRoutingColumns';
|
|
import { arrJoin } from './helpers';
|
|
import type { RuleRow } from './types';
|
|
import type { XraySettingsValue, SetTemplate } from '@/hooks/useXraySetting';
|
|
import type { RuleObject } from '@/schemas/routing';
|
|
import './RoutingTab.css';
|
|
|
|
interface RoutingTabProps {
|
|
templateSettings: XraySettingsValue | null;
|
|
setTemplateSettings: SetTemplate;
|
|
inboundTags: string[];
|
|
clientReverseTags: string[];
|
|
subscriptionOutboundTags?: string[];
|
|
isMobile: boolean;
|
|
}
|
|
|
|
export default function RoutingTab({
|
|
templateSettings,
|
|
setTemplateSettings,
|
|
inboundTags,
|
|
clientReverseTags,
|
|
subscriptionOutboundTags,
|
|
isMobile,
|
|
}: RoutingTabProps) {
|
|
const { t } = useTranslation();
|
|
const [modal, modalContextHolder] = Modal.useModal();
|
|
const [ruleModalOpen, setRuleModalOpen] = useState(false);
|
|
const [editingRule, setEditingRule] = useState<RoutingRule | null>(null);
|
|
const [editingIndex, setEditingIndex] = useState<number | null>(null);
|
|
const [draggedIndex, setDraggedIndex] = useState<number | null>(null);
|
|
const [dropTargetIndex, setDropTargetIndex] = useState<number | null>(null);
|
|
const dragRef = useRef<{ from: number | null; to: number | null; startY: number; moved: boolean }>({
|
|
from: null,
|
|
to: null,
|
|
startY: 0,
|
|
moved: false,
|
|
});
|
|
|
|
const rules = useMemo(
|
|
() => (templateSettings?.routing?.rules || []) as RoutingRule[],
|
|
[templateSettings?.routing?.rules],
|
|
);
|
|
const rulesRef = useRef(rules);
|
|
rulesRef.current = rules;
|
|
|
|
const rows: RuleRow[] = useMemo(
|
|
() =>
|
|
rules.map((rule, idx) => {
|
|
const r: RuleRow = { key: idx };
|
|
r.domain = arrJoin(rule.domain);
|
|
r.ip = arrJoin(rule.ip);
|
|
r.port = rule.port;
|
|
r.sourcePort = rule.sourcePort;
|
|
r.vlessRoute = rule.vlessRoute;
|
|
r.network = rule.network;
|
|
r.sourceIP = arrJoin(rule.sourceIP);
|
|
r.user = arrJoin(rule.user);
|
|
r.inboundTag = arrJoin(rule.inboundTag);
|
|
r.protocol = arrJoin(rule.protocol);
|
|
if (rule.attrs && typeof rule.attrs === 'object' && !Array.isArray(rule.attrs)) {
|
|
r.attrs = JSON.stringify(rule.attrs, null, 2);
|
|
}
|
|
r.outboundTag = rule.outboundTag;
|
|
r.balancerTag = rule.balancerTag;
|
|
return r;
|
|
}),
|
|
[rules],
|
|
);
|
|
|
|
const mutate = useCallback(
|
|
(mutator: (next: XraySettingsValue) => void) => {
|
|
setTemplateSettings((prev) => {
|
|
if (!prev) return prev;
|
|
const clone = JSON.parse(JSON.stringify(prev)) as XraySettingsValue;
|
|
mutator(clone);
|
|
return clone;
|
|
});
|
|
},
|
|
[setTemplateSettings],
|
|
);
|
|
|
|
const inboundTagOptions = useMemo(() => {
|
|
const seen = new Set<string>();
|
|
const out: string[] = [];
|
|
const push = (tag?: string) => {
|
|
if (!tag || seen.has(tag)) return;
|
|
seen.add(tag);
|
|
out.push(tag);
|
|
};
|
|
for (const ib of (templateSettings?.inbounds as Array<{ tag?: string }>) || []) push(ib?.tag);
|
|
for (const tag of inboundTags || []) push(tag);
|
|
for (const ob of templateSettings?.outbounds || []) {
|
|
const obx = ob as { reverse?: { tag?: string }; settings?: { reverse?: { tag?: string }; inboundTag?: string } };
|
|
push(obx?.reverse?.tag || obx?.settings?.reverse?.tag || obx?.settings?.inboundTag);
|
|
}
|
|
push((templateSettings?.dns as { tag?: string } | undefined)?.tag);
|
|
for (const s of (templateSettings?.dns as { servers?: Array<{ tag?: string }> } | undefined)?.servers || []) {
|
|
if (typeof s === 'object' && s?.tag) push(s.tag);
|
|
}
|
|
return out;
|
|
}, [templateSettings, inboundTags]);
|
|
|
|
const outboundTagOptions = useMemo(() => {
|
|
const out = new Set<string>(['']);
|
|
for (const ob of templateSettings?.outbounds || []) {
|
|
if (ob?.tag) out.add(ob.tag);
|
|
}
|
|
for (const tag of clientReverseTags || []) {
|
|
if (tag) out.add(tag);
|
|
}
|
|
for (const tag of subscriptionOutboundTags || []) {
|
|
if (tag) out.add(tag);
|
|
}
|
|
return [...out];
|
|
}, [templateSettings?.outbounds, clientReverseTags, subscriptionOutboundTags]);
|
|
|
|
const balancerTagOptions = useMemo(() => {
|
|
const out: string[] = [''];
|
|
for (const b of (templateSettings?.routing?.balancers as Array<{ tag?: string }>) || []) {
|
|
if (b?.tag) out.push(b.tag);
|
|
}
|
|
return out;
|
|
}, [templateSettings?.routing?.balancers]);
|
|
|
|
function openAdd() {
|
|
setEditingRule(null);
|
|
setEditingIndex(null);
|
|
setRuleModalOpen(true);
|
|
}
|
|
function openEdit(idx: number) {
|
|
setEditingRule(rulesRef.current[idx]);
|
|
setEditingIndex(idx);
|
|
setRuleModalOpen(true);
|
|
}
|
|
function onRuleConfirm(rule: Record<string, unknown>) {
|
|
if (JSON.stringify(rule).length <= 3) {
|
|
setRuleModalOpen(false);
|
|
return;
|
|
}
|
|
mutate((tt) => {
|
|
if (!tt.routing) tt.routing = { rules: [] };
|
|
if (!Array.isArray(tt.routing.rules)) tt.routing.rules = [];
|
|
const typed = rule as unknown as RuleObject;
|
|
if (editingIndex == null) tt.routing.rules.push(typed);
|
|
else tt.routing.rules[editingIndex] = typed;
|
|
});
|
|
setRuleModalOpen(false);
|
|
}
|
|
|
|
function confirmDelete(idx: number) {
|
|
modal.confirm({
|
|
title: `${t('delete')} ${t('pages.xray.Routings')} #${idx + 1}?`,
|
|
okText: t('delete'),
|
|
okType: 'danger',
|
|
cancelText: t('cancel'),
|
|
onOk: () => mutate((tt) => {
|
|
tt.routing?.rules?.splice(idx, 1);
|
|
}),
|
|
});
|
|
}
|
|
|
|
function moveUp(idx: number) {
|
|
if (idx <= 0) return;
|
|
mutate((tt) => {
|
|
const list = tt.routing?.rules;
|
|
if (!list) return;
|
|
[list[idx - 1], list[idx]] = [list[idx], list[idx - 1]];
|
|
});
|
|
}
|
|
function moveDown(idx: number) {
|
|
mutate((tt) => {
|
|
const list = tt.routing?.rules;
|
|
if (!list || idx >= list.length - 1) return;
|
|
[list[idx + 1], list[idx]] = [list[idx], list[idx + 1]];
|
|
});
|
|
}
|
|
|
|
function onHandlePointerDown(idx: number, ev: React.PointerEvent) {
|
|
if (ev.button != null && ev.button !== 0) return;
|
|
ev.preventDefault();
|
|
try {
|
|
(ev.currentTarget as Element).setPointerCapture(ev.pointerId);
|
|
} catch { /* ignore */ }
|
|
dragRef.current = { from: idx, to: idx, startY: ev.clientY, moved: false };
|
|
setDraggedIndex(idx);
|
|
setDropTargetIndex(idx);
|
|
|
|
const onMove = (e: PointerEvent) => {
|
|
const state = dragRef.current;
|
|
if (state.from == null) return;
|
|
if (!state.moved && Math.abs(e.clientY - state.startY) < 5) return;
|
|
state.moved = true;
|
|
const el = document.elementFromPoint(e.clientX, e.clientY);
|
|
if (!el) return;
|
|
const target = el.closest('[data-row-key]');
|
|
if (!target) return;
|
|
const newIdx = Number(target.getAttribute('data-row-key'));
|
|
if (Number.isFinite(newIdx) && newIdx !== state.to) {
|
|
state.to = newIdx;
|
|
setDropTargetIndex(newIdx);
|
|
}
|
|
};
|
|
|
|
const onUp = () => {
|
|
document.removeEventListener('pointermove', onMove);
|
|
document.removeEventListener('pointerup', onUp);
|
|
document.removeEventListener('pointercancel', onUp);
|
|
const { from, to, moved } = dragRef.current;
|
|
dragRef.current = { from: null, to: null, startY: 0, moved: false };
|
|
setDraggedIndex(null);
|
|
setDropTargetIndex(null);
|
|
if (!moved || from == null || to == null || from === to) return;
|
|
mutate((tt) => {
|
|
const list = tt.routing?.rules;
|
|
if (!list) return;
|
|
const [movedItem] = list.splice(from, 1);
|
|
list.splice(to, 0, movedItem);
|
|
});
|
|
};
|
|
|
|
document.addEventListener('pointermove', onMove);
|
|
document.addEventListener('pointerup', onUp);
|
|
document.addEventListener('pointercancel', onUp);
|
|
}
|
|
|
|
const hasSource = rows.some((r) => r.sourceIP || r.sourcePort || r.vlessRoute);
|
|
const hasBalancer = rows.some((r) => r.balancerTag);
|
|
|
|
const desktopColumns = useRoutingColumns({
|
|
isMobile,
|
|
rowsLength: rows.length,
|
|
showSource: hasSource,
|
|
showBalancer: hasBalancer,
|
|
onHandlePointerDown,
|
|
openEdit,
|
|
moveUp,
|
|
moveDown,
|
|
confirmDelete,
|
|
});
|
|
|
|
const tableScrollX = desktopColumns.reduce((sum, c) => {
|
|
const col = c as { width?: number; hidden?: boolean };
|
|
return col.hidden ? sum : sum + (typeof col.width === 'number' ? col.width : 0);
|
|
}, 0);
|
|
|
|
return (
|
|
<>
|
|
{modalContextHolder}
|
|
<Tabs
|
|
defaultActiveKey="basic"
|
|
items={[
|
|
{
|
|
key: 'basic',
|
|
label: catTabLabel(<ControlOutlined />, t('pages.xray.basicRouting'), isMobile),
|
|
children: (
|
|
<RoutingBasic
|
|
templateSettings={templateSettings}
|
|
setTemplateSettings={setTemplateSettings}
|
|
/>
|
|
),
|
|
},
|
|
{
|
|
key: 'rules',
|
|
label: catTabLabel(<UnorderedListOutlined />, t('pages.xray.Routings'), isMobile),
|
|
children: (
|
|
<Space orientation="vertical" size="middle" style={{ width: '100%' }}>
|
|
<Button type="primary" icon={<PlusOutlined />} onClick={openAdd}>
|
|
{t('pages.xray.Routings')}
|
|
</Button>
|
|
|
|
{isMobile ? (
|
|
<RuleCardList
|
|
rows={rows}
|
|
draggedIndex={draggedIndex}
|
|
dropTargetIndex={dropTargetIndex}
|
|
onHandlePointerDown={onHandlePointerDown}
|
|
openEdit={openEdit}
|
|
moveUp={moveUp}
|
|
moveDown={moveDown}
|
|
confirmDelete={confirmDelete}
|
|
/>
|
|
) : (
|
|
<Table
|
|
columns={desktopColumns}
|
|
dataSource={rows}
|
|
rowKey={(r) => r.key}
|
|
pagination={false}
|
|
scroll={{ x: tableScrollX }}
|
|
size="small"
|
|
className="routing-table"
|
|
onRow={(_record, index) => {
|
|
const classes: string[] = [];
|
|
const i = index ?? -1;
|
|
if (draggedIndex === i) classes.push('row-dragging');
|
|
if (dropTargetIndex === i && draggedIndex !== i && draggedIndex != null) {
|
|
classes.push(i > draggedIndex ? 'drop-after' : 'drop-before');
|
|
}
|
|
return { className: classes.join(' '), 'data-row-key': i } as React.HTMLAttributes<HTMLElement>;
|
|
}}
|
|
/>
|
|
)}
|
|
</Space>
|
|
),
|
|
},
|
|
{
|
|
key: 'tester',
|
|
label: catTabLabel(<AimOutlined />, t('pages.xray.routeTester'), isMobile),
|
|
children: <RouteTester inboundTags={inboundTagOptions} isMobile={isMobile} />,
|
|
},
|
|
]}
|
|
/>
|
|
<RuleFormModal
|
|
open={ruleModalOpen}
|
|
rule={editingRule}
|
|
inboundTags={inboundTagOptions}
|
|
outboundTags={outboundTagOptions}
|
|
balancerTags={balancerTagOptions}
|
|
onClose={() => setRuleModalOpen(false)}
|
|
onConfirm={onRuleConfirm}
|
|
/>
|
|
</>
|
|
);
|
|
}
|