From 72d5c16e5129a9bb635a77e8fd1196d36ac46ed1 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Mon, 17 Feb 2020 17:11:44 +0800 Subject: [PATCH] luci-app-unblockmusic: fix hotplug.d script --- package/lean/luci-app-unblockmusic/Makefile | 13 +------------ .../luasrc/model/cbi/unblockmusic.lua | 7 +------ .../root/etc/hotplug.d/iface/099-unblockmusic | 8 +++++--- .../root/etc/init.d/unblockmusic | 12 ++---------- .../root/etc/ppp/ip-up.d/unblockmusic.sh | 4 ---- .../root/usr/share/UnblockNeteaseMusic/logcheck.sh | 7 ++++++- 6 files changed, 15 insertions(+), 36 deletions(-) delete mode 100755 package/lean/luci-app-unblockmusic/root/etc/ppp/ip-up.d/unblockmusic.sh diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 0d5e47072..00d3b10d6 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.1 -PKG_RELEASE:=8 +PKG_RELEASE:=10 PKG_LICENSE:=Apache-2.0 @@ -20,16 +20,5 @@ PKG_MAINTAINER:=lean include $(TOPDIR)/feeds/luci/luci.mk -define Package/$(PKG_NAME)/postinst -#!/bin/sh -if [ -z "$${IPKG_INSTROOT}" ]; then - ( . /etc/uci-defaults/unblockmusic ) && rm -f /etc/uci-defaults/unblockmusic - rm -f /tmp/luci-indexcache - /bin/sh /etc/ppp/ip-up.d/unblockmusic.sh & - /etc/init.d/unblockmusic disable >/dev/null 2>&1 -fi -exit 0 -endef - # call BuildPackage - OpenWrt buildroot signature diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua index 104baa303..219a4e8e2 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua @@ -24,11 +24,6 @@ speedtype:value("kuwo", translate("酷我音乐(高音质推荐)")) speedtype:value("migu", translate("咕咪音乐")) speedtype:value("joox", translate("JOOX音乐")) -endpoint = s:option(Value, "endpoint", translate("转发HTTPS音源地址")) -endpoint.default = "http://music.163.com" -endpoint.rmempty = true -endpoint.description = translate("默认为 http://music.163.com") - o = s:option(Button,"certificate",translate("HTTPS 证书")) o.inputtitle = translate("下载 CA 根证书") o.description = translate("新版安卓/iOS客户端可能需要安装 CA根证书并信任
苹果系统需要在“设置 -> 通用 -> 关于本机 -> 证书信任设置”中，信任 UnblockNeteaseMusic Root CA )") @@ -67,7 +62,7 @@ o.inputtitle = translate("更新核心版本") o.description = string.format(translate("目前运行主程序版本") .. ": %s ", ver) o.inputstyle = "reload" o.write = function() - luci.sys.exec("bash /usr/share/UnblockNeteaseMusic/update_core.sh 2>&1") + luci.sys.exec("/usr/share/UnblockNeteaseMusic/update_core.sh 2>&1") luci.http.redirect(luci.dispatcher.build_url("admin", "services", "unblockmusic")) end diff --git a/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic index 78430ec4b..4fbe7ddc4 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic @@ -1,6 +1,8 @@ #!/bin/sh -[ "${ACTION}" = "ifup" ] && { +[ "$ACTION" = ifup ] || exit 0 +[ "$INTERFACE" = "wan" ] || exit 0 + +ipset -! -N music hash:ip sleep 10 -wget 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 -O- | grep -Eo '[0-9]+?\.[0-9]+?\.[0-9]+?\.[0-9]+?' | sort | uniq | awk '{print "ipset -! add music "$1}' | sh -} +wget-ssl -t 99 -T 10 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 -O- | grep -Eo '[0-9]+?\.[0-9]+?\.[0-9]+?\.[0-9]+?' | sort | uniq | awk '{print "ipset -! add music "$1}' | sh diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic index c92f172c1..6f998effb 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -5,8 +5,6 @@ STOP=10 enable=$(uci get unblockmusic.@unblockmusic[0].enabled) TYPE=$(uci get unblockmusic.@unblockmusic[0].musicapptype) -PROXY=$(uci get unblockmusic.@unblockmusic[0].proxy) -ENDPOINT=$(uci get unblockmusic.@unblockmusic[0].endpoint) AUTOUPDATE=$(uci get unblockmusic.@unblockmusic[0].autoupdate) CRON_FILE=/etc/crontabs/root @@ -82,12 +80,6 @@ start() [ $enable -eq "0" ] && exit 0 - endponintset=" "; - - if [ -n "$ENDPOINT" ]; then - endponintset="-e ${ENDPOINT}" - fi - rm -f /tmp/unblockmusic.log echo "$(date -R) # Start UnblockNeteaseMusic" >/tmp/unblockmusic.log @@ -97,7 +89,7 @@ start() musictype="-o $TYPE" fi - node /usr/share/UnblockNeteaseMusic/app.js $endponintset -p 5200:5201 $musictype >>/tmp/unblockmusic.log 2>&1 & + node /usr/share/UnblockNeteaseMusic/app.js -e http://music.163.com -p 5200:5201 $musictype >>/tmp/unblockmusic.log 2>&1 & set_firewall add_cron @@ -107,7 +99,7 @@ start() stop() { - kill -9 $(busybox ps -w | grep UnblockNeteaseMusic/app.js | grep -v grep | awk '{print $1}') >/dev/null 2>&1 + kill -9 $(busybox ps -w | grep UnblockNeteaseMusic/app.js | grep -v grep | awk '{print $1}') >/dev/null 2>&1 kill -9 $(busybox ps -w | grep logcheck.sh | grep -v grep | awk '{print $1}') >/dev/null 2>&1 rm -f /tmp/unblockmusic.log diff --git a/package/lean/luci-app-unblockmusic/root/etc/ppp/ip-up.d/unblockmusic.sh b/package/lean/luci-app-unblockmusic/root/etc/ppp/ip-up.d/unblockmusic.sh deleted file mode 100755 index e8844f63a..000000000 --- a/package/lean/luci-app-unblockmusic/root/etc/ppp/ip-up.d/unblockmusic.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -sleep 10 -wget 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 -O- | grep -Eo '[0-9]+?\.[0-9]+?\.[0-9]+?\.[0-9]+?' | sort | uniq | awk '{print "ipset -! add music "$1}' | sh diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh index 862d4c55f..0e3558783 100755 --- a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh +++ b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh @@ -1,10 +1,15 @@ #!/bin/sh -log_max_size="10" #使用KB计算 +log_max_size="100" #使用KB计算 log_file="/tmp/unblockmusic.log" while true do + sleep 10s + icount=`busybox ps -w | grep UnblockNeteaseMusic/app.js |grep -v grep| wc -l` + if [ $icount -ne 1 ] ;then + /etc/init.d/unblockmusic restart + fi (( log_size = "$(ls -l "${log_file}" | awk -F ' ' '{print $5}')" / "1024" )) (( "${log_size}" >= "${log_max_size}" )) && echo "" > /tmp/unblockmusic.log sleep 10m