From 22ac7fe3cc7e764bacae35e9abd41aff5a88841b Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Sun, 14 Jul 2024 12:42:47 +0200
Subject: [PATCH] fallback outbound in balancer #1244

---
 web/html/xui/xray.html                 | 12 ++++++++----
 web/html/xui/xray_balancer_modal.html  | 12 ++++++++++--
 web/translation/translate.en_US.toml   |  1 +
 web/translation/translate.fa_IR.toml   |  1 +
 web/translation/translate.ru_RU.toml   |  1 +
 web/translation/translate.vi_VN.toml   |  1 +
 web/translation/translate.zh_Hans.toml |  1 +
 7 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index b6272b65..2fa5803f 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -1117,7 +1117,8 @@
                     balancer: {
                         tag: '',
                         strategy: 'random',
-                        selector: []
+                        selector: [],
+                        fallbackTag: ''
                     },
                     confirm: (balancer) => {
                         balancerModal.loading();
@@ -1127,7 +1128,8 @@
                         }
                         let tmpBalancer = {
                             'tag': balancer.tag,
-                            'selector': balancer.selector
+                            'selector': balancer.selector,
+                            'fallbackTag': balancer.fallbackTag
                         };
                         if (balancer.strategy && balancer.strategy != 'random') {
                             tmpBalancer.strategy = {
@@ -1157,7 +1159,8 @@
 
                         let tmpBalancer = {
                             'tag': balancer.tag,
-                            'selector': balancer.selector
+                            'selector': balancer.selector,
+                            'fallbackTag': balancer.fallbackTag
                         };
 
                         // Remove old tag
@@ -1480,7 +1483,8 @@
                                 'key': index,
                                 'tag': o.tag ? o.tag : "",
                                 'strategy': o.strategy?.type ?? "random",
-                                'selector': o.selector ? o.selector : []
+                                'selector': o.selector ? o.selector : [],
+                                'fallbackTag': o.fallbackTag?? '',
                             });
                         });
                     }
diff --git a/web/html/xui/xray_balancer_modal.html b/web/html/xui/xray_balancer_modal.html
index b2075e4d..5d549ced 100644
--- a/web/html/xui/xray_balancer_modal.html
+++ b/web/html/xui/xray_balancer_modal.html
@@ -31,6 +31,12 @@
                 <a-select-option v-for="tag in balancerModal.outboundTags" :value="tag">[[ tag ]]</a-select-option>
             </a-select>
         </a-form-item>
+        <a-form-item label='{{ i18n "pages.xray.balancer.fallback" }}'>
+            <a-select v-model="balancerModal.balancer.fallbackTag" clearable
+                :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option v-for="tag in [ '', ...balancerModal.outboundTags]" :value="tag">[[ tag ]]</a-select-option>
+            </a-select>
+        </a-form-item>
         </table>
     </a-form>
 </a-modal>
@@ -47,7 +53,8 @@
         balancer: {
             tag: '',
             strategy: 'random',
-            selector: []
+            selector: [],
+            fallbackTag: ''
         },
         outboundTags: [],
         balancerTags:[],
@@ -70,7 +77,8 @@
                 balancerModal.balancer = {
                     tag: '',
                     strategy: 'random',
-                    selector: []
+                    selector: [],
+                    fallbackTag: ''
                 };
             }
             this.balancerTags = balancerTags.filter((tag) => tag != balancer.tag);
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index efbb8d75..acf5d7eb 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -433,6 +433,7 @@
 "editBalancer" = "Edit Balancer"
 "balancerStrategy" = "Strategy"
 "balancerSelectors" = "Selectors"
+"fallback" = "Fallback"
 "tag" = "Tag"
 "tagDesc" = "Unique Tag"
 "balancerDesc" = "It is not possible to use both balancerTag and outboundTag simultaneously. If both are used together, only outboundTag will function."
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index 2c5c41f1..7d61e4cc 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -432,6 +432,7 @@
 "editBalancer" = "ویرایش بالانسر"
 "balancerStrategy" = "استراتژی"
 "balancerSelectors" = "انتخاب‌گرها"
+"fallback" = "جایگزین"
 "tag" = "برچسب"
 "tagDesc" = "برچسب یگانه"
 "balancerDesc" = "امکان استفاده همزمان برچسب خروجی و برچسب بالانسر باهم وجود ندارد. درصورت استفاده همزمان فقط برچسب خروجی عمل خواهد کرد"
diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index 56bb3e22..dfb303aa 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -433,6 +433,7 @@
 "editBalancer" = "Редактировать балансир"
 "balancerStrategy" = "Стратегия"
 "balancerSelectors" = "Селекторы"
+"fallback" = "Отступать"
 "tag" = "Тег"
 "tagDesc" = "уникальный тег"
 "balancerDesc" = "Невозможно одновременно использовать balancerTag и outboundTag. При одновременном использовании будет работать только outboundTag."
diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml
index 81e206d6..2d17fafe 100644
--- a/web/translation/translate.vi_VN.toml
+++ b/web/translation/translate.vi_VN.toml
@@ -433,6 +433,7 @@
 "editBalancer" = "Chỉnh sửa cân bằng"
 "balancerStrategy" = "Chiến lược"
 "balancerSelectors" = "Bộ chọn"
+"fallback" = "Dự phòng"
 "tag" = "Thẻ"
 "tagDesc" = "thẻ duy nhất"
 "balancerDesc" = "Không thể sử dụng balancerTag và outboundTag cùng một lúc. Nếu sử dụng cùng lúc thì chỉ outboundTag mới hoạt động."
diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml
index e4c9a9fc..0fc2e049 100644
--- a/web/translation/translate.zh_Hans.toml
+++ b/web/translation/translate.zh_Hans.toml
@@ -433,6 +433,7 @@
 "editBalancer" = "编辑平衡器"
 "balancerStrategy" = "战略"
 "balancerSelectors" = "选择器"
+"fallback" = "倒退"
 "tag" = "标签"
 "tagDesc" = "唯一标记"
 "balancerDesc" = "不能同时使用balancerTag和outboundTag。 如果同时使用，则只有outboundTag起作用。"