bump to v2.6-3

Makefile

@@ -12,7 +12,7 @@ LUCI_DEPENDS:=+bash +busybox +coreutils-nohup +curl +dnsmasq-full +ipset +libope
 LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-unblockneteasemusic
 PKG_VERSION:=2.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt
 

luasrc/model/cbi/unblockneteasemusic.lua

@@ -39,26 +39,19 @@ youtube_key:depends("music_source", "youtube")
 
 endpoint_url = s:option(Value, "endpoint_url", translate("EndPoint"))
 endpoint_url.description = translate("具体说明参见：https://github.com/nondanee/UnblockNeteaseMusic")
-endpoint_url.default = "https://music.163.com"
-endpoint_url.placeholder = "https://music.163.com"
+endpoint_url.default = "http://music.163.com"
+endpoint_url.placeholder = "http://music.163.com"
 endpoint_url.datatype = "string"
 endpoint_url.rmempty = false
 
-hijack = s:option(ListValue, "hijack_ways", translate("[主实例] 劫持方法"))
+hijack = s:option(ListValue, "hijack_ways", translate("劫持方法"))
 hijack:value("dont_hijack", translate("不开启劫持"))
 hijack:value("use_ipset", translate("使用IPSet劫持"))
 hijack:value("use_hosts", translate("使用Hosts劫持"))
 hijack.description = translate("如果使用Hosts劫持，主实例的HTTP/HTTPS端口将被锁定为80/443")
 hijack.default = "dont_hijack"
 hijack.rmempty = false
 
-hijack_apple = s:option(ListValue, "hijack_ways_apple", translate("[苹果实例] 劫持方法"))
-hijack_apple:value("dont_hijack", translate("不开启劫持"))
-hijack_apple:value("use_dnsmasq", translate("使用DNSmasq劫持"))
-hijack_apple.description = translate("如果使用DNSmasq劫持，请在设备中将代理选项设置为自动")
-hijack_apple.default = "dont_hijack"
-hijack_apple.rmempty = false
-
 auto_update = s:option(Flag, "auto_update", translate("启用自动更新"))
 auto_update.description = translate("启用后，每天将定时自动检查最新版本并更新")
 auto_update.default = 0
@@ -77,34 +70,20 @@ advanced_mode.description = translate("仅推荐高级玩家使用")
 advanced_mode.default = 0
 advanced_mode.rmempty = false
 
-http_port = s:option(Value, "http_port", translate("[主实例] HTTP 监听端口"))
-http_port.description = translate("主实例监听的HTTP端口，不可与苹果实例/其他程序/HTTPS共用一个端口")
+http_port = s:option(Value, "http_port", translate("HTTP 监听端口"))
+http_port.description = translate("程序监听的HTTP端口，不可与 其他程序/HTTPS 共用一个端口")
 http_port.placeholder = "5200"
 http_port.default = "5200"
 http_port.datatype = "port"
 http_port:depends("advanced_mode", 1)
 
-https_port = s:option(Value, "https_port", translate("[主实例] HTTPS 监听端口"))
-https_port.description = translate("主实例监听的HTTPS端口，不可与苹果实例/其他程序/HTTP共用一个端口")
+https_port = s:option(Value, "https_port", translate("HTTPS 监听端口"))
+https_port.description = translate("程序监听的HTTPS端口，不可与 其他程序/HTTP 共用一个端口")
 https_port.placeholder = "5201"
 https_port.default = "5201"
 https_port.datatype = "port"
 https_port:depends("advanced_mode", 1)
 
-apple_http_port = s:option(Value, "apple_http_port", translate("[苹果实例] HTTP 监听端口"))
-apple_http_port.description = translate("苹果实例监听的HTTP端口，不可与主实例/其他程序/HTTPS共用一个端口")
-apple_http_port.placeholder = "5202"
-apple_http_port.default = "5202"
-apple_http_port.datatype = "port"
-apple_http_port:depends("advanced_mode", 1)
-
-apple_https_port = s:option(Value, "apple_https_port", translate("[苹果实例] HTTPS 监听端口"))
-apple_https_port.description = translate("苹果实例监听的HTTPS端口，不可与主实例/其他程序/HTTP共用一个端口")
-apple_https_port.placeholder = "5203"
-apple_https_port.default = "5203"
-apple_https_port.datatype = "port"
-apple_https_port:depends("advanced_mode", 1)
-
 daemon_enable = s:option(Flag, "daemon_enable", translate("启用进程守护"))
 daemon_enable.description = translate("开启后，附属程序会自动检测主程序运行状态，在主程序退出时自动重启")
 daemon_enable.default = 0

root/etc/config/unblockneteasemusic

@@ -4,16 +4,13 @@ config unblockneteasemusic
 	option music_source 'default'
 	option qq_cookie ''
 	option youtube_key ''
-	option endpoint_url 'https://music.163.com'
+	option endpoint_url 'http://music.163.com'
 	option hijack_ways 'use_ipset'
-	option hijack_ways_apple 'use_dnsmasq'
 	option auto_update '1'
 	option update_time '3'
 	option advanced_mode '0'
 	option http_port '5200'
 	option https_port '5201'
-	option apple_http_port '5202'
-	option apple_https_port '5203'
 	option daemon_enable '0'
 	option keep_core_when_upgrade '0'
 	option pub_access '0'

root/etc/init.d/unblockneteasemusic

@@ -15,15 +15,12 @@ youtube_key="$(uci get unblockneteasemusic.@unblockneteasemusic[0].youtube_key 2
 
 endpoint_url="$(uci get unblockneteasemusic.@unblockneteasemusic[0].endpoint_url)"
 hijack_ways="$(uci get unblockneteasemusic.@unblockneteasemusic[0].hijack_ways)"
-hijack_ways_apple="$(uci get unblockneteasemusic.@unblockneteasemusic[0].hijack_ways_apple)"
 
 auto_update="$(uci get unblockneteasemusic.@unblockneteasemusic[0].auto_update)"
 update_time="$(uci get unblockneteasemusic.@unblockneteasemusic[0].update_time)"
 
 http_port="$(uci get unblockneteasemusic.@unblockneteasemusic[0].http_port 2>"/dev/null" || echo "5200")"
 https_port="$(uci get unblockneteasemusic.@unblockneteasemusic[0].https_port 2>"/dev/null" || echo "5201")"
-apple_http_port="$(uci get unblockneteasemusic.@unblockneteasemusic[0].apple_http_port 2>"/dev/null" || echo "5202")"
-apple_https_port="$(uci get unblockneteasemusic.@unblockneteasemusic[0].apple_https_port 2>"/dev/null" || echo "5203")"
 
 keep_core_when_upgrade="$(uci get unblockneteasemusic.@unblockneteasemusic[0].keep_core_when_upgrade 2>"/dev/null")"
 [ "*$(uci get unblockneteasemusic.@unblockneteasemusic[0].pub_access 2>"/dev/null")*" = "*1*" ] && addr="0.0.0.0" || addr="${lan_addr}"
@@ -39,6 +36,7 @@ set_ipset(){
 		mkdir -p "/tmp/dnsmasq.d"
 		rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic.conf"
 		cat <<-EOF > "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic.conf"
+dhcp-option=252,http://${lan_addr}:${http_port}/proxy.pac
 ipset=/.music.163.com/music
 ipset=/interface.music.163.com/music
 ipset=/interface3.music.163.com/music
@@ -63,9 +61,7 @@ ipset=/apm3.music.163.com/music
 		iptables -t nat -I PREROUTING -p tcp -m set --match-set music dst -j cloud_music
 
 		mkdir -p /var/etc
-		cat <<-EOF > "/var/etc/unblockneteasemusic.include"
-/etc/init.d/unblockneteasemusic restart
-		EOF
+		echo -e "/etc/init.d/unblockneteasemusic restart" > "/var/etc/unblockneteasemusic.include"
 	elif [ "${set_type}" = "stop" ]; then
 		iptables -t nat -D PREROUTING -p tcp -m set --match-set music dst -j cloud_music
 		iptables -t nat -F cloud_music
@@ -83,6 +79,7 @@ set_hosts(){
 		mkdir -p "/tmp/dnsmasq.d"
 		rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic.conf"
 		cat <<-EOF > "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic.conf"
+dhcp-option=252,http://${lan_addr}:${http_port}/proxy.pac
 address=/music.163.com/${lan_addr}
 address=/interface.music.163.com/${lan_addr}
 address=/interface3.music.163.com/${lan_addr}
@@ -101,29 +98,13 @@ address=/music.httpdns.c.163.com/0.0.0.0
 	fi
 }
 
-set_dnsmasq(){
-	if [ "${set_type}" = "start" ]; then
-		mkdir -p "/tmp/dnsmasq.d"
-		rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic-apple.conf"
-		cat <<-EOF > "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic-apple.conf"
-dhcp-option=252,http://${lan_addr}:${apple_http_port}/proxy.pac
-		EOF
-		/etc/init.d/dnsmasq restart > "/dev/null" 2>&1
-	elif [ "${set_type}" = "stop" ]; then
-		rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic-apple.conf"
-		/etc/init.d/dnsmasq restart > "/dev/null" 2>&1
-	fi
-}
-
 set_ports(){
 	if [ "${set_type}" = "start" ]; then
 		iptables -I INPUT -p tcp --dport "${http_port}" -j ACCEPT
 		iptables -I INPUT -p tcp --dport "${https_port}" -j ACCEPT
 
 		mkdir -p /var/etc
-		cat <<-EOF > "/var/etc/unblockneteasemusic.include"
-/etc/init.d/unblockneteasemusic
-		EOF
+		echo -e "/etc/init.d/unblockneteasemusic restart" > "/var/etc/unblockneteasemusic.include"
 	elif [ "${set_type}" = "stop" ]; then
 		iptables -D INPUT -p tcp --dport "${http_port}" -j ACCEPT
 		iptables -D INPUT -p tcp --dport "${https_port}" -j ACCEPT
@@ -154,11 +135,9 @@ start()
 
 	[ "${hijack_ways}" = "use_hosts" ] && { http_port="80"; https_port="443"; }
 	if [ "${music_source}" = "default" ]; then
-		nohup node "/usr/share/unblockneteasemusic/core/app.js" -a "${addr}" -p "${http_port}":"${https_port}" ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >> "/tmp/unblockneteasemusic.log" 2>&1 &
-		nohup node "/usr/share/unblockneteasemusic/core/app.js" -a "${addr}" -p "${apple_http_port}":"${apple_https_port}" -e "${endpoint_url}" ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >> "/tmp/unblockneteasemusic.log" 2>&1 &
+		nohup node "/usr/share/unblockneteasemusic/core/app.js" -a "${addr}" -p "${http_port}":"${https_port}" -e "${endpoint_url}" ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >> "/tmp/unblockneteasemusic.log" 2>&1 &
 	else
-		nohup node "/usr/share/unblockneteasemusic/core/app.js" -a "${addr}" -p "${http_port}":"${https_port}" -o "${music_source}" ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >> "/tmp/unblockneteasemusic.log" 2>&1 &
-		nohup node "/usr/share/unblockneteasemusic/core/app.js" -a "${addr}" -p "${apple_http_port}":"${apple_https_port}" -o "${music_source}" -e "${endpoint_url}" ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >> "/tmp/unblockneteasemusic.log" 2>&1 &
+		nohup node "/usr/share/unblockneteasemusic/core/app.js" -a "${addr}" -p "${http_port}":"${https_port}" -o "${music_source}" -e "${endpoint_url}" ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >> "/tmp/unblockneteasemusic.log" 2>&1 &
 	fi
 
 	set_type="start"
@@ -167,7 +146,6 @@ start()
 	elif [ "${hijack_ways}" = "use_hosts" ]; then
 		set_hosts > "/dev/null" 2>&1
 	fi
-	[ "${hijack_ways_apple}" = "use_dnsmasq" ] && set_dnsmasq > "/dev/null" 2>&1
 
 	[ "*$(uci get unblockneteasemusic.@unblockneteasemusic[0].pub_access 2>"/dev/null")*" = "*1*" ] && set_ports > "/dev/null" 2>&1
 
@@ -192,6 +170,5 @@ stop()
 	set_type="stop"
 	set_ipset > "/dev/null" 2>&1
 	set_hosts > "/dev/null" 2>&1
-	set_dnsmasq > "/dev/null" 2>&1
 	set_ports > "/dev/null" 2>&1
 }