From be73fa2babf114bcf55351a9a0c33ce7460eeec0 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 2 Aug 2019 23:40:19 +0800 Subject: [PATCH] luci-app-openclash: sync source --- package/cnsztl/luci-app-openclash/Makefile | 2 +- .../files/etc/init.d/openclash | 61 ++++++++++++++----- .../files/etc/openclash/default.yaml | 8 +-- .../files/etc/openclash/openclash_version | 4 +- .../usr/lib/lua/luci/controller/openclash.lua | 9 +-- .../lua/luci/model/cbi/openclash/settings.lua | 6 +- .../lib/lua/luci/view/openclash/update.htm | 4 +- .../files/usr/share/openclash/openclash.sh | 10 +-- .../usr/share/openclash/yml_rules_change.sh | 12 ++-- 9 files changed, 69 insertions(+), 47 deletions(-) diff --git a/package/cnsztl/luci-app-openclash/Makefile b/package/cnsztl/luci-app-openclash/Makefile index f5842d8431..9c029ca78a 100644 --- a/package/cnsztl/luci-app-openclash/Makefile +++ b/package/cnsztl/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.33.2 +PKG_VERSION:=0.33.3 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong diff --git a/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash b/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash index 7e145aa0ce..dbf55d2d8d 100755 --- a/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash +++ b/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (c) 2011-2015 OpenWrt.org +# Copyright (c) 2019 vernesong START=99 STOP=15 @@ -11,8 +11,8 @@ CRON_FILE="/etc/crontabs/root" CONFIG_FILE="/etc/openclash/config.yaml" LOG_FILE="/tmp/openclash.log" START_LOG="/tmp/openclash_start.log" -BACKPACK_FILE="/etc/openclash/config.bak" -START_BACKPACK="/tmp/config.sbak" +BACKUP_FILE="/etc/openclash/config.bak" +START_BACKUP="/tmp/config.sbak" CHANGE_FILE="/tmp/yaml_change.yaml" RULE_FILE="/tmp/yaml_rules.yaml" DNS_FILE="/tmp/yaml_dns.yaml" @@ -282,8 +282,8 @@ status=$(ps|grep -c /etc/init.d/openclash) if [ ! -f "$CONFIG_FILE" ] && [ "$(ls -l /etc/openclash/config.yml 2>/dev/null |awk '{print int($5/1024)}')" -gt 0 ]; then mv "/etc/openclash/config.yml" "$CONFIG_FILE" fi -if [ ! -f "$CONFIG_FILE" ] && [ -f "$BACKPACK_FILE" ]; then - cp $BACKPACK_FILE $CONFIG_FILE +if [ ! -f "$CONFIG_FILE" ] && [ -f "$BACKUP_FILE" ]; then + cp $BACKUP_FILE $CONFIG_FILE fi echo "OpenClash 开始启动..." >$START_LOG @@ -308,12 +308,12 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then http_port=$(uci get openclash.config.http_port 2>/dev/null) socks_port=$(uci get openclash.config.socks_port 2>/dev/null) echo "第二步: 配置文件检查..." >$START_LOG - yml_check "$en_mode" "$enable_custom_dns" "$CONFIG_FILE" "$BACKPACK_FILE" "$START_BACKPACK" - grep "^ \{0,\}nameserver:" $CONFIG_FILE >/dev/null 2>&1 && grep "^ \{0,\}Proxy:" $CONFIG_FILE >/dev/null 2>&1 && grep "^ \{0,\}Proxy Group:" $CONFIG_FILE >/dev/null 2>&1 && grep "^ \{0,\}Rule:" $CONFIG_FILE >/dev/null 2>&1 + yml_check "$en_mode" "$enable_custom_dns" "$CONFIG_FILE" "$BACKUP_FILE" "$START_BACKUP" + grep "^ \{0,\}Proxy:" $CONFIG_FILE >/dev/null 2>&1 && grep "^ \{0,\}Proxy Group:" $CONFIG_FILE >/dev/null 2>&1 && grep "^ \{0,\}Rule:" $CONFIG_FILE >/dev/null 2>&1 if [ "$?" -ne "0" ]; then nohup $CLASH -d "$CLASH_CONFIG" >> $LOG_FILE 2>&1 & echo "错误: 配置文件完整性检查不通过，已自动还原配置文件，请根据日志信息对照模板格式检查修改配置文件！" >$START_LOG - mv $START_BACKPACK $CONFIG_FILE + mv $START_BACKUP $CONFIG_FILE stop sleep 5 echo "" >$START_LOG @@ -334,7 +334,7 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then if [ ! -z "$(sed -n '/^ \{0,\}nameserver:/{n;p}' $CONFIG_FILE |grep '^ \{0,\}fallback:')" ] || [ ! -z "$(sed -n '/^ \{0,\}nameserver:/{n;p}' $CONFIG_FILE |grep 'OpenClash-General')" ]; then echo "错误: 配置文件DNS选项下的Nameserver必须设置服务器，已自动还原配置文件，请重新设置！" >$START_LOG echo "${LOGTIME} Nameserver Must Be Set, Please Change Your Configrations In Config.yaml" >>$LOG_FILE - mv $START_BACKPACK $CONFIG_FILE + mv $START_BACKUP $CONFIG_FILE sleep 10 echo "" >$START_LOG else @@ -384,17 +384,46 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then sleep 5 echo "" >$START_LOG else - echo "错误: OpenClash 启动失败，请到日志页面查看详细错误信息！" >$START_LOG - echo "${LOGTIME} OpenClash Can Not Start, Please Check The Error Info And Try Again" >> $LOG_FILE - sleep 10 - echo "" >$START_LOG - stop && echo "" >$START_LOG + if [ "$rule_source" != 0 ]; then + echo "错误: OpenClash 启动失败，尝试还原规则并重新启动 Clash 主程序..." >$START_LOG + echo "${LOGTIME} OpenClash Can Not Start, Try Use Backup Rules Start Again" >> $LOG_FILE + mv "$BACKUP_FILE" /etc/openclash/configrules.bak + sed -i -n '/^Rule:/,$p' /etc/openclash/configrules.bak + sed -i '/^Rule:/,$d' "$CONFIG_FILE" + cat /etc/openclash/configrules.bak >> "$CONFIG_FILE" + rm -rf /etc/openclash/configrules.bak + nohup $CLASH -d "$CLASH_CONFIG" >> $LOG_FILE 2>&1 & + if pidof clash >/dev/null; then + add_cron + echo "OpenClash 使用备份规则启动成功，请更新、检查第三方规则后重试！" >$START_LOG + echo "${LOGTIME} OpenClash Start Successful With Backup Rules Config, Please Check Or Update Other Rules And Retry" >> $LOG_FILE + sleep 5 + echo "" >$START_LOG + else + echo "错误: OpenClash 启动失败，请到日志页面查看详细错误信息！" >$START_LOG + echo "${LOGTIME} OpenClash Can Not Start, Please Check The Error Info And Try Again" >> $LOG_FILE + sleep 10 + echo "" >$START_LOG + stop && echo "" >$START_LOG + fi + else + echo "错误: OpenClash 启动失败，请到日志页面查看详细错误信息！" >$START_LOG + echo "${LOGTIME} OpenClash Can Not Start, Please Check The Error Info And Try Again" >> $LOG_FILE + sleep 10 + echo "" >$START_LOG + stop && echo "" >$START_LOG + fi fi fi - rm -rf $START_BACKPACK 2>/dev/null + rm -rf $START_BACKUP 2>/dev/null fi else - if [ ! -f "$CONFIG_FILE" ]; then + subscribe_url=$(uci get openclash.config.subscribe_url 2>/dev/null) + if [ ! -f "$CONFIG_FILE" ] && [ ! -z "$subscribe_url" ]; then + echo "OpenClash 配置文件不存在，开始下载..." >$START_LOG + nohup /usr/share/openclash/openclash.sh & + exit 0 + elif [ ! -f "$CONFIG_FILE" ]; then echo "错误: OpenClash 缺少配置文件，请上传或更新配置文件！" >$START_LOG echo "${LOGTIME} Config Not Found" >> $LOG_FILE sleep 5 diff --git a/package/cnsztl/luci-app-openclash/files/etc/openclash/default.yaml b/package/cnsztl/luci-app-openclash/files/etc/openclash/default.yaml index b08adb3804..cb9dff298e 100644 --- a/package/cnsztl/luci-app-openclash/files/etc/openclash/default.yaml +++ b/package/cnsztl/luci-app-openclash/files/etc/openclash/default.yaml @@ -37,19 +37,19 @@ authentication: # 此项将被接管 - "user1:pass1" - "user2:pass2" -dns: # 此参数必须保留,不能删除,如订阅配置无包括此项的所有DNS设置，OpenClash将自动添加 +dns: # 如订阅配置无包括此项的所有DNS设置，OpenClash将自动添加 enable: true # set true to enable dns (default is false) # 此项将被接管为true ipv6: false # default is false # 此项将被接管 listen: 0.0.0.0:53 # 端口为53时将被接管为7874 - enhanced-mode: redir-host # or fake-ip # 此项可被接管 + enhanced-mode: redir-host # or fake-ip # 此项将被接管 fake-ip-range: 198.18.0.1/16 # if you don't know what it is, don't change it # 此项将被接管 # experimental hosts, support wildcard (e.g. *.clash.dev Even *.foo.*.example.com) # static domain has a higher priority than wildcard domain (foo.example.com > *.example.com) # NOTE: hosts don't work with `fake-ip` -# hosts: +# hosts: # 此项将被接管 # '*.clash.dev': 127.0.0.1 # 'alpha.clash.dev': '::1' - nameserver: # 此参数必须保留,不能删除 + nameserver: - 114.114.114.114 - tls://dns.rubyfish.cn:853 # dns over tls - https://1.1.1.1/dns-query # dns over https diff --git a/package/cnsztl/luci-app-openclash/files/etc/openclash/openclash_version b/package/cnsztl/luci-app-openclash/files/etc/openclash/openclash_version index 2b93b062d3..2fc1d5ede9 100644 --- a/package/cnsztl/luci-app-openclash/files/etc/openclash/openclash_version +++ b/package/cnsztl/luci-app-openclash/files/etc/openclash/openclash_version @@ -1,2 +1,2 @@ -v0.33.2-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWoAAAAqCAMAAACtKeEJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQyIDc5LjE2MDkyNCwgMjAxNy8wNy8xMy0wMTowNjozOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1N0E5REJCRkFFMDQxMUU5OEY4N0I5QzNCNzMzRDExMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1N0E5REJDMEFFMDQxMUU5OEY4N0I5QzNCNzMzRDExMCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjU3QTlEQkJEQUUwNDExRTk4Rjg3QjlDM0I3MzNEMTEwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjU3QTlEQkJFQUUwNDExRTk4Rjg3QjlDM0I3MzNEMTEwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+nlXGtQAAAwBQTFRFwdXgB1aElMXhRZrKCXKtB2edhLzdioqKgICAstPm4e/37/T3oaGhHHGiY5WxYmJiysrKaWlpBl6RKo3F0dHRFWmabW1tRYCiBW2p0ebyVIuqNXWazs7Onp6eoszlBnCsh7/fxsbGCna0CWSYCFyNPz8/drXZ5+fnCHe3InWlREREBFyOJGqSZqzVBFOAF4C9scrYdKfERZG9RkZGJHmqOpXKCWqhCWGUk7vThISEMJPLI4S8G4XBkZGRubm5ZKvTpaWlqampwMDAtbW1BlWCcnJy2tragoKCrKyseHh4V6TRZWVlRoqxS0tL39/fdbLVQUFB4ODgstXqV5W5BWmikrTIBGCUQkJCFH24lpaWg6rBpM7mCW2lCViFBnKwBVqKtra2BWWbdHR0wsLCNHylhLTRdnZ2SZ7O8PX3vr6+Sp/Pcp64ob/QGG2er6+vsc7eJnGdosbblJSUosnfc6C6ZqjOosDRBnSzBGKY3NzcGGKNCWieR5zNgq7HRYiuBWulicHiQ36gNpLGJm6XWabTocPXg7PPB2ykAnO0AXKzUVFRU1NTVFRUVVVVC3y9UlJSCnu8B3i5BXa3VlZWDoDABHW2A3S0A3W1Dn/ABHa2A3S1EoPDEoPEEoTEE4TFAHKyV1dXDn+/Bne4DX6/DX6+DH2+DH29CHm5CXu7CXq6CXq7Ojo6qqqq1dXVq6ur1NTUPT09PDw8SEhIOzs7SUlJfn5+6urq8Pf7gqnAwt7unZ2dg7zc8/PzTExMf39/9PT04Orwwd7uwNTfwd3t9fX1hKzC0eDojIyMFF6Jhb7ewd3u1tbWhoaG4Orvg6/IdLPY0N/nhL3dw9/vwt/vg6vCB1iHBXS0Y56/C3q56Ojogrvbe3t7VaLPwdvqwtzrss/gaK/XRpvLJYrEwt7vkbTIk7bK0OTwBWefsszcwdfkhKvCgrjXCnm5ZJi2NYq7EYLDEIHCD4DBWVlZWlpaX19fW1tbXFxcXl5eTU1NT09PUFBQWFhYXV1dTk5O////////eFiiEwAAAQB0Uk5T////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AFP3ByUAAAv+SURBVHja7JcJVBRXFoYLRDGIIKgICqJiS2y0JbaixA0Q1DZC0KgJokY0Dk5inKzGRLOZbcZGFpmZTGYLITqoiNCINCIG9y0uwajZJotJjMlktiRMZBl+5r73qrqrugE98RwnleN3jlX33neXen8VVbbU2npwRUC9jhn15x8/nz5jb22VWmcm1euaUX/SA7eGtEoHky7rm1F/1AW32qUVl/Uu9R/0wTNS0n91zqh/6YNbpf/ekPo68ROQ+t86Qfpe79yQ+rox9BudIP1H79yQ+vpJ/WudIH2nd4b+Tie0KbXFd9qKNMv/VUBL7NXOH/paO3zT85MBA+51i45/foAqzJOGjHYrvndAG7Wv3Yszr/1gpG/d8K0Ep3Ja0LfXSNC0tB9Y+SbevMrMoa+3gyffhc9oTbDnGbE5n+e5m+kj3DParHQRtT/v0jITZ9qb9nrmgMzXO8RNav83gchFYWFLaoBp1yp17FULdg1Sb2ybY1h2y4w7PoZ9vDqaCRw+dGjlMiBTJCH60KFouGRR0sVDF/fKSerqtzdubHfesY0dIjW7kABMMHBORE5rvkamouQHVhoNxqvMHLqpTXoC/RYQEtLV4cyVz7HoE3tFeMihJ5jbD/hEnSX14UmHMUvblKTe1B4k9aYOkdzEwQlDanlystlgSA66WmGCpk71V7mWqZYrSj1VydFgURo5pabeLqNcpP5LmwzBlwvme3lF9IFdFd3otWBBYEzM6nOH8DbzYxYsiIiJiaAbckxdTEmrY1YP7gtom2ayqvGZmepQ5mhhHFO1GJ2pyRG4St0DoYY9wmxJTW5u3o7twgPk49QeIAG70r+0meCrR/jLPYFrVIKuacyttHBH0PUIKuX+lThCR/8E/jFgprqT+EpUsp7KXHVvik1lLQ+mqa+4+6Zsznigp7DS4ZmdPQt/G8ScMcDobCdeETz67lg8zM7zY95lp0GH8agqKXuMF096CsjWkInPRn/GXuLH5Jn8pe4znUx5q6wgRFjp47XFUoEWeqgb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 \ No newline at end of file +v0.33.3-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWoAAAAqCAMAAACtKeEJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkNEREYyQ0UyQjUxODExRTk4MjUwQzhBODI2MUU4NkI5IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkNEREYyQ0UzQjUxODExRTk4MjUwQzhBODI2MUU4NkI5Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0RERjJDRTBCNTE4MTFFOTgyNTBDOEE4MjYxRTg2QjkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0RERjJDRTFCNTE4MTFFOTgyNTBDOEE4MjYxRTg2QjkiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz6Bq8+FAAADAFBMVEUFaaKTxeE9PT1FmsoKdbOWlpYJcq3h7/eStcmEvN3B1eAHVoRjlbKKioqAgICy0+Z2ttpXpdEHZ52hoaEdcqJiYmLKysppaWkGXpGTvNPR0dEVaprv9PcJZJhtbW01dZoFbamizOQGcKzOzs6enp7R5vMHXI3GxsZTiqqHv98keao/Pz86lsoEU4Dn5+cEXI4gdaZERERFgKIGVYIkapKxyth0p8QbhcFGRkYJaqEXgL1kq9OEhIQwk8uRkZG5ubkkhLulpaVFkb1GirEJYZSpqanAwMC1tbVycnLa2tqCgoKsrKx4eHgqjMU1fKZlZWVLS0t0sdTf399BQUHg4OBmrdVXlbkEYJTw9fdCQkKkzuYGcrAUfbgJWIUHbKUFZZsFWoq2trZ0dHTCwsKDqsF0oLqy1el2dna+vr5ynrihv9AYbZ1Fhquvr6+xzdwmcZ2ixtujwNEEYphJns5Kns+jyd9mqM4GdLPc3NzQ3+dHnM2CrscYYo02kcaJweJDfqAmbpehw9eDs89Inc0Cc7QBcrNRUVFTU1NUVFRVVVULfL1SUlIKe7wFdrcHeLlWVlYDdbUDdLUOf8AEdbYEdrYOgMADdLQSg8MSg8QShMQThMUAcrJXV1cGd7gOf78Nfr8Nfr4Mfb4Mfb0IebkIeboJe7sJeroJers6OjqqqqrV1dXU1NSrq6tISEg7OztJSUl+fn7q6urw9/vC3u6dnZ3z8/NMTEx/f3/A1N+CqcD09PSDvNzB3u6ErMLg6vDB3e319fWFvt4UXonW1tbB3e6MjIx0s9jC3++Dr8iEvd3g6u/R4OiGhobD3++Dq8IFdLQHWIcsj8dor9eEtNDo6OhVos97e3tjnr8LernB2+rC3Os1i72Du9yyz+BGm8snicHC3u8mi8bR5O+EuNYFZ58ndaLg7PPP5PEKbqgZdqzB1+SAudkab6BFia+Eq8IRgsMQgcIPgMFZWVlaWlpfX19bW1tcXFxeXl5NTU1PT09QUFBYWFhdXV1OTk7///////94yZZKAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADBJJREFUeNrsVwlUVNcZfjyWQQZcIMiogMjiNgw4InFAgpIIIo6GgAaDAYJbGxNNFLOHbG0dBGS62B2SWBFxEEeGJYDiFjWiiZp9aWPS1rRpEtsmoZEl/OS/9743894MEE88x+bl+J3Dvf///du733vz3oEbGDiyPqhLwZj+h+8//vqEbWCAG1ia3qVoTP+9EnBT1AB3JP2ysjH9d4rATTZu/WWlS/1bZeAJLv1rhWP6f5SBm7ivr0t9jfADkPq/CgH3ldJxXeprJ/XnCgH3P6VjxnWpr5nUv1YIuC+Vjhm/VAgGldoYsGi9p/H/KqAx6Urnz3h2KLz62rRpm53Jz2ePmSalSdLoaJfa6NHTpr32qjO7GV559juD+8IFAQ1A0bAo9IurROgiz+9Y+SK8eIWZM54bAm70FKpoGfnqK+xwqjHU3axi7ivyrNE2RufOlrdEqYea9tzmaZufGxYuUge+CBBTGBm5qhlg0dVKnXTFgl2F1M8PjqOw/MZbbn8fbLOlbBHAmY6OjcsBilgSxHd0xINT1kuwfGNHxxmAl+Q9i5wJ2byjzw8Lrs8JaQDJPMXLMYv6rhIZYPmOlXpef4WZM3YMisUAE/MQPpArpYs2PkXYxw8x+mTH48SdCLBMmvWAL2Hz1gAsljVFqXcMBZR6x7DgXMSBl/ns+sxMg5bPDL1SYUIzMgIlrjHD+K1SZ4g5MhjFRg6psbfTKCep/zQoRsOGvI+9vEJmgk3CPu+Vl6dJSPA/3wEvET8hLy8kISEEb8hRafH8vMlIa/Lw2Zc1LSJVs4ukZFFRNDOOSlpEFxUVuVyRs9RjIYJvYWZ/dmZf317YyzwAYc0YCyjgSPzzXAo0eoK+3NOoRhYY6UncBiN1GEaegAahfwOcwDUwjX4MiCntxL4SDaSnOFfaG7kM0vKIp/SKbyhlmI2PILNywa20dC3824M48wGiSx3wCvHYgds74+AB4uYnvEM2jzPwoCSpNORjuv0L4AMpXfoT+DD6Q7wC21Fh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 \ No newline at end of file diff --git a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua index 633bac6b73..f9e1e6cd7f 100644 --- a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua +++ b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua @@ -42,24 +42,17 @@ local function config_check() local yml = luci.sys.call("ls -l /etc/openclash/config.yml >/dev/null 2>&1") local nameserver,proxy,group,rule if (yaml == 0) then - nameserver = luci.sys.call("egrep '^ {0,}nameserver:' /etc/openclash/config.yaml >/dev/null 2>&1") proxy = luci.sys.call("egrep '^ {0,}Proxy:' /etc/openclash/config.yaml >/dev/null 2>&1") group = luci.sys.call("egrep '^ {0,}Proxy Group:' /etc/openclash/config.yaml >/dev/null 2>&1") rule = luci.sys.call("egrep '^ {0,}Rule:' /etc/openclash/config.yaml >/dev/null 2>&1") else if (yml == 0) then - nameserver = luci.sys.call("egrep '^ {0,}nameserver:' /etc/openclash/config.yml >/dev/null 2>&1") proxy = luci.sys.call("egrep '^ {0,}Proxy:' /etc/openclash/config.yml >/dev/null 2>&1") group = luci.sys.call("egrep '^ {0,}Proxy Group:' /etc/openclash/config.yml >/dev/null 2>&1") rule = luci.sys.call("egrep '^ {0,}Rule:' /etc/openclash/config.yml >/dev/null 2>&1") end end if (yaml == 0) or (yml == 0) then - if (nameserver == 0) then - nameserver = "" - else - nameserver = " - DNS服务器" - end if (proxy == 0) then proxy = "" else @@ -75,7 +68,7 @@ local function config_check() else rule = " - 规则" end - return nameserver..proxy..group..rule + return proxy..group..rule elseif (yaml ~= 0) and (yml ~= 0) then return "1" end diff --git a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua index 4159c879ca..a4a6ea1d25 100644 --- a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua +++ b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua @@ -164,7 +164,7 @@ o:value("3", translate("Every Wednesday")) o:value("4", translate("Every Thursday")) o:value("5", translate("Every Friday")) o:value("6", translate("Every Saturday")) -o:value("7", translate("Every Sunday")) +o:value("0", translate("Every Sunday")) o.default=1 o = s:taboption("config_update", ListValue, "auto_update_time", translate("Update time (every day)")) @@ -211,7 +211,7 @@ o:value("3", translate("Every Wednesday")) o:value("4", translate("Every Thursday")) o:value("5", translate("Every Friday")) o:value("6", translate("Every Saturday")) -o:value("7", translate("Every Sunday")) +o:value("0", translate("Every Sunday")) o.default=1 o = s:taboption("rules_update", ListValue, "other_rule_update_day_time", translate("Update time (every day)")) @@ -246,7 +246,7 @@ o:value("3", translate("Every Wednesday")) o:value("4", translate("Every Thursday")) o:value("5", translate("Every Friday")) o:value("6", translate("Every Saturday")) -o:value("7", translate("Every Sunday")) +o:value("0", translate("Every Sunday")) o.default=1 o = s:taboption("geo_update", ListValue, "geo_update_day_time", translate("Update time (every day)")) diff --git a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/update.htm b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/update.htm index 059c8e1c1e..3c2fc94de2 100644 --- a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/update.htm +++ b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/update.htm @@ -134,9 +134,9 @@ if ( x && x.status == 200 ) { btn.value = '<%:检查并更新%>'; btn.disabled = false; - return false; } }); + return false; } function op_update(btn) @@ -147,9 +147,9 @@ if ( x && x.status == 200 ) { btn.value = '<%:检查并更新%>'; btn.disabled = false; - return false; } }); + return false; } function ma_core_update(btn) diff --git a/package/cnsztl/luci-app-openclash/files/usr/share/openclash/openclash.sh b/package/cnsztl/luci-app-openclash/files/usr/share/openclash/openclash.sh index f2e5ac7eb6..0264f8d704 100755 --- a/package/cnsztl/luci-app-openclash/files/usr/share/openclash/openclash.sh +++ b/package/cnsztl/luci-app-openclash/files/usr/share/openclash/openclash.sh @@ -13,12 +13,12 @@ if [ "$URL_TYPE" == "V2ray" ]; then elif [ "$URL_TYPE" == "surge" ]; then echo "开始下载Surge配置文件..." >$START_LOG subscribe_url=`echo $subscribe_url |sed 's/{/%7B/g;s/}/%7D/g;s/:/%3A/g;s/\"/%22/g;s/,/%2C/g;s/?/%3F/g;s/=/%3D/g;s/&/%26/g;s/\//%2F/g'` - wget-ssl --no-check-certificate --timeout=10 --debug --tries=2 https://tgbot.lbyczf.com/surge2clash?url="$subscribe_url" -O /tmp/config.yaml + wget-ssl --no-check-certificate --quiet --timeout=10 --tries=2 https://tgbot.lbyczf.com/surge2clash?url="$subscribe_url" -O /tmp/config.yaml else echo "开始下载Clash配置文件..." >$START_LOG wget-ssl --no-check-certificate --quiet --timeout=10 --tries=2 "$subscribe_url" -O /tmp/config.yaml fi -if [ "$?" -eq "0" ] && [ "$(ls -l /tmp/config.yaml |awk '{print int($5/1024)}')" -ne 0 ]; then +if [ "$?" -eq "0" ] && [ "$(ls -l /tmp/config.yaml |awk '{print int($5/1024)}')" -ne 0 ] && [ "$(awk '/Proxy Group:/,/Rule:/{print}' /tmp/config.yaml 2>/dev/null |egrep '^ {0,}-' |grep name: |sed 's/,.*//' |awk -F 'name: ' '{print $2}' |sed 's/\"//g' |wc -l)" -gt 0 ]; then echo "配置文件下载成功，检查是否有更新..." >$START_LOG if [ -f "$CONFIG_FILE" ]; then cmp -s "$BACKPACK_FILE" /tmp/config.yaml @@ -27,8 +27,8 @@ if [ "$?" -eq "0" ] && [ "$(ls -l /tmp/config.yaml |awk '{print int($5/1024)}')" mv /tmp/config.yaml "$CONFIG_FILE" 2>/dev/null\ && cp "$CONFIG_FILE" "$BACKPACK_FILE"\ && echo "配置文件替换成功，开始启动 OpenClash ..." >$START_LOG\ + && echo "${LOGTIME} Config Update Successful" >>$LOG_FILE\ && /etc/init.d/openclash restart 2>/dev/null - echo "${LOGTIME} Config Update Successful" >>$LOG_FILE else echo "配置文件没有任何更新，停止继续操作..." >$START_LOG rm -rf /tmp/config.yaml @@ -41,13 +41,13 @@ if [ "$?" -eq "0" ] && [ "$(ls -l /tmp/config.yaml |awk '{print int($5/1024)}')" mv /tmp/config.yaml "$CONFIG_FILE" 2>/dev/null\ && cp "$CONFIG_FILE" "$BACKPACK_FILE"\ && echo "配置文件创建成功，开始启动 OpenClash ..." >$START_LOG\ + && echo "${LOGTIME} Config Update Successful" >>$LOG_FILE\ && /etc/init.d/openclash restart 2>/dev/null - echo "${LOGTIME} Config Update Successful" >>$LOG_FILE fi else echo "配置文件下载失败，请检查网络或稍后再试！" >$START_LOG echo "${LOGTIME} Config Update Error" >>$LOG_FILE - #rm -rf /tmp/config.yaml 2>/dev/null + rm -rf /tmp/config.yaml 2>/dev/null sleep 10 echo "" >$START_LOG fi diff --git a/package/cnsztl/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh b/package/cnsztl/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh index da2d6dbc30..91c08a1626 100755 --- a/package/cnsztl/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh +++ b/package/cnsztl/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh @@ -88,12 +88,12 @@ elif [ "$2" = 0 ]; then [ -f /etc/openclash/config.bak ] && { grep '##source:' "$4" 1>/dev/null if [ "$?" -eq "0" ]; then - cp /etc/openclash/config.bak /etc/openclash/configrules.bak - sed -i -n '/^Rule:/,$p' /etc/openclash/configrules.bak - sed -i '/^Rule:/,$d' "$4" - cat /etc/openclash/configrules.bak >> "$4" - rm -rf /etc/openclash/configrules.bak - fi + cp /etc/openclash/config.bak /etc/openclash/configrules.bak + sed -i -n '/^Rule:/,$p' /etc/openclash/configrules.bak + sed -i '/^Rule:/,$d' "$4" + cat /etc/openclash/configrules.bak >> "$4" + rm -rf /etc/openclash/configrules.bak + fi } fi