diff --git a/package/lean/luci-app-unblockneteasemusic-go/Makefile b/package/lean/luci-app-unblockneteasemusic-go/Makefile index 60d6707f43..53fdbef707 100644 --- a/package/lean/luci-app-unblockneteasemusic-go/Makefile +++ b/package/lean/luci-app-unblockneteasemusic-go/Makefile @@ -2,10 +2,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for UnblockNeteaseMusic Go -LUCI_DEPENDS:=+bash +coreutils-nohup +curl +dnsmasq-full +openssl-util +ipset +UnblockNeteaseMusic-Go +LUCI_DEPENDS:=+bash +busybox +coreutils-nohup +curl +dnsmasq-full +openssl-util +ipset +UnblockNeteaseMusic-Go LUCI_PKGARCH:=all PKG_NAME:=luci-app-unblockneteasemusic-go -PKG_VERSION:=1.5 +PKG_VERSION:=1.6 PKG_RELEASE:=1 PKG_MAINTAINER:=https://github.com/cnsilvan/luci-app-unblockneteasemusic diff --git a/package/lean/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic.lua b/package/lean/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic.lua index aa42238409..f445ba8ef0 100644 --- a/package/lean/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic.lua +++ b/package/lean/luci-app-unblockneteasemusic-go/luasrc/model/cbi/unblockneteasemusic.lua @@ -30,14 +30,14 @@ https_port.rmempty = false music_source = s:option(ListValue, "music_source", translate("音源选择")) music_source:value("default", translate("默认")) music_source:value("customize", translate("自定义")) -music_source.description = translate("默认为kuwo:kugou") +music_source.description = translate("默认为kuwo") music_source.default = "default" music_source.rmempty = false music_customize_source = s:option(Value, "music_customize_source", translate("自定义音源")) music_customize_source.description = translate("自定义音源设置,如kuwo:kugou:migu ,以:隔开,migu在某些运营商下无法使用可能会导致卡顿") music_customize_source.default = "kuwo:kugou" -music_customize_source.rmempty = false +music_customize_source.rmempty = true music_customize_source:depends("music_source", "customize") hijack = s:option(ListValue, "hijack_ways", translate("劫持方法")) diff --git a/package/lean/luci-app-unblockneteasemusic-go/root/etc/hotplug.d/iface/99-unblockneteasemusic b/package/lean/luci-app-unblockneteasemusic-go/root/etc/hotplug.d/iface/99-unblockneteasemusic new file mode 100755 index 0000000000..b8fb321325 --- /dev/null +++ b/package/lean/luci-app-unblockneteasemusic-go/root/etc/hotplug.d/iface/99-unblockneteasemusic @@ -0,0 +1,14 @@ +#!/bin/sh +[ "$ACTION" = ifup ] || exit 0 +log_file="/tmp/unblockneteasemusic.log" +sleep 10 +if [ "$(uci get unblockneteasemusic.@unblockneteasemusic[0].enable)" == "1" ]; then + echo "$(date -R) ifup--尝试重启应用..." >>"${log_file}" + /etc/init.d/unblockneteasemusic restart +fi +# curl -s "http://httpdns.n.netease.com/httpdns/v2/d?domain=music.163.com,interface.music.163.com,interface3.music.163.com,apm.music.163.com,apm3.music.163.com,clientlog.music.163.com,clientlog3.music.163.com" | grep -Eo '[0-9]+?\.[0-9]+?\.[0-9]+?\.[0-9]+?' | sort | uniq | awk '{print "ipset add unblockneteasemusic4 "$1}' | bash >"/dev/null" 2>&1 +# domains="music.163.com" +# for domain in $domains; do +# ip=$(ping6 ${domain} -c 1 | sed '1{s/[^(]*(//;s/).*//;q}') +# ipset add unblockneteasemusic6 $ip +# done diff --git a/package/lean/luci-app-unblockneteasemusic-go/root/etc/init.d/unblockneteasemusic b/package/lean/luci-app-unblockneteasemusic-go/root/etc/init.d/unblockneteasemusic index 3005923540..4ac8741224 100755 --- a/package/lean/luci-app-unblockneteasemusic-go/root/etc/init.d/unblockneteasemusic +++ b/package/lean/luci-app-unblockneteasemusic-go/root/etc/init.d/unblockneteasemusic @@ -127,27 +127,30 @@ subjectAltName=DNS:music.163.com,DNS:*.music.163.com" >"${extFile}" start() { stop >>"${logFile}" 2>&1 [ "${enable}" -ne "1" ] && exit 0 - if [ ! -f "$serverCrt" ]; then - createCertificate >>"${logFile}" 2>&1 - fi - if [ "${endpoint}" = "1" ]; then - exArgs="-e" - fi - if [ "${music_source}" = "default" ]; then - nohup UnblockNeteaseMusic -p "${http_port}" -sp "${https_port}" -m 0 -c "${serverCrt}" -k "${serverKey}" ${exArgs} >>"${logFile}" 2>&1 & + ping -c 1 114.114.114.114 >/dev/null 2>&1 + if [ $? -eq 0 ]; then + if [ ! -f "$serverCrt" ]; then + createCertificate >>"${logFile}" 2>&1 + fi + if [ "${endpoint}" = "1" ]; then + exArgs="-e" + fi + if [ "${music_source}" = "default" ]; then + nohup UnblockNeteaseMusic -p "${http_port}" -sp "${https_port}" -o kuwo -m 0 -c "${serverCrt}" -k "${serverKey}" ${exArgs} >>"${logFile}" 2>&1 & + else + nohup UnblockNeteaseMusic -p "${http_port}" -sp "${https_port}" -o "${music_customize_source}" -m 0 -c "${serverCrt}" -k "${serverKey}" ${exArgs} >>"${logFile}" 2>&1 & + fi + set_type="start" + if [ "${hijack_ways}" = "use_ipset" ]; then + set_ipset >"/dev/null" 2>&1 + elif [ "${hijack_ways}" = "use_hosts" ]; then + set_hosts >"/dev/null" 2>&1 + fi else - nohup UnblockNeteaseMusic -p "${http_port}" -sp "${https_port}" -o "${music_customize_source}" -m 0 -c "${serverCrt}" -k "${serverKey}" ${exArgs} >>"${logFile}" 2>&1 & + echo "$(date -R) 网络连接异常" >>"${logFile}" fi - - set_type="start" - if [ "${hijack_ways}" = "use_ipset" ]; then - set_ipset >"/dev/null" 2>&1 - elif [ "${hijack_ways}" = "use_hosts" ]; then - set_hosts >"/dev/null" 2>&1 - fi - sed -i '/UnblockNeteaseMusic/d' /etc/crontabs/root - echo "*/5 * * * * /usr/share/UnblockNeteaseMusic/log_check.sh" >>"/etc/crontabs/root" + echo "*/1 * * * * /usr/share/UnblockNeteaseMusic/log_check.sh" >>"/etc/crontabs/root" /etc/init.d/cron restart >"/dev/null" 2>&1 } @@ -157,7 +160,7 @@ stop() { sed -i '/UnblockNeteaseMusic/d' "/etc/crontabs/root" /etc/init.d/cron restart >"/dev/null" 2>&1 - rm -f "${logFile}" + # rm -f "${logFile}" set_type="stop" set_ipset >"/dev/null" 2>&1 diff --git a/package/lean/luci-app-unblockneteasemusic-go/root/etc/ppp/ip-up.d/unblockneteasemusic b/package/lean/luci-app-unblockneteasemusic-go/root/etc/ppp/ip-up.d/unblockneteasemusic deleted file mode 100755 index cce9e213a7..0000000000 --- a/package/lean/luci-app-unblockneteasemusic-go/root/etc/ppp/ip-up.d/unblockneteasemusic +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -sleep 10 -curl -s "http://httpdns.n.netease.com/httpdns/v2/d?domain=music.163.com,interface.music.163.com,interface3.music.163.com,apm.music.163.com,apm3.music.163.com,clientlog.music.163.com,clientlog3.music.163.com" | grep -Eo '[0-9]+?\.[0-9]+?\.[0-9]+?\.[0-9]+?' | sort | uniq | awk '{print "ipset add unblockneteasemusic4 "$1}' | bash >"/dev/null" 2>&1 -domains="music.163.com" -for domain in $domains; do - ip=$(ping6 ${domain} -c 1 | sed '1{s/[^(]*(//;s/).*//;q}') - ipset add unblockneteasemusic6 $ip -done diff --git a/package/lean/luci-app-unblockneteasemusic-go/root/usr/share/UnblockNeteaseMusic/log_check.sh b/package/lean/luci-app-unblockneteasemusic-go/root/usr/share/UnblockNeteaseMusic/log_check.sh index e6148caf9e..8e910cd708 100755 --- a/package/lean/luci-app-unblockneteasemusic-go/root/usr/share/UnblockNeteaseMusic/log_check.sh +++ b/package/lean/luci-app-unblockneteasemusic-go/root/usr/share/UnblockNeteaseMusic/log_check.sh @@ -1,8 +1,12 @@ #!/bin/bash -log_max_size="16" #使用KB计算 +log_max_size="128" #使用KB计算 log_file="/tmp/unblockneteasemusic.log" -(( log_size = "$(ls -l "${log_file}" | awk -F ' ' '{print $5}')" / "1024" )) -(( "${log_size}" >= "${log_max_size}" )) && echo "" > "${log_file}" - -[ "*$(uci get unblockneteasemusic.@unblockneteasemusic[0].daemon_enable)*" == "*1*" ] && { [ -z "$(ps |grep "UnblockNeteaseMusic" |grep -v "grep")" ] && /etc/init.d/unblockneteasemusic restart; } \ No newline at end of file +((log_size = "$(ls -l "${log_file}" | awk -F ' ' '{print $5}')" / "1024")) +(("${log_size}" >= "${log_max_size}")) && echo "" >"${log_file}" +if [ "$(uci get unblockneteasemusic.@unblockneteasemusic[0].daemon_enable)" == "1" ]; then + if [ -z "$(ps | grep "UnblockNeteaseMusic" | grep -v "grep")" ]; then + echo "$(date -R) 尝试重启应用..." >>"${log_file}" + /etc/init.d/unblockneteasemusic restart + fi +fi