TLS: Remove ECH Force Query

1 files changed, 60 insertions, 34 deletions

diff --git a/web/html/modals/xray_reverse_modal.html b/web/html/modals/xray_reverse_modal.html
index 22f04317..addc8515 100644
--- a/web/html/modals/xray_reverse_modal.html
+++ b/web/html/modals/xray_reverse_modal.html
@@ -1,7 +1,7 @@
 {{define "modals/reverseModal"}}
 <a-modal id="reverse-modal" v-model="reverseModal.visible" :title="reverseModal.title" @ok="reverseModal.ok"
-         :confirm-loading="reverseModal.confirmLoading" :closable="true" :mask-closable="false"
-         :ok-text="reverseModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
+    :confirm-loading="reverseModal.confirmLoading" :closable="true" :mask-closable="false"
+    :ok-text="reverseModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
     <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
         <a-form-item label='{{ i18n "pages.xray.outbound.type" }}'>
             <a-select v-model="reverseModal.reverse.type" :dropdown-class-name="themeSwitcher.currentTheme">
@@ -15,26 +15,24 @@
             <a-input v-model.trim="reverseModal.reverse.domain"></a-input>
         </a-form-item>
         <template v-if="reverseModal.reverse.type=='bridge'">
-        <a-form-item label='{{ i18n "pages.xray.outbound.intercon" }}'>
-            <a-select v-model="reverseModal.rules[0].outboundTag" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option v-for="x in reverseModal.outboundTags" :value="x">[[ x ]]</a-select-option>
-            </a-select>
-        </a-form-item>
-        <a-form-item label='{{ i18n "pages.xray.rules.outbound" }}'>
-            <a-select v-model="reverseModal.rules[1].outboundTag" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option v-for="x in reverseModal.outboundTags" :value="x">[[ x ]]</a-select-option>
-            </a-select>
-        </a-form-item>
+            <a-form-item label='{{ i18n "pages.xray.outbound.intercon" }}'>
+                <a-select v-model="reverseModal.rules[0].outboundTag" :dropdown-class-name="themeSwitcher.currentTheme">
+                    <a-select-option v-for="x in reverseModal.outboundTags" :value="x">[[ x ]]</a-select-option>
+                </a-select>
+            </a-form-item>
+            <a-form-item label='{{ i18n "pages.xray.rules.outbound" }}'>
+                <a-select v-model="reverseModal.rules[1].outboundTag" :dropdown-class-name="themeSwitcher.currentTheme">
+                    <a-select-option v-for="x in reverseModal.outboundTags" :value="x">[[ x ]]</a-select-option>
+                </a-select>
+            </a-form-item>
         </template>
         <template v-else>
             <a-form-item label='{{ i18n "pages.xray.outbound.intercon" }}'>
-                <a-checkbox-group
-                    v-model="reverseModal.rules[0].inboundTag"
+                <a-checkbox-group v-model="reverseModal.rules[0].inboundTag"
                     :options="reverseModal.inboundTags"></a-checkbox-group>
             </a-form-item>
             <a-form-item label='{{ i18n "pages.xray.rules.inbound" }}'>
-                <a-checkbox-group
-                    v-model="reverseModal.rules[1].inboundTag"
+                <a-checkbox-group v-model="reverseModal.rules[1].inboundTag"
                     :options="reverseModal.inboundTags"></a-checkbox-group>
             </a-form-item>
         </template>
@@ -53,9 +51,14 @@
             type: "",
             domain: ""
         },
-        rules: [
-            { outboundTag: '', inboundTag: []},
-            { outboundTag: '', inboundTag: []}
+        rules: [{
+                outboundTag: '',
+                inboundTag: []
+            },
+            {
+                outboundTag: '',
+                inboundTag: []
+            }
         ],
         inboundTags: [],
         outboundTags: [],
@@ -64,7 +67,7 @@
             reverseModal.rules[0].type = 'field';
             reverseModal.rules[1].type = 'field';
 
-            if(reverseModal.reverse.type == 'bridge'){
+            if (reverseModal.reverse.type == 'bridge') {
                 reverseModal.rules[0].inboundTag = [reverseModal.reverse.tag];
                 reverseModal.rules[1].inboundTag = [reverseModal.reverse.tag];
             } else {
@@ -73,22 +76,36 @@
             }
             ObjectUtil.execute(reverseModal.confirm, reverseModal.reverse, reverseModal.rules);
         },
-        show({ title='', okText='{{ i18n "sure" }}', reverse, rules, confirm=(reverse, rules)=>{}, isEdit=false  }) {
+        show({
+            title = '',
+            okText = '{{ i18n "sure" }}',
+            reverse,
+            rules,
+            confirm = (reverse, rules) => {},
+            isEdit = false
+        }) {
             this.title = title;
             this.okText = okText;
             this.confirm = confirm;
             this.visible = true;
-            if(isEdit) {
+            if (isEdit) {
                 this.reverse = {
                     tag: reverse.tag,
                     type: reverse.type,
                     domain: reverse.domain,
                 };
-                    reverse;
+                reverse;
                 rules0 = rules.filter(r => r.domain != null);
-                if(rules0.length == 0) rules0 = [{ outboundTag: '', domain: ["full:" + this.reverse.domain], inboundTag: []}];
+                if (rules0.length == 0) rules0 = [{
+                    outboundTag: '',
+                    domain: ["full:" + this.reverse.domain],
+                    inboundTag: []
+                }];
                 rules1 = rules.filter(r => r.domain == null);
-                if(rules1.length == 0) rules1 = [{ outboundTag: '', inboundTag: []}];
+                if (rules1.length == 0) rules1 = [{
+                    outboundTag: '',
+                    inboundTag: []
+                }];
                 this.rules = [];
                 this.rules.push({
                     domain: rules0[0].domain,
@@ -105,22 +122,29 @@
                     type: "bridge",
                     domain: "reverse.xui"
                 }
-                this.rules = [
-                    { outboundTag: '', inboundTag: []},
-                    { outboundTag: '', inboundTag: []}
+                this.rules = [{
+                        outboundTag: '',
+                        inboundTag: []
+                    },
+                    {
+                        outboundTag: '',
+                        inboundTag: []
+                    }
                 ]
             }
             this.isEdit = isEdit;
-            this.inboundTags = app.templateSettings.inbounds.filter((i) => !ObjectUtil.isEmpty(i.tag)).map(obj => obj.tag);
+            this.inboundTags = app.templateSettings.inbounds.filter((i) => !ObjectUtil.isEmpty(i.tag)).map(obj =>
+                obj.tag);
             this.inboundTags.push(...app.inboundTags);
             if (app.enableDNS && !ObjectUtil.isEmpty(app.dnsTag)) this.inboundTags.push(app.dnsTag)
-            this.outboundTags = app.templateSettings.outbounds.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj => obj.tag);
+            this.outboundTags = app.templateSettings.outbounds.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj =>
+                obj.tag);
         },
         close() {
             reverseModal.visible = false;
             reverseModal.loading(false);
         },
-        loading(loading=true) {
+        loading(loading = true) {
             reverseModal.confirmLoading = loading;
         },
     };
@@ -130,9 +154,11 @@
         el: '#reverse-modal',
         data: {
             reverseModal: reverseModal,
-            reverseTypes: { bridge: '{{ i18n "pages.xray.outbound.bridge" }}', portal:'{{ i18n "pages.xray.outbound.portal" }}'},
+            reverseTypes: {
+                bridge: '{{ i18n "pages.xray.outbound.bridge" }}',
+                portal: '{{ i18n "pages.xray.outbound.portal" }}'
+            },
         },
     });
-
 </script>
-{{end}}
+{{end}}
\ No newline at end of file