From 7061faa09ad4070087aae84fe88cc05a10155899 Mon Sep 17 00:00:00 2001
From: gitea-action <git@cooluc.com>
Date: Thu, 2 Jan 2025 23:00:28 +0800
Subject: [PATCH] luci-app-mihomo: sync upstream

last commit: https://github.com/morytyann/OpenWrt-mihomo/commit/c9e95eeff9c1d9be51e7b4efe10103bfa7920e21
---
 luci-app-mihomo/Makefile                                      | 2 +-
 .../htdocs/luci-static/resources/view/mihomo/proxy.js         | 4 ++++
 luci-app-mihomo/po/templates/mihomo.pot                       | 4 ++++
 luci-app-mihomo/po/zh_Hans/mihomo.po                          | 4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/luci-app-mihomo/Makefile b/luci-app-mihomo/Makefile
index 196f40d4c..c930c382b 100644
--- a/luci-app-mihomo/Makefile
+++ b/luci-app-mihomo/Makefile
@@ -1,6 +1,6 @@
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.16.0
+PKG_VERSION:=1.17.0
 
 LUCI_TITLE:=LuCI Support for mihomo
 LUCI_DEPENDS:=+luci-base +mihomo
diff --git a/luci-app-mihomo/htdocs/luci-static/resources/view/mihomo/proxy.js b/luci-app-mihomo/htdocs/luci-static/resources/view/mihomo/proxy.js
index 6264ef3d7..8c631f881 100644
--- a/luci-app-mihomo/htdocs/luci-static/resources/view/mihomo/proxy.js
+++ b/luci-app-mihomo/htdocs/luci-static/resources/view/mihomo/proxy.js
@@ -140,6 +140,10 @@ return view.extend({
         o.rmempty = false;
         o.value('0-65535', _('All Port'));
         o.value('123 443 8443', _('Commonly Used Port'));
+
+        o = s.taboption('bypass', form.DynamicList, 'bypass_dscp', _('Bypass DSCP'));
+        o.datatype = 'range(0, 63)';
+
         return m.render();
     }
 });
diff --git a/luci-app-mihomo/po/templates/mihomo.pot b/luci-app-mihomo/po/templates/mihomo.pot
index 43d9ac58e..68d3bb72f 100644
--- a/luci-app-mihomo/po/templates/mihomo.pot
+++ b/luci-app-mihomo/po/templates/mihomo.pot
@@ -61,6 +61,10 @@ msgstr ""
 msgid "Bypass China Mainland IP"
 msgstr ""
 
+#: applications/luci-app-mihomo/htdocs/luci-static/resources/view/mihomo/proxy.js:144
+msgid "Bypass DSCP"
+msgstr ""
+
 #: applications/luci-app-mihomo/htdocs/luci-static/resources/view/mihomo/proxy.js:124
 msgid "Bypass Group"
 msgstr ""
diff --git a/luci-app-mihomo/po/zh_Hans/mihomo.po b/luci-app-mihomo/po/zh_Hans/mihomo.po
index b3afaadd0..a9b62478a 100644
--- a/luci-app-mihomo/po/zh_Hans/mihomo.po
+++ b/luci-app-mihomo/po/zh_Hans/mihomo.po
@@ -68,6 +68,10 @@ msgstr "绕过"
 msgid "Bypass China Mainland IP"
 msgstr "绕过中国大陆 IP"
 
+#: applications/luci-app-mihomo/htdocs/luci-static/resources/view/mihomo/proxy.js:144
+msgid "Bypass DSCP"
+msgstr "绕过 DSCP"
+
 #: applications/luci-app-mihomo/htdocs/luci-static/resources/view/mihomo/proxy.js:124
 msgid "Bypass Group"
 msgstr "绕过用户组"