From b3f4656f36dea38cd8136b99485c30fd34054f37 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <31687149+coolsnowwolf@users.noreply.github.com>
Date: Tue, 29 Oct 2019 22:31:35 +0800
Subject: [PATCH 1/6]  luci-app-unblockmusic: fix pc version playing

---
 .../lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 1aa15e8de..777ed4f85 100755
--- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
+++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
@@ -25,7 +25,7 @@ add_rule()
 	$ipt_n -A cloud_music -d 192.168.0.0/16 -j RETURN
 	$ipt_n -A cloud_music -d 224.0.0.0/4 -j RETURN
 	$ipt_n -A cloud_music -d 240.0.0.0/4 -j RETURN
-	$ipt_n -A cloud_music -p tcp -j REDIRECT --to-ports 5200
+	$ipt_n -A cloud_music -p tcp -j REDIRECT --to-ports 5202
 	$ipt_n -I PREROUTING -p tcp --dport 80 -m set --match-set music dst -j cloud_music
 }
 
@@ -83,8 +83,10 @@ start()
 	
 	if [ $TYPE = "default" ]; then
 			node /usr/share/UnblockNeteaseMusic/app.js $endponintset -p 5200:5201 >/tmp/unblockmusic.log 2>&1 &
+			node /usr/share/UnblockNeteaseMusic/app.js -p 5202 >/tmp/unblockmusic.log 2>&1 &
 	else
 			node /usr/share/UnblockNeteaseMusic/app.js $endponintset -p 5200:5201 -o $TYPE >/tmp/unblockmusic.log 2>&1 &
+			node /usr/share/UnblockNeteaseMusic/app.js -p 5202 -o $TYPE >/tmp/unblockmusic.log 2>&1 &
 	fi
 	
 	set_firewall

From 2a05eb07abc95ea9208aeacb6828086d44493712 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <31687149+coolsnowwolf@users.noreply.github.com>
Date: Tue, 29 Oct 2019 22:38:49 +0800
Subject: [PATCH 2/6] luci-app-unblockmusic: merge logs

---
 .../lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 777ed4f85..5be523956 100755
--- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
+++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
@@ -83,10 +83,10 @@ start()
 	
 	if [ $TYPE = "default" ]; then
 			node /usr/share/UnblockNeteaseMusic/app.js $endponintset -p 5200:5201 >/tmp/unblockmusic.log 2>&1 &
-			node /usr/share/UnblockNeteaseMusic/app.js -p 5202 >/tmp/unblockmusic.log 2>&1 &
+			node /usr/share/UnblockNeteaseMusic/app.js -p 5202 >>/tmp/unblockmusic.log 2>&1 &
 	else
 			node /usr/share/UnblockNeteaseMusic/app.js $endponintset -p 5200:5201 -o $TYPE >/tmp/unblockmusic.log 2>&1 &
-			node /usr/share/UnblockNeteaseMusic/app.js -p 5202 -o $TYPE >/tmp/unblockmusic.log 2>&1 &
+			node /usr/share/UnblockNeteaseMusic/app.js -p 5202 -o $TYPE >>/tmp/unblockmusic.log 2>&1 &
 	fi
 	
 	set_firewall

From 5f10bf015a7a471003e916692e040f3ebd8f13f0 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <31687149+coolsnowwolf@users.noreply.github.com>
Date: Wed, 30 Oct 2019 00:46:46 +0800
Subject: [PATCH 3/6] Update unblockmusiclog.lua

---
 .../luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua
index 83d05981f..074c8c4a8 100644
--- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua
+++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua
@@ -8,7 +8,7 @@ t = f:field(TextValue, "conf")
 t.rmempty = true
 t.rows = 20
 function t.cfgvalue()
-  luci.sys.exec(" sed '/MITM/d' /tmp/unblockmusic.log > /tmp/music.log")
+  luci.sys.exec("cat /tmp/unblockmusic.log | grep http > /tmp/music.log")
 	return fs.readfile(conffile) or ""
 end
 t.readonly="readonly"

From 700739398d5ddc0815d497daa40a4e2248c30934 Mon Sep 17 00:00:00 2001
From: lean <coolsnowwolf@gmail.com>
Date: Wed, 30 Oct 2019 14:35:05 +0800
Subject: [PATCH 4/6] UnblockNeteaseMusic: bump to 0.20.4

---
 package/lean/UnblockNeteaseMusic/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile
index 2e207b177..97f36eb47 100644
--- a/package/lean/UnblockNeteaseMusic/Makefile
+++ b/package/lean/UnblockNeteaseMusic/Makefile
@@ -11,14 +11,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UnblockNeteaseMusic
-PKG_VERSION:=0.20.3
+PKG_VERSION:=0.20.4
 PKG_RELEASE:=1
 
 PKG_LICENSE:=MIT
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git
-PKG_SOURCE_VERSION:=9675b15cbcda37a5b19695c8cfa9f9c63b094b88
+PKG_SOURCE_VERSION:=023a97f0e62d322a8d64c59ef3942da7c8a1b546
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz
@@ -43,8 +43,9 @@ endef
 
 define Build/Prepare
 	tar -xzvf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR)
-	echo -e $(PKG_VERSION) > $(PKG_BUILD_DIR)/UnblockNeteaseMusic/core_ver
-	echo -e $(PKG_SOURCE_VERSION) > $(PKG_BUILD_DIR)/UnblockNeteaseMusic/local_ver
+	mkdir -p $(PKG_BUILD_DIR)/$(PKG_NAME)
+	echo -e $(PKG_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)/core_ver
+	echo -e $(PKG_SOURCE_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)/local_ver
 endef
 
 define Build/Configure

From 61964b6aa5391ff0c02b54f3476eda0daf3e70de Mon Sep 17 00:00:00 2001
From: lean <coolsnowwolf@gmail.com>
Date: Wed, 30 Oct 2019 15:54:07 +0800
Subject: [PATCH 5/6] luci-app-unblockmusic: add deamon monitor process

---
 package/lean/luci-app-unblockmusic/Makefile                | 4 ++--
 .../root/usr/share/UnblockNeteaseMusic/logcheck.sh         | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile
index bec835b07..a50de73a3 100644
--- a/package/lean/luci-app-unblockmusic/Makefile
+++ b/package/lean/luci-app-unblockmusic/Makefile
@@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-unblockmusic
 PKG_VERSION:=2.2.0
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 PKG_LICENSE:=Apache-2.0
 
 LUCI_TITLE:=LuCI support for Unblock NeteaseCloudMusic
-LUCI_DEPENDS:=+UnblockNeteaseMusic +bash +dnsmasq-full +ipset +bash
+LUCI_DEPENDS:=+UnblockNeteaseMusic +bash +dnsmasq-full +ipset
 LUCI_PKGARCH:=all
 
 PKG_MAINTAINER:=lean
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 920392db8..168020537 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/bash
 
-log_max_size="4" #使用KB计算
+log_max_size="10" #使用KB计算
 log_file="/tmp/unblockmusic.log"
 
 while true
 do
+  sleep 10s
+  icount=`busybox ps -w | grep app.js |grep -v grep| wc -l`
+  if [ $icount -ne 2 ] ;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

From 61cfe1645c0680ba099627b07c8bed1a9e36f6f5 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <31687149+coolsnowwolf@users.noreply.github.com>
Date: Thu, 31 Oct 2019 18:14:45 +0800
Subject: [PATCH 6/6] Update unblockmusiclog.lua

---
 .../luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua
index 074c8c4a8..1be151743 100644
--- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua
+++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua
@@ -8,7 +8,7 @@ t = f:field(TextValue, "conf")
 t.rmempty = true
 t.rows = 20
 function t.cfgvalue()
-  luci.sys.exec("cat /tmp/unblockmusic.log | grep http > /tmp/music.log")
+  luci.sys.exec("grep -B 1 'http' /tmp/unblockmusic.log > /tmp/music.log")
 	return fs.readfile(conffile) or ""
 end
 t.readonly="readonly"