|
@@ -81,13 +81,6 @@
|
|
|
</template>
|
|
</template>
|
|
|
{{ template "settings/xray/outbounds" . }}
|
|
{{ template "settings/xray/outbounds" . }}
|
|
|
</a-tab-pane>
|
|
</a-tab-pane>
|
|
|
- <a-tab-pane key="tpl-reverse" :style="{ paddingTop: '20px' }" force-render="true">
|
|
|
|
|
- <template #tab>
|
|
|
|
|
- <a-icon type="import"></a-icon>
|
|
|
|
|
- <span>{{ i18n "pages.xray.outbound.reverse"}}</span>
|
|
|
|
|
- </template>
|
|
|
|
|
- {{ template "settings/xray/reverse" . }}
|
|
|
|
|
- </a-tab-pane>
|
|
|
|
|
<a-tab-pane key="tpl-balancer" :style="{ paddingTop: '20px' }" force-render="true">
|
|
<a-tab-pane key="tpl-balancer" :style="{ paddingTop: '20px' }" force-render="true">
|
|
|
<template #tab>
|
|
<template #tab>
|
|
|
<a-icon type="cluster"></a-icon>
|
|
<a-icon type="cluster"></a-icon>
|
|
@@ -135,7 +128,6 @@
|
|
|
{{template "component/aSettingListItem" .}}
|
|
{{template "component/aSettingListItem" .}}
|
|
|
{{template "modals/ruleModal" .}}
|
|
{{template "modals/ruleModal" .}}
|
|
|
{{template "modals/outModal" .}}
|
|
{{template "modals/outModal" .}}
|
|
|
-{{template "modals/reverseModal" .}}
|
|
|
|
|
{{template "modals/balancerModal" .}}
|
|
{{template "modals/balancerModal" .}}
|
|
|
{{template "modals/dnsModal" .}}
|
|
{{template "modals/dnsModal" .}}
|
|
|
{{template "modals/dnsPresetsModal" .}}
|
|
{{template "modals/dnsPresetsModal" .}}
|
|
@@ -184,34 +176,6 @@
|
|
|
{ title: '{{ i18n "pages.xray.outbound.test" }}', align: 'center', width: 70, scopedSlots: { customRender: 'test' } },
|
|
{ title: '{{ i18n "pages.xray.outbound.test" }}', align: 'center', width: 70, scopedSlots: { customRender: 'test' } },
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
- const reverseColumns = [{
|
|
|
|
|
- title: "#",
|
|
|
|
|
- align: 'center',
|
|
|
|
|
- width: 20,
|
|
|
|
|
- scopedSlots: {
|
|
|
|
|
- customRender: 'action'
|
|
|
|
|
- }
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- title: '{{ i18n "pages.xray.outbound.type"}}',
|
|
|
|
|
- dataIndex: 'type',
|
|
|
|
|
- align: 'center',
|
|
|
|
|
- width: 50
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- title: '{{ i18n "pages.xray.outbound.tag"}}',
|
|
|
|
|
- dataIndex: 'tag',
|
|
|
|
|
- align: 'center',
|
|
|
|
|
- width: 50
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- title: '{{ i18n "pages.xray.outbound.domain"}}',
|
|
|
|
|
- dataIndex: 'domain',
|
|
|
|
|
- align: 'center',
|
|
|
|
|
- width: 50
|
|
|
|
|
- },
|
|
|
|
|
- ];
|
|
|
|
|
-
|
|
|
|
|
const balancerColumns = [{
|
|
const balancerColumns = [{
|
|
|
title: "#",
|
|
title: "#",
|
|
|
align: 'center',
|
|
align: 'center',
|
|
@@ -945,110 +909,6 @@
|
|
|
Vue.prototype.$message.error('{{ i18n "pages.xray.outbound.testError" }}: ' + error.message);
|
|
Vue.prototype.$message.error('{{ i18n "pages.xray.outbound.testError" }}: ' + error.message);
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
- addReverse() {
|
|
|
|
|
- reverseModal.show({
|
|
|
|
|
- title: '{{ i18n "pages.xray.outbound.addReverse"}}',
|
|
|
|
|
- okText: '{{ i18n "pages.xray.outbound.addReverse" }}',
|
|
|
|
|
- confirm: (reverse, rules) => {
|
|
|
|
|
- reverseModal.loading();
|
|
|
|
|
- if (reverse.tag.length > 0) {
|
|
|
|
|
- newTemplateSettings = this.templateSettings;
|
|
|
|
|
- if (newTemplateSettings.reverse == undefined) newTemplateSettings.reverse = {};
|
|
|
|
|
- if (newTemplateSettings.reverse[reverse.type + 's'] == undefined) newTemplateSettings.reverse[
|
|
|
|
|
- reverse.type + 's'] = [];
|
|
|
|
|
- newTemplateSettings.reverse[reverse.type + 's'].push({
|
|
|
|
|
- tag: reverse.tag,
|
|
|
|
|
- domain: reverse.domain
|
|
|
|
|
- });
|
|
|
|
|
- this.templateSettings = newTemplateSettings;
|
|
|
|
|
-
|
|
|
|
|
- // Add related rules
|
|
|
|
|
- this.templateSettings.routing.rules.push(...rules);
|
|
|
|
|
- this.routingRuleSettings = JSON.stringify(this.templateSettings.routing.rules);
|
|
|
|
|
- }
|
|
|
|
|
- reverseModal.close();
|
|
|
|
|
- },
|
|
|
|
|
- isEdit: false
|
|
|
|
|
- });
|
|
|
|
|
- },
|
|
|
|
|
- editReverse(index) {
|
|
|
|
|
- if (this.reverseData[index].type == "bridge") {
|
|
|
|
|
- oldRules = this.templateSettings.routing.rules.filter(r => r.inboundTag && r.inboundTag[0] == this
|
|
|
|
|
- .reverseData[index].tag);
|
|
|
|
|
- } else {
|
|
|
|
|
- oldRules = this.templateSettings.routing.rules.filter(r => r.outboundTag && r.outboundTag == this
|
|
|
|
|
- .reverseData[index].tag);
|
|
|
|
|
- }
|
|
|
|
|
- reverseModal.show({
|
|
|
|
|
- title: '{{ i18n "pages.xray.outbound.editReverse"}} ' + (index + 1),
|
|
|
|
|
- reverse: this.reverseData[index],
|
|
|
|
|
- rules: oldRules,
|
|
|
|
|
- confirm: (reverse, rules) => {
|
|
|
|
|
- reverseModal.loading();
|
|
|
|
|
- if (reverse.tag.length > 0) {
|
|
|
|
|
- oldData = this.reverseData[index];
|
|
|
|
|
- newTemplateSettings = this.templateSettings;
|
|
|
|
|
- oldReverseIndex = newTemplateSettings.reverse[oldData.type + 's'].findIndex(rs => rs.tag ==
|
|
|
|
|
- oldData.tag);
|
|
|
|
|
- oldRuleIndex0 = oldRules.length > 0 ? newTemplateSettings.routing.rules.findIndex(r => JSON
|
|
|
|
|
- .stringify(r) == JSON.stringify(oldRules[0])) : -1;
|
|
|
|
|
- oldRuleIndex1 = oldRules.length == 2 ? newTemplateSettings.routing.rules.findIndex(r => JSON
|
|
|
|
|
- .stringify(r) == JSON.stringify(oldRules[1])) : -1;
|
|
|
|
|
- if (oldData.type == reverse.type) {
|
|
|
|
|
- newTemplateSettings.reverse[oldData.type + 's'][oldReverseIndex] = {
|
|
|
|
|
- tag: reverse.tag,
|
|
|
|
|
- domain: reverse.domain
|
|
|
|
|
- };
|
|
|
|
|
- } else {
|
|
|
|
|
- newTemplateSettings.reverse[oldData.type + 's'].splice(oldReverseIndex, 1);
|
|
|
|
|
- // delete empty object
|
|
|
|
|
- if (newTemplateSettings.reverse[oldData.type + 's'].length == 0) Reflect.deleteProperty(
|
|
|
|
|
- newTemplateSettings.reverse, oldData.type + 's');
|
|
|
|
|
- // add other type of reverse if it is not exist
|
|
|
|
|
- if (!newTemplateSettings.reverse[reverse.type + 's']) newTemplateSettings.reverse[reverse
|
|
|
|
|
- .type + 's'] = [];
|
|
|
|
|
- newTemplateSettings.reverse[reverse.type + 's'].push({
|
|
|
|
|
- tag: reverse.tag,
|
|
|
|
|
- domain: reverse.domain
|
|
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
- this.templateSettings = newTemplateSettings;
|
|
|
|
|
-
|
|
|
|
|
- // Adjust Rules
|
|
|
|
|
- newRules = this.templateSettings.routing.rules;
|
|
|
|
|
- oldRuleIndex0 != -1 ? newRules[oldRuleIndex0] = rules[0] : newRules.push(rules[0]);
|
|
|
|
|
- oldRuleIndex1 != -1 ? newRules[oldRuleIndex1] = rules[1] : newRules.push(rules[1]);
|
|
|
|
|
- this.routingRuleSettings = JSON.stringify(newRules);
|
|
|
|
|
- }
|
|
|
|
|
- reverseModal.close();
|
|
|
|
|
- },
|
|
|
|
|
- isEdit: true
|
|
|
|
|
- });
|
|
|
|
|
- },
|
|
|
|
|
- deleteReverse(index) {
|
|
|
|
|
- oldData = this.reverseData[index];
|
|
|
|
|
- newTemplateSettings = this.templateSettings;
|
|
|
|
|
- reverseTypeObj = newTemplateSettings.reverse[oldData.type + 's'];
|
|
|
|
|
- realIndex = reverseTypeObj.findIndex(r => r.tag == oldData.tag && r.domain == oldData.domain);
|
|
|
|
|
- newTemplateSettings.reverse[oldData.type + 's'].splice(realIndex, 1);
|
|
|
|
|
-
|
|
|
|
|
- // delete empty objects
|
|
|
|
|
- if (reverseTypeObj.length == 0) Reflect.deleteProperty(newTemplateSettings.reverse, oldData.type + 's');
|
|
|
|
|
- if (Object.keys(newTemplateSettings.reverse).length === 0) Reflect.deleteProperty(newTemplateSettings,
|
|
|
|
|
- 'reverse');
|
|
|
|
|
-
|
|
|
|
|
- // delete related routing rules
|
|
|
|
|
- newRules = newTemplateSettings.routing.rules;
|
|
|
|
|
- if (oldData.type == "bridge") {
|
|
|
|
|
- newRules = newTemplateSettings.routing.rules.filter(r => !(r.inboundTag && r.inboundTag.length == 1 && r
|
|
|
|
|
- .inboundTag[0] == oldData.tag));
|
|
|
|
|
- } else if (oldData.type == "portal") {
|
|
|
|
|
- newRules = newTemplateSettings.routing.rules.filter(r => r.outboundTag != oldData.tag);
|
|
|
|
|
- }
|
|
|
|
|
- newTemplateSettings.routing.rules = newRules;
|
|
|
|
|
-
|
|
|
|
|
- this.templateSettings = newTemplateSettings;
|
|
|
|
|
- },
|
|
|
|
|
async refreshOutboundTraffic() {
|
|
async refreshOutboundTraffic() {
|
|
|
if (!this.refreshing) {
|
|
if (!this.refreshing) {
|
|
|
this.refreshing = true;
|
|
this.refreshing = true;
|
|
@@ -1457,32 +1317,6 @@
|
|
|
return data;
|
|
return data;
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
- reverseData: {
|
|
|
|
|
- get: function() {
|
|
|
|
|
- data = []
|
|
|
|
|
- if (this.templateSettings != null && this.templateSettings.reverse != null) {
|
|
|
|
|
- if (this.templateSettings.reverse.bridges) {
|
|
|
|
|
- this.templateSettings.reverse.bridges.forEach((o, index) => {
|
|
|
|
|
- data.push({
|
|
|
|
|
- 'key': index,
|
|
|
|
|
- 'type': 'bridge',
|
|
|
|
|
- ...o
|
|
|
|
|
- });
|
|
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
- if (this.templateSettings.reverse.portals) {
|
|
|
|
|
- this.templateSettings.reverse.portals.forEach((o, index) => {
|
|
|
|
|
- data.push({
|
|
|
|
|
- 'key': index,
|
|
|
|
|
- 'type': 'portal',
|
|
|
|
|
- ...o
|
|
|
|
|
- });
|
|
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- return data;
|
|
|
|
|
- },
|
|
|
|
|
- },
|
|
|
|
|
routingRuleSettings: {
|
|
routingRuleSettings: {
|
|
|
get: function() {
|
|
get: function() {
|
|
|
return this.templateSettings ? JSON.stringify(this.templateSettings.routing.rules, null, 2) : null;
|
|
return this.templateSettings ? JSON.stringify(this.templateSettings.routing.rules, null, 2) : null;
|