From 4da19477bc16a25b8bf21f747f31621a91fb256b Mon Sep 17 00:00:00 2001
From: gitea-action <git@cooluc.com>
Date: Sun, 23 Feb 2025 21:30:58 +0800
Subject: [PATCH] luci-app-nikki: sync upstream

last commit: https://github.com/nikkinikki-org/OpenWrt-nikki/commit/e91acf2dd8d1a4ebd09161cc3ec879c39b1b4564
---
 luci-app-nikki/Makefile                       |  2 +-
 .../luci-static/resources/view/nikki/mixin.js |  2 +-
 .../luci-static/resources/view/nikki/proxy.js |  3 +
 luci-app-nikki/po/templates/nikki.pot         | 60 ++++++++++---------
 luci-app-nikki/po/zh_Hans/nikki.po            | 60 ++++++++++---------
 5 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/luci-app-nikki/Makefile b/luci-app-nikki/Makefile
index ffde789b1..54e974fbb 100644
--- a/luci-app-nikki/Makefile
+++ b/luci-app-nikki/Makefile
@@ -1,6 +1,6 @@
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.19.0
+PKG_VERSION:=1.19.1
 
 LUCI_TITLE:=LuCI Support for nikki
 LUCI_DEPENDS:=+luci-base +nikki
diff --git a/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js b/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js
index 1887ee579..be335274b 100644
--- a/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js
+++ b/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js
@@ -86,7 +86,7 @@ return view.extend({
         o.password = true;
         o.rmempty = false;
 
-        o = s.taboption('external_control', form.Flag, 'selection_cache', _('Save Proxy Selection'));
+        o = s.taboption('external_control', form.Flag, 'selection_cache', '*' + ' ' + _('Save Proxy Selection'));
         o.rmempty = false;
 
         s.tab('inbound', _('Inbound Config'));
diff --git a/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js b/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js
index e7758dc08..0c3bfd003 100644
--- a/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js
+++ b/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js
@@ -52,6 +52,9 @@ return view.extend({
         o = s.taboption('transparent_proxy', form.Flag, 'ipv6_proxy', _('IPv6 Proxy'));
         o.rmempty = false;
 
+        o = s.taboption('transparent_proxy', form.Flag, 'fake_ip_ping_hijack', _('Fake-IP Ping Hijack'));
+        o.rmempty = false;
+
         o = s.taboption('transparent_proxy', form.Flag, 'router_proxy', _('Router Proxy'));
         o.rmempty = false;
 
diff --git a/luci-app-nikki/po/templates/nikki.pot b/luci-app-nikki/po/templates/nikki.pot
index 09b6bee43..175f406a0 100644
--- a/luci-app-nikki/po/templates/nikki.pot
+++ b/luci-app-nikki/po/templates/nikki.pot
@@ -9,16 +9,16 @@ msgstr ""
 msgid "API Secret"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:61
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:64
 msgid "Access Control"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:64
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:67
 msgid "All Mode"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:136
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:141
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:139
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:144
 msgid "All Port"
 msgstr ""
 
@@ -27,7 +27,7 @@ msgid "Allow Lan"
 msgstr ""
 
 #: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js:203
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:65
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:68
 msgid "Allow Mode"
 msgstr ""
 
@@ -36,7 +36,7 @@ msgstr ""
 msgid "App Config"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:26
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:27
 msgid "App Log"
 msgstr ""
 
@@ -61,27 +61,27 @@ msgid "Behavior"
 msgstr ""
 
 #: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js:202
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:66
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:69
 msgid "Block Mode"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:115
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:118
 msgid "Bypass"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:131
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:134
 msgid "Bypass China Mainland IP"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:144
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:147
 msgid "Bypass DSCP"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:124
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:127
 msgid "Bypass Group"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:117
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:120
 msgid "Bypass User"
 msgstr ""
 
@@ -93,13 +93,13 @@ msgstr ""
 msgid "Choose Profile"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:30
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:63
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:31
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:64
 msgid "Clear Log"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:137
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:142
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:140
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:145
 msgid "Commonly Used Port"
 msgstr ""
 
@@ -107,7 +107,7 @@ msgstr ""
 msgid "Core Environment Variable Config"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:59
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:60
 msgid "Core Log"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgstr ""
 msgid "DNS Port"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:92
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:93
 msgid "Debug Log"
 msgstr ""
 
@@ -151,11 +151,11 @@ msgstr ""
 msgid "Destination Port"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:134
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:137
 msgid "Destination TCP Port to Proxy"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:139
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:142
 msgid "Destination UDP Port to Proxy"
 msgstr ""
 
@@ -281,6 +281,10 @@ msgstr ""
 msgid "External Control Config"
 msgstr ""
 
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:55
+msgid "Fake-IP Ping Hijack"
+msgstr ""
+
 #: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js:206
 msgid "Fake-IP Cache"
 msgstr ""
@@ -342,7 +346,7 @@ msgstr ""
 msgid "General Config"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:96
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:97
 msgid "Generate & Download"
 msgstr ""
 
@@ -431,11 +435,11 @@ msgstr ""
 msgid "Inbound Config"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:108
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:111
 msgid "Interface"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:58
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:61
 msgid "Lan Proxy"
 msgstr ""
 
@@ -443,7 +447,7 @@ msgstr ""
 msgid "Local"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:24
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:25
 #: applications/luci-app-nikki/root/usr/share/luci/menu.d/luci-app-nikki.json:53
 msgid "Log"
 msgstr ""
@@ -487,7 +491,7 @@ msgid "Mixin Option"
 msgstr ""
 
 #: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js:37
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:63
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:66
 msgid "Mode"
 msgstr ""
 
@@ -633,7 +637,7 @@ msgstr ""
 msgid "Restart Service"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:55
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:58
 msgid "Router Proxy"
 msgstr ""
 
@@ -669,8 +673,8 @@ msgstr ""
 msgid "Scheduled Restart"
 msgstr ""
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:53
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:86
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:54
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:87
 msgid "Scroll To Bottom"
 msgstr ""
 
diff --git a/luci-app-nikki/po/zh_Hans/nikki.po b/luci-app-nikki/po/zh_Hans/nikki.po
index 58fbdaddc..ac148bc7f 100644
--- a/luci-app-nikki/po/zh_Hans/nikki.po
+++ b/luci-app-nikki/po/zh_Hans/nikki.po
@@ -16,16 +16,16 @@ msgstr "API 端口"
 msgid "API Secret"
 msgstr "API 密钥"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:61
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:64
 msgid "Access Control"
 msgstr "访问控制"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:64
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:67
 msgid "All Mode"
 msgstr "全部模式"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:136
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:141
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:139
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:144
 msgid "All Port"
 msgstr "全部端口"
 
@@ -34,7 +34,7 @@ msgid "Allow Lan"
 msgstr "允许局域网访问"
 
 #: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js:203
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:65
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:68
 msgid "Allow Mode"
 msgstr "白名单模式"
 
@@ -43,7 +43,7 @@ msgstr "白名单模式"
 msgid "App Config"
 msgstr "插件配置"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:26
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:27
 msgid "App Log"
 msgstr "插件日志"
 
@@ -68,27 +68,27 @@ msgid "Behavior"
 msgstr "行为"
 
 #: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js:202
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:66
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:69
 msgid "Block Mode"
 msgstr "黑名单模式"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:115
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:118
 msgid "Bypass"
 msgstr "绕过"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:131
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:134
 msgid "Bypass China Mainland IP"
 msgstr "绕过中国大陆 IP"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:144
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:147
 msgid "Bypass DSCP"
 msgstr "绕过 DSCP"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:124
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:127
 msgid "Bypass Group"
 msgstr "绕过用户组"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:117
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:120
 msgid "Bypass User"
 msgstr "绕过用户"
 
@@ -100,13 +100,13 @@ msgstr "选择文件"
 msgid "Choose Profile"
 msgstr "选择配置文件"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:30
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:63
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:31
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:64
 msgid "Clear Log"
 msgstr "清空日志"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:137
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:142
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:140
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:145
 msgid "Commonly Used Port"
 msgstr "常用端口"
 
@@ -114,7 +114,7 @@ msgstr "常用端口"
 msgid "Core Environment Variable Config"
 msgstr "核心环境变量配置"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:59
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:60
 msgid "Core Log"
 msgstr "核心日志"
 
@@ -142,7 +142,7 @@ msgstr "DNS 模式"
 msgid "DNS Port"
 msgstr "DNS 端口"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:92
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:93
 msgid "Debug Log"
 msgstr "调试日志"
 
@@ -158,11 +158,11 @@ msgstr "目标 IP（Geo）"
 msgid "Destination Port"
 msgstr "目标端口"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:134
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:137
 msgid "Destination TCP Port to Proxy"
 msgstr "要代理的 TCP 目标端口"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:139
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:142
 msgid "Destination UDP Port to Proxy"
 msgstr "要代理的 UDP 目标端口"
 
@@ -288,6 +288,10 @@ msgstr "到期时间"
 msgid "External Control Config"
 msgstr "外部控制配置"
 
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:55
+msgid "Fake-IP Ping Hijack"
+msgstr "Fake-IP Ping 劫持"
+
 #: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js:206
 msgid "Fake-IP Cache"
 msgstr "Fake-IP 缓存"
@@ -349,7 +353,7 @@ msgstr "分段最大长度"
 msgid "General Config"
 msgstr "全局配置"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:96
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:97
 msgid "Generate & Download"
 msgstr "生成并下载"
 
@@ -438,11 +442,11 @@ msgstr "忽略嗅探的域名"
 msgid "Inbound Config"
 msgstr "入站配置"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:108
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:111
 msgid "Interface"
 msgstr "接口"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:58
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:61
 msgid "Lan Proxy"
 msgstr "局域网代理"
 
@@ -450,7 +454,7 @@ msgstr "局域网代理"
 msgid "Local"
 msgstr "本地"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:24
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:25
 #: applications/luci-app-nikki/root/usr/share/luci/menu.d/luci-app-nikki.json:53
 msgid "Log"
 msgstr "日志"
@@ -494,7 +498,7 @@ msgid "Mixin Option"
 msgstr "混入选项"
 
 #: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js:37
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:63
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:66
 msgid "Mode"
 msgstr "模式"
 
@@ -640,7 +644,7 @@ msgstr "遵循分流规则"
 msgid "Restart Service"
 msgstr "重启服务"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:55
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js:58
 msgid "Router Proxy"
 msgstr "路由器代理"
 
@@ -676,8 +680,8 @@ msgstr "保存节点/策略组选择"
 msgid "Scheduled Restart"
 msgstr "定时重启"
 
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:53
-#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:86
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:54
+#: applications/luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js:87
 msgid "Scroll To Bottom"
 msgstr "滚动到底部"