mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-05-13 09:36:05 +00:00
feat(frontend): Phase 6-ii — xray Basics tab structured editor
Replaces the placeholder on the Basics tab with a structured form for the most-touched fields of the xray template — outbound + routing strategy, log levels, traffic stat counters, and the "basic routing" shortcuts (block torrent / IPs / domains, direct IPs / domains, IPv4 forced, WARP / NordVPN routing). - useXraySetting.js: hoists a parsed `templateSettings` reactive alongside the JSON string, with two cooperating watches that keep them in sync. Editing structured fields stringifies into xraySetting for the dirty-poll + Advanced JSON tab; editing the JSON re-parses into templateSettings only when valid, so structured tabs stay readable mid-edit. - BasicsTab.vue: collapse panels mirror the legacy partial — General, Statistics, Logs, Basic routing. Every input is a computed v-model reading/writing into templateSettings; the routing-rule shortcuts funnel through ruleGetter/ruleSetter which match the legacy templateRuleGetter/templateRuleSetter behavior (replace-first, drop-duplicates, pop-the-rule-when-empty). Direct/IPv4 setters also call syncOutbound() to provision/prune the matching outbound. - XrayPage.vue: imports BasicsTab + derives `warpExist`/`nordExist` from the parsed templateSettings. WARP/NordVPN provisioning modals are still placeholders that toast — those land in 6-v with the routing/outbound editors. Default tab flips back to Basics so users land on the structured editor. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
parent
59a4a713cd
commit
c20dd42d7a
3 changed files with 547 additions and 3 deletions
471
frontend/src/pages/xray/BasicsTab.vue
Normal file
471
frontend/src/pages/xray/BasicsTab.vue
Normal file
|
|
@ -0,0 +1,471 @@
|
||||||
|
<script setup>
|
||||||
|
import { computed } from 'vue';
|
||||||
|
import { ExclamationCircleFilled, CloudOutlined, ApiOutlined } from '@ant-design/icons-vue';
|
||||||
|
|
||||||
|
import { OutboundDomainStrategies } from '@/models/outbound.js';
|
||||||
|
import SettingListItem from '@/components/SettingListItem.vue';
|
||||||
|
|
||||||
|
// Phase 6-ii: structured editor for the most-touched fields of the
|
||||||
|
// xray template — outbound strategy, routing strategy, log levels,
|
||||||
|
// stat counters, and the "basic routing" lists (block IPs/domains/
|
||||||
|
// torrent + direct IPs/domains + IPv4 forced + warp/nord domains).
|
||||||
|
//
|
||||||
|
// Mutates the parent's templateSettings reactive directly. The
|
||||||
|
// useXraySetting composable's deep watch on templateSettings re-
|
||||||
|
// stringifies into xraySetting so the Advanced JSON tab and the
|
||||||
|
// dirty-poll see every edit.
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
templateSettings: { type: Object, default: null },
|
||||||
|
outboundTestUrl: { type: String, default: '' },
|
||||||
|
warpExist: { type: Boolean, default: false },
|
||||||
|
nordExist: { type: Boolean, default: false },
|
||||||
|
});
|
||||||
|
|
||||||
|
const emit = defineEmits(['update:outbound-test-url', 'show-warp', 'show-nord']);
|
||||||
|
|
||||||
|
// === Static option lists (mirror legacy) =============================
|
||||||
|
const ROUTING_DOMAIN_STRATEGIES = ['AsIs', 'IPIfNonMatch', 'IPOnDemand'];
|
||||||
|
const LOG_LEVELS = ['none', 'debug', 'info', 'warning', 'error'];
|
||||||
|
const ACCESS_LOG = ['none', './access.log'];
|
||||||
|
const ERROR_LOG = ['none', './error.log'];
|
||||||
|
const MASK_ADDRESS = ['quarter', 'half', 'full'];
|
||||||
|
const BITTORRENT_PROTOCOLS = ['bittorrent'];
|
||||||
|
|
||||||
|
// Country lists copied from the legacy template's settingsData. Keep
|
||||||
|
// them alphabetised by ISO code so additions stay obvious in diffs.
|
||||||
|
const IPS_OPTIONS = [
|
||||||
|
{ label: 'Private IPs', value: 'geoip:private' },
|
||||||
|
{ label: '🇮🇷 Iran', value: 'ext:geoip_IR.dat:ir' },
|
||||||
|
{ label: '🇨🇳 China', value: 'geoip:cn' },
|
||||||
|
{ label: '🇷🇺 Russia', value: 'ext:geoip_RU.dat:ru' },
|
||||||
|
];
|
||||||
|
const BLOCK_DOMAINS_OPTIONS = [
|
||||||
|
{ label: 'Ads (Iran)', value: 'ext:geosite_IR.dat:category-ads-all' },
|
||||||
|
{ label: 'Ads', value: 'geosite:category-ads-all' },
|
||||||
|
{ label: '🇮🇷 Iran', value: 'ext:geosite_IR.dat:category-ir' },
|
||||||
|
{ label: '🇨🇳 China', value: 'geosite:cn' },
|
||||||
|
{ label: '🇷🇺 Russia', value: 'ext:geosite_RU.dat:category-ru' },
|
||||||
|
];
|
||||||
|
const DOMAINS_OPTIONS = [
|
||||||
|
{ label: 'Private DNS', value: 'geosite:private' },
|
||||||
|
{ label: '🇮🇷 Iran', value: 'ext:geosite_IR.dat:category-ir' },
|
||||||
|
{ label: '🇨🇳 China', value: 'geosite:cn' },
|
||||||
|
{ label: '🇷🇺 Russia', value: 'ext:geosite_RU.dat:category-ru' },
|
||||||
|
];
|
||||||
|
const SERVICES_OPTIONS = [
|
||||||
|
{ label: 'Google', value: 'geosite:google' },
|
||||||
|
{ label: 'Apple', value: 'geosite:apple' },
|
||||||
|
{ label: 'Meta', value: 'geosite:meta' },
|
||||||
|
{ label: 'Microsoft', value: 'geosite:microsoft' },
|
||||||
|
{ label: 'Netflix', value: 'geosite:netflix' },
|
||||||
|
{ label: 'OpenAI', value: 'geosite:openai' },
|
||||||
|
{ label: 'Spotify', value: 'geosite:spotify' },
|
||||||
|
];
|
||||||
|
|
||||||
|
// === Routing-rule helpers (matches legacy templateRule{Getter,Setter}) ==
|
||||||
|
function ruleGetter(outboundTag, property) {
|
||||||
|
if (!props.templateSettings?.routing?.rules) return [];
|
||||||
|
const out = [];
|
||||||
|
for (const rule of props.templateSettings.routing.rules) {
|
||||||
|
if (
|
||||||
|
rule
|
||||||
|
&& Object.prototype.hasOwnProperty.call(rule, property)
|
||||||
|
&& Object.prototype.hasOwnProperty.call(rule, 'outboundTag')
|
||||||
|
&& rule.outboundTag === outboundTag
|
||||||
|
) {
|
||||||
|
out.push(...rule[property]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
function ruleSetter(outboundTag, property, data) {
|
||||||
|
if (!props.templateSettings?.routing) return;
|
||||||
|
const current = ruleGetter(outboundTag, property);
|
||||||
|
if (current.length === 0) {
|
||||||
|
props.templateSettings.routing.rules.push({
|
||||||
|
type: 'field',
|
||||||
|
outboundTag,
|
||||||
|
[property]: data,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Replace the property on the FIRST matching rule and drop any later
|
||||||
|
// duplicates with the same (outboundTag, property) pair (matches the
|
||||||
|
// legacy single-write-then-filter behavior).
|
||||||
|
const next = [];
|
||||||
|
let inserted = false;
|
||||||
|
for (const rule of props.templateSettings.routing.rules) {
|
||||||
|
const matches =
|
||||||
|
rule
|
||||||
|
&& Object.prototype.hasOwnProperty.call(rule, property)
|
||||||
|
&& Object.prototype.hasOwnProperty.call(rule, 'outboundTag')
|
||||||
|
&& rule.outboundTag === outboundTag;
|
||||||
|
if (matches) {
|
||||||
|
if (!inserted && data.length > 0) {
|
||||||
|
rule[property] = data;
|
||||||
|
next.push(rule);
|
||||||
|
inserted = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
next.push(rule);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
props.templateSettings.routing.rules = next;
|
||||||
|
}
|
||||||
|
|
||||||
|
function syncOutbound(tag, settings) {
|
||||||
|
// After editing direct/IPv4/warp/nord rules, ensure the matching
|
||||||
|
// outbound exists when the rule list has any entries, and is
|
||||||
|
// pruned when none remain (legacy syncRulesWithOutbound).
|
||||||
|
const t = props.templateSettings;
|
||||||
|
if (!t) return;
|
||||||
|
const haveRules = t.routing.rules.some((r) => r?.outboundTag === tag);
|
||||||
|
const idx = t.outbounds.findIndex((o) => o.tag === tag);
|
||||||
|
if (!haveRules && idx > 0) t.outbounds.splice(idx, 1);
|
||||||
|
if (haveRules && idx < 0) t.outbounds.push(settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
// === Computed v-models for every Basics field ========================
|
||||||
|
function rule(tag, property, syncFn) {
|
||||||
|
return computed({
|
||||||
|
get: () => ruleGetter(tag, property),
|
||||||
|
set: (next) => { ruleSetter(tag, property, next); if (syncFn) syncFn(); },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const directSettings = { tag: 'direct', protocol: 'freedom' };
|
||||||
|
const ipv4Settings = { tag: 'IPv4', protocol: 'freedom', settings: { domainStrategy: 'UseIPv4' } };
|
||||||
|
|
||||||
|
const freedomStrategy = computed({
|
||||||
|
get: () => {
|
||||||
|
const ob = props.templateSettings?.outbounds?.find(
|
||||||
|
(o) => o.protocol === 'freedom' && o.tag === 'direct',
|
||||||
|
);
|
||||||
|
return ob?.settings?.domainStrategy ?? 'AsIs';
|
||||||
|
},
|
||||||
|
set: (next) => {
|
||||||
|
const t = props.templateSettings;
|
||||||
|
if (!t) return;
|
||||||
|
const idx = t.outbounds.findIndex((o) => o.protocol === 'freedom' && o.tag === 'direct');
|
||||||
|
if (idx < 0) {
|
||||||
|
t.outbounds.push({ protocol: 'freedom', tag: 'direct', settings: { domainStrategy: next } });
|
||||||
|
} else {
|
||||||
|
t.outbounds[idx].settings = t.outbounds[idx].settings || {};
|
||||||
|
t.outbounds[idx].settings.domainStrategy = next;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const routingStrategy = computed({
|
||||||
|
get: () => props.templateSettings?.routing?.domainStrategy ?? 'AsIs',
|
||||||
|
set: (next) => { if (props.templateSettings?.routing) props.templateSettings.routing.domainStrategy = next; },
|
||||||
|
});
|
||||||
|
|
||||||
|
function logField(field, fallback) {
|
||||||
|
return computed({
|
||||||
|
get: () => props.templateSettings?.log?.[field] ?? fallback,
|
||||||
|
set: (next) => { if (props.templateSettings?.log) props.templateSettings.log[field] = next; },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const logLevel = logField('loglevel', 'warning');
|
||||||
|
const accessLog = logField('access', '');
|
||||||
|
const errorLog = logField('error', '');
|
||||||
|
const maskAddressLog = logField('maskAddress', '');
|
||||||
|
const dnslog = logField('dnsLog', false);
|
||||||
|
|
||||||
|
function policyField(field) {
|
||||||
|
return computed({
|
||||||
|
get: () => !!props.templateSettings?.policy?.system?.[field],
|
||||||
|
set: (next) => {
|
||||||
|
if (!props.templateSettings?.policy?.system) return;
|
||||||
|
props.templateSettings.policy.system[field] = next;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const statsInboundUplink = policyField('statsInboundUplink');
|
||||||
|
const statsInboundDownlink = policyField('statsInboundDownlink');
|
||||||
|
const statsOutboundUplink = policyField('statsOutboundUplink');
|
||||||
|
const statsOutboundDownlink = policyField('statsOutboundDownlink');
|
||||||
|
|
||||||
|
const blockedIPs = rule('blocked', 'ip');
|
||||||
|
const blockedDomains = rule('blocked', 'domain');
|
||||||
|
const blockedProtocols = rule('blocked', 'protocol');
|
||||||
|
const directIPs = rule('direct', 'ip', () => syncOutbound('direct', directSettings));
|
||||||
|
const directDomains = rule('direct', 'domain', () => syncOutbound('direct', directSettings));
|
||||||
|
const ipv4Domains = rule('IPv4', 'domain', () => syncOutbound('IPv4', ipv4Settings));
|
||||||
|
const warpDomains = rule('warp', 'domain');
|
||||||
|
const nordTag = computed(() => {
|
||||||
|
const ob = props.templateSettings?.outbounds?.find((o) => o.tag?.startsWith?.('nord-'));
|
||||||
|
return ob?.tag || 'nord';
|
||||||
|
});
|
||||||
|
const nordDomains = computed({
|
||||||
|
get: () => ruleGetter(nordTag.value, 'domain'),
|
||||||
|
set: (next) => ruleSetter(nordTag.value, 'domain', next),
|
||||||
|
});
|
||||||
|
|
||||||
|
const torrentSettings = computed({
|
||||||
|
get: () => BITTORRENT_PROTOCOLS.every((p) => blockedProtocols.value.includes(p)),
|
||||||
|
set: (next) => {
|
||||||
|
if (next) {
|
||||||
|
blockedProtocols.value = [...blockedProtocols.value, ...BITTORRENT_PROTOCOLS];
|
||||||
|
} else {
|
||||||
|
blockedProtocols.value = blockedProtocols.value.filter((d) => !BITTORRENT_PROTOCOLS.includes(d));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const localOutboundTestUrl = computed({
|
||||||
|
get: () => props.outboundTestUrl,
|
||||||
|
set: (next) => emit('update:outbound-test-url', next),
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<a-collapse default-active-key="1">
|
||||||
|
<a-collapse-panel key="1" header="General">
|
||||||
|
<a-alert
|
||||||
|
type="warning"
|
||||||
|
class="mb-12 hint-alert"
|
||||||
|
message="Editing this template manually is for advanced users only."
|
||||||
|
>
|
||||||
|
<template #icon><ExclamationCircleFilled style="color: #FFA031;" /></template>
|
||||||
|
</a-alert>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Freedom outbound strategy</template>
|
||||||
|
<template #description>How the direct outbound resolves destinations.</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select v-model:value="freedomStrategy" :style="{ width: '100%' }">
|
||||||
|
<a-select-option v-for="s in OutboundDomainStrategies" :key="s" :value="s">{{ s }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Routing strategy</template>
|
||||||
|
<template #description>Domain strategy applied at the routing level.</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select v-model:value="routingStrategy" :style="{ width: '100%' }">
|
||||||
|
<a-select-option v-for="s in ROUTING_DOMAIN_STRATEGIES" :key="s" :value="s">{{ s }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Outbound test URL</template>
|
||||||
|
<template #description>HTTP endpoint used for outbound latency tests.</template>
|
||||||
|
<template #control>
|
||||||
|
<a-input v-model:value="localOutboundTestUrl" placeholder="https://www.google.com/generate_204" />
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
</a-collapse-panel>
|
||||||
|
|
||||||
|
<a-collapse-panel key="2" header="Statistics">
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Inbound uplink stats</template>
|
||||||
|
<template #control><a-switch v-model:checked="statsInboundUplink" /></template>
|
||||||
|
</SettingListItem>
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Inbound downlink stats</template>
|
||||||
|
<template #control><a-switch v-model:checked="statsInboundDownlink" /></template>
|
||||||
|
</SettingListItem>
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Outbound uplink stats</template>
|
||||||
|
<template #control><a-switch v-model:checked="statsOutboundUplink" /></template>
|
||||||
|
</SettingListItem>
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Outbound downlink stats</template>
|
||||||
|
<template #control><a-switch v-model:checked="statsOutboundDownlink" /></template>
|
||||||
|
</SettingListItem>
|
||||||
|
</a-collapse-panel>
|
||||||
|
|
||||||
|
<a-collapse-panel key="3" header="Logs">
|
||||||
|
<a-alert
|
||||||
|
type="warning"
|
||||||
|
class="mb-12 hint-alert"
|
||||||
|
message="Empty access/error log fields disable that log; ./access.log writes to disk."
|
||||||
|
>
|
||||||
|
<template #icon><ExclamationCircleFilled style="color: #FFA031;" /></template>
|
||||||
|
</a-alert>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Log level</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select v-model:value="logLevel" :style="{ width: '100%' }">
|
||||||
|
<a-select-option v-for="s in LOG_LEVELS" :key="s" :value="s">{{ s }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Access log</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select v-model:value="accessLog" :style="{ width: '100%' }">
|
||||||
|
<a-select-option value="">Empty</a-select-option>
|
||||||
|
<a-select-option v-for="s in ACCESS_LOG" :key="s" :value="s">{{ s }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Error log</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select v-model:value="errorLog" :style="{ width: '100%' }">
|
||||||
|
<a-select-option value="">Empty</a-select-option>
|
||||||
|
<a-select-option v-for="s in ERROR_LOG" :key="s" :value="s">{{ s }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Mask address</template>
|
||||||
|
<template #description>Truncate IPs in logs.</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select v-model:value="maskAddressLog" :style="{ width: '100%' }">
|
||||||
|
<a-select-option value="">Empty</a-select-option>
|
||||||
|
<a-select-option v-for="s in MASK_ADDRESS" :key="s" :value="s">{{ s }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>DNS log</template>
|
||||||
|
<template #control><a-switch v-model:checked="dnslog" /></template>
|
||||||
|
</SettingListItem>
|
||||||
|
</a-collapse-panel>
|
||||||
|
|
||||||
|
<a-collapse-panel key="4" header="Basic routing">
|
||||||
|
<a-alert
|
||||||
|
type="warning"
|
||||||
|
class="mb-12 hint-alert"
|
||||||
|
message="These shortcuts edit the underlying routing rules. Use the Routing tab for full control."
|
||||||
|
>
|
||||||
|
<template #icon><ExclamationCircleFilled style="color: #FFA031;" /></template>
|
||||||
|
</a-alert>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Block torrent</template>
|
||||||
|
<template #control><a-switch v-model:checked="torrentSettings" /></template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<a-alert
|
||||||
|
type="warning"
|
||||||
|
class="mb-12 hint-alert"
|
||||||
|
message="Block lists drop traffic matching these IPs / domains."
|
||||||
|
>
|
||||||
|
<template #icon><ExclamationCircleFilled style="color: #FFA031;" /></template>
|
||||||
|
</a-alert>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Block IPs</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select v-model:value="blockedIPs" mode="tags" :style="{ width: '100%' }">
|
||||||
|
<a-select-option v-for="p in IPS_OPTIONS" :key="p.value" :value="p.value" :label="p.label">{{ p.label }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Block domains</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select v-model:value="blockedDomains" mode="tags" :style="{ width: '100%' }">
|
||||||
|
<a-select-option v-for="p in BLOCK_DOMAINS_OPTIONS" :key="p.value" :value="p.value" :label="p.label">{{ p.label }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<a-alert
|
||||||
|
type="warning"
|
||||||
|
class="mb-12 hint-alert"
|
||||||
|
message="Direct lists bypass the proxy for matched IPs / domains."
|
||||||
|
>
|
||||||
|
<template #icon><ExclamationCircleFilled style="color: #FFA031;" /></template>
|
||||||
|
</a-alert>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Direct IPs</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select v-model:value="directIPs" mode="tags" :style="{ width: '100%' }">
|
||||||
|
<a-select-option v-for="p in IPS_OPTIONS" :key="p.value" :value="p.value" :label="p.label">{{ p.label }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>Direct domains</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select v-model:value="directDomains" mode="tags" :style="{ width: '100%' }">
|
||||||
|
<a-select-option v-for="p in DOMAINS_OPTIONS" :key="p.value" :value="p.value" :label="p.label">{{ p.label }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<a-alert
|
||||||
|
type="warning"
|
||||||
|
class="mb-12 hint-alert"
|
||||||
|
message="IPv4 routing forces the listed services through an IPv4-only outbound."
|
||||||
|
>
|
||||||
|
<template #icon><ExclamationCircleFilled style="color: #FFA031;" /></template>
|
||||||
|
</a-alert>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>IPv4 forced</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select v-model:value="ipv4Domains" mode="tags" :style="{ width: '100%' }">
|
||||||
|
<a-select-option v-for="p in SERVICES_OPTIONS" :key="p.value" :value="p.value" :label="p.label">{{ p.label }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<a-alert
|
||||||
|
type="warning"
|
||||||
|
class="mb-12 hint-alert"
|
||||||
|
message="WARP / NordVPN routing requires the matching outbound to exist — use the buttons to provision it."
|
||||||
|
>
|
||||||
|
<template #icon><ExclamationCircleFilled style="color: #FFA031;" /></template>
|
||||||
|
</a-alert>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>WARP routing</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select
|
||||||
|
v-if="warpExist"
|
||||||
|
v-model:value="warpDomains"
|
||||||
|
mode="tags"
|
||||||
|
:style="{ width: '100%' }"
|
||||||
|
>
|
||||||
|
<a-select-option v-for="p in SERVICES_OPTIONS" :key="p.value" :value="p.value" :label="p.label">{{ p.label }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
<a-button v-else type="primary" @click="emit('show-warp')">
|
||||||
|
<template #icon><CloudOutlined /></template>
|
||||||
|
Configure WARP
|
||||||
|
</a-button>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
|
<SettingListItem paddings="small">
|
||||||
|
<template #title>NordVPN routing</template>
|
||||||
|
<template #control>
|
||||||
|
<a-select
|
||||||
|
v-if="nordExist"
|
||||||
|
v-model:value="nordDomains"
|
||||||
|
mode="tags"
|
||||||
|
:style="{ width: '100%' }"
|
||||||
|
>
|
||||||
|
<a-select-option v-for="p in SERVICES_OPTIONS" :key="p.value" :value="p.value" :label="p.label">{{ p.label }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
<a-button v-else type="primary" @click="emit('show-nord')">
|
||||||
|
<template #icon><ApiOutlined /></template>
|
||||||
|
Configure NordVPN
|
||||||
|
</a-button>
|
||||||
|
</template>
|
||||||
|
</SettingListItem>
|
||||||
|
</a-collapse-panel>
|
||||||
|
</a-collapse>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.mb-12 { margin-bottom: 12px; }
|
||||||
|
.hint-alert { text-align: center; }
|
||||||
|
</style>
|
||||||
|
|
@ -13,7 +13,9 @@ import {
|
||||||
|
|
||||||
import { theme as themeState } from '@/composables/useTheme.js';
|
import { theme as themeState } from '@/composables/useTheme.js';
|
||||||
import { useMediaQuery } from '@/composables/useMediaQuery.js';
|
import { useMediaQuery } from '@/composables/useMediaQuery.js';
|
||||||
|
import { message } from 'ant-design-vue';
|
||||||
import AppSidebar from '@/components/AppSidebar.vue';
|
import AppSidebar from '@/components/AppSidebar.vue';
|
||||||
|
import BasicsTab from './BasicsTab.vue';
|
||||||
import { useXraySetting } from './useXraySetting.js';
|
import { useXraySetting } from './useXraySetting.js';
|
||||||
|
|
||||||
// Phase 6-i: scaffold + advanced JSON tab. Other tabs (Basics, Routing,
|
// Phase 6-i: scaffold + advanced JSON tab. Other tabs (Basics, Routing,
|
||||||
|
|
@ -32,11 +34,26 @@ const {
|
||||||
spinning,
|
spinning,
|
||||||
saveDisabled,
|
saveDisabled,
|
||||||
xraySetting,
|
xraySetting,
|
||||||
|
templateSettings,
|
||||||
outboundTestUrl,
|
outboundTestUrl,
|
||||||
restartResult,
|
restartResult,
|
||||||
saveAll,
|
saveAll,
|
||||||
restartXray,
|
restartXray,
|
||||||
} = useXraySetting();
|
} = useXraySetting();
|
||||||
|
|
||||||
|
// `WarpExist` / `NordExist` derive from the parsed templateSettings —
|
||||||
|
// the Basics tab gates its WARP / NordVPN domain selectors on whether
|
||||||
|
// the matching outbound is provisioned, falling back to a "configure"
|
||||||
|
// button that today just toasts (the modals land in 6-v).
|
||||||
|
const warpExist = computed(
|
||||||
|
() => !!templateSettings.value?.outbounds?.find((o) => o?.tag === 'warp'),
|
||||||
|
);
|
||||||
|
const nordExist = computed(
|
||||||
|
() => !!templateSettings.value?.outbounds?.find((o) => o?.tag?.startsWith?.('nord-')),
|
||||||
|
);
|
||||||
|
|
||||||
|
function showWarp() { message.info('WARP outbound modal — coming in 6-v'); }
|
||||||
|
function showNord() { message.info('NordVPN outbound modal — coming in 6-v'); }
|
||||||
const { isMobile } = useMediaQuery();
|
const { isMobile } = useMediaQuery();
|
||||||
|
|
||||||
const basePath = window.__X_UI_BASE_PATH__ || '';
|
const basePath = window.__X_UI_BASE_PATH__ || '';
|
||||||
|
|
@ -103,12 +120,20 @@ function confirmRestart() {
|
||||||
|
|
||||||
<!-- Tabs -->
|
<!-- Tabs -->
|
||||||
<a-col :span="24">
|
<a-col :span="24">
|
||||||
<a-tabs default-active-key="tpl-advanced">
|
<a-tabs default-active-key="tpl-basic">
|
||||||
<a-tab-pane key="tpl-basic" class="tab-pane">
|
<a-tab-pane key="tpl-basic" class="tab-pane">
|
||||||
<template #tab>
|
<template #tab>
|
||||||
<SettingOutlined /> <span>Basic template</span>
|
<SettingOutlined /> <span>Basic template</span>
|
||||||
</template>
|
</template>
|
||||||
<a-empty description="Basic template — coming in 6-ii. Use the Advanced (JSON) tab to edit log/dns/api/policy directly for now." />
|
<BasicsTab
|
||||||
|
:template-settings="templateSettings"
|
||||||
|
:outbound-test-url="outboundTestUrl"
|
||||||
|
:warp-exist="warpExist"
|
||||||
|
:nord-exist="nordExist"
|
||||||
|
@update:outbound-test-url="(v) => (outboundTestUrl = v)"
|
||||||
|
@show-warp="showWarp"
|
||||||
|
@show-nord="showNord"
|
||||||
|
/>
|
||||||
</a-tab-pane>
|
</a-tab-pane>
|
||||||
|
|
||||||
<a-tab-pane key="tpl-routing" class="tab-pane">
|
<a-tab-pane key="tpl-routing" class="tab-pane">
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,21 @@
|
||||||
// printed for the textarea; tabs that want a parsed view can JSON.parse
|
// printed for the textarea; tabs that want a parsed view can JSON.parse
|
||||||
// it themselves.
|
// it themselves.
|
||||||
|
|
||||||
import { onMounted, onUnmounted, ref } from 'vue';
|
import { onMounted, onUnmounted, ref, watch } from 'vue';
|
||||||
import { HttpUtil, PromiseUtil } from '@/utils';
|
import { HttpUtil, PromiseUtil } from '@/utils';
|
||||||
|
|
||||||
const DIRTY_POLL_MS = 1000;
|
const DIRTY_POLL_MS = 1000;
|
||||||
|
|
||||||
|
// Hoists the parsed `templateSettings` alongside the JSON string so
|
||||||
|
// structured tabs (Basics/Routing/Outbounds/etc.) can mutate fields
|
||||||
|
// directly while the Advanced (JSON) tab edits the same data as text.
|
||||||
|
// We keep both in sync with two cooperating watches:
|
||||||
|
// • mutating templateSettings re-stringifies into xraySetting;
|
||||||
|
// • editing the JSON text re-parses into templateSettings (only on
|
||||||
|
// valid JSON — invalid edits leave templateSettings untouched
|
||||||
|
// so the structured tabs don't blow up while the user types).
|
||||||
|
let syncing = false;
|
||||||
|
|
||||||
export function useXraySetting() {
|
export function useXraySetting() {
|
||||||
const fetched = ref(false);
|
const fetched = ref(false);
|
||||||
const spinning = ref(false);
|
const spinning = ref(false);
|
||||||
|
|
@ -18,6 +28,9 @@ export function useXraySetting() {
|
||||||
const xraySetting = ref('');
|
const xraySetting = ref('');
|
||||||
const oldXraySetting = ref('');
|
const oldXraySetting = ref('');
|
||||||
|
|
||||||
|
// Parsed mirror — null until first successful fetch / parse.
|
||||||
|
const templateSettings = ref(null);
|
||||||
|
|
||||||
const outboundTestUrl = ref('https://www.google.com/generate_204');
|
const outboundTestUrl = ref('https://www.google.com/generate_204');
|
||||||
const oldOutboundTestUrl = ref('');
|
const oldOutboundTestUrl = ref('');
|
||||||
|
|
||||||
|
|
@ -30,8 +43,11 @@ export function useXraySetting() {
|
||||||
if (!msg?.success) return;
|
if (!msg?.success) return;
|
||||||
const obj = JSON.parse(msg.obj);
|
const obj = JSON.parse(msg.obj);
|
||||||
const pretty = JSON.stringify(obj.xraySetting, null, 2);
|
const pretty = JSON.stringify(obj.xraySetting, null, 2);
|
||||||
|
syncing = true;
|
||||||
xraySetting.value = pretty;
|
xraySetting.value = pretty;
|
||||||
oldXraySetting.value = pretty;
|
oldXraySetting.value = pretty;
|
||||||
|
templateSettings.value = obj.xraySetting;
|
||||||
|
syncing = false;
|
||||||
inboundTags.value = obj.inboundTags || [];
|
inboundTags.value = obj.inboundTags || [];
|
||||||
clientReverseTags.value = obj.clientReverseTags || [];
|
clientReverseTags.value = obj.clientReverseTags || [];
|
||||||
outboundTestUrl.value = obj.outboundTestUrl || 'https://www.google.com/generate_204';
|
outboundTestUrl.value = obj.outboundTestUrl || 'https://www.google.com/generate_204';
|
||||||
|
|
@ -40,6 +56,37 @@ export function useXraySetting() {
|
||||||
saveDisabled.value = true;
|
saveDisabled.value = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Structured tabs mutate templateSettings deeply. Re-stringify on
|
||||||
|
// change so the Advanced JSON view + the dirty-poll see the edits.
|
||||||
|
watch(
|
||||||
|
templateSettings,
|
||||||
|
(next) => {
|
||||||
|
if (syncing || !next) return;
|
||||||
|
syncing = true;
|
||||||
|
try {
|
||||||
|
xraySetting.value = JSON.stringify(next, null, 2);
|
||||||
|
} finally {
|
||||||
|
syncing = false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ deep: true },
|
||||||
|
);
|
||||||
|
|
||||||
|
// Advanced JSON edits — only refresh templateSettings when the text
|
||||||
|
// parses, so structured tabs stay readable mid-edit.
|
||||||
|
watch(xraySetting, (next) => {
|
||||||
|
if (syncing) return;
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(next);
|
||||||
|
syncing = true;
|
||||||
|
try {
|
||||||
|
templateSettings.value = parsed;
|
||||||
|
} finally {
|
||||||
|
syncing = false;
|
||||||
|
}
|
||||||
|
} catch (_e) { /* ignore — wait for user to finish */ }
|
||||||
|
});
|
||||||
|
|
||||||
async function saveAll() {
|
async function saveAll() {
|
||||||
spinning.value = true;
|
spinning.value = true;
|
||||||
try {
|
try {
|
||||||
|
|
@ -98,6 +145,7 @@ export function useXraySetting() {
|
||||||
spinning,
|
spinning,
|
||||||
saveDisabled,
|
saveDisabled,
|
||||||
xraySetting,
|
xraySetting,
|
||||||
|
templateSettings,
|
||||||
outboundTestUrl,
|
outboundTestUrl,
|
||||||
inboundTags,
|
inboundTags,
|
||||||
clientReverseTags,
|
clientReverseTags,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue