Merge branch 'dev'

Author: vernesong

luci-app-openclash/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-openclash
-PKG_VERSION:=0.46.133
+PKG_VERSION:=0.46.137
 PKG_MAINTAINER:=vernesong <https://github.com/vernesong/OpenClash>
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

luci-app-openclash/luasrc/controller/openclash.lua

@@ -3159,16 +3159,16 @@ function action_oc_action()
 	if action == "start" then
 		uci:set("openclash", "config", "enable", "1")
 		uci:commit("openclash")
-		luci.sys.call("/etc/init.d/openclash start >/dev/null 2>&1 &")
+		luci.sys.call("/etc/init.d/openclash start >/dev/null 2>&1")
 	elseif action == "stop" then
 		uci:set("openclash", "config", "enable", "0")
 		uci:commit("openclash")
 		luci.sys.call("ps | grep openclash | grep -v grep | awk '{print $1}' | xargs -r kill -9 >/dev/null 2>&1")
-		luci.sys.call("/etc/init.d/openclash stop >/dev/null 2>&1 &")
+		luci.sys.call("/etc/init.d/openclash stop >/dev/null 2>&1")
 	elseif action == "restart" then
 		uci:set("openclash", "config", "enable", "1")
 		uci:commit("openclash")
-		luci.sys.call("/etc/init.d/openclash restart >/dev/null 2>&1 &")
+		luci.sys.call("/etc/init.d/openclash restart >/dev/null 2>&1")
 	else
 		luci.http.status(400, "Invalid action parameter")
 		return

luci-app-openclash/luasrc/view/openclash/status.htm

@@ -2100,6 +2100,9 @@ msgstr "第六步：删除 OpenClash 残留文件..."
 msgid "OpenClash Already Stop!"
 msgstr "OpenClash 关闭成功！"
 
+msgid "Skip Reload OpenClash Firewall Rules Until 5 Minutes Later..."
+msgstr "5 分钟内重置已超过 3 次，跳过本次 OpenClash 防火墙规则重置..."
+
 msgid "Reload OpenClash Firewall Rules..."
 msgstr "重置 OpenClash 防火墙规则..."
 

luci-app-openclash/po/zh-cn/openclash.zh-cn.po

@@ -3130,16 +3130,28 @@ start_watchdog()
 reload_service()
 {
    enable=$(uci -q get openclash.config.enable)
+   MAX_RELOAD=10
    if pidof clash >/dev/null && [ "$enable" == "1" ] && [ "$1" == "firewall" ]; then
-      LAST_RELOAD_TIME=$(grep "Reload OpenClash Firewall Rules..." "$LOG_FILE" | tail -n 1 | awk '{print $1" "$2}')
-      if [ -n "$LAST_RELOAD_TIME" ]; then
-         LAST_RELOAD_TS=$(date -d "$LAST_RELOAD_TIME" +%s 2>/dev/null)
-         NOW_TS=$(date +%s)
-         if [ -n "$LAST_RELOAD_TS" ] && [ $((NOW_TS - LAST_RELOAD_TS)) -lt 300 ]; then
-            exit 0
-         fi
-      fi
-      LOG_OUT "Reload OpenClash Firewall Rules..."
+      NOW_TS=$(date +%s)
+      LAST_LINE=$(grep "Reload OpenClash Firewall Rules...$" "$LOG_FILE" | tail -n 1)
+      LAST_TIME=$(echo "$LAST_LINE" | awk '{print $1" "$2}')
+      LAST_TS=$(date -d "$LAST_TIME" +%s 2>/dev/null)
+      CUR_RELOAD_NUM=$(echo "$LAST_LINE" | grep -oE '【[0-9]+/' | grep -oE '[0-9]+')
+      if [ -n "$LAST_TS" ] && [ $((NOW_TS - LAST_TS)) -gt 300 ]; then
+         CUR_RELOAD_NUM=0
+      fi
+      [ -z "$CUR_RELOAD_NUM" ] && CUR_RELOAD_NUM=0
+      CUR_RELOAD_NUM=$((CUR_RELOAD_NUM+1))
+      [ "$CUR_RELOAD_NUM" -gt "$MAX_RELOAD" ] && CUR_RELOAD_NUM=$MAX_RELOAD
+      RELOAD_COUNT=$(grep "Reload OpenClash Firewall Rules...$" "$LOG_FILE" | awk '{print $1" "$2}' | while read t; do
+         TS=$(date -d "$t" +%s 2>/dev/null)
+         [ -n "$TS" ] && [ $((NOW_TS - TS)) -le 300 ] && echo 1
+      done | wc -l)
+      if [ "$RELOAD_COUNT" -ge "$MAX_RELOAD" ]; then
+         LOG_OUT "【${CUR_RELOAD_NUM}/$MAX_RELOAD】Skip Reload OpenClash Firewall Rules Until 5 Minutes Later..."
+         exit 0
+      fi
+      LOG_OUT "【${CUR_RELOAD_NUM}/$MAX_RELOAD】Reload OpenClash Firewall Rules..."
       revert_firewall
       do_run_mode
       get_config

luci-app-openclash/root/etc/init.d/openclash

@@ -692,6 +692,7 @@
 2402:1600::/32
 2402:16e0::/32
 2402:1740::/32
+2402:18a0::/32
 2402:19c0::/32
 2402:1f80::/32
 2402:2000::/32
@@ -1573,7 +1574,6 @@
 2405:ed40::/32
 2405:ef40::/30
 2405:f340::/32
-2405:f3c0::/32
 2405:f580::/32
 2405:f6c0::/32
 2405:f940::/32

luci-app-openclash/root/etc/openclash/Country.mmdb

@@ -6345,6 +6345,7 @@
 165.101.122.0/23
 165.101.144.0/23
 165.101.170.0/23
+165.101.208.0/23
 166.111.0.0/16
 167.139.0.0/16
 167.189.0.0/16