From 8b6e3491c4ed8e8dca8c068d99c4126b6927cf2e Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Thu, 26 Sep 2024 12:19:18 +0200
Subject: [PATCH 01/45] base install for amzn

---
 install.sh | 2 +-
 x-ui.sh    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index a0b937a4..3435fc76 100644
--- a/install.sh
+++ b/install.sh
@@ -110,7 +110,7 @@ install_base() {
     centos | almalinux | rocky | oracle)
         yum -y update && yum install -y -q wget curl tar tzdata
         ;;
-    fedora)
+    fedora | amzn)
         dnf -y update && dnf install -y -q wget curl tar tzdata
         ;;
     arch | manjaro | parch)
diff --git a/x-ui.sh b/x-ui.sh
index 120c83a0..e4bc622b 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -478,7 +478,7 @@ enable_bbr() {
     centos | almalinux | rocky | oracle)
         yum -y update && yum -y install ca-certificates
         ;;
-    fedora)
+    fedora | amzn)
         dnf -y update && dnf -y install ca-certificates
         ;;
     arch | manjaro | parch)
@@ -818,7 +818,7 @@ ssl_cert_issue() {
     centos | almalinux | rocky | oracle)
         yum -y update && yum -y install socat
         ;;
-    fedora)
+    fedora | amzn)
         dnf -y update && dnf -y install socat
         ;;
     arch | manjaro | parch)
@@ -1169,7 +1169,7 @@ install_iplimit() {
             yum update -y && yum install epel-release -y
             yum -y install fail2ban
             ;;
-        fedora)
+        fedora | amzn)
             dnf -y update && dnf -y install fail2ban
             ;;
         arch | manjaro | parch)
@@ -1250,7 +1250,7 @@ remove_iplimit() {
             yum remove fail2ban -y
             yum autoremove -y
             ;;
-        fedora)
+        fedora | amzn)
             dnf remove fail2ban -y
             dnf autoremove -y
             ;;

From 0b8beafc89c684140fe6be4cd007fbb2a9eb5f3d Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Thu, 26 Sep 2024 13:08:54 +0200
Subject: [PATCH 02/45] DNS - Expect IPs

---
 web/html/xui/dns_modal.html          |  33 ++++--
 web/html/xui/xray.html               | 161 ++++++++++++++-------------
 web/translation/translate.en_US.toml |   1 +
 web/translation/translate.es_ES.toml |   1 +
 web/translation/translate.fa_IR.toml |   1 +
 web/translation/translate.id_ID.toml |   1 +
 web/translation/translate.pt_BR.toml |   1 +
 web/translation/translate.ru_RU.toml |   1 +
 web/translation/translate.tr_TR.toml |   1 +
 web/translation/translate.uk_UA.toml |   1 +
 web/translation/translate.vi_VN.toml |   1 +
 web/translation/translate.zh_CN.toml |   1 +
 12 files changed, 119 insertions(+), 85 deletions(-)

diff --git a/web/html/xui/dns_modal.html b/web/html/xui/dns_modal.html
index 1ea93885..f61cd8b2 100644
--- a/web/html/xui/dns_modal.html
+++ b/web/html/xui/dns_modal.html
@@ -1,5 +1,7 @@
 {{define "dnsModal"}}
-<a-modal id="dns-modal" v-model="dnsModal.visible" :title="dnsModal.title" @ok="dnsModal.ok" :closable="true" :mask-closable="false" :ok-text="dnsModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
+<a-modal id="dns-modal" v-model="dnsModal.visible" :title="dnsModal.title" @ok="dnsModal.ok" :closable="true"
+  :mask-closable="false" :ok-text="dnsModal.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.address" }}'>
       <a-input v-model.trim="dnsModal.dnsServer.address"></a-input>
@@ -8,18 +10,29 @@
       <a-button icon="plus" size="small" type="primary" @click="dnsModal.dnsServer.domains.push('')"></a-button>
       <template v-for="(domain, index) in dnsModal.dnsServer.domains">
         <a-input v-model.trim="dnsModal.dnsServer.domains[index]">
-          <a-button icon="minus" size="small" slot="addonAfter" @click="dnsModal.dnsServer.domains.splice(index,1)"></a-button>
+          <a-button icon="minus" size="small" slot="addonAfter"
+            @click="dnsModal.dnsServer.domains.splice(index,1)"></a-button>
         </a-input>
       </template>
     </a-form-item>
     <a-form-item label='{{ i18n "pages.xray.dns.strategy" }}' v-if="isAdvanced">
-      <a-select v-model="dnsModal.dnsServer.queryStrategy" style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme">
+      <a-select v-model="dnsModal.dnsServer.queryStrategy" style="width: 100%"
+        :dropdown-class-name="themeSwitcher.currentTheme">
         <a-select-option :value="l" :label="l" v-for="l in ['UseIP', 'UseIPv4', 'UseIPv6']"> [[ l ]] </a-select-option>
       </a-select>
     </a-form-item>
     <a-form-item label='Skip Fallback' v-if="isAdvanced">
       <a-switch v-model="dnsModal.dnsServer.skipFallback"></a-switch>
     </a-form-item>
+    <a-form-item label='{{ i18n "pages.xray.dns.expectIPs"}}'>
+      <a-button icon="plus" size="small" type="primary" @click="dnsModal.dnsServer.expectIPs.push('')"></a-button>
+      <template v-for="(domain, index) in dnsModal.dnsServer.expectIPs">
+        <a-input v-model.trim="dnsModal.dnsServer.expectIPs[index]">
+          <a-button icon="minus" size="small" slot="addonAfter"
+            @click="dnsModal.dnsServer.expectIPs.splice(index,1)"></a-button>
+        </a-input>
+      </template>
+    </a-form-item>
   </a-form>
 </a-modal>
 <script>
@@ -32,20 +45,24 @@
     dnsServer: {
       address: "localhost",
       domains: [],
+      expectIPs: [],
       queryStrategy: 'UseIP',
       skipFallback: true,
     },
     ok() {
       domains = dnsModal.dnsServer.domains.filter(d => d.length > 0);
+      expectIPs = dnsModal.dnsServer.expectIPs.filter(ip => ip.length > 0);
       dnsModal.dnsServer.domains = domains;
-      newDnsServer = domains.length > 0 ? dnsModal.dnsServer : dnsModal.dnsServer.address;
+      dnsModal.dnsServer.expectIPs = expectIPs;
+      newDnsServer = (domains.length > 0 || expectIPs.length > 0) ? dnsModal.dnsServer : dnsModal.dnsServer.address;
       ObjectUtil.execute(dnsModal.confirm, newDnsServer);
     },
+
     show({
       title = '',
       okText = '{{ i18n "confirm" }}',
       dnsServer,
-      confirm = (dnsServer) => {},
+      confirm = (dnsServer) => { },
       isEdit = false
     }) {
       this.title = title;
@@ -59,6 +76,7 @@
           this.dnsServer = {
             address: dnsServer ?? "",
             domains: [],
+            expectIPs: [],
             queryStrategy: 'UseIP',
             skipFallback: true,
           }
@@ -67,6 +85,7 @@
         this.dnsServer = {
           address: "localhost",
           domains: [],
+          expectIPs: [],
           queryStrategy: 'UseIP',
           skipFallback: true,
         }
@@ -85,8 +104,8 @@
     },
     computed: {
       isAdvanced: {
-        get: function() {
-          return dnsModal.dnsServer.domains.length > 0
+        get: function () {
+          return dnsModal.dnsServer.domains.length > 0;
         }
       }
     }
diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index 39010f28..71c7f4a1 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -587,86 +587,90 @@
                 </a-radio-group>
                 <textarea style="position:absolute; left: -800px;" id="obsSetting"></textarea>
               </a-tab-pane>
-              <a-tab-pane key="tpl-dns" tab='DNS' style="padding-top: 20px;" force-render="true">
-                <setting-list-item type="switch" title='{{ i18n "pages.xray.dns.enable" }}' desc='{{ i18n "pages.xray.dns.enableDesc" }}' v-model="enableDNS"></setting-list-item>
+            <a-tab-pane key="tpl-dns" tab='DNS' style="padding-top: 20px;" force-render="true">
+                <setting-list-item type="switch" title='{{ i18n "pages.xray.dns.enable" }}'
+                    desc='{{ i18n "pages.xray.dns.enableDesc" }}' v-model="enableDNS"></setting-list-item>
                 <template v-if="enableDNS">
-                  <setting-list-item style="padding: 10px 20px" type="text" title='{{ i18n "pages.xray.dns.tag" }}' desc='{{ i18n "pages.xray.dns.tagDesc" }}' v-model="dnsTag"></setting-list-item>
-                  <a-list-item style="padding: 10px 20px">
-                    <a-row>
-                      <a-col :lg="24" :xl="12">
-                        <a-list-item-meta title='{{ i18n "pages.xray.dns.strategy" }}' description='{{ i18n "pages.xray.dns.strategyDesc" }}' />
-                      </a-col>
-                      <a-col :lg="24" :xl="12">
-                        <a-select
-                            v-model="dnsStrategy"
-                            style="width: 100%"
-                            :dropdown-class-name="themeSwitcher.currentTheme">
-                          <a-select-option :value="l" :label="l" v-for="l in ['UseIP', 'UseIPv4', 'UseIPv6']">
-                            [[ l ]]
-                          </a-select-option>
-                        </a-select>
-                      </a-col>
-                    </a-row>
-                  </a-list-item>
-                  <a-divider>DNS</a-divider>
-                  <a-button type="primary" icon="plus" @click="addDNSServer()" style="margin-bottom: 10px;">{{ i18n "pages.xray.dns.add" }}</a-button>
-                  <a-table :columns="dnsColumns" bordered v-if="dnsServers.length>0"
-                      :row-key="r => r.key"
-                      :data-source="dnsServers"
-                      :scroll="isMobile ? {} : { x: 200 }"
-                      :pagination="false"
-                      :indent-size="0"
-                      :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
-                    <template slot="action" slot-scope="text,dns,index">
-                        [[ index+1 ]]
-                      <a-dropdown :trigger="['click']">
-                        <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
-                        <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
-                          <a-menu-item @click="editDNSServer(index)">
-                            <a-icon type="edit"></a-icon>
-                            {{ i18n "edit" }}
-                          </a-menu-item>
-                          <a-menu-item @click="deleteDNSServer(index)">
-                            <span style="color: #FF4D4F">
-                              <a-icon type="delete"></a-icon> {{ i18n "delete"}}
-                            </span>
-                          </a-menu-item>
-                        </a-menu>
-                      </a-dropdown>
-                    </template>
-                    <template slot="address" slot-scope="dns,index">
-                      <span v-if="typeof dns == 'object'">[[ dns.address ]]</span>
-                      <span v-else>[[ dns ]]</span>
-                    </template>
-                    <template slot="domain" slot-scope="dns,index">
-                      <span v-if="typeof dns == 'object'">[[ dns.domains.join(",") ]]</span>
-                    </template>
-                  </a-table>
-                  <a-divider>Fake DNS</a-divider>
-                  <a-button type="primary" icon="plus" @click="addFakedns()" style="margin-bottom: 10px;">{{ i18n "pages.xray.fakedns.add" }}</a-button>
-                  <a-table :columns="fakednsColumns" bordered v-if="fakeDns && fakeDns.length>0" :row-key="r => r.key"
-                      :data-source="fakeDns" :scroll="isMobile ? {} : { x: 200 }" :pagination="false" :indent-size="0"
-                      :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
-                    <template slot="action" slot-scope="text,fakedns,index">
-                        [[ index+1 ]]
-                      <a-dropdown :trigger="['click']">
-                        <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
-                        <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
-                          <a-menu-item @click="editFakedns(index)">
-                            <a-icon type="edit"></a-icon>
-                            {{ i18n "edit" }}
-                          </a-menu-item>
-                          <a-menu-item @click="deleteFakedns(index)">
-                            <span style="color: #FF4D4F">
-                              <a-icon type="delete"></a-icon> {{ i18n "delete"}}
-                            </span>
-                          </a-menu-item>
-                        </a-menu>
-                      </a-dropdown>
-                    </template>
-                  </a-table>
+                    <setting-list-item style="padding: 10px 20px" type="text" title='{{ i18n "pages.xray.dns.tag" }}'
+                        desc='{{ i18n "pages.xray.dns.tagDesc" }}' v-model="dnsTag"></setting-list-item>
+                    <a-list-item style="padding: 10px 20px">
+                        <a-row>
+                            <a-col :lg="24" :xl="12">
+                                <a-list-item-meta title='{{ i18n "pages.xray.dns.strategy" }}'
+                                    description='{{ i18n "pages.xray.dns.strategyDesc" }}' />
+                            </a-col>
+                            <a-col :lg="24" :xl="12">
+                                <a-select v-model="dnsStrategy" style="width: 100%"
+                                    :dropdown-class-name="themeSwitcher.currentTheme">
+                                    <a-select-option :value="l" :label="l" v-for="l in ['UseIP', 'UseIPv4', 'UseIPv6']">
+                                        [[ l ]]
+                                    </a-select-option>
+                                </a-select>
+                            </a-col>
+                        </a-row>
+                    </a-list-item>
+                    <a-divider>DNS</a-divider>
+                    <a-button type="primary" icon="plus" @click="addDNSServer()" style="margin-bottom: 10px;">{{ i18n
+                        "pages.xray.dns.add" }}</a-button>
+                    <a-table :columns="dnsColumns" bordered v-if="dnsServers.length>0" :row-key="r => r.key"
+                        :data-source="dnsServers" :scroll="isMobile ? {} : { x: 200 }" :pagination="false" :indent-size="0"
+                        :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
+                        <template slot="action" slot-scope="text,dns,index">
+                            [[ index+1 ]]
+                            <a-dropdown :trigger="['click']">
+                                <a-icon @click="e => e.preventDefault()" type="more"
+                                    style="font-size: 16px; text-decoration: bold;"></a-icon>
+                                <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                                    <a-menu-item @click="editDNSServer(index)">
+                                        <a-icon type="edit"></a-icon>
+                                        {{ i18n "edit" }}
+                                    </a-menu-item>
+                                    <a-menu-item @click="deleteDNSServer(index)">
+                                        <span style="color: #FF4D4F">
+                                            <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                                        </span>
+                                    </a-menu-item>
+                                </a-menu>
+                            </a-dropdown>
+                        </template>
+                        <template slot="address" slot-scope="dns,index">
+                            <span v-if="typeof dns == 'object'">[[ dns.address ]]</span>
+                            <span v-else>[[ dns ]]</span>
+                        </template>
+                        <template slot="domain" slot-scope="dns,index">
+                            <span v-if="typeof dns == 'object'">[[ dns.domains.join(",") ]]</span>
+                        </template>
+                        <template slot="expectIPs" slot-scope="dns,index">
+                            <span v-if="typeof dns == 'object'">[[ dns.expectIPs.join(",") ]]</span>
+                        </template>
+                    </a-table>
+                    <a-divider>Fake DNS</a-divider>
+                    <a-button type="primary" icon="plus" @click="addFakedns()" style="margin-bottom: 10px;">{{ i18n
+                        "pages.xray.fakedns.add" }}</a-button>
+                    <a-table :columns="fakednsColumns" bordered v-if="fakeDns && fakeDns.length>0" :row-key="r => r.key"
+                        :data-source="fakeDns" :scroll="isMobile ? {} : { x: 200 }" :pagination="false" :indent-size="0"
+                        :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
+                        <template slot="action" slot-scope="text,fakedns,index">
+                            [[ index+1 ]]
+                            <a-dropdown :trigger="['click']">
+                                <a-icon @click="e => e.preventDefault()" type="more"
+                                    style="font-size: 16px; text-decoration: bold;"></a-icon>
+                                <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                                    <a-menu-item @click="editFakedns(index)">
+                                        <a-icon type="edit"></a-icon>
+                                        {{ i18n "edit" }}
+                                    </a-menu-item>
+                                    <a-menu-item @click="deleteFakedns(index)">
+                                        <span style="color: #FF4D4F">
+                                            <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                                        </span>
+                                    </a-menu-item>
+                                </a-menu>
+                            </a-dropdown>
+                        </template>
+                    </a-table>
                 </template>
-              </a-tab-pane>
+            </a-tab-pane>
               <a-tab-pane key="tpl-advanced" tab='{{ i18n "pages.xray.advancedTemplate"}}' style="padding-top: 20px;" force-render="true">
                 <a-list-item-meta title='{{ i18n "pages.xray.Template"}}' description='{{ i18n "pages.xray.TemplateDesc"}}'></a-list-item-meta>
                 <a-radio-group v-model="advSettings" @change="changeCode" button-style="solid" style="margin: 10px 0;" :size="isMobile ? 'small' : ''">
@@ -748,6 +752,7 @@
         { title: "#", align: 'center', width: 20, scopedSlots: { customRender: 'action' } },
         { title: '{{ i18n "pages.xray.outbound.address"}}', align: 'center', width: 50, scopedSlots: { customRender: 'address' } },
         { title: '{{ i18n "pages.xray.dns.domains"}}', align: 'center', width: 50, scopedSlots: { customRender: 'domain' } },
+        { title: '{{ i18n "pages.xray.dns.expectIPs"}}', align: 'center', width: 50, scopedSlots: { customRender: 'expectIPs' } },
     ];
 
     const fakednsColumns = [
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index 0978e84e..8174e24f 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -488,6 +488,7 @@
 "add" = "Add Server"
 "edit" = "Edit Server"
 "domains" = "Domains"
+"expectIPs" = "Expect IPs"
 
 [pages.xray.fakedns]
 "add" = "Add Fake DNS"
diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml
index 1997bd82..b5b306bb 100644
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
@@ -486,6 +486,7 @@
 "add" = "Agregar Servidor"
 "edit" = "Editar Servidor"
 "domains" = "Dominios"
+"expectIPs" = "IPs esperadas"
 
 [pages.xray.fakedns]
 "add" = "Agregar DNS Falso"
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index dac201f2..b6c8fb60 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -488,6 +488,7 @@
 "add" = "افزودن سرور"
 "edit" = "ویرایش سرور"
 "domains" = "دامنه‌ها"
+"expectIPs" = "آی‌پی‌های مورد انتظار"
 
 [pages.xray.fakedns]
 "add" = "افزودن دی‌ان‌اس جعلی"
diff --git a/web/translation/translate.id_ID.toml b/web/translation/translate.id_ID.toml
index 565b10a7..5b649079 100644
--- a/web/translation/translate.id_ID.toml
+++ b/web/translation/translate.id_ID.toml
@@ -488,6 +488,7 @@
 "add" = "Tambahkan Server"
 "edit" = "Sunting Server"
 "domains" = "Domains"
+"expectIPs" = "IP yang Diharapkan"
 
 [pages.xray.fakedns]
 "add" = "Tambahkan DNS Palsu"
diff --git a/web/translation/translate.pt_BR.toml b/web/translation/translate.pt_BR.toml
index 106bc9b9..cbfad950 100644
--- a/web/translation/translate.pt_BR.toml
+++ b/web/translation/translate.pt_BR.toml
@@ -488,6 +488,7 @@
 "add" = "Adicionar Servidor"
 "edit" = "Editar Servidor"
 "domains" = "Domínios"
+"expectIPs" = "IPs Esperadas"
 
 [pages.xray.fakedns]
 "add" = "Adicionar Fake DNS"
diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index 7ddc95c8..4717d889 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -488,6 +488,7 @@
 "add" = "Добавить сервер"
 "edit" = "Редактировать сервер"
 "domains" = "Домены"
+"expectIPs" = "Ожидаемые IP"
 
 [pages.xray.fakedns]
 "add" = "Добавить поддельный DNS"
diff --git a/web/translation/translate.tr_TR.toml b/web/translation/translate.tr_TR.toml
index f21a2927..52558485 100644
--- a/web/translation/translate.tr_TR.toml
+++ b/web/translation/translate.tr_TR.toml
@@ -488,6 +488,7 @@
 "add" = "Sunucu Ekle"
 "edit" = "Sunucuyu Düzenle"
 "domains" = "Alan Adları"
+"expectIPs" = "Beklenen IP'ler"
 
 [pages.xray.fakedns]
 "add" = "Sahte DNS Ekle"
diff --git a/web/translation/translate.uk_UA.toml b/web/translation/translate.uk_UA.toml
index 1ed68eab..a9926bd1 100644
--- a/web/translation/translate.uk_UA.toml
+++ b/web/translation/translate.uk_UA.toml
@@ -488,6 +488,7 @@
 "add" = "Додати сервер"
 "edit" = "Редагувати сервер"
 "domains" = "Домени"
+"expectIPs" = "Очікувані IP"
 
 [pages.xray.fakedns]
 "add" = "Додати підроблений DNS"
diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml
index edcf56bb..91c748cd 100644
--- a/web/translation/translate.vi_VN.toml
+++ b/web/translation/translate.vi_VN.toml
@@ -488,6 +488,7 @@
 "add" = "Thêm máy chủ"
 "edit" = "Chỉnh sửa máy chủ"
 "domains" = "Tên miền"
+"expectIPs" = "Các IP Dự Kiến"
 
 [pages.xray.fakedns]
 "add" = "Thêm DNS giả"
diff --git a/web/translation/translate.zh_CN.toml b/web/translation/translate.zh_CN.toml
index 65a2a6ea..152e3e6d 100644
--- a/web/translation/translate.zh_CN.toml
+++ b/web/translation/translate.zh_CN.toml
@@ -488,6 +488,7 @@
 "add" = "添加服务器"
 "edit" = "编辑服务器"
 "domains" = "域"
+"expectIPs" = "预期 IP"
 
 [pages.xray.fakedns]
 "add" = "添加假 DNS"

From c9c8abe97b71bf54d9f1920be2dfcd1d5854d5b3 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Thu, 26 Sep 2024 15:55:56 +0200
Subject: [PATCH 03/45] refactor: split XTLS and Reality form tls into separate
 files

---
 web/html/xui/form/client.html           |   2 +-
 web/html/xui/form/reality_settings.html |  48 ++++++++++
 web/html/xui/form/tls_settings.html     | 117 ++++--------------------
 web/html/xui/form/xtls_settings.html    |  58 ++++++++++++
 4 files changed, 123 insertions(+), 102 deletions(-)
 create mode 100644 web/html/xui/form/reality_settings.html
 create mode 100644 web/html/xui/form/xtls_settings.html

diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html
index 070b962c..01d96c73 100644
--- a/web/html/xui/form/client.html
+++ b/web/html/xui/form/client.html
@@ -104,7 +104,7 @@
             </a-textarea>
         </a-form>
     </a-form-item>
-    <a-form-item v-if="inbound.xtls" label='Flow'>
+    <a-form-item v-if="inbound.stream.isXtls" label='Flow'>
         <a-select v-model="client.flow" :dropdown-class-name="themeSwitcher.currentTheme">
             <a-select-option value="" selected>{{ i18n "none" }}</a-select-option>
             <a-select-option v-for="key in XTLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
diff --git a/web/html/xui/form/reality_settings.html b/web/html/xui/form/reality_settings.html
new file mode 100644
index 00000000..19804e17
--- /dev/null
+++ b/web/html/xui/form/reality_settings.html
@@ -0,0 +1,48 @@
+{{define "form/realitySettings"}}
+<template>
+    <a-form-item label='Show'>
+        <a-switch v-model="inbound.stream.reality.show"></a-switch>
+    </a-form-item>
+    <a-form-item label='Xver'>
+        <a-input-number v-model.number="inbound.stream.reality.xver" :min="0"></a-input-number>
+    </a-form-item>
+    <a-form-item label='uTLS'>
+        <a-select v-model="inbound.stream.reality.settings.fingerprint" style="width: 50%"
+            :dropdown-class-name="themeSwitcher.currentTheme">
+            <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
+        </a-select>
+    </a-form-item>
+    <a-form-item label='Dest'>
+        <a-input v-model.trim="inbound.stream.reality.dest"></a-input>
+    </a-form-item>
+    <a-form-item label='SNI'>
+        <a-input v-model.trim="inbound.stream.reality.serverNames"></a-input>
+    </a-form-item>
+    <a-form-item label='Max Time Diff (ms)'>
+        <a-input-number v-model.number="inbound.stream.reality.maxTimediff" :min="0"></a-input-number>
+    </a-form-item>
+    <a-form-item>
+        <template slot="label">
+            <a-tooltip>
+                <template slot="title">
+                    <span>{{ i18n "reset" }}</span>
+                </template> Short IDs <a-icon @click="inbound.stream.reality.shortIds = RandomUtil.randomShortIds()"
+                    type="sync"></a-icon>
+            </a-tooltip>
+        </template>
+        <a-input v-model.trim="inbound.stream.reality.shortIds"></a-input>
+    </a-form-item>
+    <a-form-item label='SpiderX'>
+        <a-input v-model.trim="inbound.stream.reality.settings.spiderX"></a-input>
+    </a-form-item>
+    <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'>
+        <a-input v-model.trim="inbound.stream.reality.privateKey"></a-input>
+    </a-form-item>
+    <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'>
+        <a-input v-model.trim="inbound.stream.reality.settings.publicKey"></a-input>
+    </a-form-item>
+    <a-form-item label=" ">
+        <a-button type="primary" icon="import" @click="getNewX25519Cert">Get New Cert</a-button>
+    </a-form-item>
+</template>
+{{end}}
\ No newline at end of file
diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html
index 97b23ef6..6c2f4a67 100644
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -34,16 +34,19 @@
     </a-form-item>
     <a-form-item label="Min/Max Version">
       <a-input-group compact>
-        <a-select v-model="inbound.stream.tls.minVersion" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
+        <a-select v-model="inbound.stream.tls.minVersion" style="width: 50%"
+          :dropdown-class-name="themeSwitcher.currentTheme">
           <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
         </a-select>
-        <a-select v-model="inbound.stream.tls.maxVersion" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
+        <a-select v-model="inbound.stream.tls.maxVersion" style="width: 50%"
+          :dropdown-class-name="themeSwitcher.currentTheme">
           <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
         </a-select>
       </a-input-group>
     </a-form-item>
     <a-form-item label="uTLS">
-      <a-select v-model="inbound.stream.tls.settings.fingerprint" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
+      <a-select v-model="inbound.stream.tls.settings.fingerprint" style="width: 50%"
+        :dropdown-class-name="themeSwitcher.currentTheme">
         <a-select-option value=''>None</a-select-option>
         <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
       </a-select>
@@ -71,8 +74,10 @@
           <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
           <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button>
         </a-radio-group>
-        <a-button icon="plus" v-if="index === 0" type="primary" size="small" @click="inbound.stream.tls.addCert()" style="margin-left: 10px"></a-button>
-        <a-button icon="minus" v-if="inbound.stream.tls.certs.length>1" type="primary" size="small" @click="inbound.stream.tls.removeCert(index)" style="margin-left: 10px"></a-button>
+        <a-button icon="plus" v-if="index === 0" type="primary" size="small" @click="inbound.stream.tls.addCert()"
+          style="margin-left: 10px"></a-button>
+        <a-button icon="minus" v-if="inbound.stream.tls.certs.length>1" type="primary" size="small"
+          @click="inbound.stream.tls.removeCert(index)" style="margin-left: 10px"></a-button>
       </a-form-item>
       <template v-if="cert.useFile">
         <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'>
@@ -82,7 +87,8 @@
           <a-input v-model.trim="cert.keyFile"></a-input>
         </a-form-item>
         <a-form-item label=" ">
-          <a-button type="primary" icon="import" @click="setDefaultCertData(index)">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button>
+          <a-button type="primary" icon="import" @click="setDefaultCertData(index)">
+            {{ i18n "pages.inbounds.setDefaultCert" }}</a-button>
         </a-form-item>
       </template>
       <template v-else>
@@ -111,104 +117,13 @@
   </template>
 
   <!-- xtls settings -->
-  <template v-else-if="inbound.xtls">
-    <a-form-item label="SNI" placeholder="Server Name Indication">
-      <a-input v-model.trim="inbound.stream.xtls.sni"></a-input>
-    </a-form-item>
-    <a-form-item label="ALPN">
-      <a-select mode="multiple" :dropdown-class-name="themeSwitcher.currentTheme" v-model="inbound.stream.xtls.alpn">
-        <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
-      </a-select>
-    </a-form-item>
-    <a-form-item label="Allow Insecure">
-      <a-switch v-model="inbound.stream.xtls.settings.allowInsecure"></a-switch>
-    </a-form-item>
-    <template v-for="cert,index in inbound.stream.xtls.certs">
-      <a-form-item label='{{ i18n "certificate" }}'>
-        <a-radio-group v-model="cert.useFile" button-style="solid">
-          <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
-          <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button>
-        </a-radio-group>
-        <a-button icon="plus" v-if="index === 0" type="primary" size="small" @click="inbound.stream.xtls.addCert()" style="margin-left: 10px"></a-button>
-        <a-button icon="minus" v-if="inbound.stream.xtls.certs.length>1" type="primary" size="small" @click="inbound.stream.xtls.removeCert(index)" style="margin-left: 10px"></a-button>
-      </a-form-item>
-      <template v-if="cert.useFile">
-        <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'>
-          <a-input v-model.trim="cert.certFile"></a-input>
-        </a-form-item>
-        <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'>
-          <a-input v-model.trim="cert.keyFile"></a-input>
-        </a-form-item>
-        <a-form-item label=" ">
-          <a-button type="primary" icon="import" @click="setDefaultCertXtls(index)">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button>
-        </a-form-item>
-      </template>
-      <template v-else>
-        <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'>
-          <a-input type="textarea" :rows="3" v-model="cert.cert"></a-input>
-        </a-form-item>
-        <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'>
-          <a-input type="textarea" :rows="3" v-model="cert.key"></a-input>
-        </a-form-item>
-      </template>
-      <a-form-item label='OCSP stapling'>
-        <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number>
-      </a-form-item>
-      <a-form-item label="One Time Loading">
-        <a-switch v-model="cert.oneTimeLoading"></a-switch>
-      </a-form-item>
-      <a-form-item label='Usage Option'>
-        <a-select v-model="cert.usage" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
-          <a-select-option v-for="key in USAGE_OPTION" :value="key">[[ key ]]</a-select-option>
-        </a-select>
-      </a-form-item>
-    </template>
+  <template v-else-if="inbound.stream.isXtls">
+    {{template "form/xtlsSettings"}}
   </template>
 
   <!-- reality settings -->
   <template v-if="inbound.stream.isReality">
-    <a-form-item label='Show'>
-      <a-switch v-model="inbound.stream.reality.show"></a-switch>
-    </a-form-item>
-    <a-form-item label='Xver'>
-      <a-input-number v-model.number="inbound.stream.reality.xver" :min="0"></a-input-number>
-    </a-form-item>
-    <a-form-item label='uTLS'>
-      <a-select v-model="inbound.stream.reality.settings.fingerprint" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
-        <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
-      </a-select>
-    </a-form-item>
-    <a-form-item label='Dest'>
-      <a-input v-model.trim="inbound.stream.reality.dest"></a-input>
-    </a-form-item>
-    <a-form-item label='SNI'>
-      <a-input v-model.trim="inbound.stream.reality.serverNames"></a-input>
-    </a-form-item>
-    <a-form-item label='Max Time Diff (ms)'>
-      <a-input-number v-model.number="inbound.stream.reality.maxTimediff" :min="0"></a-input-number>
-    </a-form-item>
-    <a-form-item>
-      <template slot="label">
-        <a-tooltip>
-          <template slot="title">
-            <span>{{ i18n "reset" }}</span>
-          </template> Short IDs <a-icon @click="inbound.stream.reality.shortIds = RandomUtil.randomShortIds()" type="sync"></a-icon>
-        </a-tooltip>
-      </template>
-      <a-input v-model.trim="inbound.stream.reality.shortIds"></a-input>
-    </a-form-item>
-    <a-form-item label='SpiderX'>
-      <a-input v-model.trim="inbound.stream.reality.settings.spiderX"></a-input>
-    </a-form-item>
-    <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'>
-      <a-input v-model.trim="inbound.stream.reality.privateKey"></a-input>
-    </a-form-item>
-    <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'>
-      <a-input v-model.trim="inbound.stream.reality.settings.publicKey"></a-input>
-    </a-form-item>
-    <a-form-item label=" ">
-      <a-button type="primary" icon="import" @click="getNewX25519Cert">Get New Cert</a-button>
-    </a-form-item>
+    {{template "form/realitySettings"}}
   </template>
 </a-form>
-{{end}}
+{{end}}
\ No newline at end of file
diff --git a/web/html/xui/form/xtls_settings.html b/web/html/xui/form/xtls_settings.html
new file mode 100644
index 00000000..e6b88b4f
--- /dev/null
+++ b/web/html/xui/form/xtls_settings.html
@@ -0,0 +1,58 @@
+{{define "form/xtlsSettings"}}
+<template>
+    <a-form-item label="SNI" placeholder="Server Name Indication">
+        <a-input v-model.trim="inbound.stream.xtls.sni"></a-input>
+    </a-form-item>
+    <a-form-item label="ALPN">
+        <a-select mode="multiple" :dropdown-class-name="themeSwitcher.currentTheme" v-model="inbound.stream.xtls.alpn">
+            <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
+        </a-select>
+    </a-form-item>
+    <a-form-item label="Allow Insecure">
+        <a-switch v-model="inbound.stream.xtls.settings.allowInsecure"></a-switch>
+    </a-form-item>
+    <template v-for="cert,index in inbound.stream.xtls.certs">
+        <a-form-item label='{{ i18n "certificate" }}'>
+            <a-radio-group v-model="cert.useFile" button-style="solid">
+                <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
+                <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button>
+            </a-radio-group>
+            <a-button icon="plus" v-if="index === 0" type="primary" size="small" @click="inbound.stream.xtls.addCert()"
+                style="margin-left: 10px"></a-button>
+            <a-button icon="minus" v-if="inbound.stream.xtls.certs.length>1" type="primary" size="small"
+                @click="inbound.stream.xtls.removeCert(index)" style="margin-left: 10px"></a-button>
+        </a-form-item>
+        <template v-if="cert.useFile">
+            <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'>
+                <a-input v-model.trim="cert.certFile"></a-input>
+            </a-form-item>
+            <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'>
+                <a-input v-model.trim="cert.keyFile"></a-input>
+            </a-form-item>
+            <a-form-item label=" ">
+                <a-button type="primary" icon="import" @click="setDefaultCertXtls(index)">
+                    {{ i18n "pages.inbounds.setDefaultCert" }}</a-button>
+            </a-form-item>
+        </template>
+        <template v-else>
+            <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'>
+                <a-input type="textarea" :rows="3" v-model="cert.cert"></a-input>
+            </a-form-item>
+            <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'>
+                <a-input type="textarea" :rows="3" v-model="cert.key"></a-input>
+            </a-form-item>
+        </template>
+        <a-form-item label='OCSP stapling'>
+            <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number>
+        </a-form-item>
+        <a-form-item label="One Time Loading">
+            <a-switch v-model="cert.oneTimeLoading"></a-switch>
+        </a-form-item>
+        <a-form-item label='Usage Option'>
+            <a-select v-model="cert.usage" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option v-for="key in USAGE_OPTION" :value="key">[[ key ]]</a-select-option>
+            </a-select>
+        </a-form-item>
+    </template>
+</template>
+{{end}}
\ No newline at end of file

From ac08e8674782c735e544a02251c5aa392fa7d767 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Thu, 26 Sep 2024 16:20:35 +0200
Subject: [PATCH 04/45] inbound - better view

---
 web/html/xui/form/allocate.html |  1 -
 web/html/xui/form/inbound.html  | 16 ++++++++++------
 web/html/xui/form/sniffing.html |  1 -
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/web/html/xui/form/allocate.html b/web/html/xui/form/allocate.html
index 35527c19..aba8d5c9 100644
--- a/web/html/xui/form/allocate.html
+++ b/web/html/xui/form/allocate.html
@@ -1,5 +1,4 @@
 {{define "form/allocate"}}
-<a-divider style="margin:5px 0 0;">Allocate</a-divider>
 <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
     <a-form-item label='Strategy'>
       <a-select v-model="inbound.allocate.strategy" :dropdown-class-name="themeSwitcher.currentTheme">
diff --git a/web/html/xui/form/inbound.html b/web/html/xui/form/inbound.html
index 2930b7be..3a3b352f 100644
--- a/web/html/xui/form/inbound.html
+++ b/web/html/xui/form/inbound.html
@@ -115,13 +115,17 @@
 </template>
 
 <!-- sniffing -->
-<template>
-    {{template "form/sniffing"}}
-</template>
+<a-collapse>
+    <a-collapse-panel header='Sniffing'>
+        {{template "form/sniffing"}}
+    </a-collapse-panel>
+</a-collapse>
 
 <!-- allocate -->
-<template>
-    {{template "form/allocate"}}
-</template>
+<a-collapse>
+    <a-collapse-panel header='Allocate'>
+        {{template "form/allocate"}}
+    </a-collapse-panel>
+</a-collapse>
 
 {{end}}
diff --git a/web/html/xui/form/sniffing.html b/web/html/xui/form/sniffing.html
index df49a97a..d8a2e85a 100644
--- a/web/html/xui/form/sniffing.html
+++ b/web/html/xui/form/sniffing.html
@@ -1,5 +1,4 @@
 {{define "form/sniffing"}}
-<a-divider style="margin:5px 0 0;">Sniffing</a-divider>
 <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
   <a-form-item>
     <span slot="label">

From b09f52357ccd84f201b600079577051f7ba0473a Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Fri, 27 Sep 2024 13:34:12 +0200
Subject: [PATCH 05/45] update block and direct connection

---
 web/html/xui/settings.html           |  8 +--
 web/html/xui/xray.html               | 89 +++++++++++++++++++---------
 web/translation/translate.en_US.toml | 44 +++-----------
 web/translation/translate.es_ES.toml | 44 +++-----------
 web/translation/translate.fa_IR.toml | 44 +++-----------
 web/translation/translate.id_ID.toml | 44 +++-----------
 web/translation/translate.pt_BR.toml | 44 +++-----------
 web/translation/translate.ru_RU.toml | 44 +++-----------
 web/translation/translate.tr_TR.toml | 44 +++-----------
 web/translation/translate.uk_UA.toml | 44 +++-----------
 web/translation/translate.vi_VN.toml | 44 +++-----------
 web/translation/translate.zh_CN.toml | 44 +++-----------
 12 files changed, 146 insertions(+), 391 deletions(-)

diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html
index f2462518..803459a0 100644
--- a/web/html/xui/settings.html
+++ b/web/html/xui/settings.html
@@ -380,14 +380,14 @@
                       </a-col>
                     </a-row>
                     <a-collapse v-if="enableDirect" style="margin-top: 14px;">
-                      <a-collapse-panel header='Geo IP'>
+                      <a-collapse-panel header='{{ i18n "pages.xray.directips"}}'>
                         <a-list-item style="padding: 10px 20px">
-                          <a-checkbox-group v-model="geoIP" name="Geo IP" :options="geoIPOptions"></a-checkbox-group>
+                          <a-checkbox-group v-model="geoIP" :options="geoIPOptions"></a-checkbox-group>
                         </a-list-item>
                       </a-collapse-panel>
-                      <a-collapse-panel header='Geo Site'>
+                      <a-collapse-panel header='{{ i18n "pages.xray.directdomains"}}'>
                         <a-list-item style="padding: 10px 20px">
-                          <a-checkbox-group v-model="geoSite" name="Geo Site" :options="geoSiteOptions"></a-checkbox-group>
+                          <a-checkbox-group v-model="geoSite" :options="geoSiteOptions"></a-checkbox-group>
                         </a-list-item>
                       </a-collapse-panel>
                     </a-collapse>
diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index 71c7f4a1..f467c97a 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -235,44 +235,78 @@
                       <setting-list-item type="switch" title='{{ i18n "pages.xray.Speedtest"}}' desc='{{ i18n "pages.xray.SpeedtestDesc"}}' v-model="SpeedTestSettings"></setting-list-item>
                     </a-list-item>
                   </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.xray.blockCountryConfigs"}}'>
+                  <a-collapse-panel header='{{ i18n "pages.xray.blockConnectionsConfigs"}}'>
                     <a-row :xs="24" :sm="24" :lg="12">
                       <a-alert type="warning" style="text-align: center;">
                         <template slot="message">
                           <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
-                          {{ i18n "pages.xray.blockCountryConfigsDesc" }}
+                          {{ i18n "pages.xray.blockConnectionsConfigsDesc" }}
                         </template>
                       </a-alert>
                     </a-row>
                     <a-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.IRIp"}}' desc='{{ i18n "pages.xray.IRIpDesc"}}' v-model="IRIpSettings"></setting-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.IRDomain"}}' desc='{{ i18n "pages.xray.IRDomainDesc"}}' v-model="IRDomainSettings"></setting-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.ChinaIp"}}' desc='{{ i18n "pages.xray.ChinaIpDesc"}}' v-model="ChinaIpSettings"></setting-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.ChinaDomain"}}' desc='{{ i18n "pages.xray.ChinaDomainDesc"}}' v-model="ChinaDomainSettings"></setting-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.RussiaIp"}}' desc='{{ i18n "pages.xray.RussiaIpDesc"}}' v-model="RussiaIpSettings"></setting-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.RussiaDomain"}}' desc='{{ i18n "pages.xray.RussiaDomainDesc"}}' v-model="RussiaDomainSettings"></setting-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.VNIp"}}' desc='{{ i18n "pages.xray.VNIpDesc"}}' v-model="VNIpSettings"></setting-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.VNDomain"}}' desc='{{ i18n "pages.xray.VNDomainDesc"}}' v-model="VNDomainSettings"></setting-list-item>
+                        <a-collapse>
+                            <a-collapse-panel header='{{ i18n "pages.xray.blockips"}}'>
+                                <setting-list-item type="switch" title='🇮🇷 Iran'
+                                    v-model="IRIpSettings"></setting-list-item>
+                                <setting-list-item type="switch" title='🇨🇳 China'
+                                    v-model="ChinaIpSettings"></setting-list-item>
+                                <setting-list-item type="switch" title='🇷🇺 Russia'
+                                    v-model="RussiaIpSettings"></setting-list-item>
+                                <setting-list-item type="switch" title='🇻🇳 Vietnam'
+                                    v-model="VNIpSettings"></setting-list-item>
+                            </a-collapse-panel>
+                        </a-collapse>
+                        <br>
+                        <a-collapse>
+                            <a-collapse-panel header='{{ i18n "pages.xray.blockdomains"}}'>
+                                <setting-list-item type="switch" title='🇮🇷 Iran'
+                                    v-model="IRDomainSettings"></setting-list-item>
+                                <setting-list-item type="switch" title='🇨🇳 China'
+                                    v-model="ChinaDomainSettings"></setting-list-item>
+                                <setting-list-item type="switch" title='🇷🇺 Russia'
+                                    v-model="RussiaDomainSettings"></setting-list-item>
+                                <setting-list-item type="switch" title='🇻🇳 Vietnam'
+                                    v-model="VNDomainSettings"></setting-list-item>
+                            </a-collapse-panel>
+                        </a-collapse>
                     </a-list-item>
                   </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.xray.directCountryConfigs"}}'>
+                  <a-collapse-panel header='{{ i18n "pages.xray.directConnectionsConfigs"}}'>
                     <a-row :xs="24" :sm="24" :lg="12">
                       <a-alert type="warning" style="text-align: center;">
                         <template slot="message">
                           <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
-                          {{ i18n "pages.xray.directCountryConfigsDesc" }}
+                          {{ i18n "pages.xray.directConnectionsConfigsDesc" }}
                         </template>
                       </a-alert>
                     </a-row>
                     <a-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectIRIp"}}' desc='{{ i18n "pages.xray.DirectIRIpDesc"}}' v-model="IRIpDirectSettings"></setting-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectIRDomain"}}' desc='{{ i18n "pages.xray.DirectIRDomainDesc"}}' v-model="IRDomainDirectSettings"></setting-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectChinaIp"}}' desc='{{ i18n "pages.xray.DirectChinaIpDesc"}}' v-model="ChinaIpDirectSettings"></setting-list-item>
-                      <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.DirectVNDomain"}}' desc='{{ i18n "pages.xray.DirectVNDomainDesc"}}' v-model="VNDomainDirectSettings"></setting-list-item>
+                        <a-collapse>
+                            <a-collapse-panel header='{{ i18n "pages.xray.directips"}}'>
+                                <setting-list-item type="switch" title='🇮🇷 Iran'
+                                    v-model="IRIpDirectSettings"></setting-list-item>
+                                <setting-list-item type="switch" title='🇨🇳 China'
+                                    v-model="ChinaIpDirectSettings"></setting-list-item>
+                                <setting-list-item type="switch" title='🇷🇺 Russia'
+                                    v-model="RussiaIpDirectSettings"></setting-list-item>
+                                <setting-list-item type="switch" title='🇻🇳 Vietnam'
+                                    v-model="VNIpDirectSettings"></setting-list-item>
+                            </a-collapse-panel>
+                        </a-collapse>
+                        <br>
+                        <a-collapse>
+                            <a-collapse-panel header='{{ i18n "pages.xray.directdomains"}}'>
+                                <setting-list-item type="switch" title='🇮🇷 Iran'
+                                    v-model="IRDomainDirectSettings"></setting-list-item>
+                                <setting-list-item type="switch" title='🇨🇳 China'
+                                    v-model="ChinaDomainDirectSettings"></setting-list-item>
+                                <setting-list-item type="switch" title='🇷🇺 Russia'
+                                    v-model="RussiaDomainDirectSettings"></setting-list-item>
+                                <setting-list-item type="switch" title='🇻🇳 Vietnam'
+                                    v-model="VNDomainDirectSettings"></setting-list-item>
+                            </a-collapse-panel>
+                        </a-collapse>
                     </a-list-item>
                   </a-collapse-panel>
                   <a-collapse-panel header='{{ i18n "pages.xray.ipv4Configs"}}'>
@@ -851,18 +885,19 @@
                     apple: ["geosite:apple"],
                     reddit: ["geosite:reddit"],
                     cn: [
-                        "geosite:cn",
-                        "regexp:.*\\.cn$"
+                        "regexp:.*\\.cn$",
+                        "geosite:cn"
                     ],
                     ru: [
-                        "geosite:category-ru",  //https://github.com/v2fly/domain-list-community/blob/master/data/category-ru
-                        "regexp:.*\\.ru$"
+                        "regexp:.*\\.ru$",
+                        "geosite:category-ru"  //https://github.com/v2fly/domain-list-community/blob/master/data/category-ru
+                        
                     ],
                     ir: [
-                        "geosite:category-ir",  // https://github.com/v2fly/domain-list-community/blob/master/data/category-ir
                         "regexp:.*\\.ir$",
-                        "regexp:.*\\.xn--mgba3a4f16a$",  // .ایران
-                        "ext:geosite_IR.dat:ir"
+                        "ext:geosite_IR.dat:ir",
+                        "geosite:category-ir",  // https://github.com/v2fly/domain-list-community/blob/master/data/category-ir
+                        "regexp:.*\\.xn--mgba3a4f16a$"  // .ایران
                     ],
                     vn: [
                         "regexp:.*\\.vn$",
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index 8174e24f..75564fc4 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -330,10 +330,14 @@
 "logConfigsDesc" = "Logs may affect your server's efficiency. It is recommended to enable it wisely only in case of your needs"
 "blockConfigs" = "Protection Shield"
 "blockConfigsDesc" = "These options will block traffic based on specific requested protocols and websites."
-"blockCountryConfigs" = "Block Country"
-"blockCountryConfigsDesc" = "These options will block traffic based on the specific requested country."
-"directCountryConfigs" = "Direct Country"
-"directCountryConfigsDesc" = "A direct connection ensures that specific traffic is not routed through another server."
+"blockConnectionsConfigs" = "Block Connections"
+"blockConnectionsConfigsDesc" = "These options will block traffic based on the specific requested country."
+"directConnectionsConfigs" = "Direct Connections"
+"directConnectionsConfigsDesc" = "A direct connection ensures that specific traffic is not routed through another server."
+"blockips" = "Block IPs"
+"blockdomains" = "Block Domains"
+"directips" = "Direct IPs"
+"directdomains" = "Direct Domains"
 "ipv4Configs" = "IPv4 Routing"
 "ipv4ConfigsDesc" = "These options will route traffic based on a specific destination via IPv4."
 "warpConfigs" = "WARP Routing"
@@ -356,38 +360,6 @@
 "SecurityDesc" = "Blocks malware, phishing, and cryptominers websites."
 "Speedtest" = "Block Speedtest"
 "SpeedtestDesc" = "Blocks establishing connectins to speedtest websites."
-"IRIp" = "Block Connection to Iran IPs"
-"IRIpDesc" = "Blocks establishing connections to Iran IP ranges."
-"IRDomain" = "Block Connection to Iran Domains"
-"IRDomainDesc" = "Blocks establishing connections to Iran domains."
-"ChinaIp" = "Block Connection to China IPs"
-"ChinaIpDesc" = "Blocks establishing connections to China IP ranges."
-"ChinaDomain" = "Block Connection to China Domains"
-"ChinaDomainDesc" = "Blocks establishing connections to China domains."
-"RussiaIp" = "Block Connection to Russia IPs"
-"RussiaIpDesc" = "Blocks establishing connections to Russia IP ranges."
-"RussiaDomain" = "Block Connection to Russia Domains"
-"RussiaDomainDesc" = "Blocks establishing connections to Russia domains."
-"VNIp" = "Block Connection to Vietnam IPs"
-"VNIpDesc" = "Blocks establishing connections to Vietnam IP ranges."
-"VNDomain" = "Block Connection to Vietnam Domains"
-"VNDomainDesc" = "Blocks establishing connections to Vietnam domains."
-"DirectIRIp" = "Direct Connection to Iran IPs"
-"DirectIRIpDesc" = "Directly establishes connections to Iran IP ranges."
-"DirectIRDomain" = "Direct Connection to Iran Domains"
-"DirectIRDomainDesc" = "Directly establishes connections to Iran domains."
-"DirectChinaIp" = "Direct Connection to China IPs"
-"DirectChinaIpDesc" = "Directly establishes connections to China IP ranges."
-"DirectChinaDomain" = "Direct Connection to China Domains"
-"DirectChinaDomainDesc" = "Directly establishes connections to China domains."
-"DirectRussiaIp" = "Direct Connection to Russia IPs"
-"DirectRussiaIpDesc" = "Directly establishes connections to Russia IP ranges."
-"DirectRussiaDomain" = "Direct Connection to Russia Domains"
-"DirectRussiaDomainDesc" = "Directly establishes connections to Russia domains."
-"DirectVNIp" = "Direct Connection to Vietnam IPs"
-"DirectVNIpDesc" = "Directly establishes connections to Vietnam IP ranges."
-"DirectVNDomain" = "Direct Connection to Vietnam Domains"
-"DirectVNDomainDesc" = "Directly establishes connections to Vietnam domains."
 "GoogleIPv4" = "Google"
 "GoogleIPv4Desc" = "Routes traffic to Google via IPv4."
 "NetflixIPv4" = "Netflix"
diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml
index b5b306bb..36980ed4 100644
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
@@ -330,10 +330,14 @@
 "logConfigsDesc" = "Los registros pueden afectar la eficiencia de su servidor. Se recomienda habilitarlos sabiamente solo en caso de sus necesidades."
 "blockConfigs" = "Configuraciones de Bloqueo"
 "blockConfigsDesc" = "Estas opciones evitarán que los usuarios se conecten a protocolos y sitios web específicos."
-"blockCountryConfigs" = "Configuraciones de Bloqueo por País"
-"blockCountryConfigsDesc" = "Estas opciones evitarán que los usuarios se conecten a dominios de países específicos."
-"directCountryConfigs" = "Configuraciones de Conexión Directa por País"
-"directCountryConfigsDesc" = "Una conexión directa asegura que el tráfico específico no se enrutará a través de otro servidor."
+"blockConnectionsConfigs" = "Bloquear Conexiones"
+"blockConnectionsConfigsDesc" = "Estas opciones bloquearán el tráfico según el país solicitado específico."
+"directConnectionsConfigs" = "Conexiones Directas"
+"directConnectionsConfigsDesc" = "Una conexión directa asegura que el tráfico específico no sea enrutado a través de otro servidor."
+"blockips" = "Bloquear IPs"
+"blockdomains" = "Bloquear Dominios"
+"directips" = "IPs Directas"
+"directdomains" = "Dominios Directos"
 "ipv4Configs" = "Configuraciones IPv4"
 "ipv4ConfigsDesc" = "Estas opciones solo enrutarán a los dominios objetivo a través de IPv4."
 "warpConfigs" = "Configuraciones de WARP"
@@ -356,38 +360,6 @@
 "SecurityDesc" = "Cambiar la plantilla de configuración para la protección de seguridad."
 "Speedtest" = "Bloquear Sitios Web de Pruebas de Velocidad"
 "SpeedtestDesc" = "Cambia la plantilla de configuración para evitar la conexión a sitios web de pruebas de velocidad."
-"IRIp" = "Desactivar Conexión a Rangos de IP de Irán"
-"IRIpDesc" = "Cambia la plantilla de configuración para evitar la conexión a rangos de IP de Irán."
-"IRDomain" = "Desactivar Conexión a Dominios de Irán"
-"IRDomainDesc" = "Cambia la plantilla de configuración para evitar la conexión a dominios de Irán."
-"ChinaIp" = "Desactivar Conexión a Rangos de IP de China"
-"ChinaIpDesc" = "Cambia la plantilla de configuración para evitar la conexión a rangos de IP de China."
-"ChinaDomain" = "Desactivar Conexión a Dominios de China"
-"ChinaDomainDesc" = "Cambia la plantilla de configuración para evitar la conexión a dominios de China."
-"RussiaIp" = "Desactivar Conexión a Rangos de IP de Rusia"
-"RussiaIpDesc" = "Cambia la plantilla de configuración para evitar la conexión a rangos de IP de Rusia."
-"RussiaDomain" = "Desactivar Conexión a Dominios de Rusia"
-"RussiaDomainDesc" = "Cambia la plantilla de configuración para evitar la conexión a dominios de Rusia."
-"VNIp" = "Deshabilitar la conexión a las IP de Vietnam"
-"VNIpDesc" = "Cambie la plantilla de configuración para evitar conectarse a rangos de IP de Vietnam."
-"VNDomain" = "Deshabilitar la conexión a dominios de Vietnam"
-"VNDomainDesc" = "Cambie la plantilla de configuración para evitar conectarse a dominios de Vietnam."
-"DirectIRIp" = "Conexión Directa a Rangos de IP de Irán"
-"DirectIRIpDesc" = "Cambia la plantilla de configuración para conectarse directamente a rangos de IP de Irán."
-"DirectIRDomain" = "Conexión Directa a Dominios de Irán"
-"DirectIRDomainDesc" = "Cambia la plantilla de configuración para conectarse directamente a dominios de Irán."
-"DirectChinaIp" = "Conexión Directa a Rangos de IP de China"
-"DirectChinaIpDesc" = "Cambia la plantilla de configuración para conectarse directamente a rangos de IP de China."
-"DirectChinaDomain" = "Conexión Directa a Dominios de China"
-"DirectChinaDomainDesc" = "Cambia la plantilla de configuración para conectarse directamente a dominios de China."
-"DirectRussiaIp" = "Conexión Directa a Rangos de IP de Rusia"
-"DirectRussiaIpDesc" = "Cambia la plantilla de configuración para conectarse directamente a rangos de IP de Rusia."
-"DirectRussiaDomain" = "Conexión Directa a Dominios de Rusia"
-"DirectRussiaDomainDesc" = "Cambia la plantilla de configuración para conectarse directamente a dominios de Rusia."
-"DirectVNIp" = "Conexión directa a IP de Vietnam"
-"DirectVNIpDesc" = "Cambie la plantilla de configuración para la conexión directa a rangos de IP de Vietnam."
-"DirectVNDomain" = "Conexión directa a dominios de Vietnam"
-"DirectVNDomainDesc" = "Cambie la plantilla de configuración para la conexión directa a dominios de Vietnam."
 "GoogleIPv4" = "Usar IPv4 para Google"
 "GoogleIPv4Desc" = "Agregar enrutamiento para que Google se conecte con IPv4."
 "NetflixIPv4" = "Usar IPv4 para Netflix"
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index b6c8fb60..31e65b06 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -330,10 +330,14 @@
 "logConfigsDesc" = "گزارش‌ها ممکن است بر کارایی سرور شما تأثیر بگذارد. توصیه می شود فقط در صورت نیاز آن را عاقلانه فعال کنید"
 "blockConfigs" = "سپر محافظ"
 "blockConfigsDesc" = "این گزینه‌ها ترافیک را بر اساس پروتکل‌های درخواستی خاص، و وب سایت‌ها مسدود می‌کند"
-"blockCountryConfigs" = "مسدودسازی کشور"
-"blockCountryConfigsDesc" = "این گزینه‌ها ترافیک را بر اساس کشور درخواستی خاص مسدود می‌کند"
-"directCountryConfigs" = "اتصال مستقیم کشور"
-"directCountryConfigsDesc" = "اتصال مستقیم اطمینان حاصل می‌کند که ترافیک خاص از طریق یک سرور دیگر هدایت نمی‌شود."
+"blockConnectionsConfigs" = "مسدود کردن اتصالات"
+"blockConnectionsConfigsDesc" = "این گزینه‌ها ترافیک را بر اساس کشور درخواست‌شده خاص مسدود می‌کنند."
+"directConnectionsConfigs" = "اتصالات مستقیم"
+"directConnectionsConfigsDesc" = "یک اتصال مستقیم تضمین می‌کند که ترافیک خاص از طریق سرور دیگری مسیریابی نشود."
+"blockips" = "مسدود کردن آی‌پی‌ها"
+"blockdomains" = "مسدود کردن دامنه‌ها"
+"directips" = "آی‌پی‌های مستقیم"
+"directdomains" = "دامنه‌های مستقیم"
 "ipv4Configs" = "IPv4 مسیریابی"
 "ipv4ConfigsDesc" = "این گزینه‌ها ترافیک‌ را از طریق آی‌پی‌نسخه4 به مقصد هدایت می‌کند"
 "warpConfigs" = "WARP مسیریابی"
@@ -356,38 +360,6 @@
 "SecurityDesc" = "وب‌سایت‌های ناامن، بدافزار، فیشینگ، و کریپتوماینرها را مسدود می‌کند"
 "Speedtest" = "مسدودسازی اسپیدتست"
 "SpeedtestDesc" = "اتصال به وب‌سایت‌های تست سرعت را مسدود می‌کند"
-"IRIp" = "مسدودسازی اتصال به آی‌پی‌های ایران"
-"IRIpDesc" = "اتصال به آی‌پی‌های کشور ایران را مسدود می‌کند"
-"IRDomain" = "مسدودسازی اتصال به دامنه‌های‌ ایران"
-"IRDomainDesc" = "اتصال به دامنه‌های کشور ایران را مسدود می‌کند"
-"ChinaIp" = "مسدودسازی اتصال به آی‌‌پی‌های چین"
-"ChinaIpDesc" = "اتصال به آی‌پی‌های کشور چین را مسدود می‌کند"
-"ChinaDomain" = "مسدودسازی اتصال به دامنه‌های چین"
-"ChinaDomainDesc" = "اتصال به دامنه‌های کشور چین را مسدود می‌کند"
-"RussiaIp" = "مسدودسازی اتصال به آی‌پی‌های روسیه"
-"RussiaIpDesc" = "اتصال به آی‌پی‌های کشور روسیه را مسدود می‌کند"
-"RussiaDomain" = "مسدودسازی اتصال به دامنه‌های روسیه"
-"RussiaDomainDesc" = "اتصال به دامنه‌های کشور روسیه را مسدود می‌کند"
-"VNIp" = "مسدودسازی اتصال به آی‌پی‌های ویتنام"
-"VNIpDesc" = "اتصال به آی‌پی‌های کشور ویتنام را مسدود می‌کند"
-"VNDomain" = "مسدودسازی اتصال به دامنه های ویتنام"
-"VNDomainDesc" = "اتصال به دامنه‌های کشور ویتنام را مسدود می‌کند"
-"DirectIRIp" = "اتصال مستقیم آی‌پی‌های ایران"
-"DirectIRIpDesc" = "اتصال مستقیم به آی‌پی‌های کشور ایران"
-"DirectIRDomain" = "اتصال مستقیم دامنه‌های ایران"
-"DirectIRDomainDesc" = "اتصال مستقیم به دامنه‌های کشور ایران"
-"DirectChinaIp" = "اتصال مستقیم آی‌پی‌های چین"
-"DirectChinaIpDesc" = "اتصال مستقیم به آی‌پی‌های کشور چین"
-"DirectChinaDomain" = "اتصال مستقیم دامنه‌های چین"
-"DirectChinaDomainDesc" = "اتصال مستقیم به دامنه‌های کشور چین"
-"DirectRussiaIp" = "اتصال مستقیم آی‌پی‌های روسیه"
-"DirectRussiaIpDesc" = "اتصال مستقیم به آی‌پی‌های کشور روسیه"
-"DirectRussiaDomain" = "اتصال مستقیم دامنه‌های روسیه"
-"DirectRussiaDomainDesc" = "اتصال مستقیم به دامنه‌های کشور روسیه"
-"DirectVNIp" = "اتصال مستقیم آی‌پی‌های ویتنام"
-"DirectVNIpDesc" = "اتصال مستقیم به آی‌پی‌های کشور ویتنام"
-"DirectVNDomain" = "اتصال مستقیم دامنه‌های ویتنام"
-"DirectVNDomainDesc" = "اتصال مستقیم به دامنه‌های کشور ویتنام"
 "GoogleIPv4" = "گوگل"
 "GoogleIPv4Desc" = "ترافیک را از طریق آی‌پی‌نسخه4 به گوگل هدایت می‌کند"
 "NetflixIPv4" = "نتفلیکس"
diff --git a/web/translation/translate.id_ID.toml b/web/translation/translate.id_ID.toml
index 5b649079..c2260c30 100644
--- a/web/translation/translate.id_ID.toml
+++ b/web/translation/translate.id_ID.toml
@@ -330,10 +330,14 @@
 "logConfigsDesc" = "Log dapat mempengaruhi efisiensi server Anda. Disarankan untuk mengaktifkannya dengan bijak hanya jika diperlukan"
 "blockConfigs" = "Pelindung"
 "blockConfigsDesc" = "Opsi ini akan memblokir lalu lintas berdasarkan protokol dan situs web yang diminta."
-"blockCountryConfigs" = "Blokir Negara"
-"blockCountryConfigsDesc" = "Opsi ini akan memblokir lalu lintas berdasarkan negara yang diminta."
-"directCountryConfigs" = "Langsung ke Negara"
-"directCountryConfigsDesc" = "Koneksi langsung memastikan bahwa lalu lintas tertentu tidak diarahkan melalui server lain."
+"blockConnectionsConfigs" = "Blokir Koneksi"
+"blockConnectionsConfigsDesc" = "Opsi ini akan memblokir lalu lintas berdasarkan negara yang diminta."
+"directConnectionsConfigs" = "Koneksi Langsung"
+"directConnectionsConfigsDesc" = "Koneksi langsung memastikan bahwa lalu lintas tertentu tidak dialihkan melalui server lain."
+"blockips" = "Blokir IP"
+"blockdomains" = "Blokir Domain"
+"directips" = "IP Langsung"
+"directdomains" = "Domain Langsung"
 "ipv4Configs" = "Pengalihan IPv4"
 "ipv4ConfigsDesc" = "Opsi ini akan mengalihkan lalu lintas berdasarkan tujuan tertentu melalui IPv4."
 "warpConfigs" = "Pengalihan WARP"
@@ -356,38 +360,6 @@
 "SecurityDesc" = "Memblokir situs web malware, phishing, dan penambang kripto."
 "Speedtest" = "Blokir Speedtest"
 "SpeedtestDesc" = "Memblokir pembentukan koneksi ke situs web speedtest."
-"IRIp" = "Blokir Koneksi ke IP Iran"
-"IRIpDesc" = "Memblokir pembentukan koneksi ke rentang IP Iran."
-"IRDomain" = "Blokir Koneksi ke Domain Iran"
-"IRDomainDesc" = "Memblokir pembentukan koneksi ke domain Iran."
-"ChinaIp" = "Blokir Koneksi ke IP China"
-"ChinaIpDesc" = "Memblokir pembentukan koneksi ke rentang IP China."
-"ChinaDomain" = "Blokir Koneksi ke Domain China"
-"ChinaDomainDesc" = "Memblokir pembentukan koneksi ke domain China."
-"RussiaIp" = "Blokir Koneksi ke IP Rusia"
-"RussiaIpDesc" = "Memblokir pembentukan koneksi ke rentang IP Rusia."
-"RussiaDomain" = "Blokir Koneksi ke Domain Rusia"
-"RussiaDomainDesc" = "Memblokir pembentukan koneksi ke domain Rusia."
-"VNIp" = "Blokir Koneksi ke IP Vietnam"
-"VNIpDesc" = "Memblokir pembentukan koneksi ke rentang IP Vietnam."
-"VNDomain" = "Blokir Koneksi ke Domain Vietnam"
-"VNDomainDesc" = "Memblokir pembentukan koneksi ke domain Vietnam."
-"DirectIRIp" = "Koneksi Langsung ke IP Iran"
-"DirectIRIpDesc" = "Membentuk koneksi langsung ke rentang IP Iran."
-"DirectIRDomain" = "Koneksi Langsung ke Domain Iran"
-"DirectIRDomainDesc" = "Membentuk koneksi langsung ke domain Iran."
-"DirectChinaIp" = "Koneksi Langsung ke IP China"
-"DirectChinaIpDesc" = "Membentuk koneksi langsung ke rentang IP China."
-"DirectChinaDomain" = "Koneksi Langsung ke Domain China"
-"DirectChinaDomainDesc" = "Membentuk koneksi langsung ke domain China."
-"DirectRussiaIp" = "Koneksi Langsung ke IP Rusia"
-"DirectRussiaIpDesc" = "Membentuk koneksi langsung ke rentang IP Rusia."
-"DirectRussiaDomain" = "Koneksi Langsung ke Domain Rusia"
-"DirectRussiaDomainDesc" = "Membentuk koneksi langsung ke domain Rusia."
-"DirectVNIp" = "Koneksi Langsung ke IP Vietnam"
-"DirectVNIpDesc" = "Membentuk koneksi langsung ke rentang IP Vietnam."
-"DirectVNDomain" = "Koneksi Langsung ke Domain Vietnam"
-"DirectVNDomainDesc" = "Membentuk koneksi langsung ke domain Vietnam."
 "GoogleIPv4" = "Google"
 "GoogleIPv4Desc" = "Rute lalu lintas ke Google melalui IPv4."
 "NetflixIPv4" = "Netflix"
diff --git a/web/translation/translate.pt_BR.toml b/web/translation/translate.pt_BR.toml
index cbfad950..acf5f307 100644
--- a/web/translation/translate.pt_BR.toml
+++ b/web/translation/translate.pt_BR.toml
@@ -330,10 +330,14 @@
 "logConfigsDesc" = "Os logs podem afetar a eficiência do servidor. É recomendável habilitá-los com sabedoria apenas se necessário."
 "blockConfigs" = "Escudo de Proteção"
 "blockConfigsDesc" = "Essas opções bloqueiam tráfego com base em protocolos e sites específicos solicitados."
-"blockCountryConfigs" = "Bloquear País"
-"blockCountryConfigsDesc" = "Essas opções bloqueiam tráfego com base no país solicitado."
-"directCountryConfigs" = "País Direto"
-"directCountryConfigsDesc" = "Uma conexão direta garante que o tráfego específico não seja roteado por outro servidor."
+"blockConnectionsConfigs" = "Bloquear Conexões"
+"blockConnectionsConfigsDesc" = "Essas opções bloquearão o tráfego com base no país solicitado."
+"directConnectionsConfigs" = "Conexões Diretas"
+"directConnectionsConfigsDesc" = "Uma conexão direta garante que o tráfego específico não seja roteado por outro servidor."
+"blockips" = "Bloquear IPs"
+"blockdomains" = "Bloquear Domínios"
+"directips" = "IPs Diretos"
+"directdomains" = "Domínios Diretos"
 "ipv4Configs" = "Roteamento IPv4"
 "ipv4ConfigsDesc" = "Essas opções roteam o tráfego para um destino específico via IPv4."
 "warpConfigs" = "Roteamento WARP"
@@ -356,38 +360,6 @@
 "SecurityDesc" = "Bloqueia sites de malware, phishing e mineradores de criptomoedas."
 "Speedtest" = "Bloquear Speedtest"
 "SpeedtestDesc" = "Bloqueia a conexão com sites de teste de velocidade."
-"IRIp" = "Bloquear Conexão para IPs do Irã"
-"IRIpDesc" = "Bloqueia a conexão com faixas de IP do Irã."
-"IRDomain" = "Bloquear Conexão para Domínios do Irã"
-"IRDomainDesc" = "Bloqueia a conexão com domínios do Irã."
-"ChinaIp" = "Bloquear Conexão para IPs da China"
-"ChinaIpDesc" = "Bloqueia a conexão com faixas de IP da China."
-"ChinaDomain" = "Bloquear Conexão para Domínios da China"
-"ChinaDomainDesc" = "Bloqueia a conexão com domínios da China."
-"RussiaIp" = "Bloquear Conexão para IPs da Rússia"
-"RussiaIpDesc" = "Bloqueia a conexão com faixas de IP da Rússia."
-"RussiaDomain" = "Bloquear Conexão para Domínios da Rússia"
-"RussiaDomainDesc" = "Bloqueia a conexão com domínios da Rússia."
-"VNIp" = "Bloquear Conexão para IPs do Vietnã"
-"VNIpDesc" = "Bloqueia a conexão com faixas de IP do Vietnã."
-"VNDomain" = "Bloquear Conexão para Domínios do Vietnã"
-"VNDomainDesc" = "Bloqueia a conexão com domínios do Vietnã."
-"DirectIRIp" = "Conexão Direta para IPs do Irã"
-"DirectIRIpDesc" = "Estabelece conexão diretamente com faixas de IP do Irã."
-"DirectIRDomain" = "Conexão Direta para Domínios do Irã"
-"DirectIRDomainDesc" = "Estabelece conexão diretamente com domínios do Irã."
-"DirectChinaIp" = "Conexão Direta para IPs da China"
-"DirectChinaIpDesc" = "Estabelece conexão diretamente com faixas de IP da China."
-"DirectChinaDomain" = "Conexão Direta para Domínios da China"
-"DirectChinaDomainDesc" = "Estabelece conexão diretamente com domínios da China."
-"DirectRussiaIp" = "Conexão Direta para IPs da Rússia"
-"DirectRussiaIpDesc" = "Estabelece conexão diretamente com faixas de IP da Rússia."
-"DirectRussiaDomain" = "Conexão Direta para Domínios da Rússia"
-"DirectRussiaDomainDesc" = "Estabelece conexão diretamente com domínios da Rússia."
-"DirectVNIp" = "Conexão Direta para IPs do Vietnã"
-"DirectVNIpDesc" = "Estabelece conexão diretamente com faixas de IP do Vietnã."
-"DirectVNDomain" = "Conexão Direta para Domínios do Vietnã"
-"DirectVNDomainDesc" = "Estabelece conexão diretamente com domínios do Vietnã."
 "GoogleIPv4" = "Google"
 "GoogleIPv4Desc" = "Roteia tráfego para o Google via IPv4."
 "NetflixIPv4" = "Netflix"
diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index 4717d889..9db1116f 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -330,10 +330,14 @@
 "logConfigsDesc" = "Журналы могут повлиять на эффективность вашего сервера. Рекомендуется включать их с умом только в случае ваших нужд!"
 "blockConfigs" = "Блокировка конфигураций"
 "blockConfigsDesc" = "Эти параметры не позволят пользователям подключаться к определенным протоколам и веб-сайтам"
-"blockCountryConfigs" = "Конфигурации блокировки страны"
-"blockCountryConfigsDesc" = "Эти параметры не позволят пользователям подключаться к доменам определенной страны"
-"directCountryConfigs" = "Настройки прямого подключения для страны"
-"directCountryConfigsDesc" = "Прямое подключение обеспечивает, что конкретный трафик не направляется через другой сервер."
+"blockConnectionsConfigs" = "Блокировать соединения"
+"blockConnectionsConfigsDesc" = "Эти параметры будут блокировать трафик в зависимости от запрашиваемой страны."
+"directConnectionsConfigs" = "Прямые соединения"
+"directConnectionsConfigsDesc" = "Прямое соединение гарантирует, что определенный трафик не будет перенаправлен через другой сервер."
+"blockips" = "Блокировать IP"
+"blockdomains" = "Блокировать домены"
+"directips" = "Прямые IP"
+"directdomains" = "Прямые домены"
 "ipv4Configs" = "Настройки IPv4"
 "ipv4ConfigsDesc" = "Эти параметры позволят пользователям маршрутизироваться к целевым доменам только через IPv4"
 "warpConfigs" = "Настройки WARP"
@@ -356,38 +360,6 @@
 "SecurityDesc" = "Изменение шаблона конфигурации для защиты безопасности."
 "Speedtest" = "Блокировать сайты для проверки скорости"
 "SpeedtestDesc" = "Изменение шаблона конфигурации для предупреждения подключения к веб-сайтам для тестирования скорости"
-"IRIp" = "Заблокировать подключения к диапазонам IP-адресов Ирана"
-"IRIpDesc" = "Изменение конфигурации, чтобы заблокировать подключения к диапазонам IP-адресов Ирана"
-"IRDomain" = "Заблокировать подключения к доменам Ирана"
-"IRDomainDesc" = "Изменение конфигурации, чтобы заблокировать подключения к доменам Ирана"
-"ChinaIp" = "Заблокировать подключения к диапазонам IP-адресов Китая"
-"ChinaIpDesc" = "Изменение конфигурации, чтобы заблокировать подключения к диапазонам IP-адресов Китая"
-"ChinaDomain" = "Заблокировать подключения к доменам Китая"
-"ChinaDomainDesc" = "Изменение конфигурации, чтобы заблокировать подключения к доменам Китая"
-"RussiaIp" = "Заблокировать подключения к диапазонам IP-адресов России"
-"RussiaIpDesc" = "Изменение конфигурации, чтобы заблокировать подключения к диапазонами IP-адресов России"
-"RussiaDomain" = "Заблокировать подключения к доменам России"
-"RussiaDomainDesc" = "Изменение конфигурации, чтобы заблокировать подключения к доменам России"
-"VNIp" = "Отключить подключение к IP-адресам Вьетнама"
-"VNIpDesc" = "Измените шаблон конфигурации, чтобы избежать подключения к диапазонам IP-адресов Вьетнама"
-"VNDomain" = "Отключить подключение к доменам Вьетнама"
-"VNDomainDesc" = "Измените шаблон конфигурации, чтобы избежать подключения к доменам Вьетнама."
-"DirectIRIp" = "Прямое подключения к диапазонам IP-адресов Ирана"
-"DirectIRIpDesc" = "Изменение шаблона конфигурации для прямого подключения к диапазонам IP-адресов Ирана"
-"DirectIRDomain" = "Прямое подключение к доменам Ирана"
-"DirectIRDomainDesc" = "Изменение шаблон конфигурации для прямого подключения к доменам Ирана"
-"DirectChinaIp" = "Прямое подключение к диапазонам IP-адресов Китая"
-"DirectChinaIpDesc" = "Изменение шаблона конфигурации для прямого подключения к диапазонам IP-адресов Китая"
-"DirectChinaDomain" = "Прямое подключение к доменам Китая"
-"DirectChinaDomainDesc" = "Изменение шаблона конфигурации для прямого подключения к доменам Китая"
-"DirectRussiaIp" = "Прямое подключение к диапазонам IP-адресов России"
-"DirectRussiaIpDesc" = "Изменение шаблона конфигурации для прямого подключения к диапазонам IP-адресов России"
-"DirectRussiaDomain" = "Прямое подключение к доменам России"
-"DirectRussiaDomainDesc" = "Изменение шаблона конфигурации для прямого подключения к доменам России"
-"DirectVNIp" = "Прямое подключение к IP-адресам Вьетнама"
-"DirectVNIpDesc" = "Измените шаблон конфигурации для прямого подключения к диапазонам IP-адресов Вьетнама"
-"DirectVNDomain" = "Прямое подключение к доменам Вьетнама"
-"DirectVNDomainDesc" = "Измените шаблон конфигурации для прямого подключения к доменам Вьетнама"
 "GoogleIPv4" = "Использовать IPv4 для Google"
 "GoogleIPv4Desc" = "Добавить маршрутизацию для Google для подключения к IPv4"
 "NetflixIPv4" = "Использовать IPv4 для Netflix"
diff --git a/web/translation/translate.tr_TR.toml b/web/translation/translate.tr_TR.toml
index 52558485..f3ed119e 100644
--- a/web/translation/translate.tr_TR.toml
+++ b/web/translation/translate.tr_TR.toml
@@ -330,10 +330,14 @@
 "logConfigsDesc" = "Günlükler sunucunuzun verimliliğini etkileyebilir. Yalnızca ihtiyaç durumunda akıllıca etkinleştirmeniz önerilir"
 "blockConfigs" = "Koruma Kalkanı"
 "blockConfigsDesc" = "Bu seçenekler belirli istek protokolleri ve web siteleri temelinde trafiği engeller."
-"blockCountryConfigs" = "Ülke Engelleme"
-"blockCountryConfigsDesc" = "Bu seçenekler belirli istek ülkesi temelinde trafiği engeller."
-"directCountryConfigs" = "Doğrudan Ülke"
-"directCountryConfigsDesc" = "Doğrudan bağlantı, belirli trafiğin başka bir sunucu üzerinden yönlendirilmemesini sağlar."
+"blockConnectionsConfigs" = "Bağlantıları Engelle"
+"blockConnectionsConfigsDesc" = "Bu seçenekler belirli bir istenen ülkeye göre trafiği engelleyecektir."
+"directConnectionsConfigs" = "Doğrudan Bağlantılar"
+"directConnectionsConfigsDesc" = "Doğrudan bağlantı, belirli bir trafiğin başka bir sunucu üzerinden yönlendirilmediğini sağlar."
+"blockips" = "IP'leri Engelle"
+"blockdomains" = "Alan Adlarını Engelle"
+"directips" = "Doğrudan IP'ler"
+"directdomains" = "Doğrudan Alan Adları"
 "ipv4Configs" = "IPv4 Yönlendirme"
 "ipv4ConfigsDesc" = "Bu seçenekler belirli bir varış yerine IPv4 üzerinden trafiği yönlendirir."
 "warpConfigs" = "WARP Yönlendirme"
@@ -356,38 +360,6 @@
 "SecurityDesc" = "Kötü amaçlı yazılım, kimlik avı ve kripto madencilik web sitelerini engeller."
 "Speedtest" = "Speedtest Bağlantısını Engelle"
 "SpeedtestDesc" = "Speedtest web sitelerine bağlantı kurmayı engeller."
-"IRIp" = "İran IP'lerine Bağlantıyı Engelle"
-"IRIpDesc" = "İran IP aralıklarına bağlantı kurmayı engeller."
-"IRDomain" = "İran Alan Adlarına Bağlantıyı Engelle"
-"IRDomainDesc" = "İran alan adlarına bağlantı kurmayı engeller."
-"ChinaIp" = "Çin IP'lerine Bağlantıyı Engelle"
-"ChinaIpDesc" = "Çin IP aralıklarına bağlantı kurmayı engeller."
-"ChinaDomain" = "Çin Alan Adlarına Bağlantıyı Engelle"
-"ChinaDomainDesc" = "Çin alan adlarına bağlantı kurmayı engeller."
-"RussiaIp" = "Rusya IP'lerine Bağlantıyı Engelle"
-"RussiaIpDesc" = "Rusya IP aralıklarına bağlantı kurmayı engeller."
-"RussiaDomain" = "Rusya Alan Adlarına Bağlantıyı Engelle"
-"RussiaDomainDesc" = "Rusya alan adlarına bağlantı kurmayı engeller."
-"VNIp" = "Vietnam IP'lerine Bağlantıyı Engelle"
-"VNIpDesc" = "Vietnam IP aralıklarına bağlantı kurmayı engeller."
-"VNDomain" = "Vietnam Alan Adlarına Bağlantıyı Engelle"
-"VNDomainDesc" = "Vietnam alan adlarına bağlantı kurmayı engeller."
-"DirectIRIp" = "İran IP'lerine Doğrudan Bağlantı"
-"DirectIRIpDesc" = "İran IP aralıklarına doğrudan bağlantı kurar."
-"DirectIRDomain" = "İran Alan Adlarına Doğrudan Bağlantı"
-"DirectIRDomainDesc" = "İran alan adlarına doğrudan bağlantı kurar."
-"DirectChinaIp" = "Çin IP'lerine Doğrudan Bağlantı"
-"DirectChinaIpDesc" = "Çin IP aralıklarına doğrudan bağlantı kurar."
-"DirectChinaDomain" = "Çin Alan Adlarına Doğrudan Bağlantı"
-"DirectChinaDomainDesc" = "Çin alan adlarına doğrudan bağlantı kurar."
-"DirectRussiaIp" = "Rusya IP'lerine Doğrudan Bağlantı"
-"DirectRussiaIpDesc" = "Rusya IP aralıklarına doğrudan bağlantı kurar."
-"DirectRussiaDomain" = "Rusya Alan Adlarına Doğrudan Bağlantı"
-"DirectRussiaDomainDesc" = "Rusya alan adlarına doğrudan bağlantı kurar."
-"DirectVNIp" = "Vietnam IP'lerine Doğrudan Bağlantı"
-"DirectVNIpDesc" = "Vietnam IP aralıklarına doğrudan bağlantı kurar."
-"DirectVNDomain" = "Vietnam Alan Adlarına Doğrudan Bağlantı"
-"DirectVNDomainDesc" = "Vietnam alan adlarına doğrudan bağlantı kurar."
 "GoogleIPv4" = "Google"
 "GoogleIPv4Desc" = "Google'a trafiği IPv4 üzerinden yönlendirir."
 "NetflixIPv4" = "Netflix"
diff --git a/web/translation/translate.uk_UA.toml b/web/translation/translate.uk_UA.toml
index a9926bd1..31be0a31 100644
--- a/web/translation/translate.uk_UA.toml
+++ b/web/translation/translate.uk_UA.toml
@@ -330,10 +330,14 @@
 "logConfigsDesc" = "Журнали можуть вплинути на ефективність вашого сервера. Рекомендується вмикати його з розумом лише у випадку ваших потреб"
 "blockConfigs" = "Захисний екран"
 "blockConfigsDesc" = "Ці параметри блокуватимуть трафік на основі конкретних запитуваних протоколів і веб-сайтів."
-"blockCountryConfigs" = "Заблокувати країну"
-"blockCountryConfigsDesc" = "Ці параметри блокуватимуть трафік на основі конкретної запитуваної країни."
-"directCountryConfigs" = "Пряма країна"
-"directCountryConfigsDesc" = "Пряме підключення забезпечує, що конкретний трафік не маршрутизується через інший сервер."
+"blockConnectionsConfigs" = "Блокувати з'єднання"
+"blockConnectionsConfigsDesc" = "Ці параметри блокуватимуть трафік на основі запитаних країн."
+"directConnectionsConfigs" = "Прямі з'єднання"
+"directConnectionsConfigsDesc" = "Пряме з'єднання гарантує, що певний трафік не буде маршрутизовано через інший сервер."
+"blockips" = "Блокувати IP"
+"blockdomains" = "Блокувати домени"
+"directips" = "Прямі IP"
+"directdomains" = "Прямі домени"
 "ipv4Configs" = "Маршрутизація IPv4"
 "ipv4ConfigsDesc" = "Ці параметри спрямовуватимуть трафік на основі певного призначення через IPv4."
 "warpConfigs" = "WARP маршрутизація"
@@ -356,38 +360,6 @@
 "SecurityDesc" = "Блокує веб-сайти шкідливого програмного забезпечення, фішингу та майнерів."
 "Speedtest" = "Заблокувати Speedtest"
 "SpeedtestDesc" = "Блокує підключення до веб-сайтів для тестування швидкості."
-"IRIp" = "Блокувати підключення до IP-адрес Ірану"
-"IRIpDesc" = "Блокує встановлення з'єднань з діапазонами IP Ірану."
-"IRDomain" = "Блокувати підключення до доменів Ірану"
-"IRDomainDesc" = "Блокує встановлення з'єднань з доменами Ірану."
-"ChinaIp" = "Блокувати підключення до IP-адрес Китаю"
-"ChinaIpDesc" = "Блокує встановлення з'єднань із діапазонами IP-адрес Китаю."
-"ChinaDomain" = "Блокувати підключення до китайських доменів"
-"ChinaDomainDesc" = "Блокує встановлення підключень до доменів Китаю."
-"RussiaIp" = "Блокувати підключення до російських IP-адрес"
-"RussiaIpDesc" = "Блокує встановлення з'єднань з діапазонами IP-адрес Росії."
-"RussiaDomain" = "Блокувати підключення до російських доменів"
-"RussiaDomainDesc" = "Блокує встановлення з'єднань з російськими доменами."
-"VNIp" = "Блокувати підключення до IP-адрес В'єтнаму"
-"VNIpDesc" = "Блокує встановлення з'єднань із діапазонами IP-адрес В'єтнаму."
-"VNDomain" = "Блокувати підключення до доменів В'єтнаму"
-"VNDomainDesc" = "Блокує встановлення з'єднань із доменами В'єтнаму."
-"DirectIRIp" = "Пряме підключення до IP-адрес Ірану"
-"DirectIRIpDesc" = "Безпосередньо встановлює з'єднання з діапазонами IP Ірану."
-"DirectIRDomain" = "Пряме підключення до доменів Ірану"
-"DirectIRDomainDesc" = "Безпосередньо встановлює підключення до доменів Ірану."
-"DirectChinaIp" = "Пряме підключення до китайських IP-адрес"
-"DirectChinaIpDesc" = "Безпосередньо встановлює підключення до IP-діапазонів Китаю."
-"DirectChinaDomain" = "Пряме підключення до китайських доменів"
-"DirectChinaDomainDesc" = "Безпосередньо встановлює підключення до доменів Китаю."
-"DirectRussiaIp" = "Пряме підключення до IP-адрес Росії"
-"DirectRussiaIpDesc" = "Безпосередньо встановлює з'єднання з діапазонами IP-адрес Росії."
-"DirectRussiaDomain" = "Пряме підключення до російських доменів"
-"DirectRussiaDomainDesc" = "Безпосередньо встановлює підключення до російських доменів."
-"DirectVNIp" = "Пряме підключення до IP-адрес В'єтнаму"
-"DirectVNIpDesc" = "Безпосередньо встановлює з'єднання з діапазонами IP-адрес В'єтнаму."
-"DirectVNDomain" = "Пряме підключення до доменів В'єтнаму"
-"DirectVNDomainDesc" = "Безпосередньо встановлює з'єднання з доменами В'єтнаму."
 "GoogleIPv4" = "Google"
 "GoogleIPv4Desc" = "Направляє трафік до Google через IPv4."
 "NetflixIPv4" = "Netflix"
diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml
index 91c748cd..ed63305e 100644
--- a/web/translation/translate.vi_VN.toml
+++ b/web/translation/translate.vi_VN.toml
@@ -330,10 +330,14 @@
 "logConfigsDesc" = "Nhật ký có thể ảnh hưởng đến hiệu suất máy chủ của bạn. Bạn chỉ nên kích hoạt nó một cách khôn ngoan trong trường hợp bạn cần"
 "blockConfigs" = "Cấu hình Chặn"
 "blockConfigsDesc" = "Những tùy chọn này sẽ ngăn người dùng kết nối đến các giao thức và trang web cụ thể."
-"blockCountryConfigs" = "Cấu hình Chặn Quốc gia"
-"blockCountryConfigsDesc" = "Những tùy chọn này sẽ ngăn người dùng kết nối đến các tên miền quốc gia cụ thể."
-"directCountryConfigs" = "Cấu hình Kết nối Trực tiếp Quốc gia"
-"directCountryConfigsDesc" = "Một kết nối trực tiếp đảm bảo rằng lưu lượng cụ thể không được định tuyến qua một máy chủ khác."
+"blockConnectionsConfigs" = "Chặn Kết Nối"
+"blockConnectionsConfigsDesc" = "Các tùy chọn này sẽ chặn lưu lượng truy cập dựa trên quốc gia được yêu cầu cụ thể."
+"directConnectionsConfigs" = "Kết Nối Trực Tiếp"
+"directConnectionsConfigsDesc" = "Kết nối trực tiếp đảm bảo rằng lưu lượng truy cập cụ thể không được định tuyến qua máy chủ khác."
+"blockips" = "Chặn IP"
+"blockdomains" = "Chặn Tên Miền"
+"directips" = "IP Trực Tiếp"
+"directdomains" = "Tên Miền Trực Tiếp"
 "ipv4Configs" = "Cấu hình IPv4"
 "ipv4ConfigsDesc" = "Những tùy chọn này sẽ chỉ định kết nối đến các tên miền mục tiêu qua IPv4."
 "warpConfigs" = "Cấu hình WARP"
@@ -356,38 +360,6 @@
 "SecurityDesc" = "Thay đổi mẫu cấu hình để bảo vệ Bảo mật."
 "Speedtest" = "Chặn Trang web Speedtest"
 "SpeedtestDesc" = "Thay đổi mẫu cấu hình để tránh kết nối đến các trang web Speedtest."
-"IRIp" = "Vô hiệu hóa kết nối đến dải IP của Iran"
-"IRIpDesc" = "Thay đổi mẫu cấu hình để tránh kết nối đến dải IP của Iran."
-"IRDomain" = "Vô hiệu hóa kết nối đến tên miền của Iran"
-"IRDomainDesc" = "Thay đổi mẫu cấu hình để tránh kết nối đến các tên miền của Iran."
-"ChinaIp" = "Vô hiệu hóa kết nối đến dải IP của Trung Quốc"
-"ChinaIpDesc" = "Thay đổi mẫu cấu hình để tránh kết nối đến dải IP của Trung Quốc."
-"ChinaDomain" = "Vô hiệu hóa kết nối đến tên miền của Trung Quốc"
-"ChinaDomainDesc" = "Thay đổi mẫu cấu hình để tránh kết nối đến các tên miền của Trung Quốc."
-"RussiaIp" = "Vô hiệu hóa kết nối đến dải IP của Nga"
-"RussiaIpDesc" = "Thay đổi mẫu cấu hình để tránh kết nối đến dải IP của Nga."
-"RussiaDomain" = "Vô hiệu hóa kết nối đến tên miền của Nga"
-"RussiaDomainDesc" = "Thay đổi mẫu cấu hình để tránh kết nối đến các tên miền của Nga."
-"VNIp" = "Vô hiệu hóa kết nối đến dải IP của Việt Nam"
-"VNIpDesc" = "Thay đổi mẫu cấu hình để tránh kết nối đến dải IP của Việt Nam."
-"VNDomain" = "Vô hiệu hóa kết nối đến tên miền của Việt Nam"
-"VNDomainDesc" = "Thay đổi mẫu cấu hình để tránh kết nối đến các tên miền của Việt Nam."
-"DirectIRIp" = "Kết nối trực tiếp đến dải IP của Iran"
-"DirectIRIpDesc" = "Thay đổi mẫu cấu hình cho kết nối trực tiếp đến dải IP của Iran."
-"DirectIRDomain" = "Kết nối trực tiếp đến tên miền của Iran"
-"DirectIRDomainDesc" = "Thay đổi mẫu cấu hình cho kết nối trực tiếp đến các tên miền của Iran."
-"DirectChinaIp" = "Kết nối trực tiếp đến dải IP của Trung Quốc"
-"DirectChinaIpDesc" = "Thay đổi mẫu cấu hình cho kết nối trực tiếp đến dải IP của Trung Quốc."
-"DirectChinaDomain" = "Kết nối trực tiếp đến tên miền của Trung Quốc"
-"DirectChinaDomainDesc" = "Thay đổi mẫu cấu hình cho kết nối trực tiếp đến các tên miền của Trung Quốc."
-"DirectRussiaIp" = "Kết nối trực tiếp đến dải IP của Nga"
-"DirectRussiaIpDesc" = "Thay đổi mẫu cấu hình cho kết nối trực tiếp đến dải IP của Nga."
-"DirectRussiaDomain" = "Kết nối trực tiếp đến tên miền của Nga"
-"DirectRussiaDomainDesc" = "Thay đổi mẫu cấu hình cho kết nối trực tiếp đến các tên miền của Nga."
-"DirectVNIp" = "Kết nối trực tiếp đến dải IP của Việt Nam"
-"DirectVNIpDesc" = "Thay đổi mẫu cấu hình cho kết nối trực tiếp đến dải IP của Việt Nam"
-"DirectVNDomain" = "Kết nối trực tiếp đến tên miền của Việt Nam"
-"DirectVNDomainDesc" = "Thay đổi mẫu cấu hình cho kết nối trực tiếp đến các tên miền của Việt Nam."
 "GoogleIPv4" = "Sử dụng IPv4 cho Google"
 "GoogleIPv4Desc" = "Thêm định tuyến cho Google để kết nối qua IPv4."
 "NetflixIPv4" = "Sử dụng IPv4 cho Netflix"
diff --git a/web/translation/translate.zh_CN.toml b/web/translation/translate.zh_CN.toml
index 152e3e6d..b9bb912f 100644
--- a/web/translation/translate.zh_CN.toml
+++ b/web/translation/translate.zh_CN.toml
@@ -330,10 +330,14 @@
 "logConfigsDesc" = "日志可能会影响服务器的性能，建议仅在需要时启用"
 "blockConfigs" = "防护屏蔽"
 "blockConfigsDesc" = "这些选项将阻止用户连接到特定协议和网站"
-"blockCountryConfigs" = "屏蔽国家/地区"
-"blockCountryConfigsDesc" = "这些选项将阻止用户连接到特定国家/地区"
-"directCountryConfigs" = "直连国家/地区"
-"directCountryConfigsDesc" = "直接连接可确保特定流量不会通过其他服务器路由"
+"blockConnectionsConfigs" = "阻止连接"
+"blockConnectionsConfigsDesc" = "这些选项将根据特定的请求国家阻止流量。"
+"directConnectionsConfigs" = "直接连接"
+"directConnectionsConfigsDesc" = "直接连接确保特定的流量不会通过其他服务器路由。"
+"blockips" = "阻止IP"
+"blockdomains" = "阻止域名"
+"directips" = "直接IP"
+"directdomains" = "直接域名"
 "ipv4Configs" = "IPv4 路由"
 "ipv4ConfigsDesc" = "此选项将仅通过 IPv4 路由到目标域"
 "warpConfigs" = "WARP 路由"
@@ -356,38 +360,6 @@
 "SecurityDesc" = "屏蔽恶意软件、网络钓鱼和挖矿网站"
 "Speedtest" = "屏蔽测速网站"
 "SpeedtestDesc" = "阻止连接到测速网站"
-"IRIp" = "屏蔽连接到伊朗 IP"
-"IRIpDesc" = "阻止建立到伊朗 IP 范围的连接"
-"IRDomain" = "屏蔽连接到伊朗域名"
-"IRDomainDesc" = "阻止建立到伊朗域名的连接"
-"ChinaIp" = "屏蔽连接到中国 IP"
-"ChinaIpDesc" = "阻止建立到中国 IP 范围的连接"
-"ChinaDomain" = "屏蔽连接到中国域名"
-"ChinaDomainDesc" = "阻止建立到中国域名的连接"
-"RussiaIp" = "屏蔽连接到俄罗斯 IP"
-"RussiaIpDesc" = "阻止建立到俄罗斯 IP 范围的连接"
-"RussiaDomain" = "屏蔽连接到俄罗斯域名"
-"RussiaDomainDesc" = "阻止建立到俄罗斯域名的连接"
-"VNIp" = "屏蔽连接到越南 IP"
-"VNIpDesc" = "阻止建立到越南 IP 范围的连接"
-"VNDomain" = "屏蔽连接到越南域名"
-"VNDomainDesc" = "阻止建立到越南域名的连接"
-"DirectIRIp" = "直连伊朗 IP"
-"DirectIRIpDesc" = "直接建立到伊朗 IP 范围的连接"
-"DirectIRDomain" = "直连伊朗域名"
-"DirectIRDomainDesc" = "直接建立到伊朗域名的连接"
-"DirectChinaIp" = "直连中国 IP"
-"DirectChinaIpDesc" = "直接建立到中国 IP 范围的连接"
-"DirectChinaDomain" = "直连中国域名"
-"DirectChinaDomainDesc" = "直接建立到中国域名的连接"
-"DirectRussiaIp" = "直连俄罗斯 IP"
-"DirectRussiaIpDesc" = "直接建立到俄罗斯 IP 范围的连接"
-"DirectRussiaDomain" = "直连俄罗斯域名"
-"DirectRussiaDomainDesc" = "直接建立到俄罗斯域名的连接"
-"DirectVNIp" = "直连越南 IP"
-"DirectVNIpDesc" = "直接建立到越南 IP 范围的连接"
-"DirectVNDomain" = "直连越南域名"
-"DirectVNDomainDesc" = "直接建立到越南域名的连接"
 "GoogleIPv4" = "Google"
 "GoogleIPv4Desc" = "通过 IPv4 将流量路由到谷歌"
 "NetflixIPv4" = "Netflix"

From 9e13513205e86c910721ebcbd459e9de53de9b47 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Fri, 27 Sep 2024 14:37:57 +0200
Subject: [PATCH 06/45] Temporarily disabled Allocate

---
 web/html/xui/form/inbound.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/html/xui/form/inbound.html b/web/html/xui/form/inbound.html
index 3a3b352f..ea5dc9ef 100644
--- a/web/html/xui/form/inbound.html
+++ b/web/html/xui/form/inbound.html
@@ -122,10 +122,12 @@
 </a-collapse>
 
 <!-- allocate -->
+<!-- Temporarily disabled until we accepts range for port allocation
 <a-collapse>
     <a-collapse-panel header='Allocate'>
         {{template "form/allocate"}}
     </a-collapse-panel>
 </a-collapse>
+-->
 
 {{end}}

From cdb6eac0e67b344b1c8edb5dc290395fedddb829 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Fri, 27 Sep 2024 14:57:04 +0200
Subject: [PATCH 07/45] Reality - min,max client (not active)

---
 web/html/xui/form/reality_settings.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/web/html/xui/form/reality_settings.html b/web/html/xui/form/reality_settings.html
index 19804e17..327cd79d 100644
--- a/web/html/xui/form/reality_settings.html
+++ b/web/html/xui/form/reality_settings.html
@@ -21,6 +21,14 @@
     <a-form-item label='Max Time Diff (ms)'>
         <a-input-number v-model.number="inbound.stream.reality.maxTimediff" :min="0"></a-input-number>
     </a-form-item>
+    <!-- we also have this but i think it's not necessary
+    <a-form-item label='Min Client'>
+        <a-input v-model.trim="inbound.stream.reality.minClient"></a-input>
+    </a-form-item>
+    <a-form-item label='Max Client'>
+        <a-input v-model.trim="inbound.stream.reality.maxClient"></a-input>
+    </a-form-item>
+    -->
     <a-form-item>
         <template slot="label">
             <a-tooltip>

From 27434f323576b30d37a70bd205ef33611b45f310 Mon Sep 17 00:00:00 2001
From: Vyacheslav Scherbinin <gentslava@mail.ru>
Date: Mon, 30 Sep 2024 22:06:38 +0700
Subject: [PATCH 08/45] Fix toasts (#2571)

* Add space to toast status messages

* Removed opening space from translations
---
 web/controller/util.go               |  6 +++---
 web/translation/translate.en_US.toml |  6 +++---
 web/translation/translate.es_ES.toml |  4 ++--
 web/translation/translate.fa_IR.toml | 12 ++++++------
 web/translation/translate.id_ID.toml |  2 +-
 web/translation/translate.pt_BR.toml |  6 +++---
 web/translation/translate.ru_RU.toml |  2 +-
 web/translation/translate.tr_TR.toml |  2 +-
 web/translation/translate.uk_UA.toml |  6 +++---
 web/translation/translate.vi_VN.toml |  2 +-
 web/translation/translate.zh_CN.toml |  4 ++--
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/web/controller/util.go b/web/controller/util.go
index b07aaf0e..440de276 100644
--- a/web/controller/util.go
+++ b/web/controller/util.go
@@ -42,12 +42,12 @@ func jsonMsgObj(c *gin.Context, msg string, obj interface{}, err error) {
 	if err == nil {
 		m.Success = true
 		if msg != "" {
-			m.Msg = msg + I18nWeb(c, "success")
+			m.Msg = msg + " " + I18nWeb(c, "success")
 		}
 	} else {
 		m.Success = false
-		m.Msg = msg + I18nWeb(c, "fail") + ": " + err.Error()
-		logger.Warning(msg+I18nWeb(c, "fail")+": ", err)
+		m.Msg = msg + " " + I18nWeb(c, "fail") + ": " + err.Error()
+		logger.Warning(msg+" "+I18nWeb(c, "fail")+": ", err)
 	}
 	c.JSON(http.StatusOK, m)
 }
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index 75564fc4..de8a11a5 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -43,8 +43,8 @@
 "domainName" = "Domain Name"
 "monitor" = "Listen IP"
 "certificate" = "Digital Certificate"
-"fail" = " Failed"
-"success" = " Successfully"
+"fail" = "Failed"
+"success" = "Successfully"
 "getVersion" = "Get Version"
 "install" = "Install"
 "clients" = "Clients"
@@ -143,7 +143,7 @@
 "destinationPort" = "Destination Port"
 "targetAddress" = "Target Address"
 "monitorDesc" = "Leave blank to listen on all IPs"
-"meansNoLimit" = " = Unlimited. (unit: GB)"
+"meansNoLimit" = "= Unlimited. (unit: GB)"
 "totalFlow" = "Total Flow"
 "leaveBlankToNeverExpire" = "Leave blank to never expire"
 "noRecommendKeepDefault" = "It is recommended to keep the default"
diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml
index 36980ed4..6b98369b 100644
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
@@ -143,7 +143,7 @@
 "destinationPort" = "Puerto de Destino"
 "targetAddress" = "Dirección de Destino"
 "monitorDesc" = "Dejar en blanco por defecto"
-"meansNoLimit" = " = illimitata. (unidad: GB)"
+"meansNoLimit" = "= illimitata. (unidad: GB)"
 "totalFlow" = "Flujo Total"
 "leaveBlankToNeverExpire" = "Dejar en Blanco para Nunca Expirar"
 "noRecommendKeepDefault" = "No hay requisitos especiales para mantener la configuración predeterminada"
@@ -568,7 +568,7 @@
 "confirmResetTraffic" = "✅ ¿Confirmar Reinicio de Tráfico?"
 "confirmClearIps" = "✅ ¿Confirmar Limpiar IPs?"
 "confirmRemoveTGUser" = "✅ ¿Confirmar Eliminar Usuario de Telegram?"
-"confirmToggle" = " ✅ ¿Confirmar habilitar/deshabilitar usuario?"
+"confirmToggle" = "✅ ¿Confirmar habilitar/deshabilitar usuario?"
 "dbBackup" = "Obtener Copia de Seguridad de BD"
 "serverUsage" = "Uso del Servidor"
 "getInbounds" = "Obtener Entradas"
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index 31e65b06..9fb3f99e 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -44,7 +44,7 @@
 "monitor" = "آی‌پی اتصال"
 "certificate" = "گواهی دیجیتال"
 "fail" = "ناموفق"
-"success" = " موفق"
+"success" = "موفق"
 "getVersion" = "دریافت نسخه"
 "install" = "نصب"
 "clients" = "کاربران"
@@ -109,7 +109,7 @@
 "backup" = "پشتیبان‌گیری"
 "backupTitle" = "پشتیبان‌گیری دیتابیس"
 "backupDescription" = "توصیه‌می‌شود قبل‌از واردکردن یک دیتابیس جدید، نسخه پشتیبان تهیه ‌کنید"
-"exportDatabase" = " پشتیبان‌گیری"
+"exportDatabase" = "پشتیبان‌گیری"
 "importDatabase" = "بازگرداندن"
 
 [pages.inbounds]
@@ -285,7 +285,7 @@
 "timeZoneDesc" = "وظایف برنامه ریزی شده بر اساس این منطقه‌زمانی اجرا می‌شود"
 "subSettings" = "سابسکریپشن"
 "subEnable" = "فعال‌سازی سرویس سابسکریپشن"
-"subEnableDesc" = " سرویس سابسکریپشن‌ را فعال‌می‌کند"
+"subEnableDesc" = "سرویس سابسکریپشن‌ را فعال‌می‌کند"
 "subListen" = "آدرس آی‌پی"
 "subListenDesc" = "آدرس آی‌پی برای سرویس سابسکریپشن. برای گوش دادن به‌تمام آی‌پی‌ها خالی‌بگذارید"
 "subPort" = "پورت"
@@ -373,11 +373,11 @@
 "MetaWARP" = "متا"
 "MetaWARPDesc" = "ترافیک را از طریق وارپ به متا (اینستاگرام، فیس بوک، واتساپ، تردز و...) هدایت می کند."
 "AppleWARP" = "اپل"
-"AppleWARPDesc" = " ترافیک را از طریق وارپ به اپل هدایت می‌کند"
+"AppleWARPDesc" = "ترافیک را از طریق وارپ به اپل هدایت می‌کند"
 "RedditWARP" = "ردیت"
-"RedditWARPDesc" = " ترافیک را از طریق وارپ به ردیت هدایت می‌کند"
+"RedditWARPDesc" = "ترافیک را از طریق وارپ به ردیت هدایت می‌کند"
 "SpotifyWARP" = "اسپاتیفای"
-"SpotifyWARPDesc" = " ترافیک را از طریق وارپ به اسپاتیفای هدایت می‌کند"
+"SpotifyWARPDesc" = "ترافیک را از طریق وارپ به اسپاتیفای هدایت می‌کند"
 "IRWARP" = "دامنه‌های ایران"
 "IRWARPDesc" = "ترافیک را از طریق وارپ به دامنه‌های کشور ایران هدایت می‌کند"
 "Inbounds" = "ورودی‌ها"
diff --git a/web/translation/translate.id_ID.toml b/web/translation/translate.id_ID.toml
index c2260c30..6b819a2e 100644
--- a/web/translation/translate.id_ID.toml
+++ b/web/translation/translate.id_ID.toml
@@ -143,7 +143,7 @@
 "destinationPort" = "Port Tujuan"
 "targetAddress" = "Alamat Target"
 "monitorDesc" = "Biarkan kosong untuk mendengarkan semua IP"
-"meansNoLimit" = " = Unlimited. (unit: GB)"
+"meansNoLimit" = "= Unlimited. (unit: GB)"
 "totalFlow" = "Total Aliran"
 "leaveBlankToNeverExpire" = "Biarkan kosong untuk tidak pernah kedaluwarsa"
 "noRecommendKeepDefault" = "Disarankan untuk tetap menggunakan pengaturan default"
diff --git a/web/translation/translate.pt_BR.toml b/web/translation/translate.pt_BR.toml
index acf5f307..72decb89 100644
--- a/web/translation/translate.pt_BR.toml
+++ b/web/translation/translate.pt_BR.toml
@@ -43,8 +43,8 @@
 "domainName" = "Nome de Domínio"
 "monitor" = "IP de Escuta"
 "certificate" = "Certificado Digital"
-"fail" = " Falhou"
-"success" = " Com Sucesso"
+"fail" = "Falhou"
+"success" = "Com Sucesso"
 "getVersion" = "Obter Versão"
 "install" = "Instalar"
 "clients" = "Clientes"
@@ -143,7 +143,7 @@
 "destinationPort" = "Porta de Destino"
 "targetAddress" = "Endereço de Destino"
 "monitorDesc" = "Deixe em branco para ouvir todos os IPs"
-"meansNoLimit" = " = Ilimitado. (unidade: GB)"
+"meansNoLimit" = "= Ilimitado. (unidade: GB)"
 "totalFlow" = "Fluxo Total"
 "leaveBlankToNeverExpire" = "Deixe em branco para nunca expirar"
 "noRecommendKeepDefault" = "Recomenda-se manter o padrão"
diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index 9db1116f..7936cf14 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -143,7 +143,7 @@
 "destinationPort" = "Порт назначения"
 "targetAddress" = "Целевой адрес"
 "monitorDesc" = "Оставьте пустым по умолчанию"
-"meansNoLimit" = " = Без ограничений (значение: ГБ)"
+"meansNoLimit" = "= Без ограничений (значение: ГБ)"
 "totalFlow" = "Общий расход"
 "leaveBlankToNeverExpire" = "Оставьте пустым, чтобы не истекало"
 "noRecommendKeepDefault" = "Нет требований для сохранения настроек по умолчанию"
diff --git a/web/translation/translate.tr_TR.toml b/web/translation/translate.tr_TR.toml
index f3ed119e..5260da99 100644
--- a/web/translation/translate.tr_TR.toml
+++ b/web/translation/translate.tr_TR.toml
@@ -143,7 +143,7 @@
 "destinationPort" = "Hedef Port"
 "targetAddress" = "Hedef Adres"
 "monitorDesc" = "Tüm IP'leri dinlemek için boş bırakın"
-"meansNoLimit" = " = Sınırsız. (birim: GB)"
+"meansNoLimit" = "= Sınırsız. (birim: GB)"
 "totalFlow" = "Toplam Akış"
 "leaveBlankToNeverExpire" = "Hiçbir zaman sona ermemesi için boş bırakın"
 "noRecommendKeepDefault" = "Varsayılanı korumanız önerilir"
diff --git a/web/translation/translate.uk_UA.toml b/web/translation/translate.uk_UA.toml
index 31be0a31..faecbf30 100644
--- a/web/translation/translate.uk_UA.toml
+++ b/web/translation/translate.uk_UA.toml
@@ -43,8 +43,8 @@
 "domainName" = "Доменне ім`я"
 "monitor" = "Слухати IP"
 "certificate" = "Цифровий сертифікат"
-"fail" = " Помилка"
-"success" = " Успішно"
+"fail" = "Помилка"
+"success" = "Успішно"
 "getVersion" = "Отримати версію"
 "install" = "Встановити"
 "clients" = "Клієнти"
@@ -143,7 +143,7 @@
 "destinationPort" = "Порт призначення"
 "targetAddress" = "Цільова адреса"
 "monitorDesc" = "Залиште порожнім, щоб слухати всі IP-адреси"
-"meansNoLimit" = " = Необмежено. (одиниця: ГБ)"
+"meansNoLimit" = "= Необмежено. (одиниця: ГБ)"
 "totalFlow" = "Загальна витрата"
 "leaveBlankToNeverExpire" = "Залиште порожнім, щоб ніколи не закінчувався"
 "noRecommendKeepDefault" = "Рекомендується зберегти значення за замовчуванням"
diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml
index ed63305e..28a4a680 100644
--- a/web/translation/translate.vi_VN.toml
+++ b/web/translation/translate.vi_VN.toml
@@ -143,7 +143,7 @@
 "destinationPort" = "Cổng đích"
 "targetAddress" = "Địa chỉ mục tiêu"
 "monitorDesc" = "Mặc định để trống"
-"meansNoLimit" = " = Không giới hạn (đơn vị: GB)"
+"meansNoLimit" = "= Không giới hạn (đơn vị: GB)"
 "totalFlow" = "Tổng lưu lượng"
 "leaveBlankToNeverExpire" = "Để trống để không bao giờ hết hạn"
 "noRecommendKeepDefault" = "Không yêu cầu đặc biệt để giữ nguyên cài đặt mặc định"
diff --git a/web/translation/translate.zh_CN.toml b/web/translation/translate.zh_CN.toml
index b9bb912f..00b7684c 100644
--- a/web/translation/translate.zh_CN.toml
+++ b/web/translation/translate.zh_CN.toml
@@ -143,7 +143,7 @@
 "destinationPort" = "目标端口"
 "targetAddress" = "目标地址"
 "monitorDesc" = "留空表示监听所有 IP"
-"meansNoLimit" = " = 无限制（单位：GB)"
+"meansNoLimit" = "= 无限制（单位：GB)"
 "totalFlow" = "总流量"
 "leaveBlankToNeverExpire" = "留空表示永不过期"
 "noRecommendKeepDefault" = "建议保留默认值"
@@ -474,7 +474,7 @@
 "loginSecurity" = "登录安全"
 "loginSecurityDesc" = "添加额外的身份验证以提高安全性"
 "secretToken" = "安全令牌"
-"secretTokenDesc" = "请将此令牌存储在安全的地方。此令牌用于登录，丢失无法恢复。" 
+"secretTokenDesc" = "请将此令牌存储在安全的地方。此令牌用于登录，丢失无法恢复。"
 
 [pages.settings.toasts]
 "modifySettings" = "修改设置"

From b24855082e1fe67e2a340c406929a594a201268b Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Tue, 1 Oct 2024 09:34:13 +0200
Subject: [PATCH 09/45] RAW as an alias of TCP

---
 web/html/xui/form/stream/stream_settings.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/html/xui/form/stream/stream_settings.html b/web/html/xui/form/stream/stream_settings.html
index debc38de..7150f999 100644
--- a/web/html/xui/form/stream/stream_settings.html
+++ b/web/html/xui/form/stream/stream_settings.html
@@ -4,7 +4,7 @@
     <a-form-item label='{{ i18n "transmission" }}'>
         <a-select v-model="inbound.stream.network" style="width: 75%" @change="streamNetworkChange"
             :dropdown-class-name="themeSwitcher.currentTheme">
-            <a-select-option value="tcp">TCP</a-select-option>
+            <a-select-option value="tcp">TCP(RAW)</a-select-option>
             <a-select-option value="kcp">mKCP</a-select-option>
             <a-select-option value="ws">WebSocket</a-select-option>
             <a-select-option value="http">H2</a-select-option>

From f48df1e5c05a75b9da032c726005df7848c40277 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Tue, 1 Oct 2024 09:35:06 +0200
Subject: [PATCH 10/45] Xray Core v24.9.30

---
 .github/workflows/release.yml | 2 +-
 DockerInit.sh                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d98919a5..799f6b42 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -83,7 +83,7 @@ jobs:
           cd x-ui/bin
           
           # Download dependencies
-          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v24.9.19/"
+          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v24.9.30/"
           if [ "${{ matrix.platform }}" == "amd64" ]; then
             wget ${Xray_URL}Xray-linux-64.zip
             unzip Xray-linux-64.zip
diff --git a/DockerInit.sh b/DockerInit.sh
index a4dcbe34..b68af92f 100755
--- a/DockerInit.sh
+++ b/DockerInit.sh
@@ -27,7 +27,7 @@ case $1 in
 esac
 mkdir -p build/bin
 cd build/bin
-wget "https://github.com/XTLS/Xray-core/releases/download/v24.9.19/Xray-linux-${ARCH}.zip"
+wget "https://github.com/XTLS/Xray-core/releases/download/v24.9.30/Xray-linux-${ARCH}.zip"
 unzip "Xray-linux-${ARCH}.zip"
 rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat
 mv xray "xray-linux-${FNAME}"

From f2ee18235fcfb3d1234e7e0d8755ac6996ef6b61 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Tue, 1 Oct 2024 09:40:03 +0200
Subject: [PATCH 11/45] update dependencies

---
 go.mod                                        |  8 ++++----
 go.sum                                        | 18 ++++++++----------
 web/html/xui/form/stream/stream_settings.html |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/go.mod b/go.mod
index 749d9257..292f3d29 100644
--- a/go.mod
+++ b/go.mod
@@ -12,12 +12,12 @@ require (
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pelletier/go-toml/v2 v2.2.3
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/shirou/gopsutil/v4 v4.24.8
+	github.com/shirou/gopsutil/v4 v4.24.9
 	github.com/valyala/fasthttp v1.56.0
 	github.com/xtls/xray-core v1.8.24
 	go.uber.org/atomic v1.11.0
 	golang.org/x/text v0.18.0
-	google.golang.org/grpc v1.67.0
+	google.golang.org/grpc v1.67.1
 	gorm.io/driver/sqlite v1.5.6
 	gorm.io/gorm v1.25.12
 )
@@ -30,6 +30,7 @@ require (
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
+	github.com/ebitengine/purego v0.8.0 // indirect
 	github.com/fasthttp/router v1.5.2 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
@@ -40,7 +41,7 @@ require (
 	github.com/go-playground/validator/v10 v10.22.1 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/google/btree v1.1.3 // indirect
-	github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect
+	github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d // indirect
 	github.com/gorilla/context v1.1.2 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/gorilla/sessions v1.4.0 // indirect
@@ -69,7 +70,6 @@ require (
 	github.com/sagernet/sing-shadowsocks v0.2.7 // indirect
 	github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38 // indirect
 	github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 // indirect
-	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/tklauser/go-sysconf v0.3.14 // indirect
 	github.com/tklauser/numcpus v0.8.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
diff --git a/go.sum b/go.sum
index 414b57e6..556e6b79 100644
--- a/go.sum
+++ b/go.sum
@@ -38,6 +38,8 @@ github.com/dgryski/go-metro v0.0.0-20200812162917-85c65e2d0165/go.mod h1:c9O8+fp
 github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 h1:y7y0Oa6UawqTFPCDw9JG6pdKt4F9pAhHv0B7FMGaGD0=
 github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/ebitengine/purego v0.8.0 h1:JbqvnEzRvPpxhCJzJJ2y0RbiZ8nyjccVUrSM3q+GvvE=
+github.com/ebitengine/purego v0.8.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/fasthttp/router v1.5.2 h1:ckJCCdV7hWkkrMeId3WfEhz+4Gyyf6QPwxi/RHIMZ6I=
 github.com/fasthttp/router v1.5.2/go.mod h1:C8EY53ozOwpONyevc/V7Gr8pqnEjwnkFFqPo1alAGs0=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
@@ -98,8 +100,8 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 h1:c5FlPPgxOn7kJz3VoPLkQYQXGBS3EklQ4Zfi57uOuqQ=
-github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d h1:Jaz2JzpQaQXyET0AjLBXShrthbpqMkhGiEfkcQAiAUs=
+github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
 github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -208,12 +210,8 @@ github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38/go.mod h1:sM7Mt7uEo
 github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 h1:emzAzMZ1L9iaKCTxdy3Em8Wv4ChIAGnfiz18Cda70g4=
 github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771/go.mod h1:bR6DqgcAl1zTcOX8/pE2Qkj9XO00eCNqmKb7lXP8EAg=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shirou/gopsutil/v4 v4.24.8 h1:pVQjIenQkIhqO81mwTaXjTzOMT7d3TZkf43PlVFHENI=
-github.com/shirou/gopsutil/v4 v4.24.8/go.mod h1:wE0OrJtj4dG+hYkxqDH3QiBICdKSf04/npcvLLc/oRg=
-github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
-github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
-github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
-github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
+github.com/shirou/gopsutil/v4 v4.24.9 h1:KIV+/HaHD5ka5f570RZq+2SaeFsb/pq+fp2DGNWYoOI=
+github.com/shirou/gopsutil/v4 v4.24.9/go.mod h1:3fkaHNeYsUFCGZ8+9vZVWtbyM1k2eRnlL+bWO8Bxa/Q=
 github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
 github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
 github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=
@@ -374,8 +372,8 @@ google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmE
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
-google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
+google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
+google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
 google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/web/html/xui/form/stream/stream_settings.html b/web/html/xui/form/stream/stream_settings.html
index 7150f999..2a575595 100644
--- a/web/html/xui/form/stream/stream_settings.html
+++ b/web/html/xui/form/stream/stream_settings.html
@@ -4,7 +4,7 @@
     <a-form-item label='{{ i18n "transmission" }}'>
         <a-select v-model="inbound.stream.network" style="width: 75%" @change="streamNetworkChange"
             :dropdown-class-name="themeSwitcher.currentTheme">
-            <a-select-option value="tcp">TCP(RAW)</a-select-option>
+            <a-select-option value="tcp">TCP (RAW)</a-select-option>
             <a-select-option value="kcp">mKCP</a-select-option>
             <a-select-option value="ws">WebSocket</a-select-option>
             <a-select-option value="http">H2</a-select-option>

From 80cfbefd7570d7ed0dee4a4851240c026a523ae3 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Tue, 1 Oct 2024 09:41:12 +0200
Subject: [PATCH 12/45] v2.4.3

---
 README.es_ES.md | 4 ++--
 README.md       | 4 ++--
 README.ru_RU.md | 4 ++--
 README.zh_CN.md | 4 ++--
 config/version  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.es_ES.md b/README.es_ES.md
index e03149d0..24f7f309 100644
--- a/README.es_ES.md
+++ b/README.es_ES.md
@@ -32,10 +32,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
 
 ## Instalar una Versión Personalizada
 
-Para instalar la versión deseada, agrega la versión al final del comando de instalación. Por ejemplo, ver `v2.4.2`:
+Para instalar la versión deseada, agrega la versión al final del comando de instalación. Por ejemplo, ver `v2.4.3`:
 
 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.4.2
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.4.3
 ```
 
 ## Certificado SSL
diff --git a/README.md b/README.md
index e6525637..b15c4064 100644
--- a/README.md
+++ b/README.md
@@ -32,10 +32,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
 
 ## Install Custom Version
 
-To install your desired version, add the version to the end of the installation command. e.g., ver `v2.4.2`:
+To install your desired version, add the version to the end of the installation command. e.g., ver `v2.4.3`:
 
 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.4.2
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.4.3
 ```
 
 ## SSL Certificate
diff --git a/README.ru_RU.md b/README.ru_RU.md
index 3c65e65e..329c6cc1 100644
--- a/README.ru_RU.md
+++ b/README.ru_RU.md
@@ -32,10 +32,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
 
 ## Установка определённой версии
 
-Чтобы установить нужную вам версию, добавьте номер версии в конец команды установки. Например, `v2.4.2`:
+Чтобы установить нужную вам версию, добавьте номер версии в конец команды установки. Например, `v2.4.3`:
 
 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.4.2
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.4.3
 ```
 
 ## SSL Сертификат
diff --git a/README.zh_CN.md b/README.zh_CN.md
index 9f69a7c4..240095f4 100644
--- a/README.zh_CN.md
+++ b/README.zh_CN.md
@@ -32,10 +32,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
 
 ## 安装指定版本
 
-要安装所需的版本，请将该版本添加到安装命令的末尾。 e.g., ver `v2.4.2`:
+要安装所需的版本，请将该版本添加到安装命令的末尾。 e.g., ver `v2.4.3`:
 
 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.4.2
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.4.3
 ```
 
 ### SSL证书
diff --git a/config/version b/config/version
index acdc3f1b..6550da69 100644
--- a/config/version
+++ b/config/version
@@ -1 +1 @@
-2.4.2
\ No newline at end of file
+2.4.3
\ No newline at end of file

From fe0a8375a3253a0340cff81da0d56b7c6fb940cd Mon Sep 17 00:00:00 2001
From: Huang Kuan Wei <33425166+xellosiris@users.noreply.github.com>
Date: Thu, 3 Oct 2024 15:46:15 +0800
Subject: [PATCH 13/45] add language zh-Tw (#2572)

* add translation zh-TW

* add zh-TW to langs.js
---
 web/assets/js/langs.js               | 159 +++----
 web/translation/translate.zh_TW.toml | 620 +++++++++++++++++++++++++++
 2 files changed, 702 insertions(+), 77 deletions(-)
 create mode 100644 web/translation/translate.zh_TW.toml

diff --git a/web/assets/js/langs.js b/web/assets/js/langs.js
index 5f2577b7..2dfdc4e5 100644
--- a/web/assets/js/langs.js
+++ b/web/assets/js/langs.js
@@ -1,93 +1,98 @@
 const supportLangs = [
-    {
-        name: 'English',
-        value: 'en-US',
-        icon: '🇺🇸',
-    },
-    {
-        name: 'فارسی',
-        value: 'fa-IR',
-        icon: '🇮🇷',
-    },
-    {
-        name: '中文',
-        value: 'zh-CN',
-        icon: '🇨🇳',
-    },
-    {
-        name: 'Русский',
-        value: 'ru-RU',
-        icon: '🇷🇺',
-    },
-    {
-        name: 'Tiếng Việt',
-        value: 'vi-VN',
-        icon: '🇻🇳',
-    },
-    {
-        name: 'Español',
-        value: 'es-ES',
-        icon: '🇪🇸',
-    },
-    {
-        name: 'Indonesian',
-        value: 'id-ID',
-        icon: '🇮🇩',
-    },
-    {
-        name: 'Український',
-        value: 'uk-UA',
-        icon: '🇺🇦',
-    },
-    {
-        name: 'Türkçe',
-        value: 'tr-TR',
-        icon: '🇹🇷',
-    },
-    {
-        name: "Português",
-        value: "pt-BR",
-        icon: "🇧🇷",
-    },
+	{
+		name: "English",
+		value: "en-US",
+		icon: "🇺🇸",
+	},
+	{
+		name: "فارسی",
+		value: "fa-IR",
+		icon: "🇮🇷",
+	},
+	{
+		name: "簡體中文",
+		value: "zh-CN",
+		icon: "🇨🇳",
+	},
+	{
+		name: "繁體中文",
+		value: "zh-TW",
+		icon: "🇹🇼",
+	},
+	{
+		name: "Русский",
+		value: "ru-RU",
+		icon: "🇷🇺",
+	},
+	{
+		name: "Tiếng Việt",
+		value: "vi-VN",
+		icon: "🇻🇳",
+	},
+	{
+		name: "Español",
+		value: "es-ES",
+		icon: "🇪🇸",
+	},
+	{
+		name: "Indonesian",
+		value: "id-ID",
+		icon: "🇮🇩",
+	},
+	{
+		name: "Український",
+		value: "uk-UA",
+		icon: "🇺🇦",
+	},
+	{
+		name: "Türkçe",
+		value: "tr-TR",
+		icon: "🇹🇷",
+	},
+	{
+		name: "Português",
+		value: "pt-BR",
+		icon: "🇧🇷",
+	},
 ];
 
 function getLang() {
-    let lang = getCookie('lang');
+	let lang = getCookie("lang");
 
-    if (!lang) {
-        if (window.navigator) {
-            lang = window.navigator.language || window.navigator.userLanguage;
+	if (!lang) {
+		if (window.navigator) {
+			lang = window.navigator.language || window.navigator.userLanguage;
 
-            if (isSupportLang(lang)) {
-                setCookie('lang', lang, 150);
-            } else {
-                setCookie('lang', 'en-US', 150);
-                window.location.reload();
-            }
-        } else {
-            setCookie('lang', 'en-US', 150);
-            window.location.reload();
-        }
-    }
+			if (isSupportLang(lang)) {
+				setCookie("lang", lang, 150);
+			} else {
+				setCookie("lang", "en-US", 150);
+				window.location.reload();
+			}
+		} else {
+			setCookie("lang", "en-US", 150);
+			window.location.reload();
+		}
+	}
 
-    return lang;
+	return lang;
 }
 
 function setLang(lang) {
-    if (!isSupportLang(lang)) {
-        lang = 'en-US';
-    }
+	if (!isSupportLang(lang)) {
+		lang = "en-US";
+	}
 
-    setCookie('lang', lang, 150);
-    window.location.reload();
+	setCookie("lang", lang, 150);
+	window.location.reload();
 }
 
 function isSupportLang(lang) {
-    for (l of supportLangs) {
-        if (l.value === lang) {
-            return true;
-        }
-    }
+	for (l of supportLangs) {
+		if (l.value === lang) {
+			return true;
+		}
+	}
 
-    return false;
+	return false;
 }
diff --git a/web/translation/translate.zh_TW.toml b/web/translation/translate.zh_TW.toml
new file mode 100644
index 00000000..19f7f6b1
--- /dev/null
+++ b/web/translation/translate.zh_TW.toml
@@ -0,0 +1,620 @@
+"username" = "使用者名稱"
+"password" = "密碼"
+"login" = "登入"
+"confirm" = "確定"
+"cancel" = "取消"
+"close" = "關閉"
+"copy" = "複製"
+"copied" = "已複製"
+"download" = "下載"
+"remark" = "備註"
+"enable" = "啟用"
+"protocol" = "協議"
+"search" = "搜尋"
+"filter" = "篩選"
+"loading" = "載入中..."
+"second" = "秒"
+"minute" = "分鐘"
+"hour" = "小時"
+"day" = "天"
+"check" = "檢視"
+"indefinite" = "無限期"
+"unlimited" = "無限制"
+"none" = "無"
+"qrCode" = "二維碼"
+"info" = "更多資訊"
+"edit" = "編輯"
+"delete" = "刪除"
+"reset" = "重置"
+"copySuccess" = "複製成功"
+"sure" = "確定"
+"encryption" = "加密"
+"transmission" = "傳輸"
+"host" = "主機"
+"path" = "路徑"
+"camouflage" = "偽裝"
+"status" = "狀態"
+"enabled" = "開啟"
+"disabled" = "關閉"
+"depleted" = "耗盡"
+"depletingSoon" = "即將耗盡"
+"offline" = "離線"
+"online" = "線上"
+"domainName" = "域名"
+"monitor" = "監聽"
+"certificate" = "憑證"
+"fail" = "失敗"
+"success" = "成功"
+"getVersion" = "獲取版本"
+"install" = "安裝"
+"clients" = "客戶端"
+"usage" = "使用情況"
+"secretToken" = "安全金鑰"
+"remained" = "剩餘"
+"security" = "安全"
+"secAlertTitle" = "安全警報"
+"secAlertSsl" = "此連線不安全。在啟用 TLS 進行資料保護之前，請勿輸入敏感資訊。"
+"secAlertConf" = "某些設定易受攻擊。建議加強安全協議以防止潛在漏洞。"
+"secAlertSSL" = "面板缺少安全連線。請安裝 TLS 證書以保護資料安全。"
+"secAlertPanelPort" = "面板預設埠存在安全風險。請配置隨機埠或特定埠。"
+"secAlertPanelURI" = "面板預設 URI 路徑不安全。請配置複雜的 URI 路徑。"
+"secAlertSubURI" = "訂閱預設 URI 路徑不安全。請配置複雜的 URI 路徑。"
+"secAlertSubJsonURI" = "訂閱 JSON 預設 URI 路徑不安全。請配置複雜的 URI 路徑。"
+
+[menu]
+"dashboard" = "系統狀態"
+"inbounds" = "入站列表"
+"settings" = "面板設定"
+"xray" = "Xray 設定"
+"logout" = "退出登入"
+"link" = "管理"
+
+[pages.login]
+"hello" = "你好"
+"title" = "歡迎"
+"loginAgain" = "登入時效已過，請重新登入"
+
+[pages.login.toasts]
+"invalidFormData" = "資料格式錯誤"
+"emptyUsername" = "請輸入使用者名稱"
+"emptyPassword" = "請輸入密碼"
+"wrongUsernameOrPassword" = "使用者名稱或密碼錯誤"
+"successLogin" = "登入"
+
+[pages.index]
+"title" = "系統狀態"
+"memory" = "記憶體"
+"hard" = "磁碟"
+"xrayStatus" = "Xray"
+"stopXray" = "停止"
+"restartXray" = "重啟"
+"xraySwitch" = "版本"
+"xraySwitchClick" = "選擇你要切換到的版本"
+"xraySwitchClickDesk" = "請謹慎選擇，因為較舊版本可能與當前配置不相容"
+"operationHours" = "系統正常執行時間"
+"systemLoad" = "系統負載"
+"systemLoadDesc" = "過去 1、5 和 15 分鐘的系統平均負載"
+"connectionTcpCountDesc" = "系統中所有 TCP 連線數"
+"connectionUdpCountDesc" = "系統中所有 UDP 連線數"
+"connectionCount" = "連線數"
+"upSpeed" = "總上傳速度"
+"downSpeed" = "總下載速度"
+"totalSent" = "系統啟動以來傳送的總資料量"
+"totalReceive" = "系統啟動以來接收的總資料量"
+"xraySwitchVersionDialog" = "切換 Xray 版本"
+"xraySwitchVersionDialogDesc" = "是否切換 Xray 版本至"
+"dontRefresh" = "安裝中，請勿重新整理此頁面"
+"logs" = "日誌"
+"config" = "配置"
+"backup" = "備份和恢復"
+"backupTitle" = "備份和恢復資料庫"
+"backupDescription" = "恢復資料庫之前建議進行備份"
+"exportDatabase" = "備份"
+"importDatabase" = "恢復"
+
+[pages.inbounds]
+"title" = "入站列表"
+"totalDownUp" = "總上傳 / 下載"
+"totalUsage" = "總用量"
+"inboundCount" = "入站數量"
+"operate" = "選單"
+"enable" = "啟用"
+"remark" = "備註"
+"protocol" = "協議"
+"port" = "埠"
+"traffic" = "流量"
+"details" = "詳細資訊"
+"transportConfig" = "傳輸配置"
+"expireDate" = "到期時間"
+"resetTraffic" = "重置流量"
+"addInbound" = "新增入站"
+"generalActions" = "通用操作"
+"create" = "新增"
+"update" = "修改"
+"modifyInbound" = "修改入站"
+"deleteInbound" = "刪除入站"
+"deleteInboundContent" = "確定要刪除入站嗎？"
+"deleteClient" = "刪除客戶端"
+"deleteClientContent" = "確定要刪除客戶端嗎？"
+"resetTrafficContent" = "確定要重置流量嗎？"
+"copyLink" = "複製連結"
+"address" = "地址"
+"network" = "網路"
+"destinationPort" = "目標埠"
+"targetAddress" = "目標地址"
+"monitorDesc" = "留空表示監聽所有 IP"
+"meansNoLimit" = "= 無限制（單位：GB)"
+"totalFlow" = "總流量"
+"leaveBlankToNeverExpire" = "留空表示永不過期"
+"noRecommendKeepDefault" = "建議保留預設值"
+"certificatePath" = "檔案路徑"
+"certificateContent" = "檔案內容"
+"publicKey" = "公鑰"
+"privatekey" = "私鑰"
+"clickOnQRcode" = "點選二維碼複製"
+"client" = "客戶"
+"export" = "匯出連結"
+"clone" = "複製"
+"cloneInbound" = "複製"
+"cloneInboundContent" = "此入站規則除埠（Port）、監聽 IP（Listening IP）和客戶端（Clients）以外的所有配置都將應用於克隆"
+"cloneInboundOk" = "建立克隆"
+"resetAllTraffic" = "重置所有入站流量"
+"resetAllTrafficTitle" = "重置所有入站流量"
+"resetAllTrafficContent" = "確定要重置所有入站流量嗎？"
+"resetInboundClientTraffics" = "重置客戶端流量"
+"resetInboundClientTrafficTitle" = "重置所有客戶端流量"
+"resetInboundClientTrafficContent" = "確定要重置此入站客戶端的所有流量嗎？"
+"resetAllClientTraffics" = "重置所有客戶端流量"
+"resetAllClientTrafficTitle" = "重置所有客戶端流量"
+"resetAllClientTrafficContent" = "確定要重置所有客戶端的所有流量嗎？"
+"delDepletedClients" = "刪除流量耗盡的客戶端"
+"delDepletedClientsTitle" = "刪除流量耗盡的客戶端"
+"delDepletedClientsContent" = "確定要刪除所有流量耗盡的客戶端嗎？"
+"email" = "電子郵件"
+"emailDesc" = "電子郵件必須完全唯一"
+"IPLimit" = "IP 限制"
+"IPLimitDesc" = "如果數量超過設定值，則禁用入站流量。（0 = 禁用）"
+"IPLimitlog" = "IP 日誌"
+"IPLimitlogDesc" = "IP 歷史日誌（要啟用被禁用的入站流量，請清除日誌）"
+"IPLimitlogclear" = "清除日誌"
+"setDefaultCert" = "從面板設定證書"
+"xtlsDesc" = "Xray 核心需要 1.7.5"
+"realityDesc" = "Xray 核心需要 1.8.0 及以上版本"
+"telegramDesc" = "請提供Telegram聊天ID。（在機器人中使用'/id'命令）或（@userinfobot"
+"subscriptionDesc" = "要找到你的訂閱 URL，請導航到“詳細資訊”。此外，你可以為多個客戶端使用相同的名稱。"
+"info" = "資訊"
+"same" = "相同"
+"inboundData" = "入站資料"
+"exportInbound" = "匯出入站規則"
+"import"="匯入"
+"importInbound" = "匯入入站規則"
+
+[pages.client]
+"add" = "新增客戶端"
+"edit" = "編輯客戶端"
+"submitAdd" = "新增客戶端"
+"submitEdit" = "儲存修改"
+"clientCount" = "客戶端數量"
+"bulk" = "批量建立"
+"method" = "方法"
+"first" = "置頂"
+"last" = "置底"
+"prefix" = "字首"
+"postfix" = "字尾"
+"delayedStart" = "首次使用後開始"
+"expireDays" = "期間"
+"days" = "天"
+"renew" = "自動續訂"
+"renewDesc" = "到期後自動續訂。(0 = 禁用)(單位: 天)"
+
+[pages.inbounds.toasts]
+"obtain" = "獲取"
+
+[pages.inbounds.stream.general]
+"request" = "請求"
+"response" = "響應"
+"name" = "名稱"
+"value" = "值"
+
+[pages.inbounds.stream.tcp]
+"version" = "版本"
+"method" = "方法"
+"path" = "路徑"
+"status" = "狀態"
+"statusDescription" = "狀態說明"
+"requestHeader" = "請求頭"
+"responseHeader" = "響應頭"
+
+[pages.settings]
+"title" = "面板設定"
+"save" = "儲存"
+"infoDesc" = "此處的所有更改都需要儲存並重啟面板才能生效"
+"restartPanel" = "重啟面板"
+"restartPanelDesc" = "確定要重啟面板嗎？若重啟後無法訪問面板，請前往伺服器檢視面板日誌資訊"
+"actions" = "操作"
+"resetDefaultConfig" = "重置為預設配置"
+"panelSettings" = "常規"
+"securitySettings" = "安全設定"
+"TGBotSettings" = "Telegram 機器人配置"
+"panelListeningIP" = "面板監聽 IP"
+"panelListeningIPDesc" = "預設留空監聽所有 IP"
+"panelListeningDomain" = "面板監聽域名"
+"panelListeningDomainDesc" = "預設情況下留空以監視所有域名和 IP 地址"
+"panelPort" = "面板監聽埠"
+"panelPortDesc" = "重啟面板生效"
+"publicKeyPath" = "面板證書公鑰檔案路徑"
+"publicKeyPathDesc" = "填寫一個 '/' 開頭的絕對路徑"
+"privateKeyPath" = "面板證書金鑰檔案路徑"
+"privateKeyPathDesc" = "填寫一個 '/' 開頭的絕對路徑"
+"panelUrlPath" = "面板 url 根路徑"
+"panelUrlPathDesc" = "必須以 '/' 開頭，以 '/' 結尾"
+"pageSize" = "分頁大小"
+"pageSizeDesc" = "定義入站表的頁面大小。設定 0 表示禁用"
+"remarkModel" = "備註模型和分隔符"
+"datepicker" = "日期選擇器"
+"datepickerPlaceholder" = "選擇日期"
+"datepickerDescription" = "選擇器日曆類型指定到期日期"
+"sampleRemark" = "備註示例"
+"oldUsername" = "原使用者名稱"
+"currentPassword" = "原密碼"
+"newUsername" = "新使用者名稱"
+"newPassword" = "新密碼"
+"telegramBotEnable" = "啟用 Telegram 機器人"
+"telegramBotEnableDesc" = "啟用 Telegram 機器人功能"
+"telegramToken" = "Telegram 機器人令牌（token）"
+"telegramTokenDesc" = "從 '@BotFather' 獲取的 Telegram 機器人令牌"
+"telegramProxy" = "SOCKS5 Proxy"
+"telegramProxyDesc" = "啟用 SOCKS5 代理連線到 Telegram（根據指南調整設定）"
+"telegramChatId" = "管理員聊天 ID"
+"telegramChatIdDesc" = "Telegram 管理員聊天 ID (多個以逗號分隔)（可通過 @userinfobot 獲取，或在機器人中使用 '/id' 命令獲取）"
+"telegramNotifyTime" = "通知時間"
+"telegramNotifyTimeDesc" = "設定週期性的 Telegram 機器人通知時間（使用 crontab 時間格式）"
+"tgNotifyBackup" = "資料庫備份"
+"tgNotifyBackupDesc" = "傳送帶有報告的資料庫備份檔案"
+"tgNotifyLogin" = "登入通知"
+"tgNotifyLoginDesc" = "當有人試圖登入你的面板時顯示使用者名稱、IP 地址和時間"
+"sessionMaxAge" = "會話時長"
+"sessionMaxAgeDesc" = "保持登入狀態的時長（單位：分鐘）"
+"expireTimeDiff" = "到期通知閾值"
+"expireTimeDiffDesc" = "達到此閾值時，將收到有關到期時間的通知（單位：天）"
+"trafficDiff" = "流量耗盡閾值"
+"trafficDiffDesc" = "達到此閾值時，將收到有關流量耗盡的通知（單位：GB）"
+"tgNotifyCpu" = "CPU 負載通知閾值"
+"tgNotifyCpuDesc" = "CPU 負載超過此閾值時，將收到通知（單位：%）"
+"timeZone" = "時區"
+"timeZoneDesc" = "定時任務將按照該時區的時間執行"
+"subSettings" = "訂閱設定"
+"subEnable" = "啟用訂閱服務"
+"subEnableDesc" = "啟用訂閱服務功能"
+"subListen" = "監聽 IP"
+"subListenDesc" = "訂閱服務監聽的 IP 地址（留空表示監聽所有 IP）"
+"subPort" = "監聽埠"
+"subPortDesc" = "訂閱服務監聽的埠號（必須是未使用的埠）"
+"subCertPath" = "公鑰路徑"
+"subCertPathDesc" = "訂閱服務使用的公鑰檔案路徑（以 '/' 開頭）"
+"subKeyPath" = "私鑰路徑"
+"subKeyPathDesc" = "訂閱服務使用的私鑰檔案路徑（以 '/' 開頭）"
+"subPath" = "URI 路徑"
+"subPathDesc" = "訂閱服務使用的 URI 路徑（以 '/' 開頭，以 '/' 結尾）"
+"subDomain" = "監聽域名"
+"subDomainDesc" = "訂閱服務監聽的域名（留空表示監聽所有域名和 IP）"
+"subUpdates" = "更新間隔"
+"subUpdatesDesc" = "客戶端應用中訂閱 URL 的更新間隔（單位：小時）"
+"subEncrypt" = "編碼"
+"subEncryptDesc" = "訂閱服務返回的內容將採用 Base64 編碼"
+"subShowInfo" = "顯示使用資訊"
+"subShowInfoDesc" = "客戶端應用中將顯示剩餘流量和日期資訊"
+"subURI" = "反向代理 URI"
+"subURIDesc" = "用於代理後面的訂閱 URL 的 URI 路徑"
+"fragment" = "分片"
+"fragmentDesc" = "啟用 TLS hello 資料包分片"
+"fragmentSett" = "設定"
+"noisesDesc" = "啟用 Noises."
+"noisesSett" = "Noises 設定"
+"mux" = "多路複用器"
+"muxDesc" = "在已建立的資料流內傳輸多個獨立的資料流"
+"muxSett" = "複用器設定"
+"direct" = "直接連線"
+"directDesc" = "直接與特定國家的域或IP範圍建立連線"
+
+
+[pages.xray]
+"title" = "Xray 配置"
+"save" = "儲存"
+"restart" = "重新啟動 Xray"
+"basicTemplate" = "基礎配置"
+"advancedTemplate" = "高階配置"
+"generalConfigs" = "常規配置"
+"generalConfigsDesc" = "這些選項將決定常規配置"
+"logConfigs" = "日誌"
+"logConfigsDesc" = "日誌可能會影響伺服器的效能，建議僅在需要時啟用"
+"blockConfigs" = "防護遮蔽"
+"blockConfigsDesc" = "這些選項將阻止使用者連線到特定協議和網站"
+"blockConnectionsConfigs" = "阻止連線"
+"blockConnectionsConfigsDesc" = "這些選項將根據特定的請求國家阻止流量。"
+"directConnectionsConfigs" = "直接連線"
+"directConnectionsConfigsDesc" = "直接連線確保特定的流量不會通過其他伺服器路由。"
+"blockips" = "阻止IP"
+"blockdomains" = "阻止域名"
+"directips" = "直接IP"
+"directdomains" = "直接域名"
+"ipv4Configs" = "IPv4 路由"
+"ipv4ConfigsDesc" = "此選項將僅通過 IPv4 路由到目標域"
+"warpConfigs" = "WARP 路由"
+"warpConfigsDesc" = "注意：在使用這些選項之前，請按照面板 GitHub 上的步驟在你的伺服器上以 socks5 代理模式安裝 WARP。WARP 將通過 Cloudflare 伺服器將流量路由到網站。"
+"Template" = "高階 Xray 配置模板"
+"TemplateDesc" = "最終的 Xray 配置檔案將基於此模板生成"
+"FreedomStrategy" = "Freedom 協議策略"
+"FreedomStrategyDesc" = "設定 Freedom 協議中網路的輸出策略"
+"RoutingStrategy" = "配置路由域策略"
+"RoutingStrategyDesc" = "設定 DNS 解析的整體路由策略"
+"Torrent" = "遮蔽 BitTorrent 協議"
+"TorrentDesc" = "禁止使用 BitTorrent"
+"PrivateIp" = "遮蔽私有 IP"
+"PrivateIpDesc" = "阻止連線到私有 IP"
+"Ads" = "遮蔽廣告"
+"AdsDesc" = "遮蔽廣告網站"
+"Family" = "家庭保護"
+"FamilyDesc" = "遮蔽成人內容和惡意網站"
+"Security" = "安全防護"
+"SecurityDesc" = "遮蔽惡意軟體、網路釣魚和挖礦網站"
+"Speedtest" = "遮蔽測速網站"
+"SpeedtestDesc" = "阻止連線到測速網站"
+"GoogleIPv4" = "Google"
+"GoogleIPv4Desc" = "通過 IPv4 將流量路由到谷歌"
+"NetflixIPv4" = "Netflix"
+"NetflixIPv4Desc" = "通過 IPv4 將流量路由到 Netflix"
+"GoogleWARP" = "Google"
+"GoogleWARPDesc" = "通過 WARP 將流量路由到 Google"
+"OpenAIWARP" = "OpenAI (ChatGPT)"
+"OpenAIWARPDesc" = "通過 WARP 將流量路由到 OpenAI (ChatGPT)"
+"NetflixWARP" = "Netflix"
+"NetflixWARPDesc" = "通過 WARP 將流量路由到 Netflix"
+"MetaWARP"="Meta"
+"MetaWARPDesc" = "通過 WARP 將流量路由到 Meta（Instagram、Facebook、WhatsApp、Threads...）"
+"AppleWARP" = "Apple"
+"AppleWARPDesc" = "通過 WARP 將流量路由到 Apple"
+"RedditWARP" = "Reddit"
+"RedditWARPDesc" = "通過 WARP 將流量路由到 Reddit"
+"SpotifyWARP" = "Spotify"
+"SpotifyWARPDesc" = "通過 WARP 將流量路由到 Spotify"
+"IRWARP" = "伊朗域名"
+"IRWARPDesc" = "通過 WARP 將流量路由到伊朗域名"
+"Inbounds" = "入站規則"
+"InboundsDesc" = "接受來自特定客戶端的流量"
+"Outbounds" = "出站規則"
+"Balancers" = "負載均衡"
+"OutboundsDesc" = "設定出站流量傳出方式"
+"Routings" = "路由規則"
+"RoutingsDesc" = "每條規則的優先順序都很重要"
+"completeTemplate" = "全部"
+"logLevel" = "日誌級別"
+"logLevelDesc" = "錯誤日誌的日誌級別，用於指示需要記錄的資訊"
+"accessLog" = "訪問日誌"
+"accessLogDesc" = "訪問日誌的檔案路徑。特殊值 'none' 禁用訪問日誌"
+"errorLog" = "錯誤日誌"
+"errorLogDesc" = "錯誤日誌的檔案路徑。特殊值 'none' 禁用錯誤日誌"
+"dnsLog" = "DNS 日誌"
+"dnsLogDesc" = "是否啟用 DNS 查詢日誌"
+"maskAddress" = "隱藏地址"
+"maskAddressDesc" = "IP 地址掩碼，啟用時會自動替換日誌中出現的 IP 地址。"
+
+[pages.xray.rules]
+"first" = "置頂"
+"last" = "置底"
+"up" = "向上"
+"down" = "向下"
+"source" = "來源"
+"dest" = "目的地址"
+"inbound" = "入站"
+"outbound" = "出站"
+"balancer" = "負載均衡"
+"info" = "資訊"
+"add" = "新增規則"
+"edit" = "編輯規則"
+"useComma" = "逗號分隔的項目"
+
+[pages.xray.outbound]
+"addOutbound" = "新增出站"
+"addReverse" = "新增反向"
+"editOutbound" = "編輯出站"
+"editReverse" = "編輯反向"
+"tag" = "標籤"
+"tagDesc" = "唯一標籤"
+"address" = "地址"
+"reverse" = "反向"
+"domain" = "域名"
+"type" = "類型"
+"bridge" = "Bridge"
+"portal" = "Portal"
+"intercon" = "互連"
+"settings" = "設定"
+"accountInfo" = "帳戶資訊"
+"outboundStatus" = "出站狀態"
+"sendThrough" = "傳送通過"
+
+[pages.xray.balancer]
+"addBalancer" = "新增負載均衡"
+"editBalancer" = "編輯負載均衡"
+"balancerStrategy" = "策略"
+"balancerSelectors" = "選擇器"
+"tag" = "標籤"
+"tagDesc" = "唯一標籤"
+"balancerDesc" = "無法同時使用 balancerTag 和 outboundTag。如果同時使用，則只有 outboundTag 會生效。"
+
+[pages.xray.wireguard]
+"secretKey" = "金鑰"
+"publicKey" = "公鑰"
+"allowedIPs" = "允許的 IP"
+"endpoint" = "端點"
+"psk" = "共享金鑰"
+"domainStrategy" = "域策略"
+
+[pages.xray.dns]
+"enable" = "啟用 DNS"
+"enableDesc" = "啟用內建 DNS 伺服器"
+"tag" = "DNS 入站標籤"
+"tagDesc" = "此標籤將在路由規則中可用作入站標籤"
+"strategy" = "查詢策略"
+"strategyDesc" = "解析域名的總體策略"
+"add" = "新增伺服器"
+"edit" = "編輯伺服器"
+"domains" = "域"
+"expectIPs" = "預期 IP"
+
+[pages.xray.fakedns]
+"add" = "新增假 DNS"
+"edit" = "編輯假 DNS"
+"ipPool" = "IP 池子網"
+"poolSize" = "池大小"
+
+[pages.settings.security]
+"admin" = "管理員"
+"secret" = "安全令牌"
+"loginSecurity" = "登入安全"
+"loginSecurityDesc" = "新增額外的身份驗證以提高安全性"
+"secretToken" = "安全令牌"
+"secretTokenDesc" = "請將此令牌儲存在安全的地方。此令牌用於登入，丟失無法恢復。"
+
+[pages.settings.toasts]
+"modifySettings" = "修改設定"
+"getSettings" = "獲取設定"
+"modifyUser" = "修改管理員"
+"originalUserPassIncorrect" = "原使用者名稱或原密碼錯誤"
+"userPassMustBeNotEmpty" = "新使用者名稱和新密碼不能為空"
+
+[tgbot]
+"keyboardClosed" = "❌ 自定義鍵盤已關閉！"
+"noResult" = "❗ 沒有結果！"
+"noQuery" = "❌ 未找到查詢！請重新使用命令！"
+"wentWrong" = "❌ 出了點問題！"
+"noIpRecord" = "❗ 沒有 IP 記錄！"
+"noInbounds" = "❗ 沒有找到入站連線！"
+"unlimited" = "♾ 無限制"
+"add" = "新增"
+"month" = "月"
+"months" = "月"
+"day" = "天"
+"days" = "天"
+"hours" = "小時"
+"unknown" = "未知"
+"inbounds" = "入站連線"
+"clients" = "客戶端"
+"offline" = "🔴 離線"
+"online" = "🟢 線上"
+
+[tgbot.commands]
+"unknown" = "❗ 未知命令"
+"pleaseChoose" = "👇 請選擇：\r\n"
+"help" = "🤖 歡迎使用本機器人！它旨在為您提供來自伺服器的特定資料，並允許您進行必要的修改。\r\n\r\n"
+"start" = "👋 你好，<i>{{ .Firstname }}</i>。\r\n"
+"welcome" = "🤖 歡迎來到 <b>{{ .Hostname }}</b> 管理機器人。\r\n"
+"status" = "✅ 機器人正常執行！"
+"usage" = "❗ 請輸入要搜尋的文字！"
+"getID" = "🆔 您的 ID 為：<code>{{ .ID }}</code>"
+"helpAdminCommands" = "要搜尋客戶電子郵件：\r\n<code>/usage [電子郵件]</code>\r\n\r\n要搜尋入站（帶有客戶統計資料）：\r\n<code>/inbound [備註]</code>\r\n\r\nTelegram聊天ID：\r\n<code>/id</code>"
+"helpClientCommands" = "要搜尋統計資料，請使用以下命令：\r\n<code>/usage [電子郵件]</code>\r\n\r\nTelegram聊天ID：\r\n<code>/id</code>"
+
+[tgbot.messages]
+"cpuThreshold" = "🔴 CPU 使用率為 {{ .Percent }}%，超過閾值 {{ .Threshold }}%"
+"selectUserFailed" = "❌ 使用者選擇錯誤！"
+"userSaved" = "✅ 電報使用者已儲存。"
+"loginSuccess" = "✅ 成功登入到面板。\r\n"
+"loginFailed" = "❗️ 面板登入失敗。\r\n"
+"report" = "🕰 定時報告：{{ .RunTime }}\r\n"
+"datetime" = "⏰ 日期時間：{{ .DateTime }}\r\n"
+"hostname" = "💻 主機名：{{ .Hostname }}\r\n"
+"version" = "🚀 X-UI 版本：{{ .Version }}\r\n"
+"xrayVersion" = "📡 Xray 版本: {{ .XrayVersion }}\r\n"
+"ipv6" = "🌐 IPv6：{{ .IPv6 }}\r\n"
+"ipv4" = "🌐 IPv4：{{ .IPv4 }}\r\n"
+"ip" = "🌐 IP：{{ .IP }}\r\n"
+"ips" = "🔢 IP 地址：\r\n{{ .IPs }}\r\n"
+"serverUpTime" = "⏳ 伺服器執行時間：{{ .UpTime }} {{ .Unit }}\r\n"
+"serverLoad" = "📈 伺服器負載：{{ .Load1 }}, {{ .Load2 }}, {{ .Load3 }}\r\n"
+"serverMemory" = "📋 伺服器記憶體：{{ .Current }}/{{ .Total }}\r\n"
+"tcpCount" = "🔹 TCP 連線數：{{ .Count }}\r\n"
+"udpCount" = "🔸 UDP 連線數：{{ .Count }}\r\n"
+"traffic" = "🚦 流量：{{ .Total }} (↑{{ .Upload }},↓{{ .Download }})\r\n"
+"xrayStatus" = "ℹ️ Xray 狀態：{{ .State }}\r\n"
+"username" = "👤 使用者名稱：{{ .Username }}\r\n"
+"password" = "👤 密碼: {{ .Password }}\r\n"
+"time" = "⏰ 時間：{{ .Time }}\r\n"
+"inbound" = "📍 入站：{{ .Remark }}\r\n"
+"port" = "🔌 埠：{{ .Port }}\r\n"
+"expire" = "📅 過期日期：{{ .Time }}\r\n"
+"expireIn" = "📅 剩餘時間：{{ .Time }}\r\n"
+"active" = "💡 啟用：{{ .Enable }}\r\n"
+"enabled" = "🚨 已啟用：{{ .Enable }}\r\n"
+"online" = "🌐 連線狀態：{{ .Status }}\r\n"
+"email" = "📧 郵箱：{{ .Email }}\r\n"
+"upload" = "🔼 上傳↑：{{ .Upload }}\r\n"
+"download" = "🔽 下載↓：{{ .Download }}\r\n"
+"total" = "📊 總計：{{ .UpDown }} / {{ .Total }}\r\n"
+"TGUser" = "👤 電報使用者：{{ .TelegramID }}\r\n"
+"exhaustedMsg" = "🚨 耗盡的 {{ .Type }}：\r\n"
+"exhaustedCount" = "🚨 耗盡的 {{ .Type }} 數量：\r\n"
+"onlinesCount" = "🌐 線上客戶：{{ .Count }}\r\n"
+"disabled" = "🛑 禁用：{{ .Disabled }}\r\n"
+"depleteSoon" = "🔜 即將耗盡：{{ .Deplete }}\r\n\r\n"
+"backupTime" = "🗄 備份時間：{{ .Time }}\r\n"
+"refreshedOn" = "\r\n📋🔄 重新整理時間：{{ .Time }}\r\n\r\n"
+"yes" = "✅ 是的"
+"no" = "❌ 沒有"
+
+[tgbot.buttons]
+"closeKeyboard" = "❌ 關閉鍵盤"
+"cancel" = "❌ 取消"
+"cancelReset" = "❌ 取消重置"
+"cancelIpLimit" = "❌ 取消 IP 限制"
+"confirmResetTraffic" = "✅ 確認重置流量？"
+"confirmClearIps" = "✅ 確認清除 IP？"
+"confirmRemoveTGUser" = "✅ 確認移除 Telegram 使用者？"
+"confirmToggle" = "✅ 確認啟用/禁用使用者？"
+"dbBackup" = "獲取資料庫備份"
+"serverUsage" = "伺服器使用情況"
+"getInbounds" = "獲取入站資訊"
+"depleteSoon" = "即將耗盡"
+"clientUsage" = "獲取使用情況"
+"onlines" = "線上客戶端"
+"commands" = "命令"
+"refresh" = "🔄 重新整理"
+"clearIPs" = "❌ 清除 IP"
+"removeTGUser" = "❌ 移除 Telegram 使用者"
+"selectTGUser" = "👤 選擇 Telegram 使用者"
+"selectOneTGUser" = "👤 選擇一個 Telegram 使用者："
+"resetTraffic" = "📈 重置流量"
+"resetExpire" = "📅 更改到期日期"
+"ipLog" = "🔢 IP 日誌"
+"ipLimit" = "🔢 IP 限制"
+"setTGUser" = "👤 設定 Telegram 使用者"
+"toggle" = "🔘 啟用/禁用"
+"custom" = "🔢 風俗"
+"confirmNumber" = "✅ 確認: {{ .Num }}"
+"confirmNumberAdd" = "✅ 確認新增：{{ .Num }}"
+"limitTraffic" = "🚧 流量限制"
+"getBanLogs" = "禁止日誌"
+"allClients" = "所有客戶"
+
+[tgbot.answers]
+"successfulOperation" = "✅ 成功！"
+"errorOperation" = "❗ 操作錯誤。"
+"getInboundsFailed" = "❌ 獲取入站資訊失敗。"
+"getClientsFailed" = "❌ 獲取客戶失敗。"
+"canceled" = "❌ {{ .Email }}：操作已取消。"
+"clientRefreshSuccess" = "✅ {{ .Email }}：客戶端重新整理成功。"
+"IpRefreshSuccess" = "✅ {{ .Email }}：IP 重新整理成功。"
+"TGIdRefreshSuccess" = "✅ {{ .Email }}：客戶端的 Telegram 使用者重新整理成功。"
+"resetTrafficSuccess" = "✅ {{ .Email }}：流量已重置成功。"
+"setTrafficLimitSuccess" = "✅ {{ .Email }}: 流量限制儲存成功。"
+"expireResetSuccess" = "✅ {{ .Email }}：過期天數已重置成功。"
+"resetIpSuccess" = "✅ {{ .Email }}：成功儲存 IP 限制數量為 {{ .Count }}。"
+"clearIpSuccess" = "✅ {{ .Email }}：IP 已成功清除。"
+"getIpLog" = "✅ {{ .Email }}：獲取 IP 日誌。"
+"getUserInfo" = "✅ {{ .Email }}：獲取 Telegram 使用者資訊。"
+"removedTGUserSuccess" = "✅ {{ .Email }}：Telegram 使用者已成功移除。"
+"enableSuccess" = "✅ {{ .Email }}：已成功啟用。"
+"disableSuccess" = "✅ {{ .Email }}：已成功禁用。"
+"askToAddUserId" = "未找到您的配置！\r\n請向管理員詢問，在您的配置中使用您的 Telegram 使用者 ChatID。\r\n\r\n您的使用者 ChatID：<code>{{ .TgUserID }}</code>"
+"chooseClient" = "為入站 {{ .Inbound }} 選擇一個客戶"
+"chooseInbound" = "選擇一個入站"
\ No newline at end of file

From 150c89db72709e49662dceb64a950a239d0ef0b7 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Thu, 3 Oct 2024 10:43:33 +0200
Subject: [PATCH 14/45] maxConcurrency/maxConnections visibility

---
 web/html/xui/form/stream/stream_splithttp.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/html/xui/form/stream/stream_splithttp.html b/web/html/xui/form/stream/stream_splithttp.html
index 453263de..fa1e8e13 100644
--- a/web/html/xui/form/stream/stream_splithttp.html
+++ b/web/html/xui/form/stream/stream_splithttp.html
@@ -34,10 +34,10 @@
     <a-form-item label="No SSE Header">
         <a-switch v-model="inbound.stream.splithttp.noSSEHeader"></a-switch>
     </a-form-item>
-    <a-form-item label="Max Concurrency">
+    <a-form-item label="Max Concurrency" v-if="!inbound.stream.splithttp.xmux.maxConnections">
         <a-input-number v-model="inbound.stream.splithttp.xmux.maxConcurrency"></a-input-number>
     </a-form-item>
-    <a-form-item label="Max Connections">
+    <a-form-item label="Max Connections" v-if="!inbound.stream.splithttp.xmux.maxConcurrency">
         <a-input-number v-model="inbound.stream.splithttp.xmux.maxConnections"></a-input-number>
     </a-form-item>
     <a-form-item label="Max Reuse Times">

From 98869c71694e6c337153ccd057b844f8a79a4ef5 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Thu, 3 Oct 2024 10:48:01 +0200
Subject: [PATCH 15/45] Show buildChain only when usage is 'issue'

---
 web/html/xui/form/tls_settings.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html
index 6c2f4a67..af71b8c7 100644
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -110,7 +110,7 @@
           <a-select-option v-for="key in USAGE_OPTION" :value="key">[[ key ]]</a-select-option>
         </a-select>
       </a-form-item>
-      <a-form-item label="Build Chain">
+      <a-form-item label="Build Chain" v-if="cert.usage === 'issue'">
         <a-switch v-model="cert.buildChain"></a-switch>
       </a-form-item>
     </template>

From b22f859c38c139a985504b84514b1f24eb7593a0 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Thu, 3 Oct 2024 10:52:08 +0200
Subject: [PATCH 16/45] Show tcpNoDelay only when tcpMptcp is true

---
 web/html/xui/form/outbound.html              | 4 ++--
 web/html/xui/form/stream/stream_sockopt.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/html/xui/form/outbound.html b/web/html/xui/form/outbound.html
index 604108fe..00b33c0b 100644
--- a/web/html/xui/form/outbound.html
+++ b/web/html/xui/form/outbound.html
@@ -452,8 +452,8 @@
         </a-form-item>
         <a-form-item label="Multipath TCP">
           <a-switch v-model.trim="outbound.stream.sockopt.tcpMptcp"></a-switch>
-      </a-form-item>
-        <a-form-item label="TCP No-Delay">
+        </a-form-item>
+        <a-form-item label="TCP No-Delay" v-if="outbound.stream.sockopt.tcpMptcp">
           <a-switch v-model="outbound.stream.sockopt.tcpNoDelay"></a-switch>
         </a-form-item>
       </template>
diff --git a/web/html/xui/form/stream/stream_sockopt.html b/web/html/xui/form/stream/stream_sockopt.html
index a243a0d5..c08074ee 100644
--- a/web/html/xui/form/stream/stream_sockopt.html
+++ b/web/html/xui/form/stream/stream_sockopt.html
@@ -32,7 +32,7 @@
         <a-form-item label="Multipath TCP">
             <a-switch v-model.trim="inbound.stream.sockopt.tcpMptcp"></a-switch>
         </a-form-item>
-        <a-form-item label="TCP No-Delay">
+        <a-form-item label="TCP No-Delay" v-if="inbound.stream.sockopt.tcpMptcp">
             <a-switch v-model.trim="inbound.stream.sockopt.tcpNoDelay"></a-switch>
         </a-form-item>
         <a-form-item label="V6 Only">

From 02bc488c1c1024e9be44ae3cfdf678b20bb4d6b3 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Thu, 3 Oct 2024 16:06:25 +0200
Subject: [PATCH 17/45] go.mod for Xray v24.9.30

---
 go.mod |   4 +-
 go.sum | 160 +--------------------------------------------------------
 2 files changed, 4 insertions(+), 160 deletions(-)

diff --git a/go.mod b/go.mod
index 292f3d29..e62cdcf9 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/shirou/gopsutil/v4 v4.24.9
 	github.com/valyala/fasthttp v1.56.0
-	github.com/xtls/xray-core v1.8.24
+	github.com/xtls/xray-core v1.8.25-0.20241002041629-e45cef542e26
 	go.uber.org/atomic v1.11.0
 	golang.org/x/text v0.18.0
 	google.golang.org/grpc v1.67.1
@@ -32,7 +32,6 @@ require (
 	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
 	github.com/ebitengine/purego v0.8.0 // indirect
 	github.com/fasthttp/router v1.5.2 // indirect
-	github.com/francoispqt/gojay v1.2.13 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
@@ -52,6 +51,7 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.17.10 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/kr/text v0.1.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
diff --git a/go.sum b/go.sum
index 556e6b79..c2efc22a 100644
--- a/go.sum
+++ b/go.sum
@@ -1,54 +1,32 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo=
-dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU=
-dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
-dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
-dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
-git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0 h1:Wo41lDOevRJSGpevP+8Pk5bANX7fJacO2w04aqLiC5I=
 github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0/go.mod h1:FVGavL/QEBQDcBpr3fAojoK17xX5k9bicBphrOpP7uM=
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
-github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
 github.com/bytedance/sonic v1.12.3 h1:W2MGa7RCU1QTeYRTPE3+88mVC0yXmsRQRChiyVocVjU=
 github.com/bytedance/sonic v1.12.3/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
 github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM=
 github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/circl v1.4.0 h1:BV7h5MgrktNzytKmWjpOtdYrf0lkkbF8YMlBGPhJQrY=
 github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
 github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
 github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-metro v0.0.0-20200812162917-85c65e2d0165/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
 github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 h1:y7y0Oa6UawqTFPCDw9JG6pdKt4F9pAhHv0B7FMGaGD0=
 github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/ebitengine/purego v0.8.0 h1:JbqvnEzRvPpxhCJzJJ2y0RbiZ8nyjccVUrSM3q+GvvE=
 github.com/ebitengine/purego v0.8.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/fasthttp/router v1.5.2 h1:ckJCCdV7hWkkrMeId3WfEhz+4Gyyf6QPwxi/RHIMZ6I=
 github.com/fasthttp/router v1.5.2/go.mod h1:C8EY53ozOwpONyevc/V7Gr8pqnEjwnkFFqPo1alAGs0=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
-github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
 github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 h1:Arcl6UOIS/kgO2nW3A65HN+7CMjSDP/gofXL4CZt1V4=
 github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
 github.com/gin-contrib/gzip v1.0.1 h1:HQ8ENHODeLY7a4g1Au/46Z92bdGFl74OhxcZble9WJE=
@@ -59,8 +37,6 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
 github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
-github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
@@ -78,33 +54,17 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
 github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/U=
 github.com/golang/mock v1.7.0-rc.1/go.mod h1:s42URUywIqd+OcERslBJvOjepvNymP31m3q8d/GkuRs=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
 github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
-github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d h1:Jaz2JzpQaQXyET0AjLBXShrthbpqMkhGiEfkcQAiAUs=
 github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
-github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
-github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o=
 github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM=
 github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
@@ -115,55 +75,40 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grbit/go-json v0.11.0 h1:bAbyMdYrYl/OjYsSqLH99N2DyQ291mHy726Mx+sYrnc=
 github.com/grbit/go-json v0.11.0/go.mod h1:IYpHsdybQ386+6g3VE6AXQ3uTGa5mquBme5/ZWmtzek=
-github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
-github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0=
 github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
 github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0=
 github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
-github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
-github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.23 h1:gbShiuAP1W5j9UOksQ06aiiqPMxYecovVGwmTxWtuw0=
 github.com/mattn/go-sqlite3 v1.14.23/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
 github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
 github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mymmrac/telego v0.31.3 h1:yZlD+dm+1W6p3OmCG8K+MbS02Y6paUgwPnqfZN3RWQQ=
 github.com/mymmrac/telego v0.31.3/go.mod h1:coOoqXVmjFnwBlzusjfEezbQ7RH9wQnDowJdMm+bnEo=
-github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
-github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 github.com/nicksnyder/go-i18n/v2 v2.4.0 h1:3IcvPOAvnCKwNm0TB0dLDTuawWEj+ax/RERNC+diLMM=
 github.com/nicksnyder/go-i18n/v2 v2.4.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4=
 github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
@@ -172,22 +117,16 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
-github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
 github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
 github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
 github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
 github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
 github.com/quic-go/quic-go v0.47.0 h1:yXs3v7r2bm1wmPTYNLKAAJTHMYkPEsfYJmTazXrCZ7Y=
@@ -200,7 +139,6 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/sagernet/sing v0.4.3 h1:Ty/NAiNnVd6844k7ujlL5lkzydhcTH5Psc432jXA4Y8=
 github.com/sagernet/sing v0.4.3/go.mod h1:ieZHA/+Y9YZfXs2I3WtuwgyCZ6GPsIR7HdKb1SdEnls=
 github.com/sagernet/sing-shadowsocks v0.2.7 h1:zaopR1tbHEw5Nk6FAkM05wCslV6ahVegEZaKMv9ipx8=
@@ -209,37 +147,11 @@ github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38 h1:D0vL7YNisV2yqE55
 github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38/go.mod h1:sM7Mt7uEoCeFSCBM+qBrqvEo+/9vdmj19wzp3yzUhmg=
 github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 h1:emzAzMZ1L9iaKCTxdy3Em8Wv4ChIAGnfiz18Cda70g4=
 github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771/go.mod h1:bR6DqgcAl1zTcOX8/pE2Qkj9XO00eCNqmKb7lXP8EAg=
-github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shirou/gopsutil/v4 v4.24.9 h1:KIV+/HaHD5ka5f570RZq+2SaeFsb/pq+fp2DGNWYoOI=
 github.com/shirou/gopsutil/v4 v4.24.9/go.mod h1:3fkaHNeYsUFCGZ8+9vZVWtbyM1k2eRnlL+bWO8Bxa/Q=
-github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
-github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
-github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=
-github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
-github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
-github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
-github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI=
-github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU=
-github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag=
-github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg=
-github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw=
-github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y=
-github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
-github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q=
-github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ=
-github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I=
-github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0=
-github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
-github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk=
-github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
-github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
-github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
-github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -248,7 +160,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
 github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
 github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=
@@ -265,68 +176,34 @@ github.com/valyala/fasthttp v1.56.0 h1:bEZdJev/6LCBlpdORfrLu/WOZXXxvrUQSiyniuaoW
 github.com/valyala/fasthttp v1.56.0/go.mod h1:sReBt3XZVnudxuLOx4J/fMrJVorWRiWY2koQKgABiVI=
 github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
 github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
-github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
-github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
 github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk=
 github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs=
 github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/xtls/reality v0.0.0-20240909153216-e26ae2305463 h1:g1Cj7d+my6k/HHxLAyxPwyX8i7FGRr6ulBDMkBzg2BM=
 github.com/xtls/reality v0.0.0-20240909153216-e26ae2305463/go.mod h1:BjIOLmkEEtAgloAiVUcYj0Mt+YU00JARZw8AEU0IwAg=
-github.com/xtls/xray-core v1.8.24 h1:Y2NumdlnJ9C9gvh1Ivs2+73ui5XQgB70wZXYCiI9DyY=
-github.com/xtls/xray-core v1.8.24/go.mod h1:cWIOI6iBBOsB0HHU9PGhaiBhaMPfiktUjwA0IWolWJc=
+github.com/xtls/xray-core v1.8.25-0.20241002041629-e45cef542e26 h1:Ijmwq3J+J88VKojsQBrFPNw9ICXrdxRLitBszxfJzGU=
+github.com/xtls/xray-core v1.8.25-0.20241002041629-e45cef542e26/go.mod h1:YSvBScSqyzAocGDvzHBbEeoHNrFy8nV6gityRVDvHaM=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
 go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
-go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/arch v0.10.0 h1:S3huipmSclq3PJMNe76NGwkBR504WFkQ5dhzWzP8ZW8=
 golang.org/x/arch v0.10.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
-golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
-golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
 golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
-golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
 golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
 golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -336,42 +213,18 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
 golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
 golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
 golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
 golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
 golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
 golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
-google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
-google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
-google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
-google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
-google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
-google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
-google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
 google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
@@ -379,9 +232,6 @@ google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWn
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -392,14 +242,8 @@ gorm.io/driver/sqlite v1.5.6 h1:fO/X46qn5NUEEOZtnjJRWRzZMe8nqJiQ9E+0hi+hKQE=
 gorm.io/driver/sqlite v1.5.6/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDah4=
 gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
 gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
-grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
 gvisor.dev/gvisor v0.0.0-20231202080848-1f7806d17489 h1:ze1vwAdliUAr68RQ5NtufWaXaOg8WUO2OACzEV+TNdE=
 gvisor.dev/gvisor v0.0.0-20231202080848-1f7806d17489/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk=
-honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
 lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
-sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
-sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=

From c3ce1da0d6090c2d6019dc2049dde908f7288a99 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Fri, 4 Oct 2024 11:17:59 +0200
Subject: [PATCH 18/45] Web base path will be generated randomly

---
 README.es_ES.md |  9 +++++---
 README.md       |  9 +++++---
 README.ru_RU.md |  9 +++++---
 README.zh_CN.md |  9 +++++---
 install.sh      | 59 ++++++++++++++++++++++++++++++++++---------------
 x-ui.sh         | 11 ++++-----
 6 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/README.es_ES.md b/README.es_ES.md
index 24f7f309..5da2e5a6 100644
--- a/README.es_ES.md
+++ b/README.es_ES.md
@@ -284,11 +284,14 @@ Nuestra plataforma ofrece compatibilidad con una amplia gama de arquitecturas y
 <details>
   <summary>Haz clic para ver los detalles de la configuración predeterminada</summary>
 
-### Nombre de Usuario & Contraseña & Ruta Base Web:
+### Nombre de usuario, Contraseña, Puerto y Ruta Base Web
 
-  Estos se generarán aleatoriamente si no los modificas.
+Si elige no modificar estas configuraciones, se generarán aleatoriamente (esto no se aplica a Docker).
 
-  - **Puerto:** el puerto predeterminado para el panel es `2053`
+**Configuraciones predeterminadas para Docker:**
+- **Nombre de usuario:** admin
+- **Contraseña:** admin
+- **Puerto:** 2053
 
 ### Gestión de la Base de Datos:
 
diff --git a/README.md b/README.md
index b15c4064..a2edad7f 100644
--- a/README.md
+++ b/README.md
@@ -315,11 +315,14 @@ Our platform offers compatibility with a diverse range of architectures and devi
 <details>
   <summary>Click for default settings details</summary>
 
-### Username & Password & webbasepath:
+### Username, Password, Port, and Web Base Path
 
-  These will be generated randomly if you skip modifying them.
+If you choose not to modify these settings, they will be generated randomly (this does not apply to Docker).
 
-  - **Port:** the default port for panel is `2053`
+**Default Settings for Docker:**
+- **Username:** admin
+- **Password:** admin
+- **Port:** 2053
 
 ### Database Management:
 
diff --git a/README.ru_RU.md b/README.ru_RU.md
index 329c6cc1..0da90fb6 100644
--- a/README.ru_RU.md
+++ b/README.ru_RU.md
@@ -312,11 +312,14 @@ location /sub {
 <details>
   <summary>Нажмите для получения информации о настройках по умолчанию</summary>
 
-### Имя пользователя и пароль & webbasepath:
+### Имя пользователя, Пароль, Порт и Web Base Path
 
-Эти параметры будут сгенерированы случайным образом, если вы пропустите их изменение.
+Если вы не измените эти настройки, они будут сгенерированы случайным образом (это не относится к Docker).
 
-  - **Порт:** порт панели по умолчанию — `2053`
+**Настройки по умолчанию для Docker:**
+- **Имя пользователя:** admin
+- **Пароль:** admin
+- **Порт:** 2053
 
 ### Управление базой данных:
 
diff --git a/README.zh_CN.md b/README.zh_CN.md
index 240095f4..0aa7efcf 100644
--- a/README.zh_CN.md
+++ b/README.zh_CN.md
@@ -306,11 +306,14 @@ location /sub {
 <details>
   <summary>点击查看默认设置详情</summary>
 
-### 用户名 & 密码 & Web基础路径：
+### 用户名、密码、端口和 Web Base Path
 
-  如果不修改这些，它们将会随机生成。
+如果您选择不修改这些设置，它们将随机生成（不适用于 Docker）。
 
-  - **端口号:** 面板的默认端口号是 `2053`
+**Docker 的默认设置：**
+- **用户名：** admin
+- **密码：** admin
+- **端口：** 2053
 
 ### 数据库管理：
 
diff --git a/install.sh b/install.sh
index 3435fc76..6076acde 100644
--- a/install.sh
+++ b/install.sh
@@ -131,44 +131,67 @@ gen_random_string() {
     echo "$random_string"
 }
 
-# This function will be called when user installed x-ui out of security
 config_after_install() {
-    echo -e "${yellow}Install/update finished! For security it's recommended to modify panel settings ${plain}"
+    echo -e "${yellow}Install/update finished! For security, it's recommended to modify panel settings ${plain}"
     read -p "Would you like to customize the panel settings? (If not, random settings will be applied) [y/n]: " config_confirm
+
+    local config_webBasePath=$(gen_random_string 10)
+
     if [[ "${config_confirm}" == "y" || "${config_confirm}" == "Y" ]]; then
+
         read -p "Please set up your username: " config_account
         echo -e "${yellow}Your username will be: ${config_account}${plain}"
+
         read -p "Please set up your password: " config_password
         echo -e "${yellow}Your password will be: ${config_password}${plain}"
+
         read -p "Please set up the panel port: " config_port
         echo -e "${yellow}Your panel port is: ${config_port}${plain}"
-        read -p "Please set up the web base path (ip:port/webbasepath/): " config_webBasePath
-        echo -e "${yellow}Your web base path is: ${config_webBasePath}${plain}"
+
+        echo -e "${yellow}Your web base path will be generated randomly: ${config_webBasePath}${plain}"
+
         echo -e "${yellow}Initializing, please wait...${plain}"
-        /usr/local/x-ui/x-ui setting -username ${config_account} -password ${config_password}
-        echo -e "${yellow}Account name and password set successfully!${plain}"
-        /usr/local/x-ui/x-ui setting -port ${config_port}
-        echo -e "${yellow}Panel port set successfully!${plain}"
-        /usr/local/x-ui/x-ui setting -webBasePath ${config_webBasePath}
-        echo -e "${yellow}Web base path set successfully!${plain}"
+
+        /usr/local/x-ui/x-ui setting -username "${config_account}" -password "${config_password}" -port "${config_port}" -webBasePath "${config_webBasePath}"
+        echo -e "${yellow}Settings applied successfully!${plain}"
+
+        echo -e "###############################################"
+        echo -e "${green}Username: ${config_account}${plain}"
+        echo -e "${green}Password: ${config_password}${plain}"
+        echo -e "${green}Port: ${config_port}${plain}"
+        echo -e "${green}WebBasePath: ${config_webBasePath}${plain}"
+        echo -e "###############################################"
+
     else
+
         echo -e "${red}Cancel...${plain}"
+
         if [[ ! -f "/etc/x-ui/x-ui.db" ]]; then
-            local usernameTemp=$(head -c 6 /dev/urandom | base64)
-            local passwordTemp=$(head -c 6 /dev/urandom | base64)
-            local webBasePathTemp=$(gen_random_string 10)
-            /usr/local/x-ui/x-ui setting -username ${usernameTemp} -password ${passwordTemp} -webBasePath ${webBasePathTemp}
-            echo -e "This is a fresh installation, will generate random login info for security concerns:"
+
+            local usernameTemp=$(gen_random_string 10)
+            local passwordTemp=$(gen_random_string 10)
+            local portTemp=$(shuf -i 1024-62000 -n 1)
+
+            /usr/local/x-ui/x-ui setting -username "${usernameTemp}" -password "${passwordTemp}" -port "${portTemp}" -webBasePath "${config_webBasePath}"
+            echo -e "This is a fresh installation, generating random login info for security concerns:"
             echo -e "###############################################"
             echo -e "${green}Username: ${usernameTemp}${plain}"
             echo -e "${green}Password: ${passwordTemp}${plain}"
-            echo -e "${green}WebBasePath: ${webBasePathTemp}${plain}"
+            echo -e "${green}Port: ${portTemp}${plain}"
+            echo -e "${green}WebBasePath: ${config_webBasePath}${plain}"
             echo -e "###############################################"
-            echo -e "${yellow}If you forgot your login info, you can type "x-ui settings" to check after installation${plain}"
+            echo -e "${yellow}If you forgot your login info, you can type 'x-ui settings' to check after installation${plain}"
         else
-            echo -e "${yellow}This is your upgrade, will keep old settings. If you forgot your login info, you can type "x-ui settings" to check${plain}"
+            echo -e "${yellow}This is your upgrade, keeping old settings. If you forgot your login info, you can type 'x-ui settings' to check${plain}"
+
+            local existing_webBasePath=$(/usr/local/x-ui/x-ui setting -show true | grep -Eo 'webBasePath: [^ ]+' | awk '{print $2}')
+            if [[ -z "$existing_webBasePath" ]]; then
+                echo -e "${yellow}WebBasePath is empty, generating a random one: ${config_webBasePath}${plain}"
+                /usr/local/x-ui/x-ui setting -webBasePath "${config_webBasePath}"
+            fi
         fi
     fi
+
     /usr/local/x-ui/x-ui migrate
 }
 
diff --git a/x-ui.sh b/x-ui.sh
index e4bc622b..545b1af5 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -265,12 +265,13 @@ gen_random_string() {
 reset_webbasepath() {
     echo -e "${yellow}Resetting Web Base Path${plain}"
     
-    # Prompt user to set a new web base path
-    read -rp "Please set the new web base path [press 'y' for a random path]: " config_webBasePath
-    
-    if [[ $config_webBasePath == "y" ]]; then
-        config_webBasePath=$(gen_random_string 10)
+    read -rp "Are you sure you want to reset the web base path? (y/n): " confirm
+    if [[ $confirm != "y" && $confirm != "Y" ]]; then
+        echo -e "${yellow}Operation canceled.${plain}"
+        return
     fi
+
+    config_webBasePath=$(gen_random_string 10)
     
     # Apply the new web base path setting
     /usr/local/x-ui/x-ui setting -webBasePath "${config_webBasePath}" >/dev/null 2>&1

From decac2ef74464de472ad36a650f886cd3a4bd55e Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Fri, 4 Oct 2024 14:31:15 +0200
Subject: [PATCH 19/45] Add version check (min v2.3.5)

---
 install.sh | 28 ++++++++++++++++++----------
 x-ui.sh    | 16 +++++++++++-----
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/install.sh b/install.sh
index 6076acde..76a88aa4 100644
--- a/install.sh
+++ b/install.sh
@@ -199,24 +199,32 @@ install_x-ui() {
     cd /usr/local/
 
     if [ $# == 0 ]; then
-        last_version=$(curl -Ls "https://api.github.com/repos/MHSanaei/3x-ui/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
-        if [[ ! -n "$last_version" ]]; then
-            echo -e "${red}Failed to fetch x-ui version, it maybe due to Github API restrictions, please try it later${plain}"
+        tag_version=$(curl -Ls "https://api.github.com/repos/MHSanaei/3x-ui/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+        if [[ ! -n "$tag_version" ]]; then
+            echo -e "${red}Failed to fetch x-ui version, it may be due to GitHub API restrictions, please try it later${plain}"
             exit 1
         fi
-        echo -e "Got x-ui latest version: ${last_version}, beginning the installation..."
-        wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch).tar.gz https://github.com/MHSanaei/3x-ui/releases/download/${last_version}/x-ui-linux-$(arch).tar.gz
+        echo -e "Got x-ui latest version: ${tag_version}, beginning the installation..."
+        wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch).tar.gz https://github.com/MHSanaei/3x-ui/releases/download/${tag_version}/x-ui-linux-$(arch).tar.gz
         if [[ $? -ne 0 ]]; then
-            echo -e "${red}Downloading x-ui failed, please be sure that your server can access Github ${plain}"
+            echo -e "${red}Downloading x-ui failed, please be sure that your server can access GitHub ${plain}"
             exit 1
         fi
     else
-        last_version=$1
-        url="https://github.com/MHSanaei/3x-ui/releases/download/${last_version}/x-ui-linux-$(arch).tar.gz"
+        tag_version=$1
+        tag_version_numeric=${tag_version#v}
+        min_version="2.3.5"
+
+        if [[ "$(printf '%s\n' "$min_version" "$tag_version_numeric" | sort -V | head -n1)" != "$min_version" ]]; then
+            echo -e "${red}Please use a newer version (at least v2.3.5). Exiting installation.${plain}"
+            exit 1
+        fi
+
+        url="https://github.com/MHSanaei/3x-ui/releases/download/${tag_version}/x-ui-linux-$(arch).tar.gz"
         echo -e "Beginning to install x-ui $1"
         wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch).tar.gz ${url}
         if [[ $? -ne 0 ]]; then
-            echo -e "${red}Download x-ui $1 failed,please check the version exists ${plain}"
+            echo -e "${red}Download x-ui $1 failed, please check if the version exists ${plain}"
             exit 1
         fi
     fi
@@ -247,7 +255,7 @@ install_x-ui() {
     systemctl daemon-reload
     systemctl enable x-ui
     systemctl start x-ui
-    echo -e "${green}x-ui ${last_version}${plain} installation finished, it is running now..."
+    echo -e "${green}x-ui ${tag_version}${plain} installation finished, it is running now..."
     echo -e ""
     echo -e "x-ui control menu usages: "
     echo -e "----------------------------------------------"
diff --git a/x-ui.sh b/x-ui.sh
index 545b1af5..3219453e 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -186,20 +186,26 @@ update_menu() {
 }
 
 custom_version() {
-    echo "Enter the panel version (like 2.0.0):"
-    read panel_version
+    echo "Enter the panel version (like 2.4.0):"
+    read tag_version
 
-    if [ -z "$panel_version" ]; then
+    if [ -z "$tag_version" ]; then
         echo "Panel version cannot be empty. Exiting."
         exit 1
     fi
 
+    min_version="2.3.5"
+    if [[ "$(printf '%s\n' "$tag_version" "$min_version" | sort -V | head -n1)" == "$tag_version" && "$tag_version" != "$min_version" ]]; then
+        echo "Please use a newer version (at least 2.3.5). Exiting."
+        exit 1
+    fi
+
     download_link="https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh"
 
     # Use the entered panel version in the download link
-    install_command="bash <(curl -Ls $download_link) v$panel_version"
+    install_command="bash <(curl -Ls $download_link) v$tag_version"
 
-    echo "Downloading and installing panel version $panel_version..."
+    echo "Downloading and installing panel version $tag_version..."
     eval $install_command
 }
 

From f0dd6152fdcb9a58dbc37f1581dd083e72b420a8 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Fri, 4 Oct 2024 15:47:16 +0200
Subject: [PATCH 20/45] if webBasePath lt 3 will be replace with new random

---
 install.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index 76a88aa4..916adb90 100644
--- a/install.sh
+++ b/install.sh
@@ -184,10 +184,13 @@ config_after_install() {
         else
             echo -e "${yellow}This is your upgrade, keeping old settings. If you forgot your login info, you can type 'x-ui settings' to check${plain}"
 
-            local existing_webBasePath=$(/usr/local/x-ui/x-ui setting -show true | grep -Eo 'webBasePath: [^ ]+' | awk '{print $2}')
-            if [[ -z "$existing_webBasePath" ]]; then
-                echo -e "${yellow}WebBasePath is empty, generating a random one: ${config_webBasePath}${plain}"
+            local existing_webBasePath=$(/usr/local/x-ui/x-ui setting -show true | grep -Eo 'webBasePath: .+' | awk '{print $2}')
+
+            if [[ ${#existing_webBasePath} -lt 3 ]]; then
+                echo -e "${yellow}WebBasePath is empty, generating a random one...${plain}"
+
                 /usr/local/x-ui/x-ui setting -webBasePath "${config_webBasePath}"
+                echo -e "${green}New webBasePath: ${config_webBasePath}${plain}"
             fi
         fi
     fi

From 19a832cad8d91efad551d819afd8cd50e54b5e83 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Fri, 4 Oct 2024 16:34:50 +0200
Subject: [PATCH 21/45] change name H2 to HTTP

because we also have h3 on it
---
 install.sh                                    | 2 +-
 web/html/xui/form/stream/stream_settings.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 916adb90..375adc9d 100644
--- a/install.sh
+++ b/install.sh
@@ -186,7 +186,7 @@ config_after_install() {
 
             local existing_webBasePath=$(/usr/local/x-ui/x-ui setting -show true | grep -Eo 'webBasePath: .+' | awk '{print $2}')
 
-            if [[ ${#existing_webBasePath} -lt 3 ]]; then
+            if [[ ${#existing_webBasePath} -lt 4 ]]; then
                 echo -e "${yellow}WebBasePath is empty, generating a random one...${plain}"
 
                 /usr/local/x-ui/x-ui setting -webBasePath "${config_webBasePath}"
diff --git a/web/html/xui/form/stream/stream_settings.html b/web/html/xui/form/stream/stream_settings.html
index 2a575595..6d788090 100644
--- a/web/html/xui/form/stream/stream_settings.html
+++ b/web/html/xui/form/stream/stream_settings.html
@@ -7,7 +7,7 @@
             <a-select-option value="tcp">TCP (RAW)</a-select-option>
             <a-select-option value="kcp">mKCP</a-select-option>
             <a-select-option value="ws">WebSocket</a-select-option>
-            <a-select-option value="http">H2</a-select-option>
+            <a-select-option value="http">HTTP</a-select-option>
             <a-select-option value="grpc">gRPC</a-select-option>
             <a-select-option value="httpupgrade">HTTPUpgrade</a-select-option>
             <a-select-option value="splithttp">SplitHTTP</a-select-option>

From a85b02c6ab9124dba856399dab2887bbe445e679 Mon Sep 17 00:00:00 2001
From: bnam999 <bnam999@163.com>
Date: Sun, 6 Oct 2024 23:10:07 +0800
Subject: [PATCH 22/45] support for openEuler (#2574)

---
 README.es_ES.md | 1 +
 README.md       | 1 +
 README.ru_RU.md | 1 +
 README.zh_CN.md | 1 +
 install.sh      | 5 +++++
 x-ui.sh         | 5 +++++
 6 files changed, 14 insertions(+)

diff --git a/README.es_ES.md b/README.es_ES.md
index 5da2e5a6..ffb5b7d1 100644
--- a/README.es_ES.md
+++ b/README.es_ES.md
@@ -218,6 +218,7 @@ location /sub {
 - Ubuntu 20.04+
 - Debian 11+
 - CentOS 8+
+- OpenEuler 22.03+
 - Fedora 36+
 - Arch Linux
 - Parch Linux
diff --git a/README.md b/README.md
index a2edad7f..ed4dfecb 100644
--- a/README.md
+++ b/README.md
@@ -245,6 +245,7 @@ location /sub {
 - Ubuntu 20.04+
 - Debian 11+
 - CentOS 8+
+- OpenEuler 22.03+
 - Fedora 36+
 - Arch Linux
 - Parch Linux
diff --git a/README.ru_RU.md b/README.ru_RU.md
index 0da90fb6..5483c658 100644
--- a/README.ru_RU.md
+++ b/README.ru_RU.md
@@ -244,6 +244,7 @@ location /sub {
 - Ubuntu 20.04+
 - Debian 11+
 - CentOS 8+
+- OpenEuler 22.03+
 - Fedora 36+
 - Arch Linux
 - Parch Linux
diff --git a/README.zh_CN.md b/README.zh_CN.md
index 0aa7efcf..46b4b8a4 100644
--- a/README.zh_CN.md
+++ b/README.zh_CN.md
@@ -241,6 +241,7 @@ location /sub {
 - Ubuntu 20.04+
 - Debian 11+
 - CentOS 8+
+- OpenEuler 22.03+
 - Fedora 36+
 - Arch Linux
 - Parch Linux
diff --git a/install.sh b/install.sh
index 375adc9d..856adb85 100644
--- a/install.sh
+++ b/install.sh
@@ -51,6 +51,10 @@ elif [[ "${release}" == "armbian" ]]; then
     echo "Your OS is Armbian"
 elif [[ "${release}" == "opensuse-tumbleweed" ]]; then
     echo "Your OS is OpenSUSE Tumbleweed"
+elif [[ "${release}" == "openEuler" ]]; then
+    if [[ ${os_version} -lt 2203 ]]; then
+        echo -e "${red} Please use OpenEuler 22.03 or higher ${plain}\n" && exit 1
+    fi
 elif [[ "${release}" == "centos" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
         echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
@@ -89,6 +93,7 @@ else
     echo "- Ubuntu 20.04+"
     echo "- Debian 11+"
     echo "- CentOS 8+"
+    echo "- OpenEuler 22.03+"
     echo "- Fedora 36+"
     echo "- Arch Linux"
     echo "- Parch Linux"
diff --git a/x-ui.sh b/x-ui.sh
index 3219453e..6d642fa7 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -48,6 +48,10 @@ elif [[ "${release}" == "armbian" ]]; then
     echo "Your OS is Armbian"
 elif [[ "${release}" == "opensuse-tumbleweed" ]]; then
     echo "Your OS is OpenSUSE Tumbleweed"
+elif [[ "${release}" == "openEuler" ]]; then
+    if [[ ${os_version} -lt 2203 ]]; then
+        echo -e "${red} Please use OpenEuler 22.03 or higher ${plain}\n" && exit 1
+    fi
 elif [[ "${release}" == "centos" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
         echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
@@ -86,6 +90,7 @@ else
     echo "- Ubuntu 20.04+"
     echo "- Debian 11+"
     echo "- CentOS 8+"
+    echo "- OpenEuler 22.03+"
     echo "- Fedora 36+"
     echo "- Arch Linux"
     echo "- Parch Linux"

From db6781f3115202c4f77e679db93982a9a4315c37 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 7 Oct 2024 10:35:22 +0200
Subject: [PATCH 23/45] Update release.yml

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 799f6b42..731a916a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,10 +1,10 @@
 name: Release 3X-UI
 
 on:
+  workflow_dispatch:
   push:
     tags:
-      - "*"
-  workflow_dispatch:
+      - "v*.*.*"
 
 jobs:
   build:

From aaf68ecb2160f91fbe3f94ea4c8cb292bbe1eecd Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 7 Oct 2024 14:02:51 +0200
Subject: [PATCH 24/45] update api doc

---
 README.es_ES.md | 4 ++--
 README.md       | 4 ++--
 README.ru_RU.md | 4 ++--
 README.zh_CN.md | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.es_ES.md b/README.es_ES.md
index ffb5b7d1..c6ac544b 100644
--- a/README.es_ES.md
+++ b/README.es_ES.md
@@ -482,8 +482,8 @@ Ingresa el ID de chat de usuario en el campo de entrada número 4. Las cuentas d
 - `client.email` para Shadowsocks
 
 
-- [Documentación de API](https://documenter.getpostman.com/view/16802678/2s9YkgD5jm)
-- [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://app.getpostman.com/run-collection/16802678-1a4c9270-ac77-40ed-959a-7aa56dc4a415?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D16802678-1a4c9270-ac77-40ed-959a-7aa56dc4a415%26entityType%3Dcollection%26workspaceId%3D2cd38c01-c851-4a15-a972-f181c23359d9)
+- [Documentación de API](https://documenter.getpostman.com/view/5146551/2sAXxP8Y12)
+- [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://god.gw.postman.com/run-collection/5146551-e6aac565-e0e2-46df-acff-2607a51bbd04?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D5146551-e6aac565-e0e2-46df-acff-2607a51bbd04%26entityType%3Dcollection%26workspaceId%3Dd64f609f-485a-4951-9b8f-876b3f917124)
 </details>
 
 ## Variables de Entorno
diff --git a/README.md b/README.md
index ed4dfecb..ef1e92ee 100644
--- a/README.md
+++ b/README.md
@@ -515,8 +515,8 @@ Enter the user ID in input field number 4. The Telegram accounts with this id wi
 - `client.email` for Shadowsocks
 
 
-- [API Documentation](https://documenter.getpostman.com/view/16802678/2s9YkgD5jm)
-- [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://app.getpostman.com/run-collection/16802678-1a4c9270-ac77-40ed-959a-7aa56dc4a415?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D16802678-1a4c9270-ac77-40ed-959a-7aa56dc4a415%26entityType%3Dcollection%26workspaceId%3D2cd38c01-c851-4a15-a972-f181c23359d9)
+- [API Documentation](https://documenter.getpostman.com/view/5146551/2sAXxP8Y12)
+- [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://god.gw.postman.com/run-collection/5146551-e6aac565-e0e2-46df-acff-2607a51bbd04?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D5146551-e6aac565-e0e2-46df-acff-2607a51bbd04%26entityType%3Dcollection%26workspaceId%3Dd64f609f-485a-4951-9b8f-876b3f917124)
 </details>
 
 ## Environment Variables
diff --git a/README.ru_RU.md b/README.ru_RU.md
index 5483c658..9d0d9a38 100644
--- a/README.ru_RU.md
+++ b/README.ru_RU.md
@@ -512,8 +512,8 @@ WARP встроен, и дополнительная установка не т
 </details>
 
 
-- [API-документация](https://documenter.getpostman.com/view/16802678/2s9YkgD5jm)
-- [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://app.getpostman.com/run-collection/16802678-1a4c9270-ac77-40ed-959a-7aa56dc4a415?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D16802678-1a4c9270-ac77-40ed-959a-7aa56dc4a415%26entityType%3Dcollection%26workspaceId%3D2cd38c01-c851-4a15-a972-f181c23359d9)
+- [API документация](https://documenter.getpostman.com/view/5146551/2sAXxP8Y12)
+- [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://god.gw.postman.com/run-collection/5146551-e6aac565-e0e2-46df-acff-2607a51bbd04?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D5146551-e6aac565-e0e2-46df-acff-2607a51bbd04%26entityType%3Dcollection%26workspaceId%3Dd64f609f-485a-4951-9b8f-876b3f917124)
 </details>
 
 ## Переменные среды
diff --git a/README.zh_CN.md b/README.zh_CN.md
index 46b4b8a4..a42a1d6b 100644
--- a/README.zh_CN.md
+++ b/README.zh_CN.md
@@ -504,8 +504,8 @@ Web 面板通过 Telegram Bot 支持每日流量、面板登录、数据库备
 - `client.email`  Shadowsocks
 
 
-- [API 文档](https://documenter.getpostman.com/view/16802678/2s9YkgD5jm)
-- [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://app.getpostman.com/run-collection/16802678-1a4c9270-ac77-40ed-959a-7aa56dc4a415?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D16802678-1a4c9270-ac77-40ed-959a-7aa56dc4a415%26entityType%3Dcollection%26workspaceId%3D2cd38c01-c851-4a15-a972-f181c23359d9)
+- [API 文档](https://documenter.getpostman.com/view/5146551/2sAXxP8Y12)
+- [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://god.gw.postman.com/run-collection/5146551-e6aac565-e0e2-46df-acff-2607a51bbd04?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D5146551-e6aac565-e0e2-46df-acff-2607a51bbd04%26entityType%3Dcollection%26workspaceId%3Dd64f609f-485a-4951-9b8f-876b3f917124)
 </details>
 
 ## 环境变量

From 8335238eb3ccb6990414b45183b3bac6b544bbf7 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 7 Oct 2024 14:50:59 +0200
Subject: [PATCH 25/45] Auto-detect existing SSL domains

---
 x-ui.sh | 63 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 55 insertions(+), 8 deletions(-)

diff --git a/x-ui.sh b/x-ui.sh
index 6d642fa7..2827c2bf 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -788,7 +788,9 @@ ssl_cert_issue_main() {
     echo -e "${green}\t1.${plain} Get SSL"
     echo -e "${green}\t2.${plain} Revoke"
     echo -e "${green}\t3.${plain} Force Renew"
+    echo -e "${green}\t4.${plain} Show Existing Domains"
     echo -e "${green}\t0.${plain} Back to Main Menu"
+
     read -p "Choose an option: " choice
     case "$choice" in
     0)
@@ -798,17 +800,62 @@ ssl_cert_issue_main() {
         ssl_cert_issue
         ;;
     2)
-        local domain=""
-        read -p "Please enter your domain name to revoke the certificate: " domain
-        ~/.acme.sh/acme.sh --revoke -d ${domain}
-        LOGI "Certificate revoked"
+        # Auto-detect existing domains for revoking
+        local domains=$(find /root/cert/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
+        if [ -z "$domains" ]; then
+            echo "No certificates found to revoke."
+        else
+            echo "Existing domains:"
+            echo "$domains"
+            read -p "Please enter a domain from the list to revoke the certificate: " domain
+            if [[ " $domains " =~ " $domain " ]]; then
+                ~/.acme.sh/acme.sh --revoke -d ${domain}
+                LOGI "Certificate revoked for domain: $domain"
+            else
+                echo "Invalid domain entered."
+            fi
+        fi
         ;;
     3)
-        local domain=""
-        read -p "Please enter your domain name to forcefully renew an SSL certificate: " domain
-        ~/.acme.sh/acme.sh --renew -d ${domain} --force
+        # Auto-detect existing domains for force renewal
+        local domains=$(find /root/cert/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
+        if [ -z "$domains" ]; then
+            echo "No certificates found to renew."
+        else
+            echo "Existing domains:"
+            echo "$domains"
+            read -p "Please enter a domain from the list to renew the SSL certificate: " domain
+            if [[ " $domains " =~ " $domain " ]]; then
+                ~/.acme.sh/acme.sh --renew -d ${domain} --force
+                LOGI "Certificate forcefully renewed for domain: $domain"
+            else
+                echo "Invalid domain entered."
+            fi
+        fi
+        ;;
+    4)
+        # Show existing certificate paths for all domains
+        local domains=$(find /root/cert/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
+        if [ -z "$domains" ]; then
+            echo "No certificates found."
+        else
+            echo "Existing domains and their paths:"
+            for domain in $domains; do
+                local cert_path="/root/cert/${domain}/fullchain.pem"
+                local key_path="/root/cert/${domain}/privkey.pem"
+                if [[ -f "${cert_path}" && -f "${key_path}" ]]; then
+                    echo -e "Domain: ${domain}"
+                    echo -e "\tCertificate Path: ${cert_path}"
+                    echo -e "\tPrivate Key Path: ${key_path}"
+                else
+                    echo -e "Domain: ${domain} - Certificate or Key missing."
+                fi
+            done
+        fi
+        ;;
+    *)
+        echo "Invalid choice"
         ;;
-    *) echo "Invalid choice" ;;
     esac
 }
 

From 5f531f2de1340f39fae89a3140d91ee86293f11c Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 7 Oct 2024 15:13:38 +0200
Subject: [PATCH 26/45] Set Cert paths for the panel

Option to automatically set the web certificate and key file paths for the panel
---
 x-ui.sh | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/x-ui.sh b/x-ui.sh
index 2827c2bf..615a7708 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -789,6 +789,7 @@ ssl_cert_issue_main() {
     echo -e "${green}\t2.${plain} Revoke"
     echo -e "${green}\t3.${plain} Force Renew"
     echo -e "${green}\t4.${plain} Show Existing Domains"
+    echo -e "${green}\t5.${plain} Set Cert paths for the panel"
     echo -e "${green}\t0.${plain} Back to Main Menu"
 
     read -p "Choose an option: " choice
@@ -800,7 +801,6 @@ ssl_cert_issue_main() {
         ssl_cert_issue
         ;;
     2)
-        # Auto-detect existing domains for revoking
         local domains=$(find /root/cert/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
         if [ -z "$domains" ]; then
             echo "No certificates found to revoke."
@@ -817,7 +817,6 @@ ssl_cert_issue_main() {
         fi
         ;;
     3)
-        # Auto-detect existing domains for force renewal
         local domains=$(find /root/cert/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
         if [ -z "$domains" ]; then
             echo "No certificates found to renew."
@@ -834,7 +833,6 @@ ssl_cert_issue_main() {
         fi
         ;;
     4)
-        # Show existing certificate paths for all domains
         local domains=$(find /root/cert/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
         if [ -z "$domains" ]; then
             echo "No certificates found."
@@ -853,7 +851,33 @@ ssl_cert_issue_main() {
             done
         fi
         ;;
-    *)
+    5)
+        local domains=$(find /root/cert/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
+        if [ -z "$domains" ]; then
+            echo "No certificates found."
+        else
+            echo "Available domains:"
+            echo "$domains"
+            read -p "Please choose a domain to set the panel paths: " domain
+            if [[ " $domains " =~ " $domain " ]]; then
+                local webCertFile="/root/cert/${domain}/fullchain.pem"
+                local webKeyFile="/root/cert/${domain}/privkey.pem"
+                
+                if [[ -f "${webCertFile}" && -f "${webKeyFile}" ]]; then
+                    /usr/local/x-ui/x-ui setting -webCert "$webCertFile"
+                    /usr/local/x-ui/x-ui setting -webCertKey "$webKeyFile"
+                    echo "Panel paths set for domain: $domain"
+                    echo "  - Certificate File: $webCertFile"
+                    echo "  - Private Key File: $webKeyFile"
+                else
+                    echo "Certificate or private key not found for domain: $domain."
+                fi
+            else
+                echo "Invalid domain entered."
+            fi
+        fi
+        ;;
+    *) 
         echo "Invalid choice"
         ;;
     esac

From b8df15171e5fedb5919f978aef84973690a7e939 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 7 Oct 2024 15:18:56 +0200
Subject: [PATCH 27/45] ask auto set after get new cert

---
 x-ui.sh | 71 ++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 24 deletions(-)

diff --git a/x-ui.sh b/x-ui.sh
index 615a7708..eed60faf 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -864,8 +864,8 @@ ssl_cert_issue_main() {
                 local webKeyFile="/root/cert/${domain}/privkey.pem"
                 
                 if [[ -f "${webCertFile}" && -f "${webKeyFile}" ]]; then
-                    /usr/local/x-ui/x-ui setting -webCert "$webCertFile"
-                    /usr/local/x-ui/x-ui setting -webCertKey "$webKeyFile"
+                    /usr/local/x-ui/x-ui cert -webCert "$webCertFile"
+                    /usr/local/x-ui/x-ui cert -webCertKey "$webKeyFile"
                     echo "Panel paths set for domain: $domain"
                     echo "  - Certificate File: $webCertFile"
                     echo "  - Private Key File: $webKeyFile"
@@ -893,6 +893,7 @@ ssl_cert_issue() {
             exit 1
         fi
     fi
+
     # install socat second
     case "${release}" in
     ubuntu | debian | armbian)
@@ -919,23 +920,23 @@ ssl_cert_issue() {
         LOGI "install socat succeed..."
     fi
 
-    # get the domain here,and we need verify it
+    # get the domain here, and we need to verify it
     local domain=""
-    read -p "Please enter your domain name:" domain
-    LOGD "your domain is:${domain},check it..."
-    # here we need to judge whether there exists cert already
-    local currentCert=$(~/.acme.sh/acme.sh --list | tail -1 | awk '{print $1}')
+    read -p "Please enter your domain name: " domain
+    LOGD "Your domain is: ${domain}, checking it..."
 
-    if [ ${currentCert} == ${domain} ]; then
+    # check if there already exists a certificate
+    local currentCert=$(~/.acme.sh/acme.sh --list | tail -1 | awk '{print $1}')
+    if [ "${currentCert}" == "${domain}" ]; then
         local certInfo=$(~/.acme.sh/acme.sh --list)
-        LOGE "system already has certs here,can not issue again,current certs details:"
+        LOGE "System already has certificates for this domain. Cannot issue again. Current certificate details:"
         LOGI "$certInfo"
         exit 1
     else
-        LOGI "your domain is ready for issuing cert now..."
+        LOGI "Your domain is ready for issuing certificates now..."
     fi
 
-    # create a directory for install cert
+    # create a directory for the certificate
     certPath="/root/cert/${domain}"
     if [ ! -d "$certPath" ]; then
         mkdir -p "$certPath"
@@ -944,48 +945,70 @@ ssl_cert_issue() {
         mkdir -p "$certPath"
     fi
 
-    # get needed port here
+    # get the port number for the standalone server
     local WebPort=80
-    read -p "please choose which port do you use,default will be 80 port:" WebPort
+    read -p "Please choose which port to use (default is 80): " WebPort
     if [[ ${WebPort} -gt 65535 || ${WebPort} -lt 1 ]]; then
-        LOGE "your input ${WebPort} is invalid,will use default port"
+        LOGE "Your input ${WebPort} is invalid, will use default port 80."
+        WebPort=80
     fi
-    LOGI "will use port:${WebPort} to issue certs,please make sure this port is open..."
-    # NOTE:This should be handled by user
-    # open the port and kill the occupied progress
+    LOGI "Will use port: ${WebPort} to issue certificates. Please make sure this port is open."
+
+    # issue the certificate
     ~/.acme.sh/acme.sh --set-default-ca --server letsencrypt
     ~/.acme.sh/acme.sh --issue -d ${domain} --listen-v6 --standalone --httpport ${WebPort}
     if [ $? -ne 0 ]; then
-        LOGE "issue certs failed,please check logs"
+        LOGE "Issuing certificate failed, please check logs."
         rm -rf ~/.acme.sh/${domain}
         exit 1
     else
-        LOGE "issue certs succeed,installing certs..."
+        LOGE "Issuing certificate succeeded, installing certificates..."
     fi
-    # install cert
+
+    # install the certificate
     ~/.acme.sh/acme.sh --installcert -d ${domain} \
         --key-file /root/cert/${domain}/privkey.pem \
         --fullchain-file /root/cert/${domain}/fullchain.pem
 
     if [ $? -ne 0 ]; then
-        LOGE "install certs failed,exit"
+        LOGE "Installing certificate failed, exiting."
         rm -rf ~/.acme.sh/${domain}
         exit 1
     else
-        LOGI "install certs succeed,enable auto renew..."
+        LOGI "Installing certificate succeeded, enabling auto renew..."
     fi
 
+    # enable auto-renew
     ~/.acme.sh/acme.sh --upgrade --auto-upgrade
     if [ $? -ne 0 ]; then
-        LOGE "auto renew failed, certs details:"
+        LOGE "Auto renew failed, certificate details:"
         ls -lah cert/*
         chmod 755 $certPath/*
         exit 1
     else
-        LOGI "auto renew succeed, certs details:"
+        LOGI "Auto renew succeeded, certificate details:"
         ls -lah cert/*
         chmod 755 $certPath/*
     fi
+
+    # Prompt user to set panel paths after successful certificate installation
+    read -p "Would you like to set this certificate for the panel? (y/n): " setPanel
+    if [[ "$setPanel" == "y" || "$setPanel" == "Y" ]]; then
+        local webCertFile="/root/cert/${domain}/fullchain.pem"
+        local webKeyFile="/root/cert/${domain}/privkey.pem"
+        
+        if [[ -f "$webCertFile" && -f "$webKeyFile" ]]; then
+            /usr/local/x-ui/x-ui cert -webCert "$webCertFile"
+            /usr/local/x-ui/x-ui cert -webCertKey "$webKeyFile"
+            LOGI "Panel paths set for domain: $domain"
+            LOGI "  - Certificate File: $webCertFile"
+            LOGI "  - Private Key File: $webKeyFile"
+        else
+            LOGE "Error: Certificate or private key file not found for domain: $domain."
+        fi
+    else
+        LOGI "Skipping panel path setting."
+    fi
 }
 
 ssl_cert_issue_CF() {

From e72f67ca54dd8e4a2a5b263f466603a60d20a9d2 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 7 Oct 2024 15:24:35 +0200
Subject: [PATCH 28/45] update dependencies

---
 go.mod | 24 ++++++++++++------------
 go.sum | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/go.mod b/go.mod
index e62cdcf9..1d01274c 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module x-ui
 
-go 1.23.1
+go 1.23.2
 
 require (
 	github.com/gin-contrib/gzip v1.0.1
@@ -16,7 +16,7 @@ require (
 	github.com/valyala/fasthttp v1.56.0
 	github.com/xtls/xray-core v1.8.25-0.20241002041629-e45cef542e26
 	go.uber.org/atomic v1.11.0
-	golang.org/x/text v0.18.0
+	golang.org/x/text v0.19.0
 	google.golang.org/grpc v1.67.1
 	gorm.io/driver/sqlite v1.5.6
 	gorm.io/gorm v1.25.12
@@ -51,11 +51,11 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.17.10 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
-	github.com/kr/text v0.1.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-sqlite3 v1.14.23 // indirect
+	github.com/mattn/go-sqlite3 v1.14.24 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/onsi/ginkgo/v2 v2.20.2 // indirect
@@ -71,7 +71,7 @@ require (
 	github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38 // indirect
 	github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 // indirect
 	github.com/tklauser/go-sysconf v0.3.14 // indirect
-	github.com/tklauser/numcpus v0.8.0 // indirect
+	github.com/tklauser/numcpus v0.9.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e // indirect
@@ -83,15 +83,15 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/arch v0.10.0 // indirect
-	golang.org/x/crypto v0.27.0 // indirect
-	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
+	golang.org/x/arch v0.11.0 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // indirect
 	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/time v0.6.0 // indirect
-	golang.org/x/tools v0.25.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
+	golang.org/x/tools v0.26.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
diff --git a/go.sum b/go.sum
index c2efc22a..3e52536e 100644
--- a/go.sum
+++ b/go.sum
@@ -15,6 +15,7 @@ github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/
 github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -89,17 +90,16 @@ github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZY
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0=
 github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.23 h1:gbShiuAP1W5j9UOksQ06aiiqPMxYecovVGwmTxWtuw0=
-github.com/mattn/go-sqlite3 v1.14.23/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
+github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
 github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -162,8 +162,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
 github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
-github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=
-github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE=
+github.com/tklauser/numcpus v0.9.0 h1:lmyCHtANi8aRUgkckBgoDk1nHCux3n2cgkJLXdQGPDo=
+github.com/tklauser/numcpus v0.9.0/go.mod h1:SN6Nq1O3VychhC1npsWostA+oW+VOQTxZrS604NSRyI=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
@@ -192,16 +192,16 @@ go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
 go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
-golang.org/x/arch v0.10.0 h1:S3huipmSclq3PJMNe76NGwkBR504WFkQ5dhzWzP8ZW8=
-golang.org/x/arch v0.10.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
-golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
-golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
+golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4=
+golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
+golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 h1:1wqE9dj9NpSm04INVsJhhEUzhuDVjbcyKH91sVyPATw=
+golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
 golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
 golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -211,14 +211,14 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
-golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
-golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
+golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
 golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=

From 761eb5f38435dee33ca6c6088321cb5005a43acb Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 7 Oct 2024 15:28:00 +0200
Subject: [PATCH 29/45] update install_acme

---
 x-ui.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/x-ui.sh b/x-ui.sh
index eed60faf..5bf68fbd 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -772,15 +772,23 @@ update_geo() {
 }
 
 install_acme() {
-    cd ~
-    LOGI "install acme..."
-    curl https://get.acme.sh | sh
+    # Check if acme.sh is already installed
+    if command -v ~/.acme.sh/acme.sh &>/dev/null; then
+        LOGI "acme.sh is already installed."
+        return 0
+    fi
+
+    LOGI "Installing acme.sh..."
+    cd ~ || return 1  # Ensure you can change to the home directory
+
+    curl -s https://get.acme.sh | sh
     if [ $? -ne 0 ]; then
-        LOGE "install acme failed"
+        LOGE "Installation of acme.sh failed."
         return 1
     else
-        LOGI "install acme succeed"
+        LOGI "Installation of acme.sh succeeded."
     fi
+
     return 0
 }
 

From 41d39dfaa8a92847b4e83807ace32a6395347b05 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 7 Oct 2024 15:37:53 +0200
Subject: [PATCH 30/45] Add user choice for geo updates

---
 x-ui.sh | 53 +++++++++++++++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/x-ui.sh b/x-ui.sh
index 5bf68fbd..12621589 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -748,26 +748,43 @@ delete_ports() {
 }
 
 update_geo() {
-    local defaultBinFolder="/usr/local/x-ui/bin"
-    read -p "Please enter x-ui bin folder path. Leave blank for default. (Default: '${defaultBinFolder}')" binFolder
-    binFolder=${binFolder:-${defaultBinFolder}}
-    if [[ ! -d ${binFolder} ]]; then
-        LOGE "Folder ${binFolder} not exists!"
-        LOGI "making bin folder: ${binFolder}..."
-        mkdir -p ${binFolder}
-    fi
-
+    echo -e "${green}\t1.${plain} Loyalsoldier (geoip.dat, geosite.dat)"
+    echo -e "${green}\t2.${plain} chocolate4u (geoip_IR.dat, geosite_IR.dat)"
+    echo -e "${green}\t3.${plain} vuong2023 (geoip_VN.dat, geosite_VN.dat)"
+    echo -e "${green}\t0.${plain} Back to Main Menu"
+    read -p "Choose an option: " choice
+    
     systemctl stop x-ui
-    cd ${binFolder}
-    rm -f geoip.dat geosite.dat geoip_IR.dat geosite_IR.dat geoip_VN.dat geosite_VN.dat
-    wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
-    wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
-    wget -O geoip_IR.dat -N https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat
-    wget -O geosite_IR.dat -N https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat
-    wget -O geoip_VN.dat https://github.com/vuong2023/vn-v2ray-rules/releases/latest/download/geoip.dat
-    wget -O geosite_VN.dat https://github.com/vuong2023/vn-v2ray-rules/releases/latest/download/geosite.dat
+    cd /usr/local/x-ui/bin
+
+    case "$choice" in
+    0)
+        show_menu
+        ;;
+    1)
+        rm -f geoip.dat geosite.dat
+        wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
+        wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
+        echo -e "${green}Loyalsoldier datasets have been updated successfully!${plain}"
+        ;;
+    2)
+        rm -f geoip_IR.dat geosite_IR.dat
+        wget -O geoip_IR.dat -N https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat
+        wget -O geosite_IR.dat -N https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat
+        echo -e "${green}chocolate4u datasets have been updated successfully!${plain}"
+        ;;
+    3)
+        rm -f geoip_VN.dat geosite_VN.dat
+        wget -O geoip_VN.dat -N https://github.com/vuong2023/vn-v2ray-rules/releases/latest/download/geoip.dat
+        wget -O geosite_VN.dat -N https://github.com/vuong2023/vn-v2ray-rules/releases/latest/download/geosite.dat
+        echo -e "${green}vuong2023 datasets have been updated successfully!${plain}"
+        ;;
+    *)
+        echo "Invalid option selected! No updates made."
+        ;;
+    esac
+    
     systemctl start x-ui
-    echo -e "${green}Geosite.dat + Geoip.dat + geoip_IR.dat + geosite_IR.dat have been updated successfully in bin folder '${binfolder}'!${plain}"
     before_show_menu
 }
 

From 8404b3323234dc40b8c023f9f9f4ee9dca975097 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 7 Oct 2024 17:21:32 +0200
Subject: [PATCH 31/45] bash - minor change

---
 x-ui.sh | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/x-ui.sh b/x-ui.sh
index 12621589..8c294cd5 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -176,12 +176,12 @@ update_menu() {
         fi
         return 0
     fi
-    
+
     wget --no-check-certificate -O /usr/bin/x-ui https://raw.githubusercontent.com/MHSanaei/3x-ui/main/x-ui.sh
     chmod +x /usr/local/x-ui/x-ui.sh
     chmod +x /usr/bin/x-ui
-    
-     if [[ $? == 0 ]]; then
+
+    if [[ $? == 0 ]]; then
         echo -e "${green}Update successful. The panel has automatically restarted.${plain}"
         exit 0
     else
@@ -216,7 +216,7 @@ custom_version() {
 
 # Function to handle the deletion of the script file
 delete_script() {
-    rm "$0"  # Remove the script file itself
+    rm "$0" # Remove the script file itself
     exit 1
 }
 
@@ -275,7 +275,7 @@ gen_random_string() {
 
 reset_webbasepath() {
     echo -e "${yellow}Resetting Web Base Path${plain}"
-    
+
     read -rp "Are you sure you want to reset the web base path? (y/n): " confirm
     if [[ $confirm != "y" && $confirm != "Y" ]]; then
         echo -e "${yellow}Operation canceled.${plain}"
@@ -283,11 +283,11 @@ reset_webbasepath() {
     fi
 
     config_webBasePath=$(gen_random_string 10)
-    
+
     # Apply the new web base path setting
     /usr/local/x-ui/x-ui setting -webBasePath "${config_webBasePath}" >/dev/null 2>&1
     systemctl restart x-ui
-    
+
     # Display confirmation message
     echo -e "Web base path has been reset to: ${green}${config_webBasePath}${plain}"
     echo -e "${green}Please use the new web base path to access the panel.${plain}"
@@ -732,7 +732,7 @@ delete_ports() {
     done
 
     # Confirm that the ports are deleted
-    
+
     echo "Deleted the specified ports:"
     for port in "${PORT_LIST[@]}"; do
         if [[ $port == *-* ]]; then
@@ -753,7 +753,7 @@ update_geo() {
     echo -e "${green}\t3.${plain} vuong2023 (geoip_VN.dat, geosite_VN.dat)"
     echo -e "${green}\t0.${plain} Back to Main Menu"
     read -p "Choose an option: " choice
-    
+
     systemctl stop x-ui
     cd /usr/local/x-ui/bin
 
@@ -783,7 +783,7 @@ update_geo() {
         echo "Invalid option selected! No updates made."
         ;;
     esac
-    
+
     systemctl start x-ui
     before_show_menu
 }
@@ -796,7 +796,7 @@ install_acme() {
     fi
 
     LOGI "Installing acme.sh..."
-    cd ~ || return 1  # Ensure you can change to the home directory
+    cd ~ || return 1 # Ensure you can change to the home directory
 
     curl -s https://get.acme.sh | sh
     if [ $? -ne 0 ]; then
@@ -833,7 +833,7 @@ ssl_cert_issue_main() {
             echo "Existing domains:"
             echo "$domains"
             read -p "Please enter a domain from the list to revoke the certificate: " domain
-            if [[ " $domains " =~ " $domain " ]]; then
+            if echo "$domains" | grep -qw "$domain"; then
                 ~/.acme.sh/acme.sh --revoke -d ${domain}
                 LOGI "Certificate revoked for domain: $domain"
             else
@@ -849,7 +849,7 @@ ssl_cert_issue_main() {
             echo "Existing domains:"
             echo "$domains"
             read -p "Please enter a domain from the list to renew the SSL certificate: " domain
-            if [[ " $domains " =~ " $domain " ]]; then
+            if echo "$domains" | grep -qw "$domain"; then
                 ~/.acme.sh/acme.sh --renew -d ${domain} --force
                 LOGI "Certificate forcefully renewed for domain: $domain"
             else
@@ -884,13 +884,13 @@ ssl_cert_issue_main() {
             echo "Available domains:"
             echo "$domains"
             read -p "Please choose a domain to set the panel paths: " domain
-            if [[ " $domains " =~ " $domain " ]]; then
+
+            if echo "$domains" | grep -qw "$domain"; then
                 local webCertFile="/root/cert/${domain}/fullchain.pem"
                 local webKeyFile="/root/cert/${domain}/privkey.pem"
-                
+
                 if [[ -f "${webCertFile}" && -f "${webKeyFile}" ]]; then
-                    /usr/local/x-ui/x-ui cert -webCert "$webCertFile"
-                    /usr/local/x-ui/x-ui cert -webCertKey "$webKeyFile"
+                    /usr/local/x-ui/x-ui cert -webCert "$webCertFile" -webCertKey "$webKeyFile"
                     echo "Panel paths set for domain: $domain"
                     echo "  - Certificate File: $webCertFile"
                     echo "  - Private Key File: $webKeyFile"
@@ -902,7 +902,8 @@ ssl_cert_issue_main() {
             fi
         fi
         ;;
-    *) 
+
+    *)
         echo "Invalid choice"
         ;;
     esac
@@ -1021,10 +1022,9 @@ ssl_cert_issue() {
     if [[ "$setPanel" == "y" || "$setPanel" == "Y" ]]; then
         local webCertFile="/root/cert/${domain}/fullchain.pem"
         local webKeyFile="/root/cert/${domain}/privkey.pem"
-        
+
         if [[ -f "$webCertFile" && -f "$webKeyFile" ]]; then
-            /usr/local/x-ui/x-ui cert -webCert "$webCertFile"
-            /usr/local/x-ui/x-ui cert -webCertKey "$webKeyFile"
+            /usr/local/x-ui/x-ui cert -webCert "$webCertFile" -webCertKey "$webKeyFile"
             LOGI "Panel paths set for domain: $domain"
             LOGI "  - Certificate File: $webCertFile"
             LOGI "  - Private Key File: $webKeyFile"
@@ -1146,7 +1146,6 @@ run_speedtest() {
     # Run Speedtest
     speedtest
 }
-
 create_iplimit_jails() {
     # Use default bantime if not passed => 15 minutes
     local bantime="${1:-15}"

From 1d84284b6ddca4ff24b0fd377e15a16656a25d1d Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 7 Oct 2024 17:33:55 +0200
Subject: [PATCH 32/45] Update docker.yml

---
 .github/workflows/docker.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 94a82bb3..50ce7fbc 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,9 +1,10 @@
 name: Release 3X-UI for Docker
+
 on:
+  workflow_dispatch:
   push:
     tags:
-      - "*"
-  workflow_dispatch:
+      - "v*.*.*"
 
 jobs:
   build_and_push:

From 7efe1d60d54358d6d7d8fb9ff03406cb75f15c9a Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 7 Oct 2024 17:34:08 +0200
Subject: [PATCH 33/45] readme

---
 README.es_ES.md | 3 +--
 README.md       | 3 +--
 README.ru_RU.md | 2 +-
 README.zh_CN.md | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/README.es_ES.md b/README.es_ES.md
index c6ac544b..e5009057 100644
--- a/README.es_ES.md
+++ b/README.es_ES.md
@@ -452,6 +452,7 @@ Ingresa el ID de chat de usuario en el campo de entrada número 4. Las cuentas d
 
 #### Uso
 
+- [Documentación de API](https://documenter.getpostman.com/view/5146551/2sAXxP8Y12)
 - `/login` con `POST` datos de usuario: `{username: '', password: ''}` para iniciar sesión
 - `/panel/api/inbounds` base para las siguientes acciones:
 
@@ -481,8 +482,6 @@ Ingresa el ID de chat de usuario en el campo de entrada número 4. Las cuentas d
 - `client.password` para TROJAN
 - `client.email` para Shadowsocks
 
-
-- [Documentación de API](https://documenter.getpostman.com/view/5146551/2sAXxP8Y12)
 - [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://god.gw.postman.com/run-collection/5146551-e6aac565-e0e2-46df-acff-2607a51bbd04?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D5146551-e6aac565-e0e2-46df-acff-2607a51bbd04%26entityType%3Dcollection%26workspaceId%3Dd64f609f-485a-4951-9b8f-876b3f917124)
 </details>
 
diff --git a/README.md b/README.md
index ef1e92ee..d0205f31 100644
--- a/README.md
+++ b/README.md
@@ -484,6 +484,7 @@ Enter the user ID in input field number 4. The Telegram accounts with this id wi
 
 #### Usage
 
+- [API Documentation](https://documenter.getpostman.com/view/5146551/2sAXxP8Y12)
 - `/login` with `POST` user data: `{username: '', password: ''}` for login
 - `/panel/api/inbounds` base for following actions:
 
@@ -514,8 +515,6 @@ Enter the user ID in input field number 4. The Telegram accounts with this id wi
 - `client.password` for TROJAN
 - `client.email` for Shadowsocks
 
-
-- [API Documentation](https://documenter.getpostman.com/view/5146551/2sAXxP8Y12)
 - [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://god.gw.postman.com/run-collection/5146551-e6aac565-e0e2-46df-acff-2607a51bbd04?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D5146551-e6aac565-e0e2-46df-acff-2607a51bbd04%26entityType%3Dcollection%26workspaceId%3Dd64f609f-485a-4951-9b8f-876b3f917124)
 </details>
 
diff --git a/README.ru_RU.md b/README.ru_RU.md
index 9d0d9a38..20e108bb 100644
--- a/README.ru_RU.md
+++ b/README.ru_RU.md
@@ -479,6 +479,7 @@ WARP встроен, и дополнительная установка не т
 
 #### Использование
 
+- [API документация](https://documenter.getpostman.com/view/5146551/2sAXxP8Y12)
 - `/login` с `POST`-данными: `{username: '', password: ''}` для входа
 - `/panel/api/inbounds` это базовый путь для следующих действий:
 
@@ -512,7 +513,6 @@ WARP встроен, и дополнительная установка не т
 </details>
 
 
-- [API документация](https://documenter.getpostman.com/view/5146551/2sAXxP8Y12)
 - [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://god.gw.postman.com/run-collection/5146551-e6aac565-e0e2-46df-acff-2607a51bbd04?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D5146551-e6aac565-e0e2-46df-acff-2607a51bbd04%26entityType%3Dcollection%26workspaceId%3Dd64f609f-485a-4951-9b8f-876b3f917124)
 </details>
 
diff --git a/README.zh_CN.md b/README.zh_CN.md
index a42a1d6b..dda0651e 100644
--- a/README.zh_CN.md
+++ b/README.zh_CN.md
@@ -474,6 +474,7 @@ Web 面板通过 Telegram Bot 支持每日流量、面板登录、数据库备
 
 #### 使用
 
+- [API 文档](https://documenter.getpostman.com/view/5146551/2sAXxP8Y12)
 - `/login` 使用 `POST` 用户名称 & 密码： `{username: '', password: ''}` 登录
 - `/panel/api/inbounds` 以下操作的基础：
 
@@ -503,8 +504,6 @@ Web 面板通过 Telegram Bot 支持每日流量、面板登录、数据库备
 - `client.password`  TROJAN
 - `client.email`  Shadowsocks
 
-
-- [API 文档](https://documenter.getpostman.com/view/5146551/2sAXxP8Y12)
 - [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://god.gw.postman.com/run-collection/5146551-e6aac565-e0e2-46df-acff-2607a51bbd04?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D5146551-e6aac565-e0e2-46df-acff-2607a51bbd04%26entityType%3Dcollection%26workspaceId%3Dd64f609f-485a-4951-9b8f-876b3f917124)
 </details>
 

From e70305579345da3599f4d1a5dfbeee7f37744f75 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 7 Oct 2024 17:38:23 +0200
Subject: [PATCH 34/45] bash - restart panel after cert set

---
 x-ui.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/x-ui.sh b/x-ui.sh
index 8c294cd5..ab3c34a1 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -286,11 +286,10 @@ reset_webbasepath() {
 
     # Apply the new web base path setting
     /usr/local/x-ui/x-ui setting -webBasePath "${config_webBasePath}" >/dev/null 2>&1
-    systemctl restart x-ui
-
-    # Display confirmation message
+    
     echo -e "Web base path has been reset to: ${green}${config_webBasePath}${plain}"
     echo -e "${green}Please use the new web base path to access the panel.${plain}"
+    restart
 }
 
 reset_config() {
@@ -894,6 +893,7 @@ ssl_cert_issue_main() {
                     echo "Panel paths set for domain: $domain"
                     echo "  - Certificate File: $webCertFile"
                     echo "  - Private Key File: $webKeyFile"
+                    restart
                 else
                     echo "Certificate or private key not found for domain: $domain."
                 fi
@@ -1028,6 +1028,7 @@ ssl_cert_issue() {
             LOGI "Panel paths set for domain: $domain"
             LOGI "  - Certificate File: $webCertFile"
             LOGI "  - Private Key File: $webKeyFile"
+            restart
         else
             LOGE "Error: Certificate or private key file not found for domain: $domain."
         fi

From dcab4e6f9c9201972e22b941bf60af549b319856 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Tue, 8 Oct 2024 16:42:47 +0200
Subject: [PATCH 35/45] fix oracle

---
 install.sh |  4 ++--
 x-ui.sh    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/install.sh b/install.sh
index 856adb85..2926f6b3 100644
--- a/install.sh
+++ b/install.sh
@@ -83,7 +83,7 @@ elif [[ "${release}" == "rocky" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
         echo -e "${red} Please use Rocky Linux 8 or higher ${plain}\n" && exit 1
     fi
-elif [[ "${release}" == "oracle" ]]; then
+elif [[ "${release}" == "ol" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
         echo -e "${red} Please use Oracle Linux 8 or higher ${plain}\n" && exit 1
     fi
@@ -112,7 +112,7 @@ install_base() {
     ubuntu | debian | armbian)
         apt-get update && apt-get install -y -q wget curl tar tzdata
         ;;
-    centos | almalinux | rocky | oracle)
+    centos | almalinux | rocky | ol)
         yum -y update && yum install -y -q wget curl tar tzdata
         ;;
     fedora | amzn)
diff --git a/x-ui.sh b/x-ui.sh
index ab3c34a1..d312a225 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -80,7 +80,7 @@ elif [[ "${release}" == "rocky" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
         echo -e "${red} Please use Rocky Linux 8 or higher ${plain}\n" && exit 1
     fi
-elif [[ "${release}" == "oracle" ]]; then
+elif [[ "${release}" == "ol" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
         echo -e "${red} Please use Oracle Linux 8 or higher ${plain}\n" && exit 1
     fi
@@ -486,7 +486,7 @@ enable_bbr() {
     ubuntu | debian | armbian)
         apt-get update && apt-get install -yqq --no-install-recommends ca-certificates
         ;;
-    centos | almalinux | rocky | oracle)
+    centos | almalinux | rocky | ol)
         yum -y update && yum -y install ca-certificates
         ;;
     fedora | amzn)
@@ -925,7 +925,7 @@ ssl_cert_issue() {
     ubuntu | debian | armbian)
         apt update && apt install socat -y
         ;;
-    centos | almalinux | rocky | oracle)
+    centos | almalinux | rocky | ol)
         yum -y update && yum -y install socat
         ;;
     fedora | amzn)
@@ -1296,7 +1296,7 @@ install_iplimit() {
         debian | armbian)
             apt update && apt install fail2ban -y
             ;;
-        centos | almalinux | rocky | oracle)
+        centos | almalinux | rocky | ol)
             yum update -y && yum install epel-release -y
             yum -y install fail2ban
             ;;
@@ -1377,7 +1377,7 @@ remove_iplimit() {
             apt-get purge -y fail2ban -y
             apt-get autoremove -y
             ;;
-        centos | almalinux | rocky | oracle)
+        centos | almalinux | rocky | ol)
             yum remove fail2ban -y
             yum autoremove -y
             ;;

From 4f2f855c04322bb64f32cfb695878e946c4359e8 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Wed, 9 Oct 2024 10:49:05 +0200
Subject: [PATCH 36/45] validate Email - non-English Pattern

---
 web/service/inbound.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/web/service/inbound.go b/web/service/inbound.go
index 5213fce6..822a4e8d 100644
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -2024,6 +2024,7 @@ func (s *InboundService) GetOnlineClients() []string {
 }
 
 func validateEmail(email string) (bool, error) {
+
 	if strings.Contains(email, " ") {
 		return false, errors.New("email contains spaces, please remove them")
 	}
@@ -2032,6 +2033,11 @@ func validateEmail(email string) (bool, error) {
 		return false, errors.New("email contains uppercase letters, please convert to lowercase")
 	}
 
+	nonEnglishPattern := `[^\x00-\x7F]`
+	if regexp.MustCompile(nonEnglishPattern).MatchString(email) {
+		return false, errors.New("email contains non-English characters, please use only English")
+	}
+
 	emailPattern := `^[a-z0-9@._-]+$`
 	if !regexp.MustCompile(emailPattern).MatchString(email) {
 		return false, errors.New("email contains invalid characters, please use only lowercase letters, digits, and @._-")

From e37f2d322256ed4468fd0277b0cb10a5bf4ccaa9 Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Wed, 9 Oct 2024 11:15:37 +0200
Subject: [PATCH 37/45] Username & Password will be generated randomly

---
 install.sh | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/install.sh b/install.sh
index 2926f6b3..c4cc6798 100644
--- a/install.sh
+++ b/install.sh
@@ -138,27 +138,25 @@ gen_random_string() {
 
 config_after_install() {
     echo -e "${yellow}Install/update finished! For security, it's recommended to modify panel settings ${plain}"
-    read -p "Would you like to customize the panel settings? (If not, random settings will be applied) [y/n]: " config_confirm
+    read -p "Would you like to customize ${yellow}the Panel Port ${plain}settings? (If not, random settings will be applied) [y/n]: " config_confirm
 
-    local config_webBasePath=$(gen_random_string 10)
+    local config_webBasePath=$(gen_random_string 15)
+    local config_account=$(gen_random_string 10)
+    local config_password=$(gen_random_string 10)
 
     if [[ "${config_confirm}" == "y" || "${config_confirm}" == "Y" ]]; then
 
-        read -p "Please set up your username: " config_account
-        echo -e "${yellow}Your username will be: ${config_account}${plain}"
-
-        read -p "Please set up your password: " config_password
-        echo -e "${yellow}Your password will be: ${config_password}${plain}"
-
         read -p "Please set up the panel port: " config_port
-        echo -e "${yellow}Your panel port is: ${config_port}${plain}"
+        echo -e "${yellow}Your Panel Port is: ${config_port}${plain}"
 
-        echo -e "${yellow}Your web base path will be generated randomly: ${config_webBasePath}${plain}"
+        echo -e "${yellow}Your Username will be generated randomly: ${config_account}${plain}"
+        echo -e "${yellow}Your Password will be generated randomly: ${config_password}${plain}"
+        echo -e "${yellow}Your Web Base Path will be generated randomly: ${config_webBasePath}${plain}"
 
         echo -e "${yellow}Initializing, please wait...${plain}"
 
         /usr/local/x-ui/x-ui setting -username "${config_account}" -password "${config_password}" -port "${config_port}" -webBasePath "${config_webBasePath}"
-        echo -e "${yellow}Settings applied successfully!${plain}"
+        echo -e "${green}Settings applied successfully!${plain}"
 
         echo -e "###############################################"
         echo -e "${green}Username: ${config_account}${plain}"
@@ -173,15 +171,13 @@ config_after_install() {
 
         if [[ ! -f "/etc/x-ui/x-ui.db" ]]; then
 
-            local usernameTemp=$(gen_random_string 10)
-            local passwordTemp=$(gen_random_string 10)
             local portTemp=$(shuf -i 1024-62000 -n 1)
 
-            /usr/local/x-ui/x-ui setting -username "${usernameTemp}" -password "${passwordTemp}" -port "${portTemp}" -webBasePath "${config_webBasePath}"
+            /usr/local/x-ui/x-ui setting -username "${config_account}" -password "${config_password}" -port "${portTemp}" -webBasePath "${config_webBasePath}"
             echo -e "This is a fresh installation, generating random login info for security concerns:"
             echo -e "###############################################"
-            echo -e "${green}Username: ${usernameTemp}${plain}"
-            echo -e "${green}Password: ${passwordTemp}${plain}"
+            echo -e "${green}Username: ${config_account}${plain}"
+            echo -e "${green}Password: ${config_password}${plain}"
             echo -e "${green}Port: ${portTemp}${plain}"
             echo -e "${green}WebBasePath: ${config_webBasePath}${plain}"
             echo -e "###############################################"
@@ -195,7 +191,7 @@ config_after_install() {
                 echo -e "${yellow}WebBasePath is empty, generating a random one...${plain}"
 
                 /usr/local/x-ui/x-ui setting -webBasePath "${config_webBasePath}"
-                echo -e "${green}New webBasePath: ${config_webBasePath}${plain}"
+                echo -e "${green}New WebBasePath: ${config_webBasePath}${plain}"
             fi
         fi
     fi

From f1f5d323e820e3839f3d400bbcf0a35db916aa2a Mon Sep 17 00:00:00 2001
From: mhsanaei <ho3ein.sanaei@gmail.com>
Date: Wed, 9 Oct 2024 12:31:11 +0200
Subject: [PATCH 38/45] Sniffing - change default

---
 web/assets/js/model/xray.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js
index 078b8711..6d0c1c9d 100644
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -1184,7 +1184,7 @@ class StreamSettings extends XrayCommonClass {
 
 class Sniffing extends XrayCommonClass {
     constructor(
-        enabled = true,
+        enabled = false,
         destOverride = ['http', 'tls', 'quic', 'fakedns'],
         metadataOnly = false,
         routeOnly = false) {

From 4b1c76e97252c5bcc7a9ee16b8bd0dde693cabbb Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Thu, 10 Oct 2024 17:32:50 +0200
Subject: [PATCH 39/45] [refactor] email verification method

---
 web/service/inbound.go | 40 ++--------------------------------------
 1 file changed, 2 insertions(+), 38 deletions(-)

diff --git a/web/service/inbound.go b/web/service/inbound.go
index 822a4e8d..1450dd57 100644
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -2,9 +2,7 @@ package service
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
-	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -101,8 +99,9 @@ func (s *InboundService) getAllEmails() ([]string, error) {
 }
 
 func (s *InboundService) contains(slice []string, str string) bool {
+	lowerStr := strings.ToLower(str)
 	for _, s := range slice {
-		if s == str {
+		if strings.ToLower(s) == lowerStr {
 			return true
 		}
 	}
@@ -414,12 +413,6 @@ func (s *InboundService) AddInboundClient(data *model.Inbound) (bool, error) {
 		return false, err
 	}
 
-	email := clients[0].Email
-	valid, err := validateEmail(email)
-	if !valid {
-		return false, err
-	}
-
 	var settings map[string]interface{}
 	err = json.Unmarshal([]byte(data.Settings), &settings)
 	if err != nil {
@@ -610,12 +603,6 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 		return false, err
 	}
 
-	email := clients[0].Email
-	valid, err := validateEmail(email)
-	if !valid {
-		return false, err
-	}
-
 	var settings map[string]interface{}
 	err = json.Unmarshal([]byte(data.Settings), &settings)
 	if err != nil {
@@ -2022,26 +2009,3 @@ func (s *InboundService) MigrateDB() {
 func (s *InboundService) GetOnlineClients() []string {
 	return p.GetOnlineClients()
 }
-
-func validateEmail(email string) (bool, error) {
-
-	if strings.Contains(email, " ") {
-		return false, errors.New("email contains spaces, please remove them")
-	}
-
-	if email != strings.ToLower(email) {
-		return false, errors.New("email contains uppercase letters, please convert to lowercase")
-	}
-
-	nonEnglishPattern := `[^\x00-\x7F]`
-	if regexp.MustCompile(nonEnglishPattern).MatchString(email) {
-		return false, errors.New("email contains non-English characters, please use only English")
-	}
-
-	emailPattern := `^[a-z0-9@._-]+$`
-	if !regexp.MustCompile(emailPattern).MatchString(email) {
-		return false, errors.New("email contains invalid characters, please use only lowercase letters, digits, and @._-")
-	}
-
-	return true, nil
-}

From 1454c4ebc53027df757f92e9d6d205a82b7db559 Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Thu, 10 Oct 2024 17:37:06 +0200
Subject: [PATCH 40/45] [bug] fix restarting core on disabling depleted user

---
 web/service/inbound.go | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/web/service/inbound.go b/web/service/inbound.go
index 1450dd57..60530143 100644
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -1037,8 +1037,12 @@ func (s *InboundService) disableInvalidInbounds(tx *gorm.DB) (bool, int64, error
 			if err1 == nil {
 				logger.Debug("Inbound disabled by api:", tag)
 			} else {
-				logger.Debug("Error in disabling inbound by api:", err1)
-				needRestart = true
+				if strings.Contains(err1.Error(), fmt.Sprintf("User %s not found.", tag)) {
+					logger.Debug("User is already disabled. Nothing to do more...")
+				} else {
+					logger.Debug("Error in disabling client by api:", err1)
+					needRestart = true
+				}
 			}
 		}
 		s.xrayApi.Close()
@@ -1076,8 +1080,16 @@ func (s *InboundService) disableInvalidClients(tx *gorm.DB) (bool, int64, error)
 			if err1 == nil {
 				logger.Debug("Client disabled by api:", result.Email)
 			} else {
-				logger.Debug("Error in disabling client by api:", err1)
-				needRestart = true
+				if strings.Contains(err1.Error(), fmt.Sprintf("User %s not found.", result.Email)) {
+					logger.Debug("User is already disabled. Nothing to do more...")
+				} else {
+					if strings.Contains(err1.Error(), fmt.Sprintf("User %s not found.", result.Email)) {
+						logger.Debug("User is already disabled. Nothing to do more...")
+					} else {
+						logger.Debug("Error in disabling client by api:", err1)
+						needRestart = true
+					}
+				}
 			}
 		}
 		s.xrayApi.Close()

From c385662783e6b95c5002745dfda6418762f05e47 Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Thu, 10 Oct 2024 21:38:56 +0200
Subject: [PATCH 41/45] simplified basic routing (#2579)

---
 web/html/xui/xray.html               | 616 +++++++--------------------
 web/translation/translate.en_US.toml |  46 +-
 web/translation/translate.es_ES.toml |  39 +-
 web/translation/translate.fa_IR.toml |  39 +-
 web/translation/translate.id_ID.toml |  39 +-
 web/translation/translate.pt_BR.toml |  39 +-
 web/translation/translate.ru_RU.toml |  39 +-
 web/translation/translate.tr_TR.toml |  39 +-
 web/translation/translate.uk_UA.toml |  39 +-
 web/translation/translate.vi_VN.toml |  39 +-
 web/translation/translate.zh_CN.toml |  39 +-
 web/translation/translate.zh_TW.toml |  39 +-
 12 files changed, 202 insertions(+), 850 deletions(-)

diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index f467c97a..ac97b1f1 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -228,14 +228,10 @@
                     </a-row>
                     <a-list-item>
                       <setting-list-item type="switch" title='{{ i18n "pages.xray.Torrent"}}' desc='{{ i18n "pages.xray.TorrentDesc"}}' v-model="torrentSettings"></setting-list-item>
-                      <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-list-item>
                   </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.xray.blockConnectionsConfigs"}}'>
+                  <a-collapse-panel header='{{ i18n "pages.xray.basicRouting"}}'>
                     <a-row :xs="24" :sm="24" :lg="12">
                       <a-alert type="warning" style="text-align: center;">
                         <template slot="message">
@@ -245,36 +241,44 @@
                       </a-alert>
                     </a-row>
                     <a-list-item>
-                        <a-collapse>
-                            <a-collapse-panel header='{{ i18n "pages.xray.blockips"}}'>
-                                <setting-list-item type="switch" title='🇮🇷 Iran'
-                                    v-model="IRIpSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='🇨🇳 China'
-                                    v-model="ChinaIpSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='🇷🇺 Russia'
-                                    v-model="RussiaIpSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='🇻🇳 Vietnam'
-                                    v-model="VNIpSettings"></setting-list-item>
-                            </a-collapse-panel>
-                        </a-collapse>
-                        <br>
-                        <a-collapse>
-                            <a-collapse-panel header='{{ i18n "pages.xray.blockdomains"}}'>
-                                <setting-list-item type="switch" title='🇮🇷 Iran'
-                                    v-model="IRDomainSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='🇨🇳 China'
-                                    v-model="ChinaDomainSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='🇷🇺 Russia'
-                                    v-model="RussiaDomainSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='🇻🇳 Vietnam'
-                                    v-model="VNDomainSettings"></setting-list-item>
-                            </a-collapse-panel>
-                        </a-collapse>
+                        <a-row style="padding: 0 20px">
+                            <a-col :lg="24" :xl="12">
+                                <a-list-item-meta 
+                                    title='{{ i18n "pages.xray.blockips" }}'/>
+                            </a-col>
+                            <a-col :lg="24" :xl="12">
+                                <template>
+                                    <a-select mode="tags" v-model="blockedIPs" style="width: 100%"
+                                    :dropdown-class-name="themeSwitcher.currentTheme">
+                                        <a-select-option :value="p.value" :label="p.label"
+                                            v-for="p in settingsData.IPsOptions"> [[ p.label ]]
+                                        </a-select-option>
+                                    </a-select>
+                                </template>
+                            </a-col>
+                        </a-row>
+                    </a-list-item>
+                    <a-list-item>
+                        <a-row style="padding: 0 20px">
+                            <a-col :lg="24" :xl="12">
+                                <a-list-item-meta 
+                                    title='{{ i18n "pages.xray.blockdomains" }}'/>
+                            </a-col>
+                            <a-col :lg="24" :xl="12">
+                                <template>
+                                    <a-select mode="tags" style="width: 100%"
+                                    v-model="blockedDomains"
+                                    :dropdown-class-name="themeSwitcher.currentTheme">
+                                        <a-select-option :value="p.value" :label="p.label"
+                                            v-for="p in settingsData.DomainsOptions"> [[ p.label ]]
+                                        </a-select-option>
+                                    </a-select>
+                                </template>
+                            </a-col>
+                        </a-row>
                     </a-list-item>
-                  </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.xray.directConnectionsConfigs"}}'>
                     <a-row :xs="24" :sm="24" :lg="12">
-                      <a-alert type="warning" style="text-align: center;">
+                      <a-alert type="warning" style="text-align: center; margin-top: 20px;">
                         <template slot="message">
                           <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
                           {{ i18n "pages.xray.directConnectionsConfigsDesc" }}
@@ -282,65 +286,99 @@
                       </a-alert>
                     </a-row>
                     <a-list-item>
-                        <a-collapse>
-                            <a-collapse-panel header='{{ i18n "pages.xray.directips"}}'>
-                                <setting-list-item type="switch" title='🇮🇷 Iran'
-                                    v-model="IRIpDirectSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='🇨🇳 China'
-                                    v-model="ChinaIpDirectSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='🇷🇺 Russia'
-                                    v-model="RussiaIpDirectSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='🇻🇳 Vietnam'
-                                    v-model="VNIpDirectSettings"></setting-list-item>
-                            </a-collapse-panel>
-                        </a-collapse>
-                        <br>
-                        <a-collapse>
-                            <a-collapse-panel header='{{ i18n "pages.xray.directdomains"}}'>
-                                <setting-list-item type="switch" title='🇮🇷 Iran'
-                                    v-model="IRDomainDirectSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='🇨🇳 China'
-                                    v-model="ChinaDomainDirectSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='🇷🇺 Russia'
-                                    v-model="RussiaDomainDirectSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='🇻🇳 Vietnam'
-                                    v-model="VNDomainDirectSettings"></setting-list-item>
-                            </a-collapse-panel>
-                        </a-collapse>
+                        <a-row style="padding: 0 20px">
+                            <a-col :lg="24" :xl="12">
+                                <a-list-item-meta 
+                                    title='{{ i18n "pages.xray.directips" }}'/>
+                            </a-col>
+                            <a-col :lg="24" :xl="12">
+                                <template>
+                                    <a-select mode="tags" style="width: 100%"
+                                    v-model="directIPs"
+                                    :dropdown-class-name="themeSwitcher.currentTheme">
+                                        <a-select-option :value="p.value" :label="p.label"
+                                            v-for="p in settingsData.IPsOptions"> [[ p.label ]]
+                                        </a-select-option>
+                                    </a-select>
+                                </template>
+                            </a-col>
+                        </a-row>
+                    </a-list-item>
+                    <a-list-item>
+                        <a-row style="padding: 0 20px">
+                            <a-col :lg="24" :xl="12">
+                                <a-list-item-meta 
+                                    title='{{ i18n "pages.xray.directdomains" }}'/>
+                            </a-col>
+                            <a-col :lg="24" :xl="12">
+                                <template>
+                                    <a-select mode="tags" style="width: 100%"
+                                    v-model="directDomains"
+                                    :dropdown-class-name="themeSwitcher.currentTheme">
+                                        <a-select-option :value="p.value" :label="p.label"
+                                            v-for="p in settingsData.DomainsOptions"> [[ p.label ]]
+                                        </a-select-option>
+                                    </a-select>
+                                </template>
+                            </a-col>
+                        </a-row>
                     </a-list-item>
-                  </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.xray.ipv4Configs"}}'>
                     <a-row :xs="24" :sm="24" :lg="12">
-                      <a-alert type="warning" style="text-align: center;">
+                      <a-alert type="warning" style="text-align: center; margin-top: 20px;">
                         <template slot="message">
                           <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
-                          {{ i18n "pages.xray.ipv4ConfigsDesc" }}
+                          {{ i18n "pages.xray.ipv4RoutingDesc" }}
                         </template>
                       </a-alert>
                     </a-row>
                     <a-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.GoogleIPv4"}}' desc='{{ i18n "pages.xray.GoogleIPv4Desc"}}' v-model="GoogleIPv4Settings"></setting-list-item>
-                      <setting-list-item type="switch" title='{{ i18n "pages.xray.NetflixIPv4"}}' desc='{{ i18n "pages.xray.NetflixIPv4Desc"}}' v-model="NetflixIPv4Settings"></setting-list-item>
+                        <a-row style="padding: 0 20px">
+                            <a-col :lg="24" :xl="12">
+                                <a-list-item-meta 
+                                    title='{{ i18n "pages.xray.ipv4Routing" }}'/>
+                            </a-col>
+                            <a-col :lg="24" :xl="12">
+                                <template>
+                                    <a-select mode="tags" style="width: 100%"
+                                    v-model="ipv4Domains"
+                                    :dropdown-class-name="themeSwitcher.currentTheme">
+                                        <a-select-option :value="p.value" :label="p.label"
+                                            v-for="p in settingsData.ServicesOptions"> [[ p.label ]]
+                                        </a-select-option>
+                                    </a-select>
+                                </template>
+                            </a-col>
+                        </a-row>
                     </a-list-item>
-                  </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.xray.warpConfigs"}}'>
                     <a-row :xs="24" :sm="24" :lg="12">
-                      <a-alert type="warning" style="text-align: center;">
+                      <a-alert type="warning" style="text-align: center; margin-top: 20px;">
                         <template slot="message">
                           <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
-                          {{ i18n "pages.xray.warpConfigsDesc" }}
+                          {{ i18n "pages.xray.warpRoutingDesc" }}
                         </template>
                       </a-alert>
                     </a-row>
                     <a-list-item>
                       <template v-if="WarpExist">
-                        <setting-list-item type="switch" title='{{ i18n "pages.xray.GoogleWARP"}}' desc='{{ i18n "pages.xray.GoogleWARPDesc"}}' v-model="GoogleWARPSettings"></setting-list-item>
-                        <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.MetaWARP"}}' desc='{{ i18n "pages.xray.MetaWARPDesc"}}' v-model="MetaWARPSettings"></setting-list-item>
-                        <setting-list-item type="switch" title='{{ i18n "pages.xray.AppleWARP"}}' desc='{{ i18n "pages.xray.AppleWARPDesc"}}' v-model="AppleWARPSettings"></setting-list-item>
-                        <setting-list-item type="switch" title='{{ i18n "pages.xray.RedditWARP"}}' desc='{{ i18n "pages.xray.RedditWARPDesc"}}' v-model="RedditWARPSettings"></setting-list-item>
+                        <a-list-item>
+                            <a-row style="padding: 0 20px">
+                                <a-col :lg="24" :xl="12">
+                                    <a-list-item-meta 
+                                        title='{{ i18n "pages.xray.warpRouting" }}'/>
+                                </a-col>
+                                <a-col :lg="24" :xl="12">
+                                    <template>
+                                        <a-select mode="tags" style="width: 100%"
+                                        v-model="warpDomains"
+                                        :dropdown-class-name="themeSwitcher.currentTheme">
+                                            <a-select-option :value="p.value" :label="p.label"
+                                                v-for="p in settingsData.ServicesOptions"> [[ p.label ]]
+                                            </a-select-option>
+                                        </a-select>
+                                    </template>
+                                </a-col>
+                            </a-row>
+                        </a-list-item>
                       </template>
                       <a-button style="margin-left: 20px;" v-else type="primary" icon="cloud" @click="showWarp()">WARP</a-button>
                     </a-list-item>
@@ -859,52 +897,40 @@
                 protocols: {
                     bittorrent: ["bittorrent"],
                 },
-                ips: {
-                    local: ["geoip:private"],
-                    cn: ["geoip:cn"],
-                    ir: ["ext:geoip_IR.dat:ir"],
-                    ru: ["geoip:ru"],
-                    vn: ["ext:geoip_VN.dat:vn"],
-                },
-                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"
-                    ],
-                    speedtest: ["geosite:speedtest"],
-                    openai: ["geosite:openai"],
-                    google: ["geosite:google"],
-                    spotify: ["geosite:spotify"],
-                    netflix: ["geosite:netflix"],
-                    meta: ["geosite:meta"],
-                    apple: ["geosite:apple"],
-                    reddit: ["geosite:reddit"],
-                    cn: [
-                        "regexp:.*\\.cn$",
-                        "geosite:cn"
-                    ],
-                    ru: [
-                        "regexp:.*\\.ru$",
-                        "geosite:category-ru"  //https://github.com/v2fly/domain-list-community/blob/master/data/category-ru
-                        
-                    ],
-                    ir: [
-                        "regexp:.*\\.ir$",
-                        "ext:geosite_IR.dat:ir",
-                        "geosite:category-ir",  // https://github.com/v2fly/domain-list-community/blob/master/data/category-ir
-                        "regexp:.*\\.xn--mgba3a4f16a$"  // .ایران
-                    ],
-                    vn: [
-                        "regexp:.*\\.vn$",
-                        "ext:geosite_VN.dat:vn",
-                        "ext:geosite_VN.dat:ads"
-                    ]
-                },
+                IPsOptions: [
+                    { label: 'Private IP', value: 'geoip:private' },
+                    { label: '🇮🇷 Iran', value: 'ext:geoip_IR.dat:ir' },
+                    { label: '🇨🇳 China', value: 'geoip:cn' },
+                    { label: '🇷🇺 Russia', value: 'geoip:ru' },
+                    { label: '🇻🇳 Vietnam', value: 'ext:geoip_VN.dat:vn' },
+                ],
+                DomainsOptions: [
+                    { label: 'Ads All', value: 'geosite:category-ads-all' },
+                    { label: 'Ads IR', value: 'ext:geosite_IR.dat:category-ads-all' },
+                    { label: 'Ads VN', value: 'ext:geosite_VN.dat:ads' },
+                    { label: 'Sec-IR malware', value: 'geosite_IR.dat:malware' },
+                    { label: 'Sec-IR phishing', value: 'geosite_IR.dat:phishing' },
+                    { label: 'Sec-IR cryptominers', value: 'geosite_IR.dat:cryptominers' },
+                    { label: '🇮🇷 Iran', value: 'ext:geosite_IR.dat:ir' },
+                    { label: '🇮🇷 .ir', value: 'regexp:.*\\.ir$' },
+                    { label: '🇮🇷 .ایران', value: 'regexp:.*\\.xn--mgba3a4f16a$' },
+                    { label: '🇨🇳 China', value: 'geosite:cn' },
+                    { label: '🇨🇳 .cn', value: 'regexp:.*\\.cn$' },
+                    { label: '🇷🇺 Russia', value: 'geosite:category-ru' },  //https://github.com/v2fly/domain-list-community/blob/master/data/category-ru
+                    { label: '🇷🇺 .ru', value: 'regexp:.*\\.ru' },
+                    { label: '🇻🇳 Vietnam', value: 'ext:geosite_VN.dat:vn' },
+                    { label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' },
+                ],
+                ServicesOptions: [
+                    { label: 'Apple', value: 'geosite:apple' },
+                    { label: 'Meta', value: 'geosite:meta' },
+                    { label: 'Google', value: 'geosite:google' },
+                    { label: 'OpenAI', value: 'geosite:openai' },
+                    { label: 'Spotify', value: 'geosite:spotify' },
+                    { label: 'Netflix', value: 'geosite:netflix' },
+                    { label: 'Reddit', value: 'geosite:reddit' },
+                    { label: 'Speedtest', value: 'geosite:speedtest' },
+                ],
                 familyProtectDNS: {
                     "servers": [
                         "1.1.1.3",  // https://developers.cloudflare.com/1.1.1.1/setup/
@@ -1861,54 +1887,6 @@
                     }
                 },
             },
-            privateIpSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.ips.local, this.blockedIPs);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.blockedIPs = [...this.blockedIPs, ...this.settingsData.ips.local];
-                    } else {
-                        this.blockedIPs = this.blockedIPs.filter(data => !this.settingsData.ips.local.includes(data));
-                    }
-                },
-            },
-            AdsSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.ads, this.blockedDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.blockedDomains = [...this.blockedDomains, ...this.settingsData.domains.ads];
-                    } else {
-                        this.blockedDomains = this.blockedDomains.filter(data => !this.settingsData.domains.ads.includes(data));
-                    }
-                },
-            },
-            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);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.blockedDomains = [...this.blockedDomains, ...this.settingsData.domains.speedtest];
-                    } else {
-                        this.blockedDomains = this.blockedDomains.filter(data => !this.settingsData.domains.speedtest.includes(data));
-                    }
-                },
-            },
             familyProtectSettings: {
                 get: function () {
                     if (!this.templateSettings || !this.templateSettings.dns || !this.templateSettings.dns.servers) return false;
@@ -1924,311 +1902,11 @@
                     this.templateSettings = newTemplateSettings;
                 },
             },
-            GoogleIPv4Settings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.google, this.ipv4Domains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.ipv4Domains = [...this.ipv4Domains, ...this.settingsData.domains.google];
-                    } else {
-                        this.ipv4Domains = this.ipv4Domains.filter(data => !this.settingsData.domains.google.includes(data));
-                    }
-                },
-            },
-            NetflixIPv4Settings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.netflix, this.ipv4Domains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.ipv4Domains = [...this.ipv4Domains, ...this.settingsData.domains.netflix];
-                    } else {
-                        this.ipv4Domains = this.ipv4Domains.filter(data => !this.settingsData.domains.netflix.includes(data));
-                    }
-                },
-            },
-            IRIpSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.ips.ir, this.blockedIPs);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.blockedIPs = [...this.blockedIPs, ...this.settingsData.ips.ir];
-                    } else {
-                        this.blockedIPs = this.blockedIPs.filter(data => !this.settingsData.ips.ir.includes(data));
-                    }
-                }
-            },
-            IRDomainSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.ir, this.blockedDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.blockedDomains = [...this.blockedDomains, ...this.settingsData.domains.ir];
-                    } else {
-                        this.blockedDomains = this.blockedDomains.filter(data => !this.settingsData.domains.ir.includes(data));
-                    }
-                }
-            },
-            ChinaIpSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.ips.cn, this.blockedIPs);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.blockedIPs = [...this.blockedIPs, ...this.settingsData.ips.cn];
-                    } else {
-                        this.blockedIPs = this.blockedIPs.filter(data => !this.settingsData.ips.cn.includes(data));
-                    }
-                }
-            },
-            ChinaDomainSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.cn, this.blockedDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.blockedDomains = [...this.blockedDomains, ...this.settingsData.domains.cn];
-                    } else {
-                        this.blockedDomains = this.blockedDomains.filter(data => !this.settingsData.domains.cn.includes(data));
-                    }
-                }
-            },
-            RussiaIpSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.ips.ru, this.blockedIPs);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.blockedIPs = [...this.blockedIPs, ...this.settingsData.ips.ru];
-                    } else {
-                        this.blockedIPs = this.blockedIPs.filter(data => !this.settingsData.ips.ru.includes(data));
-                    }
-                }
-            },
-            RussiaDomainSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.ru, this.blockedDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.blockedDomains = [...this.blockedDomains, ...this.settingsData.domains.ru];
-                    } else {
-                        this.blockedDomains = this.blockedDomains.filter(data => !this.settingsData.domains.ru.includes(data));
-                    }
-                }
-            },
-            VNIpSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.ips.vn, this.blockedIPs);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.blockedIPs = [...this.blockedIPs, ...this.settingsData.ips.vn];
-                    } else {
-                        this.blockedIPs = this.blockedIPs.filter(data => !this.settingsData.ips.vn.includes(data));
-                    }
-                }
-            },
-            VNDomainSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.vn, this.blockedDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.blockedDomains = [...this.blockedDomains, ...this.settingsData.domains.vn];
-                    } else {
-                        this.blockedDomains = this.blockedDomains.filter(data => !this.settingsData.domains.vn.includes(data));
-                    }
-                }
-            },
-            IRIpDirectSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.ips.ir, this.directIPs);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.directIPs = [...this.directIPs, ...this.settingsData.ips.ir];
-                    } else {
-                        this.directIPs = this.directIPs.filter(data => !this.settingsData.ips.ir.includes(data));
-                    }
-                }
-            },
-            IRDomainDirectSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.ir, this.directDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.directDomains = [...this.directDomains, ...this.settingsData.domains.ir];
-                    } else {
-                        this.directDomains = this.directDomains.filter(data => !this.settingsData.domains.ir.includes(data));
-                    }
-                }
-            },
-            ChinaIpDirectSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.ips.cn, this.directIPs);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.directIPs = [...this.directIPs, ...this.settingsData.ips.cn];
-                    } else {
-                        this.directIPs = this.directIPs.filter(data => !this.settingsData.ips.cn.includes(data));
-                    }
-                }
-            },
-            ChinaDomainDirectSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.cn, this.directDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.directDomains = [...this.directDomains, ...this.settingsData.domains.cn];
-                    } else {
-                        this.directDomains = this.directDomains.filter(data => !this.settingsData.domains.cn.includes(data));
-                    }
-                }
-            },
-            RussiaIpDirectSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.ips.ru, this.directIPs);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.directIPs = [...this.directIPs, ...this.settingsData.ips.ru];
-                    } else {
-                        this.directIPs = this.directIPs.filter(data => !this.settingsData.ips.ru.includes(data));
-                    }
-                }
-            },
-            RussiaDomainDirectSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.ru, this.directDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.directDomains = [...this.directDomains, ...this.settingsData.domains.ru];
-                    } else {
-                        this.directDomains = this.directDomains.filter(data => !this.settingsData.domains.ru.includes(data));
-                    }
-                }
-            },
-            VNIpDirectSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.ips.vn, this.directIPs);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.directIPs = [...this.directIPs, ...this.settingsData.ips.vn];
-                    } else {
-                        this.directIPs = this.directIPs.filter(data => !this.settingsData.ips.vn.includes(data));
-                    }
-                }
-            },
-            VNDomainDirectSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.vn, this.directDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.directDomains = [...this.directDomains, ...this.settingsData.domains.vn];
-                    } else {
-                        this.directDomains = this.directDomains.filter(data => !this.settingsData.domains.vn.includes(data));
-                    }
-                }
-            },
             WarpExist: {
                 get: function() {
                     return this.templateSettings ? this.templateSettings.outbounds.findIndex((o) => o.tag == "warp")>=0  : false;
                 },
             },
-            GoogleWARPSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.google, this.warpDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.google];
-                    } else {
-                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.google.includes(data));
-                    }
-                },
-            },
-            OpenAIWARPSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.openai, this.warpDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.openai];
-                    } else {
-                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.openai.includes(data));
-                    }
-                },
-            },
-            NetflixWARPSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.netflix, this.warpDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.netflix];
-                    } else {
-                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.netflix.includes(data));
-                    }
-                },
-            },
-            MetaWARPSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.meta, this.warpDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.meta];
-                    } else {
-                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.meta.includes(data));
-                    }
-                },
-            },
-            AppleWARPSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.apple, this.warpDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.apple];
-                    } else {
-                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.apple.includes(data));
-                    }
-                },
-            },
-            RedditWARPSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.reddit, this.warpDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.reddit];
-                    } else {
-                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.reddit.includes(data));
-                    }
-                },
-            },
-            SpotifyWARPSettings: {
-                get: function () {
-                    return doAllItemsExist(this.settingsData.domains.spotify, this.warpDomains);
-                },
-                set: function (newValue) {
-                    if (newValue) {
-                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.spotify];
-                    } else {
-                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.spotify.includes(data));
-                    }
-                },
-            },
             enableDNS: {
                 get: function () {
                     return this.templateSettings ? this.templateSettings.dns != null : false;
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index de8a11a5..7b813357 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -330,18 +330,17 @@
 "logConfigsDesc" = "Logs may affect your server's efficiency. It is recommended to enable it wisely only in case of your needs"
 "blockConfigs" = "Protection Shield"
 "blockConfigsDesc" = "These options will block traffic based on specific requested protocols and websites."
-"blockConnectionsConfigs" = "Block Connections"
+"basicRouting" = "Basic Routing"
 "blockConnectionsConfigsDesc" = "These options will block traffic based on the specific requested country."
-"directConnectionsConfigs" = "Direct Connections"
 "directConnectionsConfigsDesc" = "A direct connection ensures that specific traffic is not routed through another server."
 "blockips" = "Block IPs"
 "blockdomains" = "Block Domains"
 "directips" = "Direct IPs"
 "directdomains" = "Direct Domains"
-"ipv4Configs" = "IPv4 Routing"
-"ipv4ConfigsDesc" = "These options will route traffic based on a specific destination via IPv4."
-"warpConfigs" = "WARP Routing"
-"warpConfigsDesc" = "These options will route traffic based on a specific destination via WARP."
+"ipv4Routing" = "IPv4 Routing"
+"ipv4RoutingDesc" = "These options will route traffic based on a specific destination via IPv4."
+"warpRouting" = "WARP Routing"
+"warpRoutingDesc" = "These options will route traffic based on a specific destination via WARP."
 "Template" = "Advanced Xray Configuration Template"
 "TemplateDesc" = "The final Xray config file will be generated based on this template."
 "FreedomStrategy" = "Freedom Protocol Strategy"
@@ -350,43 +349,8 @@
 "RoutingStrategyDesc" = "Set the overall traffic routing strategy for resolving all requests."
 "Torrent" = "Block BitTorrent Protocol"
 "TorrentDesc" = "Blocks BitTorrent protocol."
-"PrivateIp" = "Block Connection to Private IPs"
-"PrivateIpDesc" = "Blocks establishing connections to private IP ranges."
-"Ads" = "Block Ads"
-"AdsDesc" = "Blocks advertising websites."
 "Family" = "Family Protection"
 "FamilyDesc" = "Blocks adult content, and malware websites."
-"Security" = "Security Shield"
-"SecurityDesc" = "Blocks malware, phishing, and cryptominers websites."
-"Speedtest" = "Block Speedtest"
-"SpeedtestDesc" = "Blocks establishing connectins to speedtest websites."
-"GoogleIPv4" = "Google"
-"GoogleIPv4Desc" = "Routes traffic to Google via IPv4."
-"NetflixIPv4" = "Netflix"
-"NetflixIPv4Desc" = "Routes traffic to Netflix via IPv4."
-"GoogleWARP" = "Google"
-"GoogleWARPDesc" = "Add routing for Google via WARP."
-"OpenAIWARP" = "ChatGPT"
-"OpenAIWARPDesc" = "Routes traffic to ChatGPT via WARP."
-"NetflixWARP" = "Netflix"
-"NetflixWARPDesc" = "Routes traffic to Netflix via WARP."
-"MetaWARP" = "Meta"
-"MetaWARPDesc" = "Routes traffic to Meta (Instagram, Facebook, WhatsApp, Threads,...) via WARP."
-"AppleWARP" = "Apple"
-"AppleWARPDesc" = "Routes traffic to Apple via WARP."
-"RedditWARP" = "Reddit"
-"RedditWARPDesc" = "Routes traffic to Reddit via WARP."
-"SpotifyWARP" = "Spotify"
-"SpotifyWARPDesc" = "Routes traffic to Spotify via WARP."
-"IRWARP" = "Iran domains"
-"IRWARPDesc" = "Routes traffic to Iran domains via WARP."
-"Inbounds" = "Inbounds"
-"InboundsDesc" = "Accepting the specific clients."
-"Outbounds" = "Outbounds"
-"Balancers" = "Balancers"
-"OutboundsDesc" = "Set the outgoing traffic pathway."
-"Routings" = "Routing Rules"
-"RoutingsDesc" = "The priority of each rule is important!"
 "completeTemplate" = "All"
 "logLevel" = "Log Level"
 "logLevelDesc" = "The log level for error logs, indicating the information that needs to be recorded."
diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml
index 6b98369b..0c18e936 100644
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
@@ -330,18 +330,17 @@
 "logConfigsDesc" = "Los registros pueden afectar la eficiencia de su servidor. Se recomienda habilitarlos sabiamente solo en caso de sus necesidades."
 "blockConfigs" = "Configuraciones de Bloqueo"
 "blockConfigsDesc" = "Estas opciones evitarán que los usuarios se conecten a protocolos y sitios web específicos."
-"blockConnectionsConfigs" = "Bloquear Conexiones"
+"basicRouting" = "Enrutamiento Básico"
 "blockConnectionsConfigsDesc" = "Estas opciones bloquearán el tráfico según el país solicitado específico."
-"directConnectionsConfigs" = "Conexiones Directas"
 "directConnectionsConfigsDesc" = "Una conexión directa asegura que el tráfico específico no sea enrutado a través de otro servidor."
 "blockips" = "Bloquear IPs"
 "blockdomains" = "Bloquear Dominios"
 "directips" = "IPs Directas"
 "directdomains" = "Dominios Directos"
-"ipv4Configs" = "Configuraciones IPv4"
-"ipv4ConfigsDesc" = "Estas opciones solo enrutarán a los dominios objetivo a través de IPv4."
-"warpConfigs" = "Configuraciones de WARP"
-"warpConfigsDesc" = "Precaución: Antes de usar estas opciones, instale WARP en modo de proxy socks5 en su servidor siguiendo los pasos en el GitHub del panel. WARP enrutará el tráfico a los sitios web a través de los servidores de Cloudflare."
+"ipv4Routing" = "Enrutamiento IPv4"
+"ipv4RoutingDesc" = "Estas opciones solo enrutarán a los dominios objetivo a través de IPv4."
+"warpRouting" = "Enrutamiento WARP"
+"warpRoutingDesc" = "Precaución: Antes de usar estas opciones, instale WARP en modo de proxy socks5 en su servidor siguiendo los pasos en el GitHub del panel. WARP enrutará el tráfico a los sitios web a través de los servidores de Cloudflare."
 "Template" = "Plantilla de Configuración de Xray"
 "TemplateDesc" = "Genera el archivo de configuración final de Xray basado en esta plantilla."
 "FreedomStrategy" = "Configurar Estrategia para el Protocolo Freedom"
@@ -350,36 +349,8 @@
 "RoutingStrategyDesc" = "Establece la estrategia general de enrutamiento para la resolución de DNS."
 "Torrent" = "Prohibir Uso de BitTorrent"
 "TorrentDesc" = "Cambia la plantilla de configuración para evitar el uso de BitTorrent por parte de los usuarios."
-"PrivateIp" = "Prohibir Conexiones a Rangos de IP Privadas"
-"PrivateIpDesc" = "Cambia la plantilla de configuración para evitar la conexión a rangos de IP privadas."
-"Ads" = "Bloquear Anuncios"
-"AdsDesc" = "Cambia la plantilla de configuración para bloquear anuncios."
 "Family" = "Bloquee malware y contenido para adultos"
 "FamilyDesc" = "Resolutores de DNS de Cloudflare para bloquear malware y contenido para adultos para protección familiar."
-"Security" = "Escudo de Seguridad"
-"SecurityDesc" = "Cambiar la plantilla de configuración para la protección de seguridad."
-"Speedtest" = "Bloquear Sitios Web de Pruebas de Velocidad"
-"SpeedtestDesc" = "Cambia la plantilla de configuración para evitar la conexión a sitios web de pruebas de velocidad."
-"GoogleIPv4" = "Usar IPv4 para Google"
-"GoogleIPv4Desc" = "Agregar enrutamiento para que Google se conecte con IPv4."
-"NetflixIPv4" = "Usar IPv4 para Netflix"
-"NetflixIPv4Desc" = "Agregar enrutamiento para que Netflix se conecte con IPv4."
-"GoogleWARP" = "Google"
-"GoogleWARPDesc" = "Agrega enrutamiento para Google a través de WARP."
-"OpenAIWARP" = "ChatGPT"
-"OpenAIWARPDesc" = "Enruta el tráfico a ChatGPT a través de WARP."
-"NetflixWARP" = "Netflix"
-"NetflixWARPDesc" = "Enruta el tráfico a Netflix a través de WARP."
-"MetaWARP" = "Meta"
-"MetaWARPDesc" = "Enruta el tráfico a Meta (Instagram, Facebook, WhatsApp, Threads, etc.) a través de WARP."
-"AppleWARP" = "Apple"
-"AppleWARPDesc" = "Enruta el tráfico a Apple a través de WARP."
-"RedditWARP" = "Reddit"
-"RedditWARPDesc" = "Enruta el tráfico a Reddit a través de WARP."
-"SpotifyWARP" = "Spotify"
-"SpotifyWARPDesc" = "Enruta el tráfico a Spotify a través de WARP."
-"IRWARP" = "Rutear dominios de Irán a través de WARP."
-"IRWARPDesc" = "Agregar enrutamiento para dominios de Irán a través de WARP."
 "Inbounds" = "Entrante"
 "InboundsDesc" = "Cambia la plantilla de configuración para aceptar clientes específicos."
 "Outbounds" = "Salidas"
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index 9fb3f99e..a7ba4a6f 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -330,18 +330,17 @@
 "logConfigsDesc" = "گزارش‌ها ممکن است بر کارایی سرور شما تأثیر بگذارد. توصیه می شود فقط در صورت نیاز آن را عاقلانه فعال کنید"
 "blockConfigs" = "سپر محافظ"
 "blockConfigsDesc" = "این گزینه‌ها ترافیک را بر اساس پروتکل‌های درخواستی خاص، و وب سایت‌ها مسدود می‌کند"
-"blockConnectionsConfigs" = "مسدود کردن اتصالات"
+"basicRouting" = "مسیریابی پایه"
 "blockConnectionsConfigsDesc" = "این گزینه‌ها ترافیک را بر اساس کشور درخواست‌شده خاص مسدود می‌کنند."
-"directConnectionsConfigs" = "اتصالات مستقیم"
 "directConnectionsConfigsDesc" = "یک اتصال مستقیم تضمین می‌کند که ترافیک خاص از طریق سرور دیگری مسیریابی نشود."
 "blockips" = "مسدود کردن آی‌پی‌ها"
 "blockdomains" = "مسدود کردن دامنه‌ها"
 "directips" = "آی‌پی‌های مستقیم"
 "directdomains" = "دامنه‌های مستقیم"
-"ipv4Configs" = "IPv4 مسیریابی"
-"ipv4ConfigsDesc" = "این گزینه‌ها ترافیک‌ را از طریق آی‌پی‌نسخه4 به مقصد هدایت می‌کند"
-"warpConfigs" = "WARP مسیریابی"
-"warpConfigsDesc" = "طبق راهنما نصب کنید SOCKS5 این گزینه‌ها ترافیک‌ را از طریق وارپ کلادفلر به مقصد هدایت می‌کند. ابتدا، وارپ را در حالت پراکسی"
+"ipv4Routing" = "IPv4 مسیریابی"
+"ipv4RoutingDesc" = "این گزینه‌ها ترافیک را از طریق آی‌پی نسخه4 سرور، به مقصد هدایت می‌کند"
+"warpRouting" = "WARP مسیریابی"
+"warpRoutingDesc" = "این گزینه‌ها ترافیک‌ را از طریق وارپ کلادفلر به مقصد هدایت می‌کند"
 "Template" = "‌پیکربندی پیشرفته الگو ایکس‌ری"
 "TemplateDesc" = "فایل پیکربندی نهایی ایکس‌ری بر اساس این الگو ایجاد می‌شود"
 "FreedomStrategy" = "Freedom استراتژی پروتکل"
@@ -350,36 +349,8 @@
 "RoutingStrategyDesc" = "استراتژی کلی مسیریابی برای حل تمام درخواست‌ها را تعیین می‌کند"
 "Torrent" = "مسدودسازی پروتکل بیت‌تورنت"
 "TorrentDesc" = "پروتکل بیت تورنت را مسدود می‌کند"
-"PrivateIp" = "مسدودسازی اتصال آی‌پی‌های خصوصی"
-"PrivateIpDesc" = "اتصال به آی‌پی‌های رنج خصوصی را مسدود می‌کند"
-"Ads" = "مسدودسازی تبلیغات"
-"AdsDesc" = "وب‌سایت‌های تبلیغاتی را مسدود می‌کند"
 "Family" = "محافظت خانواده"
 "FamilyDesc" = "محتوای مخصوص بزرگسالان، و وب‌سایت‌های ناامن را مسدود می‌کند"
-"Security" = "محافظت امنیتی"
-"SecurityDesc" = "وب‌سایت‌های ناامن، بدافزار، فیشینگ، و کریپتوماینرها را مسدود می‌کند"
-"Speedtest" = "مسدودسازی اسپیدتست"
-"SpeedtestDesc" = "اتصال به وب‌سایت‌های تست سرعت را مسدود می‌کند"
-"GoogleIPv4" = "گوگل"
-"GoogleIPv4Desc" = "ترافیک را از طریق آی‌پی‌نسخه4 به گوگل هدایت می‌کند"
-"NetflixIPv4" = "نتفلیکس"
-"NetflixIPv4Desc" = "ترافیک را از طریق آی‌پی‌نسخه4 به نتفلیکس هدایت می‌کند"
-"GoogleWARP" = "گوگل"
-"GoogleWARPDesc" = "ترافیک را از طریق وارپ به گوگل هدایت می‌کند"
-"OpenAIWARP" = "چت جی‌پی‌تی"
-"OpenAIWARPDesc" = "ترافیک را از طریق وارپ به چت جی‌پی‌تی هدایت می‌کند"
-"NetflixWARP" = "نتفلیکس"
-"NetflixWARPDesc" = "ترافیک را از طریق وارپ به نتفلیکس هدایت می‌کند"
-"MetaWARP" = "متا"
-"MetaWARPDesc" = "ترافیک را از طریق وارپ به متا (اینستاگرام، فیس بوک، واتساپ، تردز و...) هدایت می کند."
-"AppleWARP" = "اپل"
-"AppleWARPDesc" = "ترافیک را از طریق وارپ به اپل هدایت می‌کند"
-"RedditWARP" = "ردیت"
-"RedditWARPDesc" = "ترافیک را از طریق وارپ به ردیت هدایت می‌کند"
-"SpotifyWARP" = "اسپاتیفای"
-"SpotifyWARPDesc" = "ترافیک را از طریق وارپ به اسپاتیفای هدایت می‌کند"
-"IRWARP" = "دامنه‌های ایران"
-"IRWARPDesc" = "ترافیک را از طریق وارپ به دامنه‌های کشور ایران هدایت می‌کند"
 "Inbounds" = "ورودی‌ها"
 "InboundsDesc" = "پذیرش کلاینت خاص"
 "Outbounds" = "خروجی‌ها"
diff --git a/web/translation/translate.id_ID.toml b/web/translation/translate.id_ID.toml
index 6b819a2e..f543971b 100644
--- a/web/translation/translate.id_ID.toml
+++ b/web/translation/translate.id_ID.toml
@@ -330,18 +330,17 @@
 "logConfigsDesc" = "Log dapat mempengaruhi efisiensi server Anda. Disarankan untuk mengaktifkannya dengan bijak hanya jika diperlukan"
 "blockConfigs" = "Pelindung"
 "blockConfigsDesc" = "Opsi ini akan memblokir lalu lintas berdasarkan protokol dan situs web yang diminta."
-"blockConnectionsConfigs" = "Blokir Koneksi"
+"basicRouting" = "Perutean Dasar"
 "blockConnectionsConfigsDesc" = "Opsi ini akan memblokir lalu lintas berdasarkan negara yang diminta."
-"directConnectionsConfigs" = "Koneksi Langsung"
 "directConnectionsConfigsDesc" = "Koneksi langsung memastikan bahwa lalu lintas tertentu tidak dialihkan melalui server lain."
 "blockips" = "Blokir IP"
 "blockdomains" = "Blokir Domain"
 "directips" = "IP Langsung"
 "directdomains" = "Domain Langsung"
-"ipv4Configs" = "Pengalihan IPv4"
-"ipv4ConfigsDesc" = "Opsi ini akan mengalihkan lalu lintas berdasarkan tujuan tertentu melalui IPv4."
-"warpConfigs" = "Pengalihan WARP"
-"warpConfigsDesc" = "Opsi ini akan mengalihkan lalu lintas berdasarkan tujuan tertentu melalui WARP."
+"ipv4Routing" = "Perutean IPv4"
+"ipv4RoutingDesc" = "Opsi ini akan mengalihkan lalu lintas berdasarkan tujuan tertentu melalui IPv4."
+"warpRouting" = "Perutean WARP"
+"warpRoutingDesc" = "Opsi ini akan mengalihkan lalu lintas berdasarkan tujuan tertentu melalui WARP."
 "Template" = "Template Konfigurasi Xray Lanjutan"
 "TemplateDesc" = "File konfigurasi Xray akhir akan dibuat berdasarkan template ini."
 "FreedomStrategy" = "Strategi Protokol Freedom"
@@ -350,36 +349,8 @@
 "RoutingStrategyDesc" = "Atur strategi pengalihan lalu lintas keseluruhan untuk menyelesaikan semua permintaan."
 "Torrent" = "Blokir Protokol BitTorrent"
 "TorrentDesc" = "Memblokir protokol BitTorrent."
-"PrivateIp" = "Blokir Koneksi ke IP Pribadi"
-"PrivateIpDesc" = "Memblokir pembentukan koneksi ke rentang IP pribadi."
-"Ads" = "Blokir Iklan"
-"AdsDesc" = "Memblokir situs web periklanan."
 "Family" = "Proteksi Keluarga"
 "FamilyDesc" = "Memblokir konten dewasa dan situs web berbahaya."
-"Security" = "Pelindung Keamanan"
-"SecurityDesc" = "Memblokir situs web malware, phishing, dan penambang kripto."
-"Speedtest" = "Blokir Speedtest"
-"SpeedtestDesc" = "Memblokir pembentukan koneksi ke situs web speedtest."
-"GoogleIPv4" = "Google"
-"GoogleIPv4Desc" = "Rute lalu lintas ke Google melalui IPv4."
-"NetflixIPv4" = "Netflix"
-"NetflixIPv4Desc" = "Rute lalu lintas ke Netflix melalui IPv4."
-"GoogleWARP" = "Google"
-"GoogleWARPDesc" = "Tambahkan pengalihan untuk Google melalui WARP."
-"OpenAIWARP" = "ChatGPT"
-"OpenAIWARPDesc" = "Rute lalu lintas ke ChatGPT melalui WARP."
-"NetflixWARP" = "Netflix"
-"NetflixWARPDesc" = "Rute lalu lintas ke Netflix melalui WARP."
-"MetaWARP" = "Meta"
-"MetaWARPDesc" = "Merutekan lalu lintas ke Meta (Instagram, Facebook, WhatsApp, Threads,...) melalui WARP."
-"AppleWARP" = "Apple"
-"AppleWARPDesc" = "Merutekan lalu lintas ke Apple melalui WARP."
-"RedditWARP" = "Reddit"
-"RedditWARPDesc" = "Merutekan lalu lintas ke Reddit melalui WARP."
-"SpotifyWARP" = "Spotify"
-"SpotifyWARPDesc" = "Rute lalu lintas ke Spotify melalui WARP."
-"IRWARP" = "Domain Iran"
-"IRWARPDesc" = "Rute lalu lintas ke domain Iran melalui WARP."
 "Inbounds" = "Masuk"
 "InboundsDesc" = "Menerima klien tertentu."
 "Outbounds" = "Keluar"
diff --git a/web/translation/translate.pt_BR.toml b/web/translation/translate.pt_BR.toml
index 72decb89..f201df66 100644
--- a/web/translation/translate.pt_BR.toml
+++ b/web/translation/translate.pt_BR.toml
@@ -330,18 +330,17 @@
 "logConfigsDesc" = "Os logs podem afetar a eficiência do servidor. É recomendável habilitá-los com sabedoria apenas se necessário."
 "blockConfigs" = "Escudo de Proteção"
 "blockConfigsDesc" = "Essas opções bloqueiam tráfego com base em protocolos e sites específicos solicitados."
-"blockConnectionsConfigs" = "Bloquear Conexões"
+"basicRouting" = "Roteamento Básico"
 "blockConnectionsConfigsDesc" = "Essas opções bloquearão o tráfego com base no país solicitado."
-"directConnectionsConfigs" = "Conexões Diretas"
 "directConnectionsConfigsDesc" = "Uma conexão direta garante que o tráfego específico não seja roteado por outro servidor."
 "blockips" = "Bloquear IPs"
 "blockdomains" = "Bloquear Domínios"
 "directips" = "IPs Diretos"
 "directdomains" = "Domínios Diretos"
-"ipv4Configs" = "Roteamento IPv4"
-"ipv4ConfigsDesc" = "Essas opções roteam o tráfego para um destino específico via IPv4."
-"warpConfigs" = "Roteamento WARP"
-"warpConfigsDesc" = "Essas opções roteam o tráfego para um destino específico via WARP."
+"ipv4Routing" = "Roteamento IPv4"
+"ipv4RoutingDesc" = "Essas opções roteam o tráfego para um destino específico via IPv4."
+"warpRouting" = "Roteamento WARP"
+"warpRoutingDesc" = "Essas opções roteam o tráfego para um destino específico via WARP."
 "Template" = "Modelo de Configuração Avançada do Xray"
 "TemplateDesc" = "O arquivo final de configuração do Xray será gerado com base neste modelo."
 "FreedomStrategy" = "Estratégia do Protocolo Freedom"
@@ -350,36 +349,8 @@
 "RoutingStrategyDesc" = "Definir a estratégia geral de roteamento de tráfego para resolver todas as solicitações."
 "Torrent" = "Bloquear Protocolo BitTorrent"
 "TorrentDesc" = "Bloqueia o protocolo BitTorrent."
-"PrivateIp" = "Bloquear Conexão para IPs Privados"
-"PrivateIpDesc" = "Bloqueia a conexão com faixas de IP privadas."
-"Ads" = "Bloquear Anúncios"
-"AdsDesc" = "Bloqueia sites de publicidade."
 "Family" = "Proteção Familiar"
 "FamilyDesc" = "Bloqueia conteúdo adulto e sites maliciosos."
-"Security" = "Escudo de Segurança"
-"SecurityDesc" = "Bloqueia sites de malware, phishing e mineradores de criptomoedas."
-"Speedtest" = "Bloquear Speedtest"
-"SpeedtestDesc" = "Bloqueia a conexão com sites de teste de velocidade."
-"GoogleIPv4" = "Google"
-"GoogleIPv4Desc" = "Roteia tráfego para o Google via IPv4."
-"NetflixIPv4" = "Netflix"
-"NetflixIPv4Desc" = "Roteia tráfego para a Netflix via IPv4."
-"GoogleWARP" = "Google"
-"GoogleWARPDesc" = "Adiciona roteamento para o Google via WARP."
-"OpenAIWARP" = "ChatGPT"
-"OpenAIWARPDesc" = "Roteia tráfego para o ChatGPT via WARP."
-"NetflixWARP" = "Netflix"
-"NetflixWARPDesc" = "Roteia tráfego para a Netflix via WARP."
-"MetaWARP" = "Meta"
-"MetaWARPDesc" = "Roteia tráfego para Meta (Instagram, Facebook, WhatsApp, Threads,...) via WARP."
-"AppleWARP" = "Apple"
-"AppleWARPDesc" = "Roteia tráfego para a Apple via WARP."
-"RedditWARP" = "Reddit"
-"RedditWARPDesc" = "Roteia tráfego para o Reddit via WARP."
-"SpotifyWARP" = "Spotify"
-"SpotifyWARPDesc" = "Roteia tráfego para o Spotify via WARP."
-"IRWARP" = "Domínios do Irã"
-"IRWARPDesc" = "Roteia tráfego para domínios do Irã via WARP."
 "Inbounds" = "Inbounds"
 "InboundsDesc" = "Aceitar clientes específicos."
 "Outbounds" = "Outbounds"
diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index 7936cf14..434d481c 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -330,18 +330,17 @@
 "logConfigsDesc" = "Журналы могут повлиять на эффективность вашего сервера. Рекомендуется включать их с умом только в случае ваших нужд!"
 "blockConfigs" = "Блокировка конфигураций"
 "blockConfigsDesc" = "Эти параметры не позволят пользователям подключаться к определенным протоколам и веб-сайтам"
-"blockConnectionsConfigs" = "Блокировать соединения"
+"basicRouting" = "Базовые соединения"
 "blockConnectionsConfigsDesc" = "Эти параметры будут блокировать трафик в зависимости от запрашиваемой страны."
-"directConnectionsConfigs" = "Прямые соединения"
 "directConnectionsConfigsDesc" = "Прямое соединение гарантирует, что определенный трафик не будет перенаправлен через другой сервер."
 "blockips" = "Блокировать IP"
 "blockdomains" = "Блокировать домены"
 "directips" = "Прямые IP"
 "directdomains" = "Прямые домены"
-"ipv4Configs" = "Настройки IPv4"
-"ipv4ConfigsDesc" = "Эти параметры позволят пользователям маршрутизироваться к целевым доменам только через IPv4"
-"warpConfigs" = "Настройки WARP"
-"warpConfigsDesc" = "Внимание: перед использованием этих параметров установите WARP в режиме прокси-сервера socks5 на свой сервер, следуя инструкциям на GitHub панели. WARP будет направлять трафик на веб-сайты через серверы Cloudflare"
+"ipv4Routing" = "Правила IPv4"
+"ipv4RoutingDesc" = "Эти параметры позволят пользователям маршрутизироваться к целевым доменам только через IPv4"
+"warpRouting" = "Правила WARP"
+"warpRoutingDesc" = "Внимание: перед использованием этих параметров установите WARP в режиме прокси-сервера socks5 на свой сервер, следуя инструкциям на GitHub панели. WARP будет направлять трафик на веб-сайты через серверы Cloudflare"
 "Template" = "Шаблон конфигурации Xray"
 "TemplateDesc" = "Создание файла конфигурации Xray на основе этого шаблона"
 "FreedomStrategy" = "Настройка стратегии протокола Freedom"
@@ -350,36 +349,8 @@
 "RoutingStrategyDesc" = "Установка общей стратегии маршрутизации разрешения DNS"
 "Torrent" = "Запрет использования BitTorrent"
 "TorrentDesc" = "Изменение шаблона конфигурации для предупреждения использования BitTorrent пользователями"
-"PrivateIp" = "Запрет частных диапазонов IP-адресов для подключения"
-"PrivateIpDesc" = "Изменение шаблона конфигурации для предупреждения подключения к диапазонам частных IP-адресов"
-"Ads" = "Блокировка рекламы"
-"AdsDesc" = "Изменение конфигурации для блокировки рекламы"
 "Family" = "Блокируйте вредоносное ПО и контент для взрослых"
 "FamilyDesc" = "DNS-преобразователи Cloudflare для блокировки вредоносного ПО и контента для взрослых в целях защиты семьи."
-"Security" = "Блокируйте вредоносное ПО, фишинговые сайты и сайты криптомайнеров"
-"SecurityDesc" = "Изменение шаблона конфигурации для защиты безопасности."
-"Speedtest" = "Блокировать сайты для проверки скорости"
-"SpeedtestDesc" = "Изменение шаблона конфигурации для предупреждения подключения к веб-сайтам для тестирования скорости"
-"GoogleIPv4" = "Использовать IPv4 для Google"
-"GoogleIPv4Desc" = "Добавить маршрутизацию для Google для подключения к IPv4"
-"NetflixIPv4" = "Использовать IPv4 для Netflix"
-"NetflixIPv4Desc" = "Добавить маршрутизацию для Netflix для подключения к IPv4"
-"GoogleWARP" = "Google"
-"GoogleWARPDesc" = "Направляет трафик в Google через WARP."
-"OpenAIWARP" = "OpenAI (ChatGPT)"
-"OpenAIWARPDesc" = "Направляет трафик в OpenAI (ChatGPT) через WARP."
-"NetflixWARP" = "Netflix"
-"NetflixWARPDesc" = "Направляет трафик в Netflix через WARP."
-"MetaWARP" = "Мета"
-"MetaWARPDesc" = "Направляет трафик в Meta (Instagram, Facebook, WhatsApp, Threads...) через WARP."
-"AppleWARP" = "Apple"
-"AppleWARPDesc" = "Направляет трафик в Apple через WARP."
-"RedditWARP" = "Reddit"
-"RedditWARPDesc" = "Направляет трафик в Reddit через WARP."
-"SpotifyWARP" = "Spotify"
-"SpotifyWARPDesc" = "Направляет трафик в Spotify через WARP."
-"IRWARP" = "Маршрутизация доменов Ирана через WARP"
-"IRWARPDesc" = "Добавить маршрутизацию для доменов Ирана через WARP"
 "Inbounds" = "Входящие"
 "InboundsDesc" = "Изменение шаблона конфигурации для подключения определенных пользователей"
 "Outbounds" = "Исходящие"
diff --git a/web/translation/translate.tr_TR.toml b/web/translation/translate.tr_TR.toml
index 5260da99..9816111f 100644
--- a/web/translation/translate.tr_TR.toml
+++ b/web/translation/translate.tr_TR.toml
@@ -330,18 +330,17 @@
 "logConfigsDesc" = "Günlükler sunucunuzun verimliliğini etkileyebilir. Yalnızca ihtiyaç durumunda akıllıca etkinleştirmeniz önerilir"
 "blockConfigs" = "Koruma Kalkanı"
 "blockConfigsDesc" = "Bu seçenekler belirli istek protokolleri ve web siteleri temelinde trafiği engeller."
-"blockConnectionsConfigs" = "Bağlantıları Engelle"
+"basicRouting" = "Temel Yönlendirme"
 "blockConnectionsConfigsDesc" = "Bu seçenekler belirli bir istenen ülkeye göre trafiği engelleyecektir."
-"directConnectionsConfigs" = "Doğrudan Bağlantılar"
 "directConnectionsConfigsDesc" = "Doğrudan bağlantı, belirli bir trafiğin başka bir sunucu üzerinden yönlendirilmediğini sağlar."
 "blockips" = "IP'leri Engelle"
 "blockdomains" = "Alan Adlarını Engelle"
 "directips" = "Doğrudan IP'ler"
 "directdomains" = "Doğrudan Alan Adları"
-"ipv4Configs" = "IPv4 Yönlendirme"
-"ipv4ConfigsDesc" = "Bu seçenekler belirli bir varış yerine IPv4 üzerinden trafiği yönlendirir."
-"warpConfigs" = "WARP Yönlendirme"
-"warpConfigsDesc" = "Bu seçenekler belirli bir varış yerine WARP üzerinden trafiği yönlendirir."
+"ipv4Routing" = "IPv4 Yönlendirme"
+"ipv4RoutingDesc" = "Bu seçenekler belirli bir varış yerine IPv4 üzerinden trafiği yönlendirir."
+"warpRouting" = "WARP Yönlendirme"
+"warpRoutingDesc" = "Bu seçenekler belirli bir varış yerine WARP üzerinden trafiği yönlendirir."
 "Template" = "Gelişmiş Xray Yapılandırma Şablonu"
 "TemplateDesc" = "Nihai Xray yapılandırma dosyası bu şablona göre oluşturulacaktır."
 "FreedomStrategy" = "Freedom Protokol Stratejisi"
@@ -350,36 +349,8 @@
 "RoutingStrategyDesc" = "Tüm istekleri çözmek için genel trafik yönlendirme stratejisini ayarlayın."
 "Torrent" = "BitTorrent Protokolünü Engelle"
 "TorrentDesc" = "BitTorrent protokolünü engeller."
-"PrivateIp" = "Özel IP'lere Bağlantıyı Engelle"
-"PrivateIpDesc" = "Özel IP aralıklarına bağlantı kurmayı engeller."
-"Ads" = "Reklamları Engelle"
-"AdsDesc" = "Reklam web sitelerini engeller."
 "Family" = "Aile Koruması"
 "FamilyDesc" = "Yetişkin içerikli ve kötü amaçlı yazılım web sitelerini engeller."
-"Security" = "Güvenlik Kalkanı"
-"SecurityDesc" = "Kötü amaçlı yazılım, kimlik avı ve kripto madencilik web sitelerini engeller."
-"Speedtest" = "Speedtest Bağlantısını Engelle"
-"SpeedtestDesc" = "Speedtest web sitelerine bağlantı kurmayı engeller."
-"GoogleIPv4" = "Google"
-"GoogleIPv4Desc" = "Google'a trafiği IPv4 üzerinden yönlendirir."
-"NetflixIPv4" = "Netflix"
-"NetflixIPv4Desc" = "Netflix'e trafiği IPv4 üzerinden yönlendirir."
-"GoogleWARP" = "Google"
-"GoogleWARPDesc" = "Google'a trafiği WARP üzerinden yönlendirir."
-"OpenAIWARP" = "ChatGPT"
-"OpenAIWARPDesc" = "ChatGPT'ye trafiği WARP üzerinden yönlendirir."
-"NetflixWARP" = "Netflix"
-"NetflixWARPDesc" = "Netflix'e trafiği WARP üzerinden yönlendirir."
-"MetaWARP" = "Meta"
-"MetaWARPDesc" = "Meta'ya (Instagram, Facebook, WhatsApp, Threads,...) trafiği WARP üzerinden yönlendirir."
-"AppleWARP" = "Apple"
-"AppleWARPDesc" = "Apple'a trafiği WARP üzerinden yönlendirir."
-"RedditWARP" = "Reddit"
-"RedditWARPDesc" = "Reddit'e trafiği WARP üzerinden yönlendirir."
-"SpotifyWARP" = "Spotify"
-"SpotifyWARPDesc" = "Spotify'a trafiği WARP üzerinden yönlendirir."
-"IRWARP" = "İran alan adları"
-"IRWARPDesc" = "İran alan adlarına trafiği WARP üzerinden yönlendirir."
 "Inbounds" = "Gelenler"
 "InboundsDesc" = "Belirli müşterileri kabul eder."
 "Outbounds" = "Gidenler"
diff --git a/web/translation/translate.uk_UA.toml b/web/translation/translate.uk_UA.toml
index faecbf30..d99b6908 100644
--- a/web/translation/translate.uk_UA.toml
+++ b/web/translation/translate.uk_UA.toml
@@ -330,18 +330,17 @@
 "logConfigsDesc" = "Журнали можуть вплинути на ефективність вашого сервера. Рекомендується вмикати його з розумом лише у випадку ваших потреб"
 "blockConfigs" = "Захисний екран"
 "blockConfigsDesc" = "Ці параметри блокуватимуть трафік на основі конкретних запитуваних протоколів і веб-сайтів."
-"blockConnectionsConfigs" = "Блокувати з'єднання"
+"basicRouting" = "Основна Маршрутизація"
 "blockConnectionsConfigsDesc" = "Ці параметри блокуватимуть трафік на основі запитаних країн."
-"directConnectionsConfigs" = "Прямі з'єднання"
 "directConnectionsConfigsDesc" = "Пряме з'єднання гарантує, що певний трафік не буде маршрутизовано через інший сервер."
 "blockips" = "Блокувати IP"
 "blockdomains" = "Блокувати домени"
 "directips" = "Прямі IP"
 "directdomains" = "Прямі домени"
-"ipv4Configs" = "Маршрутизація IPv4"
-"ipv4ConfigsDesc" = "Ці параметри спрямовуватимуть трафік на основі певного призначення через IPv4."
-"warpConfigs" = "WARP маршрутизація"
-"warpConfigsDesc" = "Ці параметри маршрутизуватимуть трафік на основі певного пункту призначення через WARP."
+"ipv4Routing" = "Маршрутизація IPv4"
+"ipv4RoutingDesc" = "Ці параметри спрямовуватимуть трафік на основі певного призначення через IPv4."
+"warpRouting" = "WARP Маршрутизація"
+"warpRoutingDesc" = "Ці параметри маршрутизуватимуть трафік на основі певного пункту призначення через WARP."
 "Template" = "Шаблон розширеної конфігурації Xray"
 "TemplateDesc" = "Остаточний конфігураційний файл Xray буде створено на основі цього шаблону."
 "FreedomStrategy" = "Стратегія протоколу свободи"
@@ -350,36 +349,8 @@
 "RoutingStrategyDesc" = "Установити загальну стратегію маршрутизації трафіку для вирішення всіх запитів."
 "Torrent" = "Блокувати протокол BitTorrent"
 "TorrentDesc" = "Блокує протокол BitTorrent."
-"PrivateIp" = "Блокувати підключення до приватних IP-адрес"
-"PrivateIpDesc" = "Блокує встановлення підключень до приватних діапазонів IP."
-"Ads" = "Блокувати рекламу"
-"AdsDesc" = "Блокує рекламні веб-сайти."
 "Family" = "Захист сім'ї"
 "FamilyDesc" = "Блокує вміст для дорослих і веб-сайти з шкідливими програмами."
-"Security" = "Щит безпеки"
-"SecurityDesc" = "Блокує веб-сайти шкідливого програмного забезпечення, фішингу та майнерів."
-"Speedtest" = "Заблокувати Speedtest"
-"SpeedtestDesc" = "Блокує підключення до веб-сайтів для тестування швидкості."
-"GoogleIPv4" = "Google"
-"GoogleIPv4Desc" = "Направляє трафік до Google через IPv4."
-"NetflixIPv4" = "Netflix"
-"NetflixIPv4Desc" = "Направляє трафік до Netflix через IPv4."
-"GoogleWARP" = "Google"
-"GoogleWARPDesc" = "Додати маршрутизацію для Google через WARP."
-"OpenAIWARP" = "ChatGPT"
-"OpenAIWARPDesc" = "Направляє трафік до ChatGPT через WARP."
-"NetflixWARP" = "Netflix"
-"NetflixWARPDesc" = "Направляє трафік до Netflix через WARP."
-"MetaWARP" = "Meta"
-"MetaWARPDesc" = "Направляє трафік до Meta (Instagram, Facebook, WhatsApp, Threads,...) через WARP."
-"AppleWARP" = "Apple"
-"AppleWARPDesc" = "Направляє трафік до Apple через WARP."
-"RedditWARP" = "Reddit"
-"RedditWARPDesc" = "Направляє трафік до Reddit через WARP."
-"SpotifyWARP" = "Spotify"
-"SpotifyWARPDesc" = "Направляє трафік до Spotify через WARP."
-"IRWARP" = "Іранські домени"
-"IRWARPDesc" = "Направляє трафік до доменів Ірану через WARP"
 "Inbounds" = "Вхідні"
 "InboundsDesc" = "Прийняття певних клієнтів."
 "Outbounds" = "Вихід"
diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml
index 28a4a680..2e082ead 100644
--- a/web/translation/translate.vi_VN.toml
+++ b/web/translation/translate.vi_VN.toml
@@ -330,18 +330,17 @@
 "logConfigsDesc" = "Nhật ký có thể ảnh hưởng đến hiệu suất máy chủ của bạn. Bạn chỉ nên kích hoạt nó một cách khôn ngoan trong trường hợp bạn cần"
 "blockConfigs" = "Cấu hình Chặn"
 "blockConfigsDesc" = "Những tùy chọn này sẽ ngăn người dùng kết nối đến các giao thức và trang web cụ thể."
-"blockConnectionsConfigs" = "Chặn Kết Nối"
+"basicRouting" = "Định tuyến Cơ bản"
 "blockConnectionsConfigsDesc" = "Các tùy chọn này sẽ chặn lưu lượng truy cập dựa trên quốc gia được yêu cầu cụ thể."
-"directConnectionsConfigs" = "Kết Nối Trực Tiếp"
 "directConnectionsConfigsDesc" = "Kết nối trực tiếp đảm bảo rằng lưu lượng truy cập cụ thể không được định tuyến qua máy chủ khác."
 "blockips" = "Chặn IP"
 "blockdomains" = "Chặn Tên Miền"
 "directips" = "IP Trực Tiếp"
 "directdomains" = "Tên Miền Trực Tiếp"
-"ipv4Configs" = "Cấu hình IPv4"
-"ipv4ConfigsDesc" = "Những tùy chọn này sẽ chỉ định kết nối đến các tên miền mục tiêu qua IPv4."
-"warpConfigs" = "Cấu hình WARP"
-"warpConfigsDesc" = "Cảnh báo: Trước khi sử dụng những tùy chọn này, hãy cài đặt WARP ở chế độ proxy socks5 trên máy chủ của bạn bằng cách làm theo các bước trên GitHub của bảng điều khiển. WARP sẽ định tuyến lưu lượng đến các trang web qua máy chủ Cloudflare."
+"ipv4Routing" = "Định tuyến IPv4"
+"ipv4RoutingDesc" = "Những tùy chọn này sẽ chỉ định kết nối đến các tên miền mục tiêu qua IPv4."
+"warpRouting" = "Định tuyến WARP"
+"warpRoutingDesc" = "Cảnh báo: Trước khi sử dụng những tùy chọn này, hãy cài đặt WARP ở chế độ proxy socks5 trên máy chủ của bạn bằng cách làm theo các bước trên GitHub của bảng điều khiển. WARP sẽ định tuyến lưu lượng đến các trang web qua máy chủ Cloudflare."
 "Template" = "Mẫu Cấu hình Xray"
 "TemplateDesc" = "Tạo tệp cấu hình Xray cuối cùng dựa trên mẫu này."
 "FreedomStrategy" = "Cấu hình Chiến lược cho Giao thức Freedom"
@@ -350,36 +349,8 @@
 "RoutingStrategyDesc" = "Đặt chiến lược định tuyến tổng thể cho việc giải quyết DNS."
 "Torrent" = "Cấu hình sử dụng BitTorrent"
 "TorrentDesc" = "Thay đổi mẫu cấu hình để tránh việc người dùng sử dụng BitTorrent."
-"PrivateIp" = "Cấm kết nối đến dải IP Riêng tư"
-"PrivateIpDesc" = "Thay đổi mẫu cấu hình để tránh kết nối đến dải IP riêng tư."
-"Ads" = "Chặn Quảng cáo"
-"AdsDesc" = "Thay đổi mẫu cấu hình để chặn quảng cáo."
 "Family" = "Chặn phần mềm độc hại và nội dung người lớn"
 "FamilyDesc" = "Trình phân giải DNS của Cloudflare để chặn phần mềm độc hại và nội dung người lớn để bảo vệ gia đình."
-"Security" = "Chặn các trang web chứa phần mềm độc hại, lừa đảo và khai thác tiền điện tử"
-"SecurityDesc" = "Thay đổi mẫu cấu hình để bảo vệ Bảo mật."
-"Speedtest" = "Chặn Trang web Speedtest"
-"SpeedtestDesc" = "Thay đổi mẫu cấu hình để tránh kết nối đến các trang web Speedtest."
-"GoogleIPv4" = "Sử dụng IPv4 cho Google"
-"GoogleIPv4Desc" = "Thêm định tuyến cho Google để kết nối qua IPv4."
-"NetflixIPv4" = "Sử dụng IPv4 cho Netflix"
-"NetflixIPv4Desc" = "Thêm định tuyến cho Netflix để kết nối qua IPv4."
-"GoogleWARP" = "Google"
-"GoogleWARPDesc" = "Định tuyến lưu lượng truy cập tới Google thông qua WARP."
-"OpenAIWARP" = "OpenAI (ChatGPT)"
-"OpenAIWARPDesc" = "Định tuyến lưu lượng truy cập tới OpenAI (ChatGPT) thông qua WARP."
-"NetflixWARP" = "Netflix"
-"NetflixWARPDesc" = "Định tuyến lưu lượng truy cập tới Netflix thông qua WARP."
-"MetaWARP" = "Meta"
-"MetaWARPDesc" = "Định tuyến lưu lượng truy cập tới Meta (Instagram, Facebook, WhatsApp, Threads,...) thông qua WARP."
-"AppleWARP" = "Apple"
-"AppleWARPDesc" = "Định tuyến lưu lượng truy cập tới Apple thông qua WARP."
-"RedditWARP" = "Reddit"
-"RedditWARPDesc" = "Định tuyến lưu lượng truy cập tới Reddit thông qua WARP."
-"SpotifyWARP" = "Spotify"
-"SpotifyWARPDesc" = "Định tuyến lưu lượng truy cập tới Spotify thông qua WARP."
-"IRWARP" = "Định tuyến tên miền của Iran qua WARP."
-"IRWARPDesc" = "Thêm định tuyến cho các tên miền của Iran qua WARP."
 "Inbounds" = "Đầu vào"
 "InboundsDesc" = "Thay đổi mẫu cấu hình để chấp nhận các máy khách cụ thể."
 "Outbounds" = "Đầu ra"
diff --git a/web/translation/translate.zh_CN.toml b/web/translation/translate.zh_CN.toml
index 00b7684c..d271b6b4 100644
--- a/web/translation/translate.zh_CN.toml
+++ b/web/translation/translate.zh_CN.toml
@@ -330,18 +330,17 @@
 "logConfigsDesc" = "日志可能会影响服务器的性能，建议仅在需要时启用"
 "blockConfigs" = "防护屏蔽"
 "blockConfigsDesc" = "这些选项将阻止用户连接到特定协议和网站"
-"blockConnectionsConfigs" = "阻止连接"
+"basicRouting" = "基本路由"
 "blockConnectionsConfigsDesc" = "这些选项将根据特定的请求国家阻止流量。"
-"directConnectionsConfigs" = "直接连接"
 "directConnectionsConfigsDesc" = "直接连接确保特定的流量不会通过其他服务器路由。"
 "blockips" = "阻止IP"
 "blockdomains" = "阻止域名"
 "directips" = "直接IP"
 "directdomains" = "直接域名"
-"ipv4Configs" = "IPv4 路由"
-"ipv4ConfigsDesc" = "此选项将仅通过 IPv4 路由到目标域"
-"warpConfigs" = "WARP 路由"
-"warpConfigsDesc" = "注意：在使用这些选项之前，请按照面板 GitHub 上的步骤在你的服务器上以 socks5 代理模式安装 WARP。WARP 将通过 Cloudflare 服务器将流量路由到网站。"
+"ipv4Routing" = "IPv4 路由"
+"ipv4RoutingDesc" = "此选项将仅通过 IPv4 路由到目标域"
+"warpRouting" = "WARP 路由"
+"warpRoutingDesc" = "注意：在使用这些选项之前，请按照面板 GitHub 上的步骤在你的服务器上以 socks5 代理模式安装 WARP。WARP 将通过 Cloudflare 服务器将流量路由到网站。"
 "Template" = "高级 Xray 配置模板"
 "TemplateDesc" = "最终的 Xray 配置文件将基于此模板生成"
 "FreedomStrategy" = "Freedom 协议策略"
@@ -350,36 +349,8 @@
 "RoutingStrategyDesc" = "设置 DNS 解析的整体路由策略"
 "Torrent" = "屏蔽 BitTorrent 协议"
 "TorrentDesc" = "禁止使用 BitTorrent"
-"PrivateIp" = "屏蔽私有 IP"
-"PrivateIpDesc" = "阻止连接到私有 IP"
-"Ads" = "屏蔽广告"
-"AdsDesc" = "屏蔽广告网站"
 "Family" = "家庭保护"
 "FamilyDesc" = "屏蔽成人内容和恶意网站"
-"Security" = "安全防护"
-"SecurityDesc" = "屏蔽恶意软件、网络钓鱼和挖矿网站"
-"Speedtest" = "屏蔽测速网站"
-"SpeedtestDesc" = "阻止连接到测速网站"
-"GoogleIPv4" = "Google"
-"GoogleIPv4Desc" = "通过 IPv4 将流量路由到谷歌"
-"NetflixIPv4" = "Netflix"
-"NetflixIPv4Desc" = "通过 IPv4 将流量路由到 Netflix"
-"GoogleWARP" = "Google"
-"GoogleWARPDesc" = "通过 WARP 将流量路由到 Google"
-"OpenAIWARP" = "OpenAI (ChatGPT)"
-"OpenAIWARPDesc" = "通过 WARP 将流量路由到 OpenAI (ChatGPT)"
-"NetflixWARP" = "Netflix"
-"NetflixWARPDesc" = "通过 WARP 将流量路由到 Netflix"
-"MetaWARP"="Meta"
-"MetaWARPDesc" = "通过 WARP 将流量路由到 Meta（Instagram、Facebook、WhatsApp、Threads...）"
-"AppleWARP" = "Apple"
-"AppleWARPDesc" = "通过 WARP 将流量路由到 Apple"
-"RedditWARP" = "Reddit"
-"RedditWARPDesc" = "通过 WARP 将流量路由到 Reddit"
-"SpotifyWARP" = "Spotify"
-"SpotifyWARPDesc" = "通过 WARP 将流量路由到 Spotify"
-"IRWARP" = "伊朗域名"
-"IRWARPDesc" = "通过 WARP 将流量路由到伊朗域名"
 "Inbounds" = "入站规则"
 "InboundsDesc" = "接受来自特定客户端的流量"
 "Outbounds" = "出站规则"
diff --git a/web/translation/translate.zh_TW.toml b/web/translation/translate.zh_TW.toml
index 19f7f6b1..93478845 100644
--- a/web/translation/translate.zh_TW.toml
+++ b/web/translation/translate.zh_TW.toml
@@ -330,18 +330,17 @@
 "logConfigsDesc" = "日誌可能會影響伺服器的效能，建議僅在需要時啟用"
 "blockConfigs" = "防護遮蔽"
 "blockConfigsDesc" = "這些選項將阻止使用者連線到特定協議和網站"
-"blockConnectionsConfigs" = "阻止連線"
+"basicRouting" = "基本路由"
 "blockConnectionsConfigsDesc" = "這些選項將根據特定的請求國家阻止流量。"
-"directConnectionsConfigs" = "直接連線"
 "directConnectionsConfigsDesc" = "直接連線確保特定的流量不會通過其他伺服器路由。"
 "blockips" = "阻止IP"
 "blockdomains" = "阻止域名"
 "directips" = "直接IP"
 "directdomains" = "直接域名"
-"ipv4Configs" = "IPv4 路由"
-"ipv4ConfigsDesc" = "此選項將僅通過 IPv4 路由到目標域"
-"warpConfigs" = "WARP 路由"
-"warpConfigsDesc" = "注意：在使用這些選項之前，請按照面板 GitHub 上的步驟在你的伺服器上以 socks5 代理模式安裝 WARP。WARP 將通過 Cloudflare 伺服器將流量路由到網站。"
+"ipv4Routing" = "IPv4 路由"
+"ipv4RoutingDesc" = "此選項將僅通過 IPv4 路由到目標域"
+"warpRouting" = "WARP 路由"
+"warpRoutingDesc" = "注意：在使用這些選項之前，請按照面板 GitHub 上的步驟在你的伺服器上以 socks5 代理模式安裝 WARP。WARP 將通過 Cloudflare 伺服器將流量路由到網站。"
 "Template" = "高階 Xray 配置模板"
 "TemplateDesc" = "最終的 Xray 配置檔案將基於此模板生成"
 "FreedomStrategy" = "Freedom 協議策略"
@@ -350,36 +349,8 @@
 "RoutingStrategyDesc" = "設定 DNS 解析的整體路由策略"
 "Torrent" = "遮蔽 BitTorrent 協議"
 "TorrentDesc" = "禁止使用 BitTorrent"
-"PrivateIp" = "遮蔽私有 IP"
-"PrivateIpDesc" = "阻止連線到私有 IP"
-"Ads" = "遮蔽廣告"
-"AdsDesc" = "遮蔽廣告網站"
 "Family" = "家庭保護"
 "FamilyDesc" = "遮蔽成人內容和惡意網站"
-"Security" = "安全防護"
-"SecurityDesc" = "遮蔽惡意軟體、網路釣魚和挖礦網站"
-"Speedtest" = "遮蔽測速網站"
-"SpeedtestDesc" = "阻止連線到測速網站"
-"GoogleIPv4" = "Google"
-"GoogleIPv4Desc" = "通過 IPv4 將流量路由到谷歌"
-"NetflixIPv4" = "Netflix"
-"NetflixIPv4Desc" = "通過 IPv4 將流量路由到 Netflix"
-"GoogleWARP" = "Google"
-"GoogleWARPDesc" = "通過 WARP 將流量路由到 Google"
-"OpenAIWARP" = "OpenAI (ChatGPT)"
-"OpenAIWARPDesc" = "通過 WARP 將流量路由到 OpenAI (ChatGPT)"
-"NetflixWARP" = "Netflix"
-"NetflixWARPDesc" = "通過 WARP 將流量路由到 Netflix"
-"MetaWARP"="Meta"
-"MetaWARPDesc" = "通過 WARP 將流量路由到 Meta（Instagram、Facebook、WhatsApp、Threads...）"
-"AppleWARP" = "Apple"
-"AppleWARPDesc" = "通過 WARP 將流量路由到 Apple"
-"RedditWARP" = "Reddit"
-"RedditWARPDesc" = "通過 WARP 將流量路由到 Reddit"
-"SpotifyWARP" = "Spotify"
-"SpotifyWARPDesc" = "通過 WARP 將流量路由到 Spotify"
-"IRWARP" = "伊朗域名"
-"IRWARPDesc" = "通過 WARP 將流量路由到伊朗域名"
 "Inbounds" = "入站規則"
 "InboundsDesc" = "接受來自特定客戶端的流量"
 "Outbounds" = "出站規則"

From fb2b58110d381686f6e2f5b03a9542f9212033b7 Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Thu, 10 Oct 2024 22:33:44 +0200
Subject: [PATCH 42/45] fix subJson direct rules (#2580)

---
 web/html/xui/settings.html | 73 +++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 29 deletions(-)

diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html
index 803459a0..e13a9c6f 100644
--- a/web/html/xui/settings.html
+++ b/web/html/xui/settings.html
@@ -464,8 +464,7 @@
           outboundTag: "direct",
           domain: [
             "geosite:category-ir"
-          ],
-          "enabled": true
+          ]
         },
         {
           type: "field",
@@ -473,8 +472,7 @@
           ip: [
             "geoip:private",
             "geoip:ir"
-          ],
-          enabled: true
+          ]
         },
       ],
       geoIPOptions: [
@@ -751,16 +749,25 @@
         get: function () {
           if (!this.enableDirect) return [];
           const rules = JSON.parse(this.allSetting.subJsonRules);
-          return Array.isArray(rules) ? rules[1].ip.map(d => d.replace("geoip:", "")) : [];
+          if (!Array.isArray(rules)) return [];
+          const ipRule = rules.find(r => r.ip);
+          return ipRule?.ip.map(d => d.replace("geoip:", "")) ?? [];
         },
         set: function (v) {
-          const rules = JSON.parse(this.allSetting.subJsonRules);
+          let rules = JSON.parse(this.allSetting.subJsonRules);
           if (!Array.isArray(rules)) return;
 
-          rules[1].ip = [];
-          v.forEach(d => {
-            rules[1].ip.push("geoip:" + d);
-          });
+          if (v.length == 0) {
+            rules = rules.filter(r => !r.ip);
+          } else {
+            let ruleIndex = rules.findIndex(r => r.ip);
+            if (ruleIndex == -1) ruleIndex = rules.push(this.defaultRules[1]) - 1;
+
+            rules[ruleIndex].ip = [];
+            v.forEach(d => {
+              rules[ruleIndex].ip.push("geoip:" + d);
+            });
+          }
           this.allSetting.subJsonRules = JSON.stringify(rules);
         }
       },
@@ -768,29 +775,37 @@
         get: function () {
           if (!this.enableDirect) return [];
           const rules = JSON.parse(this.allSetting.subJsonRules);
-          return Array.isArray(rules) ?
-            rules[0].domain.map(d => {
-              if (d.startsWith("geosite:category-")) {
-                return d.replace("geosite:category-", ""); 
-              }
-              return d.replace("geosite:", "");
-            })
-            : [];
+          if (!Array.isArray(rules)) return [];
+          const domainRule = rules.find(r => r.domain);
+          return domainRule?.domain.map(d => {
+            if (d.startsWith("geosite:category-")) {
+              return d.replace("geosite:category-", "");
+            }
+            return d.replace("geosite:", "");
+          })
+          ?? [];
         },
         set: function (v) {
-          const rules = JSON.parse(this.allSetting.subJsonRules);
+          let rules = JSON.parse(this.allSetting.subJsonRules);
           if (!Array.isArray(rules)) return;
 
-          rules[0].domain = [];
-          v.forEach(d => {
-            let category = '';
-            if (["cn", "apple", "meta", "google"].includes(d)) {
-              category = "";
-            } else if (["ru", "ir"].includes(d)) {
-              category = "category-";
-            }
-            rules[0].domain.push("geosite:" + category + d);
-          });
+          if (v.length == 0) {
+            rules = rules.filter(r => !r.domain);
+          } else {
+            let ruleIndex = rules.findIndex(r => r.domain);
+            if (ruleIndex == -1) ruleIndex = rules.push(this.defaultRules[0]) - 1;
+
+            rules[ruleIndex].domain = [];
+            v.forEach(d => {
+              let category = '';
+              if (["cn", "apple", "meta", "google"].includes(d)) {
+                category = "";
+              } else if (["ru", "ir"].includes(d)) {
+                category = "category-";
+              }
+              rules[ruleIndex].domain.push("geosite:" + category + d);
+            });
+          }
           this.allSetting.subJsonRules = JSON.stringify(rules);
         }
       },

From 6062031de41b882153866e94e41d085846dd3aa4 Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Fri, 11 Oct 2024 09:15:36 +0200
Subject: [PATCH 43/45] fix lang + more geoip option

---
 install.sh                           |  2 +-
 web/html/xui/xray.html               | 24 ++++++++++++++++++++----
 web/translation/translate.en_US.toml |  7 +++++++
 web/translation/translate.es_ES.toml |  2 ++
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index c4cc6798..8f425118 100644
--- a/install.sh
+++ b/install.sh
@@ -138,7 +138,7 @@ gen_random_string() {
 
 config_after_install() {
     echo -e "${yellow}Install/update finished! For security, it's recommended to modify panel settings ${plain}"
-    read -p "Would you like to customize ${yellow}the Panel Port ${plain}settings? (If not, random settings will be applied) [y/n]: " config_confirm
+    read -p "Would you like to customize the Panel Port settings? (If not, random settings will be applied) [y/n]: " config_confirm
 
     local config_webBasePath=$(gen_random_string 15)
     local config_account=$(gen_random_string 10)
diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index ac97b1f1..a5a842c4 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -316,7 +316,7 @@
                                     v-model="directDomains"
                                     :dropdown-class-name="themeSwitcher.currentTheme">
                                         <a-select-option :value="p.value" :label="p.label"
-                                            v-for="p in settingsData.DomainsOptions"> [[ p.label ]]
+                                            v-for="p in settingsData.DirectDomainsOptions"> [[ p.label ]]
                                         </a-select-option>
                                     </a-select>
                                 </template>
@@ -903,11 +903,16 @@
                     { label: '🇨🇳 China', value: 'geoip:cn' },
                     { label: '🇷🇺 Russia', value: 'geoip:ru' },
                     { label: '🇻🇳 Vietnam', value: 'ext:geoip_VN.dat:vn' },
+                    { label: '🇪🇸 Spain', value: 'geoip:es' },
+                    { label: '🇮🇩 Indonesia', value: 'geoip:id' },
+                    { label: '🇺🇦 Ukraine', value: 'geoip:ua' },
+                    { label: '🇹🇷 Türkiye', value: 'geoip:tr' },
+                    { label: '🇧🇷 Brazil', value: 'geoip:br' },
                 ],
                 DomainsOptions: [
                     { label: 'Ads All', value: 'geosite:category-ads-all' },
-                    { label: 'Ads IR', value: 'ext:geosite_IR.dat:category-ads-all' },
-                    { label: 'Ads VN', value: 'ext:geosite_VN.dat:ads' },
+                    { label: 'Ads IR 🇮🇷', value: 'ext:geosite_IR.dat:category-ads-all' },
+                    { label: 'Ads VN 🇻🇳', value: 'ext:geosite_VN.dat:ads' },
                     { label: 'Sec-IR malware', value: 'geosite_IR.dat:malware' },
                     { label: 'Sec-IR phishing', value: 'geosite_IR.dat:phishing' },
                     { label: 'Sec-IR cryptominers', value: 'geosite_IR.dat:cryptominers' },
@@ -916,7 +921,18 @@
                     { label: '🇮🇷 .ایران', value: 'regexp:.*\\.xn--mgba3a4f16a$' },
                     { label: '🇨🇳 China', value: 'geosite:cn' },
                     { label: '🇨🇳 .cn', value: 'regexp:.*\\.cn$' },
-                    { label: '🇷🇺 Russia', value: 'geosite:category-ru' },  //https://github.com/v2fly/domain-list-community/blob/master/data/category-ru
+                    { label: '🇷🇺 Russia', value: 'geosite:category-ru' },
+                    { label: '🇷🇺 .ru', value: 'regexp:.*\\.ru' },
+                    { label: '🇻🇳 Vietnam', value: 'ext:geosite_VN.dat:vn' },
+                    { label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' },
+                ],
+                DirectDomainsOptions: [
+                    { label: '🇮🇷 Iran', value: 'ext:geosite_IR.dat:ir' },
+                    { label: '🇮🇷 .ir', value: 'regexp:.*\\.ir$' },
+                    { label: '🇮🇷 .ایران', value: 'regexp:.*\\.xn--mgba3a4f16a$' },
+                    { label: '🇨🇳 China', value: 'geosite:cn' },
+                    { label: '🇨🇳 .cn', value: 'regexp:.*\\.cn$' },
+                    { label: '🇷🇺 Russia', value: 'geosite:category-ru' },
                     { label: '🇷🇺 .ru', value: 'regexp:.*\\.ru' },
                     { label: '🇻🇳 Vietnam', value: 'ext:geosite_VN.dat:vn' },
                     { label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' },
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index 7b813357..7e2e5eef 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -351,6 +351,13 @@
 "TorrentDesc" = "Blocks BitTorrent protocol."
 "Family" = "Family Protection"
 "FamilyDesc" = "Blocks adult content, and malware websites."
+"Inbounds" = "Inbounds"
+"InboundsDesc" = "Accepting the specific clients."
+"Outbounds" = "Outbounds"
+"Balancers" = "Balancers"
+"OutboundsDesc" = "Set the outgoing traffic pathway."
+"Routings" = "Routing Rules"
+"RoutingsDesc" = "The priority of each rule is important!"
 "completeTemplate" = "All"
 "logLevel" = "Log Level"
 "logLevelDesc" = "The log level for error logs, indicating the information that needs to be recorded."
diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml
index 0c18e936..1ca7a505 100644
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
@@ -424,6 +424,8 @@
 [pages.xray.dns]
 "enable" = "Habilitar DNS"
 "enableDesc" = "Habilitar servidor DNS incorporado"
+"tag" = "Etiqueta de Entrada DNS"
+"tagDesc" = "Esta etiqueta estará disponible como una etiqueta de entrada en las reglas de enrutamiento."
 "strategy" = "Estrategia de Consulta"
 "strategyDesc" = "Estrategia general para resolver nombres de dominio"
 "add" = "Agregar Servidor"

From 6a49e99a2c9c825040fb0451fa865c376a818a76 Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Fri, 11 Oct 2024 09:42:54 +0200
Subject: [PATCH 44/45] update dependencies

---
 go.mod | 16 ++++++++--------
 go.sum | 34 ++++++++++++++++++----------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/go.mod b/go.mod
index 1d01274c..402feeb2 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/shirou/gopsutil/v4 v4.24.9
 	github.com/valyala/fasthttp v1.56.0
-	github.com/xtls/xray-core v1.8.25-0.20241002041629-e45cef542e26
+	github.com/xtls/xray-core v1.8.25-0.20241005021528-c30f5d47964b
 	go.uber.org/atomic v1.11.0
 	golang.org/x/text v0.19.0
 	google.golang.org/grpc v1.67.1
@@ -23,10 +23,10 @@ require (
 )
 
 require (
-	github.com/andybalholm/brotli v1.1.0 // indirect
+	github.com/andybalholm/brotli v1.1.1 // indirect
 	github.com/bytedance/sonic v1.12.3 // indirect
 	github.com/bytedance/sonic/loader v0.2.0 // indirect
-	github.com/cloudflare/circl v1.4.0 // indirect
+	github.com/cloudflare/circl v1.5.0 // indirect
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
@@ -40,7 +40,7 @@ require (
 	github.com/go-playground/validator/v10 v10.22.1 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/google/btree v1.1.3 // indirect
-	github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d // indirect
+	github.com/google/pprof v0.0.0-20241009165004-a3522334989c // indirect
 	github.com/gorilla/context v1.1.2 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/gorilla/sessions v1.4.0 // indirect
@@ -59,7 +59,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/onsi/ginkgo/v2 v2.20.2 // indirect
-	github.com/pires/go-proxyproto v0.7.0 // indirect
+	github.com/pires/go-proxyproto v0.8.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
 	github.com/quic-go/quic-go v0.47.0 // indirect
@@ -85,7 +85,7 @@ require (
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
 	golang.org/x/arch v0.11.0 // indirect
 	golang.org/x/crypto v0.28.0 // indirect
-	golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // indirect
+	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
 	golang.org/x/mod v0.21.0 // indirect
 	golang.org/x/net v0.30.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
@@ -94,8 +94,8 @@ require (
 	golang.org/x/tools v0.26.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gvisor.dev/gvisor v0.0.0-20231202080848-1f7806d17489 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
diff --git a/go.sum b/go.sum
index 3e52536e..65f127fe 100644
--- a/go.sum
+++ b/go.sum
@@ -2,15 +2,15 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0 h1:Wo41lDOevRJSGpevP+8Pk5bANX7fJacO2w04aqLiC5I=
 github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0/go.mod h1:FVGavL/QEBQDcBpr3fAojoK17xX5k9bicBphrOpP7uM=
-github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
-github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
+github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
+github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
 github.com/bytedance/sonic v1.12.3 h1:W2MGa7RCU1QTeYRTPE3+88mVC0yXmsRQRChiyVocVjU=
 github.com/bytedance/sonic v1.12.3/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
 github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM=
 github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/cloudflare/circl v1.4.0 h1:BV7h5MgrktNzytKmWjpOtdYrf0lkkbF8YMlBGPhJQrY=
-github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
+github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys=
+github.com/cloudflare/circl v1.5.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
 github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
@@ -64,8 +64,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d h1:Jaz2JzpQaQXyET0AjLBXShrthbpqMkhGiEfkcQAiAUs=
-github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+github.com/google/pprof v0.0.0-20241009165004-a3522334989c h1:NDovD0SMpBYXlE1zJmS1q55vWB/fUQBcPAqAboZSccA=
+github.com/google/pprof v0.0.0-20241009165004-a3522334989c/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o=
 github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM=
 github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
@@ -121,8 +121,8 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
 github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
-github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
-github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4=
+github.com/pires/go-proxyproto v0.8.0 h1:5unRmEAPbHXHuLjDg01CxJWf91cw3lKHc/0xzKpXEe0=
+github.com/pires/go-proxyproto v0.8.0/go.mod h1:iknsfgnH8EkjrMeMyvfKByp9TiBZCKZM0jx2xmKqnVY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
@@ -182,8 +182,10 @@ github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1Y
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/xtls/reality v0.0.0-20240909153216-e26ae2305463 h1:g1Cj7d+my6k/HHxLAyxPwyX8i7FGRr6ulBDMkBzg2BM=
 github.com/xtls/reality v0.0.0-20240909153216-e26ae2305463/go.mod h1:BjIOLmkEEtAgloAiVUcYj0Mt+YU00JARZw8AEU0IwAg=
-github.com/xtls/xray-core v1.8.25-0.20241002041629-e45cef542e26 h1:Ijmwq3J+J88VKojsQBrFPNw9ICXrdxRLitBszxfJzGU=
-github.com/xtls/xray-core v1.8.25-0.20241002041629-e45cef542e26/go.mod h1:YSvBScSqyzAocGDvzHBbEeoHNrFy8nV6gityRVDvHaM=
+github.com/xtls/xray-core v1.8.25-0.20241005021528-c30f5d47964b h1:bWuePNnzV4ptnSYJkY96dAg3WgjYbfVgGnasLe3++9w=
+github.com/xtls/xray-core v1.8.25-0.20241005021528-c30f5d47964b/go.mod h1:YSvBScSqyzAocGDvzHBbEeoHNrFy8nV6gityRVDvHaM=
+github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
+github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
@@ -196,8 +198,8 @@ golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4=
 golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
 golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
-golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 h1:1wqE9dj9NpSm04INVsJhhEUzhuDVjbcyKH91sVyPATw=
-golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
+golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=
+golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
 golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
 golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
@@ -223,12 +225,12 @@ golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeu
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
 golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
 golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 h1:QCqS/PdaHTSWGvupk2F/ehwHtGc0/GYkT+3GAcR1CCc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
 google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
 google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

From 5f8c8f4525652ca053a8d0f655de32a597f26d62 Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Fri, 11 Oct 2024 09:43:04 +0200
Subject: [PATCH 45/45] v2.4.4

---
 README.md      | 7 ++++---
 config/version | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d0205f31..67ccee31 100644
--- a/README.md
+++ b/README.md
@@ -32,10 +32,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
 
 ## Install Custom Version
 
-To install your desired version, add the version to the end of the installation command. e.g., ver `v2.4.3`:
+To install your desired version, add the version to the end of the installation command. e.g., ver `v2.4.4`:
 
 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.4.3
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.4.4
 ```
 
 ## SSL Certificate
@@ -283,7 +283,8 @@ Our platform offers compatibility with a diverse range of architectures and devi
 
 - English
 - Farsi
-- Chinese
+- Traditional Chinese
+- Simplified Chinese
 - Russian
 - Vietnamese
 - Spanish
diff --git a/config/version b/config/version
index 6550da69..ab6d2789 100644
--- a/config/version
+++ b/config/version
@@ -1 +1 @@
-2.4.3
\ No newline at end of file
+2.4.4
\ No newline at end of file