Improve Server&Group Manage

README.md

@@ -8,11 +8,11 @@
 	<a target="_blank" href="https://github.com/Dreamacro/clash/releases/tag/v0.15.0">
     <img src="https://img.shields.io/badge/Clash-v0.15.0-blue.svg">
   </a>
-  <a target="_blank" href="https://github.com/vernesong/OpenClash/tree/v0.34.0-beta">
-    <img src="https://img.shields.io/badge/source code-v0.34.0--beta-green.svg">
+  <a target="_blank" href="https://github.com/vernesong/OpenClash/tree/v0.34.1-beta">
+    <img src="https://img.shields.io/badge/source code-v0.34.1--beta-green.svg">
   </a>
-  <a target="_blank" href="https://github.com/vernesong/OpenClash/releases/tag/v0.34.0-beta">
-    <img src="https://img.shields.io/badge/NewRelease-v0.34.0--beta-orange.svg">
+  <a target="_blank" href="https://github.com/vernesong/OpenClash/releases/tag/v0.34.1-beta">
+    <img src="https://img.shields.io/badge/NewRelease-v0.34.1--beta-orange.svg">
   </a>
   </p>
 

luci-app-openclash/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-openclash
-PKG_VERSION:=0.34.0
+PKG_VERSION:=0.34.1
 PKG_RELEASE:=beta
 PKG_MAINTAINER:=vernesong <https://github.com/vernesong/OpenClash>
 
@@ -70,6 +70,9 @@ elif [ -f "/tmp/config.yml" ]; then
 	mv "/tmp/config.yml" "/etc/openclash/config.yaml" 2>/dev/null
 fi
 uci set openclash.config.enable=0 && uci commit openclash
+chmod 0755 /etc/init.d/openclash
+chmod -R 0755 /usr/share/openclash/
+chmod -R 0755 /usr/lib/lua/luci/model/cbi/openclash/
 rm -rf /tmp/luci*
 endef
 

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

@@ -374,9 +374,22 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then
        echo "第五步: 启动 Clash 主程序..." >$START_LOG
        nohup $CLASH -d "$CLASH_CONFIG" >> $LOG_FILE 2>&1 &
 
-       echo "第六步: 设置 OpenClash 防火墙规则..." >$START_LOG
+       echo "第六步: 设置控制面板..." >$START_LOG
        ln -s /usr/share/openclash/yacd /www/openclash 2>/dev/null
-
+
+       echo "第七步: 设置 OpenClash 防火墙规则..." >$START_LOG
+       if [ -z "$(uci get firewall.openclash)" ] || [ -z "$(uci get ucitrack.@openclash[-1].init)" ]; then
+          uci delete ucitrack.@openclash[-1] >/dev/null 2>&1
+          uci add ucitrack openclash >/dev/null 2>&1
+          uci set ucitrack.@openclash[-1].init=openclash >/dev/null 2>&1
+          uci commit ucitrack >/dev/null 2>&1
+          uci delete firewall.openclash >/dev/null 2>&1
+          uci set firewall.openclash=include >/dev/null 2>&1
+          uci set firewall.openclash.type=script >/dev/null 2>&1
+          uci set firewall.openclash.path=/var/etc/openclash.include >/dev/null 2>&1
+          uci set firewall.openclash.reload=1 >/dev/null 2>&1
+          uci commit firewall >/dev/null 2>&1
+       fi
        mkdir -p /var/etc
        cat > "/var/etc/openclash.include" <<-EOF
 iptables -t nat -N openclash
@@ -405,7 +418,7 @@ fi
        /etc/init.d/firewall restart >/dev/null 2>&1
        /etc/init.d/miniupnpd restart >/dev/null 2>&1
 
-       echo "第七步: 重启 Dnsmasq 程序..." >$START_LOG
+       echo "第八步: 重启 Dnsmasq 程序..." >$START_LOG
        if [ "$(iptables -t nat -nL PREROUTING --line-number |grep dpt:53 |wc -l)" -gt 2 ]; then
           echo "发现53端口被劫持，请将OpenClash设置为劫持53端口程序的上游DNS服务器！" >$START_LOG
           echo "${LOGTIME} Warring: OpenClash May Can Not Take Over DNS, Please Use OpenClash for Upstream DNS Resolve Server" >> $LOG_FILE
@@ -417,7 +430,7 @@ fi
        fake_block "$en_mode" "$direct_dns"
        /etc/init.d/dnsmasq restart >/dev/null 2>&1
        if pidof clash >/dev/null; then
-          echo "第八步: 添加 OpenClash 计划任务,启动进程守护程序..." >$START_LOG
+          echo "第九步: 添加 OpenClash 计划任务,启动进程守护程序..." >$START_LOG
           add_cron
           echo "OpenClash 启动成功，请等待服务器上线！" >$START_LOG
           echo "${LOGTIME} OpenClash Start Successful" >> $LOG_FILE

luci-app-openclash/files/etc/openclash/openclash_version

@@ -1,2 +1,2 @@
-v0.34.0-beta
-data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWoAAAAqCAMAAACtKeEJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkU4REE2QkZBQ0JCMTExRTk4QzU3ODA1MjU0NDhEQUVBIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkU4REE2QkZCQ0JCMTExRTk4QzU3ODA1MjU0NDhEQUVBIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RThEQTZCRjhDQkIxMTFFOThDNTc4MDUyNTQ0OERBRUEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RThEQTZCRjlDQkIxMTFFOThDNTc4MDUyNTQ0OERBRUEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4128h0AAADAFBMVEXh7/c9PT0HZ52WlpbR4Oh1tNgbhcFBi7WKioqAgIBFgKIEXI4HVoTB1eHv9PehoaEdcqLR5vNiYmIHcKwFbanKyspqamrR0dEKc65jlbFtbW0FaaIGXpAVaprOzs6enp7GxsaUu9IIZJg/Pz+y0+aizOUqjcXn5+cGVYI1dpqStckidaUjhLxFRUUJdbOHv990p8RGRkYkeqoEU4AHXI1Ui6sjapKEhIQXgL1GibCSkpK5ubmlpaVFkb2pqanAwMC1tbVycnLa2tqCgoKsrKx4eHhXpNFlZWVLS0tFmsrf39+UxuI5lclkqtJBQUHg4OAEYJWxytiDqsGhv9BXlbmSuM5DQ0M2kcUGcrBJns6kzuYJaqEIbKW2trZ0dHTCwsI0fKUIYZQEWop0obqiyN52dnbw9fe+vr4YbZ2vr6+xzdwmcZ2ixtsFZZtKn8+y1elHnM0JWIUEYpjQ3+cFdLNnrdbd3d2TxOCjwNFDfqAJZ52CrseDs8+JweJZp9Nynrgmb5lortcYYoyhw9cCc7QBcrNRUVFTU1NUVFRVVVVSUlIFdrcLfL0Ke7wHeLlWVlYEdbYDdLQEdrYOf8ADdbUOgMADdLUSg8MSg8QShMQThMUAcrIGd7hXV1cOf78Nfr8Nfr4Mfb4Mfb0Je7sJersIebkIeboJero6OjqqqqrV1dXU1NSrq6tISEjC3u47Ozvw9/tJSUl+fn7q6urB3u6dnZ2EvN2Evd3z8/NMTEx/f3/09PSCqcCDvNzB3e319fWMjIzg6vDB3e7A1N/W1tZGm8uFvt6GhoaEtNAUXolHm8yDr8jg6u+ErMJVos/C3++Fvd4HWYfo6OhEmcrD3+97e3uDu9yEu9rB2unC3OsFZ5+Fvd2Dq8ILerkFdLTC3u+yz+AlisRInc5jnb6Audkwk8uEuNYbcKDQ5PAnbZUQe7cLd7aEq8Jjn8J/uNgRgsMQgcIPgMFZWVlaWlpfX19bW1tcXFxeXl5NTU1PT09QUFBYWFhdXV1OTk7////////ONTI9AAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAAC+1JREFUeNrsVwtYFWUanoEglIPERRQ8gUIKXo52REXRuKhHERVREgFRc3PdbMPSLM0ss3Y9iMDZde8blC0ICIIHAcVQvKVpZWWXrdzast222vZWsQkYL/v988+cM3OOkE8+j9v0+D4P//9973eb/51hBoTu7iOrQtp0jLG//+7jwiP27m6he15ym64x9nd6wEcB3cKR5Iv6xtjf6gIf2YVVF/Uu9W/0gUeE5K91jrH/1gc+Er6+LvU1wvdA6v/oBMJXesd1qa8ZRn6uEwj/1TuuS33tpP6VTiB8qXeM/IVOcFmpLf7TV3la/q8CWuKudP7Ip3rA58O2jBmz2o31fnSMC/259+rVl8t61Nu1eDXeeOpbQ/jCDf4NkNAwPeyLq0TYdM9vWfkcnrvCzJFP94DZ0imEORpy2Bv8cMKjKjIAcKndYmdJ9i0udDbe6Gna09ljsp/uFW5SBz4HRC+JiFjWDEy/Wqnjrliwq5B65+VxCitvnXT7B7B7q9ls4IazZzesBLIdXA6pqq2lrCGTJg1RJ8n8Kzt39jjv1M5eIVxyQSIQL0p4Pnr6pavENFR/y0qTaLrCzJHPXBbDgOFrCH7IUdPZGz5l7OPHnPRskPDaYgF3sqyzELQ8Sf1MTyCpn+kVgps4eF5Mq01JMUeJKWFXKkzYtGmBKtcyzfKNUk9TcjSwKI2cUlNvl1EuUv/hctjphfnncgcOjOwLu5ofuGaNcfHijefO4hWZ2YIbxgOa4jlYuWbjwIEbH1+JOZpANqvyzs5WU9lyCkntbJCtyeFwlbo/wsWD3OxKS7l0aQ/2cA+Q12n9QQL2oR/PeZCiR6WXe6KkUTX6eDK3wSI5HH2OokHu34CjtAYmSh8DZqo78a9EA+upzFX3Jm4aa3nEU33FNxVyeAPDuJWD2YWF9+Ifo5mzHJhT6MTAyM/Y9t4QrODEh1g5vC9QqIYX/HLZvtgPXprAh3h/zvvsJX5KnpkjvfdnkCkflTUK4FaOt6a2UCjVgh7qdsXe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
+v0.34.1-beta
+data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWoAAAAqCAMAAACtKeEJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkNCRjVBQTNDRDBDQzExRTk5Njc4RTZDNUI4NzU1RDhBIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkNCRjVBQTNERDBDQzExRTk5Njc4RTZDNUI4NzU1RDhBIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0JGNUFBM0FEMENDMTFFOTk2NzhFNkM1Qjg3NTVEOEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0JGNUFBM0JEMENDMTFFOTk2NzhFNkM1Qjg3NTVEOEEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5JB9kaAAADAFBMVEXR4OiUxeGKioqAgIAHZ51FgKJXpNHR5vKhoaHh7/cdcqIbhcHB1eAFXI5iYmIHcKzKyspqamrR0dFjlbFtbW0qjcYFaaIHXpEHVoQVapp0tNjOzs6enp4Kc67v9PfGxsYjhLyizOUKdrQFbakJZJiGv98/Pz+y0+bn5+cGVYKStck1dpoidaVFRUV0p8RGRkYkeqoXgL0HXI1Ui6sjapKTu9OEhIQijMmRkZG5ubkEU4ClpaVFkb2pqanAwMC1tbVycnJFmsra2tqEtNCCgoKsrKx4eHhlZWVLS0vf399kq9M5lcpBQUHg4OCxythXlblHi7MJaqAEYJSCss4GcrBDQ0OWlpaDqsGhv9A2kcakzua2trYFZZt0dHTCwsI0fKUIYZQEWop2dna+vr4YbZ1Kn8+vr6+xzdzw9fcmcZ2ixtsHbKVJns6UlJSy1elHnM2iyd9zobrQ3+cGdLOCrsdnrdbd3d2jwNEEYpiDq8IJWIXB2OWJweJDfqAmb5mhw9cYYo0Cc7QBcrNRUVFTU1NUVFRVVVVSUlILfL0FdrcKe7wHeLlWVlYEdrYOf8ADdLUOgMAEdbYDdbUDdLQSg8MSg8QShMQAcrIThMUGd7hXV1cOf78Nfr8Nfr4Mfb4Mfb0Je7sJersIeboIebkJero6OjqqqqrV1dWrq6vU1NQ9PT08PDxISEg7OztJSUnC3u5+fn7q6urw9/vB3u6dnZ2EvN2Evd3z8/NMTEx/f3+CqcD09PSDvNyFvt7g6vDB3e3B3e719fWMjIzW1tbA1N8UXomGhoZGm8uDr8jC3+9Hm8yFvd7g6u9EmcqErMJynrh7e3sHWYcIV4TD3++Fvd3o6OgFdLTB2+rC3Ouyz+CAudkmicLC3u9Inc41jsKErsXQ5PBlp80FZ58wk8tor9cQe7eDuNYIaJ+Eq8IbcKA1hrSYmJgnbZVFiK9jnsARgsMQgcIPgMFZWVlaWlpfX19bW1tcXFxeXl5NTU1PT09QUFBYWFhdXV1OTk7///////+8w3yJAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAAC7FJREFUeNrsVwlYFOcZHlA5wiWCsmHxBDd4bNaTIoZLYQVFExEQEU3aJsYGch9qzrYuQmBN06ZtCokpIIiwyLGgGBGvqDF3zH22qWmTpk3SJqERMLzk++ef2Z3ZBeMTn8dm8vg+D/983/td878zzA/CwMDhdcHdGsaMP/3w8ZN77QMDwsDSpG5NY8YftYAPvQeEw0mntY0Zf9AEPrQL605rXerfawP3CknfaBwz/qMNfCh8c1HqC4QfgdT/1QiEr7WOi1JfMEz/QiMQ/qd1XJT6wkn9sEYgfKV1TH9IIxhUarNPauq/zf9XAc0x5zp/+mND4OHRf588+TpX9gs/r8ku9Bd+17mlMXK0G3kdXn3se0P40g0+rRDRmhr65XkiNDXne1Y+hafOMXP640PAQ9yF7xIVOfpVvjlfr4ecpDfgXj4Zk924Qrw61LTHCycXPn5WuEkd+BQQvToiYm0HkHq+Usecs2DnIfW2wdGF9ZdfdeXbsPsp2UJAePHFDeuBQgeXR9K7Vi+ZDHS59SzEM9u2DTmva9tZIZxxQQIQaxBxPDr1zHkiBXXfs9JoMJ5j5vQnBsVoYNrdBH/kKenCDZ8y9pcHnLQHSHh1caH45ne5NSWpnxgKXYPkqyC4iYPjhozGtDSTwZAWeq7ChKakBCpcc4r5O6VOkXNUMMuNnFJTb5dRLlL/eTBsC8eykwVjx0aNgF3Jj7377muWL486+SKekZg7IcwG1NWjuz766wF0uXUtZFV+hYVKqnAJN7oU+UsKVTkcrlKPhN6wl5v9GWlnzuzETu4B0poyEiTgMPrJWQoxekT8uCeIGtVhWA5zW82iwzHsCFql/q04QmtggngYMFPZiZ8SraynPFfZm7gU1vJwjvKOLynh8ANGcysPHiUlN+Gfk5hzDbCkxImxUSJbMxe3cOJ9rJ82AihRYewrr7zij64SV7yP95a8R3dgl0J+efy7T6a0VdbIm1t5fupioUINeql7ZHtLcUUFbU8O8HU161JXMQxL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

luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua

@@ -17,8 +17,10 @@ function index()
 	entry({"admin", "services", "openclash", "update_ma"},call("action_update_ma"))
 	entry({"admin", "services", "openclash", "opupdate"},call("action_opupdate"))
 	entry({"admin", "services", "openclash", "coreupdate"},call("action_coreupdate"))
-	entry({"admin", "services", "openclash", "settings"},cbi("openclash/settings"),_("Takeover Settings"), 30).leaf = true
-	entry({"admin", "services", "openclash", "servers"}, arcombine(cbi("openclash/servers"), cbi("openclash/servers-config")),_("Severs Nodes"), 40).leaf = true
+	entry({"admin", "services", "openclash", "settings"},cbi("openclash/settings"),_("Global Settings"), 30).leaf = true
+	entry({"admin", "services", "openclash", "servers"},cbi("openclash/servers"),_("Severs&Groups"), 40).leaf = true
+  entry({"admin", "services", "openclash", "servers-config"},cbi("openclash/servers-config"), nil).leaf = true
+  entry({"admin", "services", "openclash", "groups-config"},cbi("openclash/groups-config"), nil).leaf = true
 	entry({"admin", "services", "openclash", "config"},form("openclash/config"),_("Server Config"), 50).leaf = true
 	entry({"admin", "services", "openclash", "log"},form("openclash/log"),_("Logs"), 60).leaf = true