fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-unblockneteasemusic: bump to v2.2-2

Browse Source
This commit is contained in:
CN_SZTL 2019-10-31 13:07:03 +08:00
parent 783e5b63dd
commit 8775dbaf6a
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
5 changed files with 73 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/ctcgfw/luci-app-unblockneteasemusic/Makefile
View File

@ -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.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt

4
package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua
View File

@ -12,7 +12,7 @@ function index()
entry({"admin", "services", "unblockneteasemusic"},firstchild(), _("解除网易云音乐播放限制"), 50).dependent = false
entry({"admin", "services", "unblockneteasemusic", "general"},cbi("unblockneteasemusic"), _("基本设定"), 1)
entry({"admin", "services", "unblockneteasemusic", "updt_core"},form("unblockneteasemusic_upcore"), _("更新核心"), 2).leaf = true
entry({"admin", "services", "unblockneteasemusic", "update_core"},form("unblockneteasemusic_upcore"), _("更新核心"), 2).leaf = true
entry({"admin", "services", "unblockneteasemusic", "log"},form("unblockneteasemusiclog"), _("日志"), 3)
entry({"admin", "services", "unblockneteasemusic", "status"},call("act_status")).leaf=true
@ -53,4 +53,4 @@ function act_update_core()
luci.http.write_json({
ret = update_core();
})
end
end

126
package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic.lua
View File

@ -7,38 +7,38 @@ s = mp:section(TypedSection, "unblockneteasemusic")
s.anonymous=true
s.addremove=false
enabled = s:option(Flag, "enabled", translate("启用本插件"))
enabled.description = translate("启用本插件以解除网易云音乐播放限制")
enabled.default = 0
enabled.rmempty = false
enable = s:option(Flag, "enable", translate("启用本插件"))
enable.description = translate("启用本插件以解除网易云音乐播放限制")
enable.default = 0
enable.rmempty = false
account = s:option(Value, "http_port", translate("[HTTP] 监听端口"))
account.description = translate("本插件监听的HTTP端口，不可与其他程序/HTTPS共用一个端口")
account.placeholder = "5200"
account.default = "5200"
account.datatype = "port"
account.rmempty = false
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.rmempty = false
account = s:option(Value, "https_port", translate("[HTTPS] 监听端口"))
account.description = translate("本插件监听的HTTPS端口，不可与其他程序/HTTP共用一个端口")
account.placeholder = "5201"
account.default = "5201"
account.datatype = "port"
account.rmempty = false
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.rmempty = false
speedtype = s:option(ListValue, "musicapptype", translate("音源接口"))
speedtype:value("default", translate("默认"))
speedtype:value("qq", translate("QQ音乐"))
speedtype:value("xiami", translate("虾米音乐"))
speedtype:value("baidu", translate("百度音乐"))
speedtype:value("kugou", translate("酷狗音乐"))
speedtype:value("kuwo", translate("酷我音乐"))
speedtype:value("migu", translate("咕咪音乐"))
speedtype:value("joox", translate("JOOX音乐"))
speedtype:value("all", translate("所有平台"))
speedtype.description = translate("音源调用接口")
speedtype.default = "default"
speedtype.rmempty = false
music_source = s:option(ListValue, "music_source", translate("音源接口"))
music_source:value("default", translate("默认"))
music_source:value("qq", translate("QQ音乐"))
music_source:value("xiami", translate("虾米音乐"))
music_source:value("baidu", translate("百度音乐"))
music_source:value("kugou", translate("酷狗音乐"))
music_source:value("kuwo", translate("酷我音乐"))
music_source:value("migu", translate("咕咪音乐"))
music_source:value("joox", translate("JOOX音乐"))
music_source:value("youtube", translate("Youtube音乐"))
music_source.description = translate("音源调用接口")
music_source.default = "default"
music_source.rmempty = false
hijack = s:option(ListValue, "hijack_ways", translate("劫持方法"))
hijack:value("dont_hijack", translate("不开启劫持"))
@ -48,45 +48,45 @@ hijack.description = translate("如果使用Hosts劫持，请将HTTP/HTTPS端口
hijack.default = "dont_hijack"
hijack.rmempty = false
enabled = s:option(Flag, "auto_update", translate("启用自动更新"))
enabled.description = translate("启用后会在每天凌晨检测最新版本并自动更新")
enabled.default = 0
enabled.rmempty = false
auto_update = s:option(Flag, "auto_update", translate("启用自动更新"))
auto_update.description = translate("启用后会在每天凌晨检测最新版本并自动更新")
auto_update.default = 0
auto_update.rmempty = false
enabled = s:option(Flag, "advanced_mode", translate("启用进阶设置"))
enabled.description = translate("仅推荐高级玩家使用")
enabled.default = 0
enabled.rmempty = false
advanced_mode = s:option(Flag, "advanced_mode", translate("启用进阶设置"))
advanced_mode.description = translate("仅推荐高级玩家使用")
advanced_mode.default = 0
advanced_mode.rmempty = false
enabled = s:option(Flag, "pub_access", translate("部署到公网"))
enabled.description = translate("默认仅监听局域网，如需提供公开访问请勾选此选项；与此同时，建议勾选“启用严格模式”")
enabled.default = 0
enabled.rmempty = false
enabled:depends("advanced_mode", 1)
pub_access = s:option(Flag, "pub_access", translate("部署到公网"))
pub_access.description = translate("默认仅监听局域网，如需提供公开访问请勾选此选项；与此同时，建议勾选“启用严格模式”")
pub_access.default = 0
pub_access.rmempty = false
pub_access:depends("advanced_mode", 1)
enabled = s:option(Flag, "strict_mode", translate("启用严格模式"))
enabled.description = translate("若将服务部署到公网，则强烈建议使用严格模式，此模式下仅放行网易云音乐所属域名的请求")
enabled.default = 0
enabled.rmempty = false
enabled:depends("advanced_mode", 1)
strict_mode = s:option(Flag, "strict_mode", translate("启用严格模式"))
strict_mode.description = translate("若将服务部署到公网，则强烈建议使用严格模式，此模式下仅放行网易云音乐所属域名的请求")
strict_mode.default = 0
strict_mode.rmempty = false
strict_mode:depends("advanced_mode", 1)
account = s:option(Value, "netease_server_ip", translate("网易云服务器IP"))
account.description = translate("通过 ping music.163.com 即可获得IP地址，仅限填写一个")
account.placeholder = "59.111.181.38"
account.datatype = "ipaddr"
account:depends("set_netease_server_ip", 1)
account:depends("advanced_mode", 1)
netease_server_ip = s:option(Value, "netease_server_ip", translate("网易云服务器IP"))
netease_server_ip.description = translate("通过 ping music.163.com 即可获得IP地址，仅限填写一个")
netease_server_ip.placeholder = "59.111.181.38"
netease_server_ip.datatype = "ipaddr"
netease_server_ip:depends("set_netease_server_ip", 1)
netease_server_ip:depends("advanced_mode", 1)
account = s:option(Value, "endpoint_url", translate("EndPoint"))
account.description = translate("具体说明参见：https://github.com/nondanee/UnblockNeteaseMusic")
account.placeholder = "https://music.163.com"
account.datatype = "string"
account:depends("advanced_mode", 1)
endpoint_url = s:option(Value, "endpoint_url", translate("EndPoint"))
endpoint_url.description = translate("具体说明参见：https://github.com/nondanee/UnblockNeteaseMusic")
endpoint_url.placeholder = "https://music.163.com"
endpoint_url.datatype = "string"
endpoint_url:depends("advanced_mode", 1)
account = s:option(Value, "proxy_server_ip", translate("代理服务器地址"))
account.description = translate("使用代理服务器获取音乐信息")
account.placeholder = "http(s)://host:port"
account.datatype = "string"
account:depends("advanced_mode", 1)
proxy_server_ip = s:option(Value, "proxy_server_ip", translate("代理服务器地址"))
proxy_server_ip.description = translate("使用代理服务器获取音乐信息")
proxy_server_ip.placeholder = "http(s)://host:port"
proxy_server_ip.datatype = "string"
proxy_server_ip:depends("advanced_mode", 1)
return mp

6
package/ctcgfw/luci-app-unblockneteasemusic/root/etc/config/unblockneteasemusic
View File

@ -1,10 +1,10 @@
config unblockneteasemusic
option enabled '0'
option enable '0'
option http_port '5200'
option https_port '5201'
option musicapptype 'default'
option hijack_ways 'dont_hijack'
option music_source 'default'
option hijack_ways 'use_ipset'
option auto_update '0'
option advanced_mode '0'
option pub_access '0'

10
package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic
View File

@ -7,10 +7,10 @@ STOP=10
lan_addr="$(uci get network.lan.ipaddr)"
enable="$(uci get unblockneteasemusic.@unblockneteasemusic[0].enabled)"
enable="$(uci get unblockneteasemusic.@unblockneteasemusic[0].enable)"
http_port="$(uci get unblockneteasemusic.@unblockneteasemusic[0].http_port)"
https_port="$(uci get unblockneteasemusic.@unblockneteasemusic[0].https_port)"
type="$(uci get unblockneteasemusic.@unblockneteasemusic[0].musicapptype)"
music_source="$(uci get unblockneteasemusic.@unblockneteasemusic[0].music_source)"
hijack_ways="$(uci get unblockneteasemusic.@unblockneteasemusic[0].hijack_ways)"
auto_update="$(uci get unblockneteasemusic.@unblockneteasemusic[0].auto_update)"
[ "*$(uci get unblockneteasemusic.@unblockneteasemusic[0].pub_access 2>/dev/null)*" = "*1*" ] && addr="0.0.0.0" || addr="${lan_addr}"
@ -123,12 +123,10 @@ start()
[ ! -e "/usr/share/unblockneteasemusic/core/app.js" ] && rm -f /usr/share/unblockneteasemusic/local_ver && bash /usr/share/unblockneteasemusic/update_core.sh
[ ! -e "/usr/share/unblockneteasemusic/core/app.js" ] && echo "Core Not Found, please download it before starting." >>/tmp/unblockneteasemusic.log && exit 1
if [ "${type}" = "default" ]; then
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} ${endpoint_url} ${strict_mode} >>/tmp/unblockneteasemusic.log 2>&1 &
elif [ "${type}" = "all" ]; then
nohup node /usr/share/unblockneteasemusic/core/app.js -a "${addr}" -p "${http_port}":"${https_port}" -o "kuwo qq xiami baidu kugou migu joox" ${netease_server_ip} ${proxy_server_ip} ${endpoint_url} ${strict_mode} >>/tmp/unblockneteasemusic.log 2>&1 &
else
nohup node /usr/share/unblockneteasemusic/core/app.js -a "${addr}" -p "${http_port}":"${https_port}" -o "${type}" ${netease_server_ip} ${proxy_server_ip} ${endpoint_url} ${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}" ${netease_server_ip} ${proxy_server_ip} ${endpoint_url} ${strict_mode} >>/tmp/unblockneteasemusic.log 2>&1 &
fi
if [ "*${hijack_ways}*" = "*use_ipset*" ]; then