feat: manual landing endpoints for forward nodes (item 8)
A forward node's exit target is now a choice: a managed panel server (existing behavior) or a manual landing endpoint — address + port + protocol (VLESS / SS2022 / SOCKS5) + operator-supplied credentials, including third-party nodes the panel does not run. The panel only builds the entry-side sing-box outbound and route rule; there is no exit resource, no exit job, and the node is exit-ready by definition. - model: Node.ExitMode/ExitAddress; manual exits force fixed port mode and skip the exit-server port table entirely - validation: address/port required; per-protocol credential presence; SS2022 passwords must be base64 key material of the method's key length (one PSK segment or serverKey:userKey) — the exact form sing-box accepts, rejected up front instead of failing at deploy - orchestration: resource building, deploy validation and rebuilds all branch on manualExit; switching managed->manual queues removal of the old exit resource, manual->managed mints a fresh exit resource id (deploy validation previously dereferenced the nil exit server — regression test locks the fix) - UI: exit target segmented control, link paste box that parses vless:// / ss:// / socks5:// links into the form, per-protocol credential fields (blank keeps the stored value on edit) - golden: new manualCreate/manualAssign/manualDeploy/manualJobs/ manualNodes sections — exactly one entry-side job whose outbound targets the manual address; all prior sections unchanged - the generated combined sing-box config passes the real sing-box 1.13.21 check
This commit is contained in:
aaaamoooo
+93
-3
@@ -906,7 +906,7 @@ function protocolOptions(role, current) {
|
||||
function nodeForm(item = null) {
|
||||
const node = item || { topology: 'forward', protocol: 'vless-reality-vision', exitProtocol: 'shadowsocks-2022-aes128', portMode: 'random', exitPortMode: 'random', networkMode: 'ipv4', realityServerName: 'www.tesla.com', realityDestPort: 443 };
|
||||
const preset = state.realityPresets.find((entry) => entry.serverName === node.realityServerName) || { id: 'custom' };
|
||||
openModal(item ? '编辑节点' : '新建节点', `<form id="node-form" class="form-grid"><input type="hidden" name="resourceId" value="${esc(item ? item.id : '')}">
|
||||
openModal(item ? '编辑节点' : '新建节点', `<form id="node-form" class="form-grid" data-exit-mode="${node.exitMode === 'manual' ? 'manual' : 'managed'}"><input type="hidden" name="resourceId" value="${esc(item ? item.id : '')}">
|
||||
<label class="wide">节点名称<input name="name" value="${esc(node.name || '')}" placeholder="新加坡入口 01" required></label>
|
||||
<label>服务器<select name="serverId" required>${state.servers.map((server) => `<option value="${esc(server.id)}"${selected(server.id, node.serverId)}>${esc(server.name)} · ${esc(roleText[server.role])}</option>`).join('')}</select></label>
|
||||
<label>网络栈<select name="networkMode"><option value="ipv4"${selected('ipv4', node.networkMode || 'ipv4')}>IPv4</option><option value="ipv6"${selected('ipv6', node.networkMode)}>IPv6</option><option value="dual"${selected('dual', node.networkMode)}>双栈监听</option></select></label>
|
||||
@@ -916,9 +916,15 @@ function nodeForm(item = null) {
|
||||
<label data-reality-only>Reality SNI / 目标端口<div class="inline-fields"><input name="realityServerName" value="${esc(node.realityServerName || 'www.tesla.com')}" placeholder="www.tesla.com"><input name="realityDestPort" type="number" value="${Number(node.realityDestPort || 443)}" min="1" max="65535"></div></label>
|
||||
<label>拓扑<select name="topology" data-node-sync><option value="forward"${selected('forward', node.topology || 'forward')}>转发（入口 → 出口）</option><option value="direct"${selected('direct', node.topology)}>单机直连（无需出口）</option></select></label>
|
||||
<div class="section-title" data-forward-only>出口与转发传输</div>
|
||||
<label data-forward-only>出口 / 落地设备<select name="exitServerId">${state.servers.map((server) => `<option value="${esc(server.id)}"${selected(server.id, node.exitServerId)}>${esc(server.name)} · ${esc(roleText[server.role])}</option>`).join('')}</select></label>
|
||||
<div class="wide" data-forward-only><div class="seg" id="exit-mode-seg"><button type="button" data-action="exit-mode" data-mode="managed">受管设备</button><button type="button" data-action="exit-mode" data-mode="manual">手动落地端点</button></div></div>
|
||||
<label class="wide" data-forward-only data-manual-only>从链接导入<input data-exit-link placeholder="粘贴 vless:// / ss:// / socks5:// 链接，自动填入下方字段"></label>
|
||||
<label data-forward-only data-managed-only>出口 / 落地设备<select name="exitServerId">${state.servers.map((server) => `<option value="${esc(server.id)}"${selected(server.id, node.exitServerId)}>${esc(server.name)} · ${esc(roleText[server.role])}</option>`).join('')}</select></label>
|
||||
<label data-forward-only data-manual-only>落地地址<input name="exitAddress" value="${esc(node.exitAddress || '')}" placeholder="IP 或域名"></label>
|
||||
<label data-forward-only>入口到出口协议<select name="exitProtocol" data-node-sync>${protocolOptions('exit-transport', node.exitProtocol)}</select></label>
|
||||
<label data-forward-only>出口端口<div class="inline-fields"><select name="exitPortMode" data-node-sync><option value="random"${selected('random', node.exitPortMode)}>范围内随机</option><option value="fixed"${selected('fixed', node.exitPortMode)}>固定端口</option></select><input name="exitPort" type="number" value="${esc(node.exitPort || '')}" placeholder="固定时填写" min="1024" max="65535"></div></label>
|
||||
<label data-forward-only data-manual-only data-exit-cred="vless">VLESS 用户 ID<input name="exitClientId" placeholder="${item ? '留空保持不变' : '链接中的 UUID'}"></label>
|
||||
<label data-forward-only data-manual-only data-exit-cred="socksuser">SOCKS5 用户名<input name="exitSocksUser" placeholder="${item ? '留空保持不变' : ''}"></label>
|
||||
<label data-forward-only data-manual-only data-exit-cred="password">落地密码<input name="exitPassword" placeholder="${item ? '留空保持不变' : ''}"></label>
|
||||
<div class="form-actions wide"><button type="button" class="btn" data-close>取消</button><button class="btn primary" type="submit">${item ? '保存修改' : '创建节点'}</button></div></form>`, true);
|
||||
syncNodeForm();
|
||||
}
|
||||
@@ -936,6 +942,77 @@ function syncNodeForm() {
|
||||
form.elements[port].disabled = !fixed;
|
||||
form.elements[port].required = fixed;
|
||||
}
|
||||
// Manual landing endpoint (round-2 item 8): swap the managed exit-server
|
||||
// picker for address + credential fields; the port is always explicit.
|
||||
const exitManual = !direct && (form.dataset.exitMode || 'managed') === 'manual';
|
||||
$$('[data-managed-only]', form).forEach((element) => element.classList.toggle('hidden', direct || exitManual));
|
||||
$$('[data-manual-only]', form).forEach((element) => element.classList.toggle('hidden', !exitManual));
|
||||
$$('#exit-mode-seg button', form).forEach((button) => button.classList.toggle('active', button.dataset.mode === (form.dataset.exitMode || 'managed')));
|
||||
form.elements.exitServerId.required = !direct && !exitManual;
|
||||
if (form.elements.exitAddress) form.elements.exitAddress.required = exitManual;
|
||||
const exitProtocol = form.elements.exitProtocol.value || '';
|
||||
const credFor = { vless: exitProtocol === 'vless-tcp', socksuser: exitProtocol === 'socks5-auth', password: exitProtocol === 'socks5-auth' || exitProtocol.startsWith('shadowsocks') };
|
||||
$$('[data-exit-cred]', form).forEach((element) => element.classList.toggle('hidden', !exitManual || !credFor[element.dataset.exitCred]));
|
||||
if (exitManual) {
|
||||
form.elements.exitPortMode.disabled = true;
|
||||
form.elements.exitPort.disabled = false;
|
||||
form.elements.exitPort.required = true;
|
||||
}
|
||||
}
|
||||
|
||||
const EXIT_LINK_METHODS = { '2022-blake3-aes-128-gcm': 'shadowsocks-2022-aes128', '2022-blake3-aes-256-gcm': 'shadowsocks-2022-aes256', 'aes-128-gcm': 'shadowsocks-aes128-gcm', 'aes-256-gcm': 'shadowsocks-aes256-gcm' };
|
||||
function parseExitLink(text) {
|
||||
const link = String(text || '').trim();
|
||||
if (!link) return null;
|
||||
try {
|
||||
if (link.startsWith('vless://')) {
|
||||
const url = new URL(link);
|
||||
if (!url.hostname || !url.port || !url.username) return null;
|
||||
return { protocol: 'vless-tcp', address: url.hostname, port: Number(url.port), clientId: decodeURIComponent(url.username) };
|
||||
}
|
||||
if (link.startsWith('ss://')) {
|
||||
const rest = link.slice(5).split('#')[0];
|
||||
const at = rest.lastIndexOf('@');
|
||||
if (at < 0) return null;
|
||||
let userinfo = rest.slice(0, at);
|
||||
const hostport = rest.slice(at + 1).split('?')[0].split('/')[0];
|
||||
if (!userinfo.includes(':')) {
|
||||
userinfo = atob(userinfo.replace(/-/g, '+').replace(/_/g, '/').padEnd(Math.ceil(userinfo.length / 4) * 4, '='));
|
||||
} else {
|
||||
userinfo = decodeURIComponent(userinfo);
|
||||
}
|
||||
const sep = userinfo.indexOf(':');
|
||||
if (sep < 0) return null;
|
||||
const protocol = EXIT_LINK_METHODS[userinfo.slice(0, sep)];
|
||||
if (!protocol) return null;
|
||||
const hostMatch = hostport.match(/^\[(.+)\]:(\d+)$/) || hostport.match(/^(.+):(\d+)$/);
|
||||
if (!hostMatch) return null;
|
||||
// The password is everything after "method:" — for SS2022 links that
|
||||
// is the combined serverKey:userKey string, which is exactly what the
|
||||
// entry outbound sends.
|
||||
return { protocol, address: hostMatch[1], port: Number(hostMatch[2]), password: userinfo.slice(sep + 1) };
|
||||
}
|
||||
if (link.startsWith('socks5://') || link.startsWith('socks://')) {
|
||||
const url = new URL(link.replace(/^socks:\/\//, 'socks5://'));
|
||||
if (!url.hostname || !url.port) return null;
|
||||
return { protocol: 'socks5-auth', address: url.hostname, port: Number(url.port), socksUser: decodeURIComponent(url.username), password: decodeURIComponent(url.password) };
|
||||
}
|
||||
} catch { return null; }
|
||||
return null;
|
||||
}
|
||||
function applyExitLink(input) {
|
||||
const form = $('#node-form'); if (!form) return;
|
||||
const parsed = parseExitLink(input.value);
|
||||
if (!parsed) { toast('无法识别该链接', true); return; }
|
||||
form.dataset.exitMode = 'manual';
|
||||
form.elements.exitAddress.value = parsed.address;
|
||||
form.elements.exitPort.value = parsed.port;
|
||||
form.elements.exitProtocol.value = parsed.protocol;
|
||||
if (parsed.clientId) form.elements.exitClientId.value = parsed.clientId;
|
||||
if (parsed.socksUser) form.elements.exitSocksUser.value = parsed.socksUser;
|
||||
if (parsed.password) form.elements.exitPassword.value = parsed.password;
|
||||
syncNodeForm();
|
||||
toast('已从链接填入落地端点');
|
||||
}
|
||||
function nodeClientsModal(node) {
|
||||
const assigned = state.nodeClients.filter((nc) => nc.nodeId === node.id);
|
||||
@@ -1037,7 +1114,15 @@ document.addEventListener('submit', async (event) => {
|
||||
closeModal(); toast(resourceId ? '客户信息已更新' : '客户已创建'); await load('customers');
|
||||
} else if (form.id === 'node-form') {
|
||||
const resourceId = data.get('resourceId');
|
||||
const payload = { name: data.get('name'), serverId: data.get('serverId'), protocol: data.get('protocol'), portMode: data.get('portMode'), port: data.get('port') || null, networkMode: data.get('networkMode'), topology: data.get('topology'), exitServerId: data.get('exitServerId') || null, exitProtocol: data.get('exitProtocol') || null, exitPortMode: data.get('exitPortMode') || null, exitPort: data.get('exitPort') || null, realityServerName: data.get('realityServerName'), realityDestPort: Number(data.get('realityDestPort') || 443) };
|
||||
const payload = { name: data.get('name'), serverId: data.get('serverId'), protocol: data.get('protocol'), portMode: data.get('portMode'), port: data.get('port') || null, networkMode: data.get('networkMode'), topology: data.get('topology'), exitServerId: data.get('exitServerId') || null, exitProtocol: data.get('exitProtocol') || null, exitPortMode: data.get('exitPortMode') || null, exitPort: data.get('exitPort') || null, realityServerName: data.get('realityServerName'), realityDestPort: Number(data.get('realityDestPort') || 443), exitMode: form.dataset.exitMode || 'managed', exitAddress: data.get('exitAddress') || null };
|
||||
if (payload.topology !== 'direct' && payload.exitMode === 'manual') {
|
||||
const creds = {};
|
||||
if (data.get('exitClientId')) creds.clientId = data.get('exitClientId');
|
||||
if (data.get('exitPassword')) creds.password = data.get('exitPassword');
|
||||
if (data.get('exitSocksUser')) creds.socksUser = data.get('exitSocksUser');
|
||||
if (Object.keys(creds).length) payload.exitCredentials = creds;
|
||||
payload.exitPortMode = 'fixed';
|
||||
}
|
||||
await api(resourceId ? `/api/nodes/${resourceId}` : '/api/nodes', { method: resourceId ? 'PATCH' : 'POST', body: JSON.stringify(payload) });
|
||||
closeModal(); toast(resourceId ? '节点已更新，运行中节点已重建下发' : '节点已创建，请分配客户后部署'); await load('chains');
|
||||
} else if (form.id === 'account-form') {
|
||||
@@ -1150,6 +1235,10 @@ document.addEventListener('click', async (event) => {
|
||||
api(`/api/customers/${itemId}/credentials`).then((data) => { customerFormState.credentials = data; renderCredentialsPane(result.customer); }).catch(() => {});
|
||||
} else if (modalOpen()) subscriptionModal(result.customer);
|
||||
}
|
||||
else if (action === 'exit-mode') {
|
||||
const form = $('#node-form');
|
||||
if (form) { form.dataset.exitMode = button.dataset.mode; syncNodeForm(); }
|
||||
}
|
||||
else if (action === 'regen-credentials') {
|
||||
const customerId = $('#customer-form').dataset.customerId;
|
||||
if (!await confirmModal('重新生成该客户的凭据？全部节点同时更换，现有连接将立即失效，需要重新导入订阅。', '重新生成')) return;
|
||||
@@ -1248,6 +1337,7 @@ document.addEventListener('change', async (event) => {
|
||||
} else if (target.matches('[data-check-all]')) {
|
||||
$$('[data-row-check]').forEach((box) => { box.checked = target.checked; });
|
||||
} else if (target.matches('[data-node-sync]')) syncNodeForm();
|
||||
else if (target.matches('[data-exit-link]')) applyExitLink(target);
|
||||
else if (target.matches('[data-reality-preset]')) {
|
||||
const option = target.selectedOptions[0]; const form = target.form;
|
||||
if (option && option.value !== 'custom') { form.elements.realityServerName.value = option.dataset.sni; form.elements.realityDestPort.value = option.dataset.port; }
|
||||
|
||||
@@ -322,6 +322,9 @@ label>input:focus,label>select:focus,label>textarea:focus{border-color:var(--pri
|
||||
.mono{font-family:var(--mono);font-size:12.5px;word-break:break-all}
|
||||
|
||||
/* 页签 */
|
||||
.seg{display:inline-flex;border:1px solid var(--border);border-radius:8px;overflow:hidden}
|
||||
.seg button{padding:6px 16px;background:var(--card);border:none;color:var(--text-2);cursor:pointer;font:inherit;font-size:13px}
|
||||
.seg button.active{background:var(--primary);color:#fff}
|
||||
.tabs{display:flex;gap:2px;border-bottom:1px solid var(--border-soft);margin-bottom:14px}
|
||||
.tabs button{border:none;background:transparent;padding:7px 14px;font-size:13.5px;color:var(--text-2);cursor:pointer;border-bottom:2px solid transparent;margin-bottom:-1px}
|
||||
.tabs button.active{color:var(--primary-text);border-bottom-color:var(--primary);font-weight:500}
|
||||
|
||||
Reference in New Issue
Block a user