From ee76721f8bb1c9d3afdd5243233f666c402cdff9 Mon Sep 17 00:00:00 2001
From: rockyjohn890 <144576338+rockyjohn890@users.noreply.github.com>
Date: Sun, 24 Dec 2023 20:32:53 +0700
Subject: [PATCH] Update xray.html

---
 web/html/xui/xray.html | 64 ++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index 54f10ddf..7ee19b3f 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -71,7 +71,7 @@
                                     <a-button type="danger" :disabled="!saveBtnDisable" @click="restartXray">{{ i18n "pages.xray.restart" }}</a-button>
                                     <a-popover v-if="restartResult"
                                         :overlay-class-name="themeSwitcher.currentTheme">
-                                        <span slot="title" style="font-size: 12pt">Error in running xray-core</span>
+                                        <span slot="title" style="font-size: 12pt">Lỗi khi chạy xray-core</span>
                                         <template slot="content">
                                             <p style="max-width: 400px" v-for="line in restartResult.split('\n')">[[ line ]]</p>
                                         </template>
@@ -157,7 +157,6 @@
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.PrivateIp"}}' desc='{{ i18n "pages.xray.PrivateIpDesc"}}' v-model="privateIpSettings"></setting-list-item>
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.Ads"}}' desc='{{ i18n "pages.xray.AdsDesc"}}' v-model="AdsSettings"></setting-list-item>
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.Family"}}' desc='{{ i18n "pages.xray.FamilyDesc"}}' v-model="familyProtectSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.Security"}}' desc='{{ i18n "pages.xray.SecurityDesc"}}' v-model="SecuritySettings"></setting-list-item>
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.Speedtest"}}' desc='{{ i18n "pages.xray.SpeedtestDesc"}}' v-model="SpeedTestSettings"></setting-list-item>
                                 </a-collapse-panel>
                                 <a-collapse-panel header='{{ i18n "pages.xray.blockCountryConfigs"}}'>
@@ -193,7 +192,7 @@
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectChinaDomain"}}' desc='{{ i18n "pages.xray.DirectChinaDomainDesc"}}' v-model="ChinaDomainDirectSettings"></setting-list-item>
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectRussiaIp"}}' desc='{{ i18n "pages.xray.DirectRussiaIpDesc"}}' v-model="RussiaIpDirectSettings"></setting-list-item>
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectRussiaDomain"}}' desc='{{ i18n "pages.xray.DirectRussiaDomainDesc"}}' v-model="RussiaDomainDirectSettings"></setting-list-item>
-				    <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectVNIp"}}' desc='{{ i18n "pages.xray.DirectVNIpDesc"}}' v-model="VNIpDirectSettings"></setting-list-item>
+				                    <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectVNIp"}}' desc='{{ i18n "pages.xray.DirectVNIpDesc"}}' v-model="VNIpDirectSettings"></setting-list-item>
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectVNDomain"}}' desc='{{ i18n "pages.xray.DirectVNDomainDesc"}}' v-model="VNDomainDirectSettings"></setting-list-item>									
                                 </a-collapse-panel>
                                 <a-collapse-panel header='{{ i18n "pages.xray.ipv4Configs"}}'>
@@ -221,6 +220,7 @@
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.OpenAIWARP"}}' desc='{{ i18n "pages.xray.OpenAIWARPDesc"}}' v-model="OpenAIWARPSettings"></setting-list-item>
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.NetflixWARP"}}' desc='{{ i18n "pages.xray.NetflixWARPDesc"}}' v-model="NetflixWARPSettings"></setting-list-item>
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.SpotifyWARP"}}' desc='{{ i18n "pages.xray.SpotifyWARPDesc"}}' v-model="SpotifyWARPSettings"></setting-list-item>
+				    <setting-list-item type="switch" title='{{ i18n "pages.xray.VNWARP"}}' desc='{{ i18n "pages.xray.VNWARPDesc"}}' v-model="VNWARPSettings"></setting-list-item>
                                 </a-collapse-panel>
                             </a-collapse>
                         </a-tab-pane>
@@ -271,7 +271,7 @@
                                 <template slot="inbound" slot-scope="text, rule, index">
                                     <a-popover :overlay-class-name="themeSwitcher.currentTheme">
                                         <template slot="content">
-                                            <p v-if="rule.inboundTag">Inbound Tag: [[ rule.inboundTag ]]</p>
+                                            <p v-if="rule.inboundTag">Thẻ đầu vào: [[ rule.inboundTag ]]</p>
                                             <p v-if="rule.user">User email: [[ rule.user ]]</p>
                                         </template>
                                         [[ [rule.inboundTag,rule.user].join('\n') ]]
@@ -280,7 +280,7 @@
                                 <template slot="outbound" slot-scope="text, rule, index">
                                     <a-popover :overlay-class-name="themeSwitcher.currentTheme">
                                         <template slot="content">
-                                            <p v-if="rule.outboundTag">Outbound Tag: [[ rule.outboundTag ]]</p>
+                                            <p v-if="rule.outboundTag">Thẻ đầu ra: [[ rule.outboundTag ]]</p>
                                         </template>
                                         [[ rule.outboundTag ]]
                                     </a-popover>
@@ -292,23 +292,23 @@
                                         <template slot="content">
                                             <table cellpadding="2" style="max-width: 300px;">
                                                 <tr v-if="rule.source">
-                                                    <td>Source</td>
+                                                    <td>Nguồn</td>
                                                     <td><a-tag color="blue" v-for="r in rule.source.split(',')">[[ r ]]</a-tag></td>
                                                 </tr>
                                                 <tr v-if="rule.sourcePort">
-                                                    <td>Source Port</td>
+                                                    <td>Cổng nguồn</td>
                                                     <td><a-tag color="green" v-for="r in rule.sourcePort.split(',')">[[ r ]]</a-tag></td>
                                                 </tr>
                                                 <tr v-if="rule.network">
-                                                    <td>Network</td>
+                                                    <td>Mạng</td>
                                                     <td><a-tag color="blue" v-for="r in rule.network.split(',')">[[ r ]]</a-tag></td>
                                                 </tr>
                                                 <tr v-if="rule.protocol">
-                                                    <td>Protocol</td>
+                                                    <td>Giao thức</td>
                                                     <td><a-tag color="green" v-for="r in rule.protocol.split(',')">[[ r ]]</a-tag></td>
                                                 </tr>
                                                 <tr v-if="rule.attrs">
-                                                    <td>Attrs</td>
+                                                    <td>Các thuộc tính</td>
                                                     <td><a-tag color="blue" v-for="r in rule.attrs.split(',')">[[ r ]]</a-tag></td>
                                                 </tr>
                                                 <tr v-if="rule.ip">
@@ -316,11 +316,11 @@
                                                     <td><a-tag color="green" v-for="r in rule.ip.split(',')">[[ r ]]</a-tag></td>
                                                 </tr>
                                                 <tr v-if="rule.domain">
-                                                    <td>Domain</td>
+                                                    <td>Tên Miền</td>
                                                     <td><a-tag color="blue" v-for="r in rule.domain.split(',')">[[ r ]]</a-tag></td>
                                                 </tr>
                                                 <tr v-if="rule.port">
-                                                    <td>Port</td>
+                                                    <td>Cổng</td>
                                                     <td><a-tag color="green" v-for="r in rule.port.split(',')">[[ r ]]</a-tag></td>
                                                 </tr>
                                             </table>
@@ -543,12 +543,8 @@
                 domains: {
                     ads: [
                         "geosite:category-ads-all",
-                        "ext:geosite_IR.dat:category-ads-all"
-                    ],
-                    security: [
-                        "ext:geosite_IR.dat:malware",
-                        "ext:geosite_IR.dat:phishing",
-                        "ext:geosite_IR.dat:cryptominers"
+                        "ext:geosite_IR.dat:category-ads-all",
+						"ext:geosite_VN.dat:category-ads-all"
                     ],
                     speedtest: ["geosite:speedtest"],
                     openai: ["geosite:openai"],
@@ -566,9 +562,9 @@
                     ir: [
                         "regexp:.*\\.ir$",
                         "regexp:.*\\.xn--mgba3a4f16a$",  // .ایران
-                        "ext:geosite_IR.dat:ir"
+                        "ext:geosite_IR.dat:ir"  // have rules to bypass all .ir domains.
                     ],
-		    vn: [
+		            vn: [
 			"regexp:.*\\.vn$",
                         "ext:geosite_VN.dat:vn",
                         "ext:geosite_VN.dat:ads"
@@ -577,7 +573,9 @@
                 familyProtectDNS: {
                     "servers": [
                         "1.1.1.3",  // https://developers.cloudflare.com/1.1.1.1/setup/
-                        "1.0.0.3"
+                        "1.0.0.3",
+                        "94.140.14.15",  // https://adguard-dns.io/kb/general/dns-providers/
+                        "94.140.15.16"
                     ],
                     "queryStrategy": "UseIPv4"
                 },
@@ -1186,18 +1184,6 @@
                     }
                 },
             },
-            SecuritySettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.security, this.blockedDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.blockedDomains = [...this.blockedDomains, ...this.settingsData.domains.security];
-                    } else {
-                        this.blockedDomains = this.blockedDomains.filter(data => !this.settingsData.domains.security.includes(data));
-                    }
-                },
-            },
             SpeedTestSettings: {
                 get: function () {
                     return doAllItemsExist(this.settingsData.domains.speedtest, this.blockedDomains);
@@ -1489,6 +1475,18 @@
                     }
                 },
             },
+	    VNWARPSettings: {
+                get: function () {
+                    return doAllItemsExist(this.settingsData.domains.vn, this.warpDomains);
+                },
+                set: function (newValue) {
+                    if (newValue) {
+                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.vn];
+                    } else {
+                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.vn.includes(data));
+                    }
+                },
+            },
         },
     });
 </script>