mirror of
https://github.com/kenzok8/small-package.git
synced 2026-02-08 07:37:13 +08:00
update 2023-02-01 15:09:29
This commit is contained in:
github-actions[bot]
@@ -1,12 +1,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=luci-app-mosdns
|
PKG_NAME:=luci-app-mosdns
|
||||||
PKG_VERSION:=1.4
|
PKG_VERSION:=1.5
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
LUCI_TITLE:=LuCI Support for mosdns
|
LUCI_TITLE:=LuCI Support for mosdns
|
||||||
LUCI_PKGARCH:=all
|
LUCI_PKGARCH:=all
|
||||||
LUCI_DEPENDS:=+mosdns +jsonfilter +bash +luci-compat +v2ray-geoip +v2ray-geosite +zoneinfo-asia
|
LUCI_DEPENDS:=+mosdns-v5 +jsonfilter +bash +luci-compat +zoneinfo-asia
|
||||||
|
|
||||||
define Package/$(PKG_NAME)/conffiles
|
define Package/$(PKG_NAME)/conffiles
|
||||||
/etc/mosdns/cus_config.yaml
|
/etc/mosdns/cus_config.yaml
|
||||||
|
|||||||
@@ -1,165 +1,206 @@
|
|||||||
# 日志设置
|
|
||||||
log:
|
log:
|
||||||
level: loglvl
|
level: loglvl
|
||||||
file: logfile
|
file: "logfile"
|
||||||
|
|
||||||
# 数据源设置
|
# api:
|
||||||
data_providers:
|
# http: "127.0.0.1:8080" # 在该地址启动 api 接口。
|
||||||
- tag: geosite
|
|
||||||
file: "/usr/share/v2ray/geosite.dat"
|
|
||||||
auto_reload: true
|
|
||||||
|
|
||||||
- tag: geoip
|
|
||||||
file: "/usr/share/v2ray/geoip.dat"
|
|
||||||
auto_reload: true
|
|
||||||
|
|
||||||
- tag: adlist
|
|
||||||
file: "./rule/serverlist.txt"
|
|
||||||
auto_reload: true
|
|
||||||
|
|
||||||
- tag: whitelist
|
|
||||||
file: "./rule/whitelist.txt"
|
|
||||||
auto_reload: true
|
|
||||||
|
|
||||||
- tag: hosts
|
|
||||||
file: "./rule/hosts.txt"
|
|
||||||
auto_reload: true
|
|
||||||
|
|
||||||
- tag: blocklist
|
|
||||||
file: "./rule/blocklist.txt"
|
|
||||||
auto_reload: true
|
|
||||||
|
|
||||||
- tag: redirect
|
|
||||||
file: "./rule/redirect.txt"
|
|
||||||
auto_reload: true
|
|
||||||
|
|
||||||
# 插件
|
|
||||||
plugins:
|
plugins:
|
||||||
- tag: "query_is_whitelist_domain"
|
# 加载配置
|
||||||
type: query_matcher
|
# 国内域名
|
||||||
|
- tag: geosite_cn
|
||||||
|
type: domain_set
|
||||||
args:
|
args:
|
||||||
domain:
|
files: # 从文本文件载入
|
||||||
- "provider:whitelist"
|
- "/etc/mosdns/rule/geosite_cn.txt"
|
||||||
|
|
||||||
|
# 国内ip
|
||||||
|
- tag: geoip_cn
|
||||||
|
type: ip_set
|
||||||
|
args:
|
||||||
|
files: # 从文本文件载入
|
||||||
|
- "/etc/mosdns/rule/geoip_cn.txt"
|
||||||
|
|
||||||
- tag: "query_is_blocklist_domain"
|
# 国外域名
|
||||||
type: query_matcher
|
- tag: geosite_no_cn
|
||||||
|
type: domain_set
|
||||||
args:
|
args:
|
||||||
domain:
|
files: # 从文本文件载入
|
||||||
- "provider:blocklist"
|
- "/etc/mosdns/rule/geosite_no_cn.txt"
|
||||||
|
|
||||||
- tag: "query_is_local_domain"
|
# 白名单 加入的域名始终允许使用 “本地 DNS” 进行解析
|
||||||
type: query_matcher
|
- tag: whitelist
|
||||||
|
type: domain_set
|
||||||
args:
|
args:
|
||||||
domain:
|
files: # 从文本文件载入
|
||||||
- "provider:geosite:cn"
|
- "/etc/mosdns/rule/whitelist.txt"
|
||||||
|
|
||||||
- tag: "query_is_non_local_domain"
|
# 黑名单 加入的域名将屏蔽 DNS 解析
|
||||||
type: query_matcher
|
- tag: blocklist
|
||||||
|
type: domain_set
|
||||||
args:
|
args:
|
||||||
domain:
|
files: # 从文本文件载入
|
||||||
- "provider:geosite:geolocation-!cn"
|
- "/etc/mosdns/rule/blocklist.txt"
|
||||||
|
|
||||||
- tag: "query_is_qtype65"
|
# 自定义 Hosts 重写
|
||||||
type: query_matcher
|
- tag: hosts
|
||||||
|
type: hosts
|
||||||
args:
|
args:
|
||||||
qtype: [65]
|
files: # 从文本文件载入
|
||||||
|
- "/etc/mosdns/rule/hosts.txt"
|
||||||
|
|
||||||
- tag: "query_is_ad_domain"
|
# 重定向请求的域名
|
||||||
type: query_matcher
|
- tag: redirect
|
||||||
|
type: redirect
|
||||||
args:
|
args:
|
||||||
domain:
|
files:
|
||||||
- "provider:adlist"
|
- "/etc/mosdns/rule/redirect.txt"
|
||||||
|
|
||||||
- tag: "response_has_local_ip"
|
# 广告列表
|
||||||
type: response_matcher
|
- tag: adlist
|
||||||
|
type: domain_set
|
||||||
args:
|
args:
|
||||||
ip:
|
files:
|
||||||
- "provider:geoip:cn"
|
- "/etc/mosdns/rule/serverlist.txt"
|
||||||
|
|
||||||
- tag: "query_is_hosts_domain"
|
# 缓存
|
||||||
type: hosts
|
- tag: cache
|
||||||
|
type: cache
|
||||||
args:
|
args:
|
||||||
hosts:
|
size: 200000
|
||||||
- "provider:hosts"
|
lazy_cache_ttl: 259200
|
||||||
|
|
||||||
- tag: "query_is_redirect_domain"
|
# 转发至本地服务器
|
||||||
type: redirect
|
- tag: forward_local
|
||||||
|
type: forward
|
||||||
args:
|
args:
|
||||||
rule:
|
upstreams:
|
||||||
- "provider:redirect"
|
- addr: localdns1
|
||||||
|
- addr: localdns2
|
||||||
- tag: "reverse"
|
|
||||||
type: "reverse_lookup"
|
# 转发至远程服务器
|
||||||
|
- tag: forward_remote
|
||||||
|
type: forward
|
||||||
args:
|
args:
|
||||||
size: 65535
|
upstreams:
|
||||||
ttl: 1800
|
- addr: remotedns1
|
||||||
handle_ptr: true
|
|
||||||
|
|
||||||
- tag: "lazy_cache"
|
|
||||||
type: cache
|
|
||||||
args:
|
|
||||||
size: 512000
|
|
||||||
lazy_cache_ttl: 259200
|
|
||||||
|
|
||||||
- tag: "forward_local"
|
|
||||||
type: fast_forward
|
|
||||||
args:
|
|
||||||
upstream:
|
|
||||||
- addr: localdns1
|
|
||||||
- addr: localdns2
|
|
||||||
|
|
||||||
- tag: "forward_remote"
|
|
||||||
type: fast_forward
|
|
||||||
args:
|
|
||||||
upstream:
|
|
||||||
- addr: remotedns1
|
|
||||||
enable_pipeline: true
|
enable_pipeline: true
|
||||||
- addr: remotedns2
|
- addr: remotedns2
|
||||||
enable_pipeline: true
|
enable_pipeline: true
|
||||||
|
|
||||||
- tag: main_sequence
|
# 国内解析
|
||||||
type: sequence
|
- tag: local_sequence
|
||||||
|
type: sequence
|
||||||
args:
|
args:
|
||||||
exec:
|
- exec: $forward_local
|
||||||
- _misc_optm
|
|
||||||
- reverse
|
|
||||||
- lazy_cache
|
|
||||||
- query_is_hosts_domain
|
|
||||||
- query_is_redirect_domain
|
|
||||||
- _no_ecs
|
|
||||||
- if: "query_is_whitelist_domain"
|
|
||||||
exec:
|
|
||||||
- forward_local
|
|
||||||
- _return
|
|
||||||
- if: "query_is_blocklist_domain || query_is_ad_domain || query_is_qtype65"
|
|
||||||
exec:
|
|
||||||
- _new_nxdomain_response
|
|
||||||
- _return
|
|
||||||
- if: "query_is_local_domain"
|
|
||||||
exec:
|
|
||||||
- forward_local
|
|
||||||
- _return
|
|
||||||
- if: "query_is_non_local_domain"
|
|
||||||
exec:
|
|
||||||
- _prefer_ipv4
|
|
||||||
- forward_remote
|
|
||||||
- _return
|
|
||||||
- primary:
|
|
||||||
- forward_local
|
|
||||||
- if: "(! response_has_local_ip) && [_response_valid_answer]"
|
|
||||||
exec:
|
|
||||||
- _drop_response
|
|
||||||
secondary:
|
|
||||||
- _prefer_ipv4
|
|
||||||
- forward_remote
|
|
||||||
fast_fallback: 150
|
|
||||||
always_standby: true
|
|
||||||
|
|
||||||
# 服务器设置
|
# 国外解析
|
||||||
servers:
|
- tag: remote_sequence
|
||||||
- exec: main_sequence
|
type: sequence
|
||||||
listeners:
|
args:
|
||||||
- protocol: udp
|
- exec: prefer_ipv4
|
||||||
addr: 127.0.0.1:listenport
|
- exec: $forward_remote
|
||||||
- protocol: tcp
|
|
||||||
addr: 127.0.0.1:listenport
|
# 有响应终止返回
|
||||||
|
- tag: has_resp_sequence
|
||||||
|
type: sequence
|
||||||
|
args:
|
||||||
|
- matches: has_resp
|
||||||
|
exec: accept
|
||||||
|
|
||||||
|
|
||||||
|
# fallback 用本地服务器 sequence
|
||||||
|
# 返回不包含本地 ip 则 reject
|
||||||
|
- tag: query_is_local_ip
|
||||||
|
type: sequence
|
||||||
|
args:
|
||||||
|
- exec: $local_sequence
|
||||||
|
- matches: resp_ip $geoip_cn
|
||||||
|
exec: accept
|
||||||
|
- exec: reject
|
||||||
|
|
||||||
|
# fallback 用远程服务器 sequence
|
||||||
|
- tag: query_is_remote
|
||||||
|
type: sequence
|
||||||
|
args:
|
||||||
|
- exec: $remote_sequence
|
||||||
|
- exec: accept
|
||||||
|
|
||||||
|
# fallback 用远程服务器 sequence
|
||||||
|
- tag: fallback
|
||||||
|
type: fallback
|
||||||
|
args:
|
||||||
|
primary: query_is_local_ip
|
||||||
|
secondary: query_is_remote
|
||||||
|
threshold: 150
|
||||||
|
always_standby: true
|
||||||
|
|
||||||
|
|
||||||
|
# 查询国内域名
|
||||||
|
- tag: query_is_local_domain
|
||||||
|
type: sequence
|
||||||
|
args:
|
||||||
|
- matches: qname $geosite_cn
|
||||||
|
exec: $local_sequence
|
||||||
|
|
||||||
|
# 查询国外域名
|
||||||
|
- tag: query_is_no_local_domain
|
||||||
|
type: sequence
|
||||||
|
args:
|
||||||
|
- matches: qname $geosite_no_cn
|
||||||
|
exec: $remote_sequence
|
||||||
|
|
||||||
|
# 查询白名单
|
||||||
|
- tag: query_is_whitelist_domain
|
||||||
|
type: sequence
|
||||||
|
args:
|
||||||
|
- matches: qname $whitelist
|
||||||
|
exec: $local_sequence
|
||||||
|
- exec: jump has_resp_sequence
|
||||||
|
|
||||||
|
# 拒绝名单
|
||||||
|
- tag: query_is_reject_domain
|
||||||
|
type: sequence
|
||||||
|
args:
|
||||||
|
- matches: qname $blocklist
|
||||||
|
exec: reject 3
|
||||||
|
- matches: qname $adlist
|
||||||
|
exec: reject 3
|
||||||
|
- matches:
|
||||||
|
- qtype 12
|
||||||
|
exec: reject 3
|
||||||
|
- matches: qtype 65
|
||||||
|
exec: reject 3
|
||||||
|
|
||||||
|
# 主要的运行逻辑插件
|
||||||
|
# sequence 插件中调用的插件 tag 必须在 sequence 前定义，
|
||||||
|
# 否则 sequence 找不到对应插件。
|
||||||
|
- tag: main_sequence
|
||||||
|
type: sequence
|
||||||
|
args:
|
||||||
|
- exec: $hosts
|
||||||
|
- exec: jump has_resp_sequence
|
||||||
|
- exec: $redirect
|
||||||
|
- exec: jump has_resp_sequence
|
||||||
|
- exec: $query_is_whitelist_domain
|
||||||
|
- exec: $query_is_reject_domain
|
||||||
|
- exec: $cache
|
||||||
|
- exec: jump has_resp_sequence
|
||||||
|
- exec: $query_is_local_domain
|
||||||
|
- exec: jump has_resp_sequence
|
||||||
|
- exec: $query_is_no_local_domain
|
||||||
|
- exec: jump has_resp_sequence
|
||||||
|
- exec: $fallback
|
||||||
|
|
||||||
|
# 启动 udp 服务器。
|
||||||
|
- tag: udp_server
|
||||||
|
type: udp_server
|
||||||
|
args:
|
||||||
|
entry: main_sequence
|
||||||
|
listen: "127.0.0.1:listenport"
|
||||||
|
# 启动 tcp 服务器。
|
||||||
|
- tag: tcp_server
|
||||||
|
type: tcp_server
|
||||||
|
args:
|
||||||
|
entry: main_sequence
|
||||||
|
listen: "127.0.0.1:listenport"
|
||||||
@@ -4,26 +4,27 @@ set -o pipefail
|
|||||||
source /etc/mosdns/lib.sh
|
source /etc/mosdns/lib.sh
|
||||||
|
|
||||||
TMPDIR=$(mktemp -d) || exit 1
|
TMPDIR=$(mktemp -d) || exit 1
|
||||||
getdat geoip.dat
|
getdat geosite_cn.txt
|
||||||
getdat geosite.dat
|
getdat geosite_no_cn.txt
|
||||||
if [ "$(grep -o CN "$TMPDIR"/geoip.dat | wc -l)" -eq 0 ]; then
|
getdat geoip_cn.txt
|
||||||
rm -rf "$TMPDIR"/geoip.dat
|
if [ "$(grep -o cn "$TMPDIR"/geosite_cn.txt | wc -l)" -lt 100 ]; then
|
||||||
|
rm -rf "$TMPDIR"/geosite_cn.txt
|
||||||
fi
|
fi
|
||||||
if [ "$(grep -o .com "$TMPDIR"/geosite.dat | wc -l)" -lt 1000 ]; then
|
if [ "$(grep -o google "$TMPDIR"/geosite_no_cn.txt | wc -l)" -eq 0 ]; then
|
||||||
rm -rf "$TMPDIR"/geosite.dat
|
rm -rf "$TMPDIR"/geosite_no_cn.txt
|
||||||
fi
|
fi
|
||||||
cp -rf "$TMPDIR"/* /usr/share/v2ray
|
cp -rf "$TMPDIR"/* /etc/mosdns/rule
|
||||||
rm -rf "$TMPDIR"
|
rm -rf "$TMPDIR"
|
||||||
|
|
||||||
syncconfig=$(uci -q get mosdns.mosdns.syncconfig)
|
syncconfig=$(uci -q get mosdns.mosdns.syncconfig)
|
||||||
if [ "$syncconfig" -eq 1 ]; then
|
if [ "$syncconfig" -eq 1 ]; then
|
||||||
TMPDIR=$(mktemp -d) || exit 2
|
TMPDIR=$(mktemp -d) || exit 2
|
||||||
getdat def_config_v4.yaml
|
getdat def_config_v5.yaml
|
||||||
|
|
||||||
if [ "$(grep -o plugin "$TMPDIR"/def_config_v4.yaml | wc -l)" -eq 0 ]; then
|
if [ "$(grep -o plugin "$TMPDIR"/def_config_v5.yaml | wc -l)" -eq 0 ]; then
|
||||||
rm -rf "$TMPDIR"/def_config_v4.yaml
|
rm -rf "$TMPDIR"/def_config_v5.yaml
|
||||||
else
|
else
|
||||||
mv "$TMPDIR"/def_config_v4.yaml "$TMPDIR"/def_config_orig.yaml
|
mv "$TMPDIR"/def_config_v5.yaml "$TMPDIR"/def_config_orig.yaml
|
||||||
fi
|
fi
|
||||||
cp -rf "$TMPDIR"/* /etc/mosdns
|
cp -rf "$TMPDIR"/* /etc/mosdns
|
||||||
rm -rf "$TMPDIR"
|
rm -rf "$TMPDIR"
|
||||||
|
|||||||
7952
luci-app-mosdns/root/etc/mosdns/rule/geoip_cn.txt
Normal file
7952
luci-app-mosdns/root/etc/mosdns/rule/geoip_cn.txt
Normal file
File diff suppressed because it is too large
Load Diff
66080
luci-app-mosdns/root/etc/mosdns/rule/geosite_cn.txt
Normal file
66080
luci-app-mosdns/root/etc/mosdns/rule/geosite_cn.txt
Normal file
File diff suppressed because it is too large
Load Diff
35123
luci-app-mosdns/root/etc/mosdns/rule/geosite_no_cn.txt
Normal file
35123
luci-app-mosdns/root/etc/mosdns/rule/geosite_no_cn.txt
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
|
|||||||
|
|
||||||
PKG_NAME:=luci-app-passwall
|
PKG_NAME:=luci-app-passwall
|
||||||
PKG_VERSION:=4.56
|
PKG_VERSION:=4.56
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=3
|
||||||
|
|
||||||
PKG_CONFIG_DEPENDS:= \
|
PKG_CONFIG_DEPENDS:= \
|
||||||
CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \
|
CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \
|
||||||
|
|||||||
@@ -1377,10 +1377,11 @@ stop() {
|
|||||||
stop_crontab
|
stop_crontab
|
||||||
source $APP_PATH/helper_dnsmasq.sh del
|
source $APP_PATH/helper_dnsmasq.sh del
|
||||||
source $APP_PATH/helper_dnsmasq.sh restart no_log=1
|
source $APP_PATH/helper_dnsmasq.sh restart no_log=1
|
||||||
|
[ -s "$TMP_PATH/bridge_nf_ipt" ] && sysctl -w net.bridge.bridge-nf-call-iptables=$(cat $TMP_PATH/bridge_nf_ipt) >/dev/null 2>&1
|
||||||
|
[ -s "$TMP_PATH/bridge_nf_ip6t" ] && sysctl -w net.bridge.bridge-nf-call-ip6tables=$(cat $TMP_PATH/bridge_nf_ip6t) >/dev/null 2>&1
|
||||||
rm -rf ${TMP_PATH}
|
rm -rf ${TMP_PATH}
|
||||||
rm -rf /tmp/lock/${CONFIG}_script.lock
|
rm -rf /tmp/lock/${CONFIG}_script.lock
|
||||||
echolog "清空并关闭相关程序和缓存完成。"
|
echolog "清空并关闭相关程序和缓存完成。"
|
||||||
/etc/init.d/sysctl restart
|
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1224,8 +1224,14 @@ add_firewall_rule() {
|
|||||||
# dns_hijack "force"
|
# dns_hijack "force"
|
||||||
|
|
||||||
[ -n "${is_tproxy}" -o -n "${udp_flag}" ] && {
|
[ -n "${is_tproxy}" -o -n "${udp_flag}" ] && {
|
||||||
|
bridge_nf_ipt=$(sysctl -e -n net.bridge.bridge-nf-call-iptables)
|
||||||
|
echo -n $bridge_nf_ipt > $TMP_PATH/bridge_nf_ipt
|
||||||
sysctl -w net.bridge.bridge-nf-call-iptables=0 >/dev/null 2>&1
|
sysctl -w net.bridge.bridge-nf-call-iptables=0 >/dev/null 2>&1
|
||||||
[ "$PROXY_IPV6" == "1" ] && sysctl -w net.bridge.bridge-nf-call-ip6tables=0 >/dev/null 2>&1
|
[ "$PROXY_IPV6" == "1" ] && {
|
||||||
|
bridge_nf_ip6t=$(sysctl -e -n net.bridge.bridge-nf-call-ip6tables)
|
||||||
|
echo -n $bridge_nf_ip6t > $TMP_PATH/bridge_nf_ip6t
|
||||||
|
sysctl -w net.bridge.bridge-nf-call-ip6tables=0 >/dev/null 2>&1
|
||||||
|
}
|
||||||
}
|
}
|
||||||
echolog "防火墙规则加载完成！"
|
echolog "防火墙规则加载完成！"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1226,8 +1226,14 @@ add_firewall_rule() {
|
|||||||
# dns_hijack "force"
|
# dns_hijack "force"
|
||||||
|
|
||||||
[ -n "${is_tproxy}" -o -n "${udp_flag}" ] && {
|
[ -n "${is_tproxy}" -o -n "${udp_flag}" ] && {
|
||||||
|
bridge_nf_ipt=$(sysctl -e -n net.bridge.bridge-nf-call-iptables)
|
||||||
|
echo -n $bridge_nf_ipt > $TMP_PATH/bridge_nf_ipt
|
||||||
sysctl -w net.bridge.bridge-nf-call-iptables=0 >/dev/null 2>&1
|
sysctl -w net.bridge.bridge-nf-call-iptables=0 >/dev/null 2>&1
|
||||||
[ "$PROXY_IPV6" == "1" ] && sysctl -w net.bridge.bridge-nf-call-ip6tables=0 >/dev/null 2>&1
|
[ "$PROXY_IPV6" == "1" ] && {
|
||||||
|
bridge_nf_ip6t=$(sysctl -e -n net.bridge.bridge-nf-call-ip6tables)
|
||||||
|
echo -n $bridge_nf_ip6t > $TMP_PATH/bridge_nf_ip6t
|
||||||
|
sysctl -w net.bridge.bridge-nf-call-ip6tables=0 >/dev/null 2>&1
|
||||||
|
}
|
||||||
}
|
}
|
||||||
echolog "防火墙规则加载完成！"
|
echolog "防火墙规则加载完成！"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
|
|||||||
|
|
||||||
PKG_NAME:=luci-app-passwall2
|
PKG_NAME:=luci-app-passwall2
|
||||||
PKG_VERSION:=1.5
|
PKG_VERSION:=1.5
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_CONFIG_DEPENDS:= \
|
PKG_CONFIG_DEPENDS:= \
|
||||||
CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \
|
CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \
|
||||||
|
|||||||
@@ -756,8 +756,14 @@ start() {
|
|||||||
run_global
|
run_global
|
||||||
source $APP_PATH/iptables.sh start
|
source $APP_PATH/iptables.sh start
|
||||||
source $APP_PATH/helper_dnsmasq.sh logic_restart
|
source $APP_PATH/helper_dnsmasq.sh logic_restart
|
||||||
|
bridge_nf_ipt=$(sysctl -e -n net.bridge.bridge-nf-call-iptables)
|
||||||
|
echo -n $bridge_nf_ipt > $TMP_PATH/bridge_nf_ipt
|
||||||
sysctl -w net.bridge.bridge-nf-call-iptables=0 >/dev/null 2>&1
|
sysctl -w net.bridge.bridge-nf-call-iptables=0 >/dev/null 2>&1
|
||||||
[ "$PROXY_IPV6" == "1" ] && sysctl -w net.bridge.bridge-nf-call-ip6tables=0 >/dev/null 2>&1
|
[ "$PROXY_IPV6" == "1" ] && {
|
||||||
|
bridge_nf_ip6t=$(sysctl -e -n net.bridge.bridge-nf-call-ip6tables)
|
||||||
|
echo -n $bridge_nf_ip6t > $TMP_PATH/bridge_nf_ip6t
|
||||||
|
sysctl -w net.bridge.bridge-nf-call-ip6tables=0 >/dev/null 2>&1
|
||||||
|
}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
start_crontab
|
start_crontab
|
||||||
@@ -775,10 +781,11 @@ stop() {
|
|||||||
stop_crontab
|
stop_crontab
|
||||||
source $APP_PATH/helper_dnsmasq.sh del
|
source $APP_PATH/helper_dnsmasq.sh del
|
||||||
source $APP_PATH/helper_dnsmasq.sh restart no_log=1
|
source $APP_PATH/helper_dnsmasq.sh restart no_log=1
|
||||||
|
[ -s "$TMP_PATH/bridge_nf_ipt" ] && sysctl -w net.bridge.bridge-nf-call-iptables=$(cat $TMP_PATH/bridge_nf_ipt) >/dev/null 2>&1
|
||||||
|
[ -s "$TMP_PATH/bridge_nf_ip6t" ] && sysctl -w net.bridge.bridge-nf-call-ip6tables=$(cat $TMP_PATH/bridge_nf_ip6t) >/dev/null 2>&1
|
||||||
rm -rf ${TMP_PATH}
|
rm -rf ${TMP_PATH}
|
||||||
rm -rf /tmp/lock/${CONFIG}_script.lock
|
rm -rf /tmp/lock/${CONFIG}_script.lock
|
||||||
echolog "清空并关闭相关程序和缓存完成。"
|
echolog "清空并关闭相关程序和缓存完成。"
|
||||||
/etc/init.d/sysctl restart
|
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
674
luci-app-unblockneteasemusic/LICENSE
Normal file
674
luci-app-unblockneteasemusic/LICENSE
Normal file
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
@@ -4,14 +4,14 @@
|
|||||||
|
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
LUCI_TITLE:=LuCI support for UnblockNeteaseMusic (JavaScript)
|
LUCI_TITLE:=LuCI support for UnblockNeteaseMusic
|
||||||
LUCI_DEPENDS:=+dnsmasq-full +node \
|
LUCI_DEPENDS:=+dnsmasq-full +ipset +node \
|
||||||
@(PACKAGE_libustream-mbedtls||PACKAGE_libustream-openssl||PACKAGE_libustream-wolfssl)
|
@(PACKAGE_libustream-mbedtls||PACKAGE_libustream-openssl||PACKAGE_libustream-wolfssl)
|
||||||
LUCI_PKGARCH:=all
|
LUCI_PKGARCH:=all
|
||||||
|
|
||||||
PKG_NAME:=luci-app-unblockneteasemusic
|
PKG_NAME:=luci-app-unblockneteasemusic
|
||||||
PKG_VERSION:=3.1
|
PKG_VERSION:=2.13
|
||||||
PKG_RELEASE:=4
|
PKG_RELEASE:=6
|
||||||
|
|
||||||
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
|
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
|
||||||
|
|
||||||
|
|||||||
63
luci-app-unblockneteasemusic/README.md
Normal file
63
luci-app-unblockneteasemusic/README.md
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
### 项目简介
|
||||||
|
这是一个用于解除网易云音乐播放限制的 OpenWrt 插件，完整支持 播放 / 下载 无版权 / 收费 歌曲<br/>
|
||||||
|
原理为通过获取其他平台的音乐播放链接，替换网易云音乐内 无版权 / 收费 歌曲链接<br/>
|
||||||
|
|
||||||
|
[](https://app.fossa.com/projects/git%2Bgithub.com%2FUnblockNeteaseMusic%2Fluci-app-unblockneteasemusic?ref=badge_shield)
|
||||||
|
|
||||||
|
### 功能说明
|
||||||
|
1. 支持自定义音源选择，一般设置默认即可；如需高音质音乐，推荐选择“酷我”或“咪咕”
|
||||||
|
2. 支持使用 IPset / Hosts 自动劫持相关请求，客户端无需设置代理即可使用
|
||||||
|
3. 支持 HTTPS 劫持，客户端信任证书后即可正常使用
|
||||||
|
4. 支持将服务公开至公网（默认监听局域网），支持开启严格模式
|
||||||
|
5. 支持设定代理，支持指定网易云音乐服务器 IP，支持设定 EndPoint
|
||||||
|
6. 支持手动/自动更新 Core，确保插件正常运作
|
||||||
|
7. 支持设定 JOOX/Migu/QQ Cookie / Youtube API，以正常使用相关音源
|
||||||
|
8. 支持无损音质（目前支持 酷狗、酷我、咪咕、pyncmd、QQ 音源）
|
||||||
|
|
||||||
|
### 编译
|
||||||
|
```bash
|
||||||
|
#进入 OpenWrt 源码 package 目录
|
||||||
|
cd package
|
||||||
|
#克隆插件源码
|
||||||
|
git clone --branch master https://github.com/UnblockNeteaseMusic/luci-app-unblockneteasemusic.git
|
||||||
|
#返回上一层目录
|
||||||
|
cd ..
|
||||||
|
#配置
|
||||||
|
make menuconfig
|
||||||
|
#在 luci -> application 选中插件，开始编译
|
||||||
|
make package/luci-app-unblockneteasemusic/compile V=s
|
||||||
|
```
|
||||||
|
|
||||||
|
### 使用方法
|
||||||
|
- #### 路由器插件配置
|
||||||
|
1. 在路由器 LuCI 界面“服务”选项中找到“解除网易云音乐播放限制”
|
||||||
|
2. 勾选“启用本插件”
|
||||||
|
3. “音源接口”选择“默认”（高音质音源推荐选择“酷我”或“咪咕”）
|
||||||
|
4. 点击“保存&应用”
|
||||||
|
- 现在您局域网下的所有设备，（一般情况下）无需任何设置即可自动解除网易云音乐播放限制
|
||||||
|
- ##### 特别说明
|
||||||
|
1. 首次使用本插件时，将会在后台下载核心程序，故启动时间可能会稍微长一点
|
||||||
|
2. 如需使用网页端，请额外安装 Tampermonkey 插件：[NeteaseMusic UI Unlocker](https://greasyfork.org/zh-CN/scripts/382285-neteasemusic-ui-unlocker)
|
||||||
|
3. 推荐在客户端信任 [UnblockNeteaseMusic 证书](https://raw.githubusercontent.com/UnblockNeteaseMusic/server/enhanced/ca.crt)，以便 HTTPS 通讯（若您不放心，也可以[自行签发证书](https://github.com/nondanee/UnblockNeteaseMusic/issues/48#issuecomment-477870013)）
|
||||||
|
|
||||||
|
### 效果图
|
||||||
|
#### LuCI 界面
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#### UWP 网易云音乐客户端
|
||||||
|
|
||||||
|
|
||||||
|
### 鸣谢
|
||||||
|
[UnblockNeteaseMusic](https://github.com/UnblockNeteaseMusic/server)的开发者：[nondanee](https://github.com/nondanee)、[pan93412](https://github.com/pan93412)、[1715173329](https://github.com/1715173329)<br/>
|
||||||
|
[luci-app-unblockmusic](https://github.com/maxlicheng/luci-app-unblockmusic)的开发者：[maxlicheng](https://github.com/maxlicheng)<br/>
|
||||||
|
[luci-app-unblockmusic（二次修改）](https://github.com/coolsnowwolf/lede/tree/master/package/lean/luci-app-unblockmusic)的开发者：[Lean](https://github.com/coolsnowwolf)<br/>
|
||||||
|
IPSet 劫持方式指导：[恩山 692049#125 楼](https://www.right.com.cn/forum/forum.php?mod=viewthread&tid=692049&page=9#pid4104303) [rufengsuixing](https://github.com/rufengsuixing/luci-app-unblockmusic) [binsee](https://github.com/binsee/luci-app-unblockmusic)<br/>
|
||||||
|
Hosts劫持方式指导：[UnblockNeteaseMusic](https://github.com/nondanee/UnblockNeteaseMusic) [云音乐安卓又搞事啦](https://jixun.moe/post/netease-android-hosts-bypass/)<br/>
|
||||||
|
核心程序版本检测方法指导：[vernesong](https://github.com/vernesong)
|
||||||
|
|
||||||
|
### 协议
|
||||||
|
本项目使用 [GPL-3.0-only](https://spdx.org/licenses/GPL-3.0-only.html) 协议授权<br/>
|
||||||
|
在遵循此协议的前提下，你可以自由修改和分发
|
||||||
|
|
||||||
|
[](https://app.fossa.com/projects/git%2Bgithub.com%2FUnblockNeteaseMusic%2Fluci-app-unblockneteasemusic?ref=badge_large)
|
||||||
@@ -1,358 +0,0 @@
|
|||||||
/* SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
*
|
|
||||||
* Copyright (C) 2022-2023 ImmortalWrt.org
|
|
||||||
*/
|
|
||||||
|
|
||||||
'use strict';
|
|
||||||
'require form';
|
|
||||||
'require fs';
|
|
||||||
'require network';
|
|
||||||
'require poll';
|
|
||||||
'require rpc';
|
|
||||||
'require uci';
|
|
||||||
'require ui';
|
|
||||||
'require view';
|
|
||||||
|
|
||||||
var CBIStaticList = form.DynamicList.extend({
|
|
||||||
__name__: 'CBI.StaticList',
|
|
||||||
|
|
||||||
renderWidget: function(/* ... */) {
|
|
||||||
var dl = form.DynamicList.prototype.renderWidget.apply(this, arguments);
|
|
||||||
dl.querySelector('.add-item ul > li[data-value="-"]').remove();
|
|
||||||
return dl;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
var callServiceList = rpc.declare({
|
|
||||||
object: 'service',
|
|
||||||
method: 'list',
|
|
||||||
params: ['name'],
|
|
||||||
expect: { '': {} }
|
|
||||||
});
|
|
||||||
|
|
||||||
function getServiceStatus() {
|
|
||||||
return L.resolveDefault(callServiceList('unblockneteasemusic'), {}).then(function (res) {
|
|
||||||
var isRunning = false;
|
|
||||||
try {
|
|
||||||
isRunning = res['unblockneteasemusic']['instances']['unblockneteasemusic']['running'];
|
|
||||||
} catch (e) { }
|
|
||||||
return isRunning;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderStatus(isRunning) {
|
|
||||||
var spanTemp = '<em><span style="color:%s"><strong>%s %s</strong></span></em>';
|
|
||||||
var renderHTML;
|
|
||||||
if (isRunning) {
|
|
||||||
renderHTML = spanTemp.format('green', _('UnblockNeteaseMusic'), _('运行中'));
|
|
||||||
} else {
|
|
||||||
renderHTML = spanTemp.format('red', _('UnblockNeteaseMusic'), _('未运行'));
|
|
||||||
}
|
|
||||||
|
|
||||||
return renderHTML;
|
|
||||||
}
|
|
||||||
|
|
||||||
function uploadCertificate(type, filename, ev) {
|
|
||||||
return ui.uploadFile('/usr/share/unblockneteasemusic/' + filename, ev.target)
|
|
||||||
.then(L.bind(function(btn, res) {
|
|
||||||
btn.firstChild.data = _('检查 %s 中...').format(type);
|
|
||||||
|
|
||||||
if (res.size <= 0) {
|
|
||||||
ui.addNotification(null, E('p', _('上传的 %s 为空。').format(tyupe)));
|
|
||||||
return fs.remove('/usr/share/unblockneteasemusic/' + filename);
|
|
||||||
}
|
|
||||||
|
|
||||||
ui.addNotification(null, E('p', _('您的 %s 已成功上传。大小：%sB。').format(type, res.size)));
|
|
||||||
}, this, ev.target))
|
|
||||||
.catch(function(e) { ui.addNotification(null, E('p', e.message)) })
|
|
||||||
.finally(L.bind(function(btn, input) {
|
|
||||||
btn.firstChild.data = _('上传...');
|
|
||||||
}, this, ev.target));
|
|
||||||
}
|
|
||||||
|
|
||||||
return view.extend({
|
|
||||||
load: function() {
|
|
||||||
return Promise.all([
|
|
||||||
uci.load('unblockneteasemusic'),
|
|
||||||
network.getHostHints()
|
|
||||||
]);
|
|
||||||
},
|
|
||||||
|
|
||||||
render: function(data) {
|
|
||||||
var m, s, o;
|
|
||||||
|
|
||||||
m = new form.Map('unblockneteasemusic', _('解除网易云音乐播放限制'),
|
|
||||||
_('原理：采用 [Bilibili/JOOX/酷狗/酷我/咪咕/pyncmd/QQ/Youtube] 等音源，替换网易云音乐 无版权/收费 歌曲链接<br/>' +
|
|
||||||
'具体使用方法参见：<a href="https://github.com/UnblockNeteaseMusic/luci-app-unblockneteasemusic" target="_blank">GitHub @UnblockNeteaseMusic/luci-app-unblockneteasemusic</a>'));
|
|
||||||
|
|
||||||
s = m.section(form.TypedSection);
|
|
||||||
s.anonymous = true;
|
|
||||||
s.render = function () {
|
|
||||||
poll.add(function () {
|
|
||||||
return L.resolveDefault(getServiceStatus()).then(function (res) {
|
|
||||||
var view = document.getElementById('service_status');
|
|
||||||
view.innerHTML = renderStatus(res);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
return E('div', { class: 'cbi-section', id: 'status_bar' }, [
|
|
||||||
E('p', { id: 'service_status' }, _('收集数据中...'))
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
s = m.section(form.NamedSection, 'config', 'unblockneteasemusic');
|
|
||||||
|
|
||||||
o = s.option(form.Flag, 'enable', _('启用服务'));
|
|
||||||
o.default = o.disabled;
|
|
||||||
o.rmempty = false;
|
|
||||||
|
|
||||||
o = s.option(CBIStaticList, 'music_source', _('音源接口'),
|
|
||||||
_('留空以使用默认音源。'));
|
|
||||||
o.value('bilibili', _('Bilibili 音乐'));
|
|
||||||
o.value('joox', _('JOOX 音乐'));
|
|
||||||
o.value('kugou', _('酷狗音乐'));
|
|
||||||
o.value('kuwo', _('酷我音乐'));
|
|
||||||
o.value('migu', _('咪咕音乐'));
|
|
||||||
o.value('pyncmd', _('网易云音乐（pyncmd）'));
|
|
||||||
o.value('qq', _('QQ 音乐'));
|
|
||||||
o.value('youtube', _('Youtube 音乐'));
|
|
||||||
o.value('youtubedl', _('Youtube 音乐（youtube-dl）'));
|
|
||||||
o.value('ytdlp', _('Youtube 音乐（yt-dlp）'));
|
|
||||||
o.value('ytdownload', _('Youtube 音乐（ytdownload）'));
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'joox_cookie', _('JOOX Cookie'),
|
|
||||||
_('在 joox.com 获取，需要 wmid 和 session_key 值。'));
|
|
||||||
o.placeholder = 'wmid=; session_key=';
|
|
||||||
o.rmempty = false;
|
|
||||||
o.depends({'music_source': 'joox', '!contains': true});
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'migu_cookie', _('Migu Cookie'),
|
|
||||||
_('通过抓包手机客户端请求获取，需要 aversionid 值。'));
|
|
||||||
o.depends({'music_source': 'migu', '!contains': true});
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'qq_cookie', _('QQ Cookie'),
|
|
||||||
_('在 y.qq.com 获取，需要 uin 和 qm_keyst 值。'));
|
|
||||||
o.placeholder = 'uin=; qm_keyst=';
|
|
||||||
o.rmempty = false;
|
|
||||||
o.depends({'music_source': 'qq', '!contains': true});
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'youtube_key', _('Youtube API Key'),
|
|
||||||
_('API Key 申请地址：https://developers.google.com/youtube/v3/getting-started#before-you-start'));
|
|
||||||
o.depends({'music_source': 'youtube', '!contains': true});
|
|
||||||
|
|
||||||
o = s.option(form.Flag, 'follow_source_order', _('顺序查询'),
|
|
||||||
_('默认为并行查询并返回第一个结果，开启后将严格按照配置音源的顺序进行查询。'))
|
|
||||||
o.default = o.disabled;
|
|
||||||
o.rmempty = false;
|
|
||||||
|
|
||||||
o = s.option(form.Flag, 'search_album', _('附加专辑名'),
|
|
||||||
_('在其他音源搜索歌曲时携带专辑名称（默认搜索条件 <code>歌曲名 - 歌手</code>，启用后搜索条件 <code>歌曲名 - 歌手 专辑名</code>）。'));
|
|
||||||
o.default = o.disabled;
|
|
||||||
o.rmempty = false;
|
|
||||||
|
|
||||||
o = s.option(form.Flag, 'local_vip', _('启用本地 VIP'),
|
|
||||||
_('启用后，可以使用去广告、个性换肤、鲸云音效等本地功能。'));
|
|
||||||
o.default = o.disabled;
|
|
||||||
o.rmempty = false;
|
|
||||||
|
|
||||||
o = s.option(form.Flag, 'enable_flac', _('启用无损音质'),
|
|
||||||
_('目前仅支持酷狗、酷我、咪咕、pyncmd、QQ 音源。'));
|
|
||||||
o.default = o.disabled;
|
|
||||||
o.rmempty = false;
|
|
||||||
|
|
||||||
o = s.option(form.Flag, 'disable_upgrade_check', _('禁用更新检查'),
|
|
||||||
_('禁止客户端检查更新，全平台支持。'));
|
|
||||||
o.default = o.enabled;
|
|
||||||
o.rmempty = false;
|
|
||||||
|
|
||||||
o = s.option(form.ListValue, 'replace_music_source', _('音源替换'),
|
|
||||||
_('当音乐音质低于指定数值时，尝试强制使用其他平台的高音质版本进行替换。'));
|
|
||||||
o.value('dont_replace', _('不强制替换音乐音源'));
|
|
||||||
o.value('lower_than_192kbps', _('当音质低于 192 Kbps（中）时'));
|
|
||||||
o.value('lower_than_320kbps', _('当音质低于 320 Kbps（高）时'));
|
|
||||||
o.value('lower_than_999kbps', _('当音质低于 999 Kbps（无损）时'));
|
|
||||||
o.value('replace_all', _('替换所有音乐音源'));
|
|
||||||
o.default = 'dont_replace';
|
|
||||||
o.rmempty = false;
|
|
||||||
|
|
||||||
o = s.option(form.Flag, 'auto_update', _('启用自动更新'),
|
|
||||||
_('启用后，每天将定时自动检查最新版本并更新。'));
|
|
||||||
o.default = o.disabled;
|
|
||||||
o.rmempty = false;
|
|
||||||
|
|
||||||
o = s.option(form.ListValue, 'update_time', '检查更新时间',
|
|
||||||
_('设定每天自动检查更新时间。'));
|
|
||||||
for (var i = 0; i < 24; i++)
|
|
||||||
o.value(i, i + ':00');
|
|
||||||
o.default = '3';
|
|
||||||
o.depends('auto_update', '1');
|
|
||||||
|
|
||||||
o = s.option(form.Button, '_download_cert', _('CA 根证书'),
|
|
||||||
_('Linux / iOS / MacOSX 在信任根证书后方可正常使用。'));
|
|
||||||
o.inputstyle = 'apply';
|
|
||||||
o.inputtitle = _('下载 ca.crt');
|
|
||||||
o.onclick = function() {
|
|
||||||
return fs.read_direct('/usr/share/unblockneteasemusic/core/ca.crt', 'blob').then(function(blob) {
|
|
||||||
var url = window.URL.createObjectURL(blob);
|
|
||||||
var link = E('a', { 'style': 'display:none', 'href': url, 'download': 'ca.crt' });
|
|
||||||
|
|
||||||
document.body.appendChild(link);
|
|
||||||
link.click();
|
|
||||||
document.body.removeChild(link);
|
|
||||||
window.URL.revokeObjectURL(url);
|
|
||||||
}).catch(function(err) {
|
|
||||||
ui.addNotification(null, E('p', [ _('下载文件失败：%s。').format(err.message) ]));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
o = s.option(form.Flag, 'advanced_mode', _('启用进阶设置'),
|
|
||||||
_('非必要不推荐使用。'));
|
|
||||||
o.default = o.disabled,
|
|
||||||
o.rmempty = false;
|
|
||||||
|
|
||||||
o = s.option(form.ListValue, 'log_level', _('日志等级'));
|
|
||||||
o.value('debug', _('调试'));
|
|
||||||
o.value('info', _('信息（默认）'));
|
|
||||||
o.value('silent', _('静默'));
|
|
||||||
o.default = 'info';
|
|
||||||
o.rmempty = false;
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'http_port', _('HTTP 监听端口'));
|
|
||||||
o.datatype = 'port';
|
|
||||||
o.default = '5200';
|
|
||||||
o.rmempty = false;
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'https_port', _('HTTPS 监听端口'));
|
|
||||||
o.datatype = 'port';
|
|
||||||
o.default = '5201';
|
|
||||||
o.rmempty = false;
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'endpoint_url', _('EndPoint'),
|
|
||||||
_('音源地址反代（包装）。'));
|
|
||||||
o.default = 'https://music.163.com';
|
|
||||||
o.rmempty = false;
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'cnrelay', _('UNM Bridge 服务器'),
|
|
||||||
_('使用 UnblockNeteaseMusic 中继桥（bridge）以获取音源信息。'));
|
|
||||||
o.placeholder = 'http(s)://host:port'
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
|
|
||||||
o = s.option(form.ListValue, 'hijack_ways', _('劫持方法'));
|
|
||||||
o.value('dont_hijack', _('不开启劫持'));
|
|
||||||
o.value('use_ipset', _('使用 IPSet 劫持'));
|
|
||||||
o.value('use_hosts', _('使用 Hosts 劫持'));
|
|
||||||
o.default = 'dont_hijack';
|
|
||||||
o.rmempty = false;
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
o.onchange = function(ev, section_id, value) {
|
|
||||||
if (!section_id || !value)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
var ele_http_port = this.map.findElement('id', 'widget.cbid.unblockneteasemusic.%s.http_port'.format(section_id));
|
|
||||||
var ele_https_port = this.map.findElement('id', 'widget.cbid.unblockneteasemusic.%s.https_port'.format(section_id));
|
|
||||||
|
|
||||||
if (value === 'use_hosts') {
|
|
||||||
ele_http_port.value = '80';
|
|
||||||
ele_http_port.disabled = true;
|
|
||||||
|
|
||||||
ele_https_port.value = '443';
|
|
||||||
ele_https_port.disabled = true;
|
|
||||||
} else if (ele_http_port.disabled || ele_https_port.disabled) {
|
|
||||||
L.resolveDefault(this.map.data.loaded.unblockneteasemusic).then((res) => {
|
|
||||||
ele_http_port.disabled = null;
|
|
||||||
ele_http_port.value = res.config.http_port || '5200';
|
|
||||||
|
|
||||||
ele_https_port.disabled = null;
|
|
||||||
ele_https_port.value = res.config.https_port || '5201';
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
o = s.option(form.Flag, 'keep_core_when_upgrade', _('升级时保留核心程序'));
|
|
||||||
o.default = o.disabled;
|
|
||||||
o.rmempty = false;
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
|
|
||||||
o = s.option(form.Flag, 'pub_access', _('部署到公网'),
|
|
||||||
_('默认仅放行局域网请求，如需提供公开访问请勾选此选项。'));
|
|
||||||
o.default = o.disabled;
|
|
||||||
o.rmempty = false;
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
|
|
||||||
o = s.option(form.Flag, 'strict_mode', _('启用严格模式'),
|
|
||||||
_('若将服务部署到公网，则强烈建议使用严格模式，此模式下仅放行网易云音乐所属域名的请求。<br/>注意：该模式下不能使用全局代理。'));
|
|
||||||
o.default = o.disabled;
|
|
||||||
o.rmempty = false;
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'netease_server_ip', _('网易云服务器 IP'));
|
|
||||||
o.datatype = 'ipaddr';
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'proxy_server_ip', _('代理服务器地址'),
|
|
||||||
_('使用代理服务器获取音乐信息。'));
|
|
||||||
o.placeholder = 'http(s)://host:port';
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'self_issue_cert_crt', _('自签发证书公钥位置'));
|
|
||||||
o.value('/usr/share/unblockneteasemusic/core/server.crt', _('内置公钥'));
|
|
||||||
o.value('/usr/share/unblockneteasemusic/server.crt');
|
|
||||||
o.default = '/usr/share/unblockneteasemusic/core/server.crt';
|
|
||||||
o.datatype = 'file';
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
|
|
||||||
o = s.option(form.Button, '_upload_cert', _('上传公钥'));
|
|
||||||
o.inputstyle = 'action';
|
|
||||||
o.inputtitle = _('上传...');
|
|
||||||
o.depends('self_issue_cert_crt', '/usr/share/unblockneteasemusic/server.crt');
|
|
||||||
o.onclick = L.bind(uploadCertificate, this, _('公钥'), 'server.crt');
|
|
||||||
o.modalonly = true;
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'self_issue_cert_key', _('自签发证书私钥位置'));
|
|
||||||
o.value('/usr/share/unblockneteasemusic/core/server.key', _('内置私钥'));
|
|
||||||
o.value('/usr/share/unblockneteasemusic/server.key');
|
|
||||||
o.default = '/usr/share/unblockneteasemusic/core/server.key';
|
|
||||||
o.datatype = 'file'
|
|
||||||
o.depends('advanced_mode', '1');
|
|
||||||
|
|
||||||
o = s.option(form.Button, '_upload_key', _('上传私钥'));
|
|
||||||
o.inputstyle = 'action';
|
|
||||||
o.inputtitle = _('上传...');
|
|
||||||
o.depends('self_issue_cert_key', '/usr/share/unblockneteasemusic/server.key');
|
|
||||||
o.onclick = L.bind(uploadCertificate, this, _('私钥'), 'server.key');
|
|
||||||
o.modalonly = true;
|
|
||||||
|
|
||||||
s = m.section(form.TableSection, 'acl_rule', _('例外客户端规则'),
|
|
||||||
_('可以为局域网客户端分别设置不同的例外模式。'));
|
|
||||||
s.addremove = true;
|
|
||||||
s.anonymous = true;
|
|
||||||
s.sortable = true;
|
|
||||||
|
|
||||||
o = s.option(form.Flag, 'enable', _('启用'));
|
|
||||||
o.default = o.enabled;
|
|
||||||
o.rmempty = false;
|
|
||||||
|
|
||||||
o = s.option(form.Value, 'ip_addr', _('IP 地址'));
|
|
||||||
o.datatype = 'ip4addr';
|
|
||||||
for (var i of Object.entries(data[1].hosts))
|
|
||||||
for (var v in i[1].ipaddrs)
|
|
||||||
if (i[1].ipaddrs[v]) {
|
|
||||||
var ip_addr = i[1].ipaddrs[v], ip_host = i[1].name;
|
|
||||||
o.value(ip_addr, ip_host ? String.format('%s (%s)', ip_host, ip_addr) : ip_addr)
|
|
||||||
}
|
|
||||||
o.rmempty = false;
|
|
||||||
|
|
||||||
o = s.option(form.ListValue, 'filter_mode', _('规则'));
|
|
||||||
o.value('disable_all', _('不代理 HTTP 和 HTTPS'));
|
|
||||||
o.value('disable_http', _('不代理 HTTP'));
|
|
||||||
o.value('disable_https', _('不代理 HTTPS'));
|
|
||||||
o.default = 'disable_all';
|
|
||||||
o.rmempty = false;
|
|
||||||
|
|
||||||
return m.render();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@@ -1,224 +0,0 @@
|
|||||||
/* SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
*
|
|
||||||
* Copyright (C) 2022 ImmortalWrt.org
|
|
||||||
*/
|
|
||||||
|
|
||||||
'use strict';
|
|
||||||
'require dom';
|
|
||||||
'require form';
|
|
||||||
'require fs';
|
|
||||||
'require poll';
|
|
||||||
'require rpc';
|
|
||||||
'require ui';
|
|
||||||
'require view';
|
|
||||||
|
|
||||||
return view.extend({
|
|
||||||
render: function() {
|
|
||||||
var m, s, o;
|
|
||||||
|
|
||||||
var unm_helper = '/usr/share/unblockneteasemusic/update.sh';
|
|
||||||
|
|
||||||
m = new form.Map('unblockneteasemusic');
|
|
||||||
|
|
||||||
s = m.section(form.NamedSection, 'config', 'unblockneteasemusic', _('核心管理'));
|
|
||||||
s.anonymous = true;
|
|
||||||
|
|
||||||
o = s.option(form.DummyValue, '_core_version', _('核心版本'));
|
|
||||||
o.cfgvalue = function() {
|
|
||||||
var _this = this;
|
|
||||||
var spanTemp = '<div style="color:%s;margin-top:5px;"><strong>%s</strong></div>';
|
|
||||||
|
|
||||||
return fs.exec(unm_helper, [ 'check_version' ]).then(function(res) {
|
|
||||||
if (res.code === 0)
|
|
||||||
_this.default = String.format(spanTemp, 'green', res.stdout.trim());
|
|
||||||
else if (res.code === 2)
|
|
||||||
_this.default = String.format(spanTemp, 'red', _('未安装'));
|
|
||||||
else {
|
|
||||||
ui.addNotification(null, E('p', [ _('获取版本信息失败：%s。').format(res) ]));
|
|
||||||
_this.default = String.format(spanTemp, 'red', _('未知错误'));
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}).catch(function(err) {
|
|
||||||
ui.addNotification(null, E('p', [ _('未知错误：%s。').format(err) ]));
|
|
||||||
_this.default = String.format(spanTemp, 'red', _('未知错误'));
|
|
||||||
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
o.rawhtml = true;
|
|
||||||
|
|
||||||
o = s.option(form.Button, '_remove_core', _('删除核心'),
|
|
||||||
_('删除核心后，需手动点击下面的按钮重新下载，有助于解决版本冲突问题。'));
|
|
||||||
o.inputstyle = 'remove';
|
|
||||||
o.onclick = function() {
|
|
||||||
var _this = this;
|
|
||||||
|
|
||||||
return fs.exec(unm_helper, [ 'remove_core' ]).then(function(res) {
|
|
||||||
_this.description = '删除完毕。'
|
|
||||||
return _this.map.reset();
|
|
||||||
}).catch(function(err) {
|
|
||||||
ui.addNotification(null, E('p', [ _('未知错误：%s。').format(err) ]));
|
|
||||||
_this.description = '删除失败。'
|
|
||||||
return _this.map.reset();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
o = s.option(form.Button, '_update_core', _('更新核心'),
|
|
||||||
_('更新完毕后会自动在后台重启插件，无需手动重启。'));
|
|
||||||
o.inputstyle = 'action';
|
|
||||||
o.onclick = function() {
|
|
||||||
var _this = this;
|
|
||||||
|
|
||||||
return fs.exec(unm_helper, [ 'update_core' ]).then(function (res) {
|
|
||||||
if (res.code === 0)
|
|
||||||
_this.description = _('更新成功。');
|
|
||||||
else if (res.code === 1)
|
|
||||||
_this.description = _('更新失败。');
|
|
||||||
else if (res.code === 2)
|
|
||||||
_this.description = _('更新程序正在运行中。');
|
|
||||||
else if (res.code === 3)
|
|
||||||
_this.description = _('当前已是最新版本。');
|
|
||||||
|
|
||||||
return _this.map.reset();
|
|
||||||
}).catch(function (err) {
|
|
||||||
ui.addNotification(null, E('p', [ _('未知错误：%s。').format(err) ]));
|
|
||||||
_this.description = _('更新失败。');
|
|
||||||
return _this.map.reset();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
o = s.option(form.Button, '_debug_log', _('调试报告'),
|
|
||||||
_('若您遇到使用上的问题，请点此打印调试报告，并将其附在您的 issue 中。'));
|
|
||||||
o.inputstyle = 'action';
|
|
||||||
o.inputtitle = _('打印报告');
|
|
||||||
o.onclick = function() {
|
|
||||||
var log_modal = ui.showModal(_('打印调试报告'), [
|
|
||||||
E('p', { 'class': 'spinning' },
|
|
||||||
_('正在打印调试报告中...'))
|
|
||||||
]);
|
|
||||||
|
|
||||||
return fs.exec_direct('/usr/bin/unm-debug', 'text').then(function (res) {
|
|
||||||
log_modal.removeChild(log_modal.lastChild);
|
|
||||||
|
|
||||||
if (res) {
|
|
||||||
log_modal.appendChild(E('p', _('提交 issue 时，您只需附上最后的链接，无需提供整个输出。')));
|
|
||||||
log_modal.appendChild(E('textarea', {
|
|
||||||
'id': 'content_debugLog',
|
|
||||||
'class': 'cbi-input-textarea',
|
|
||||||
'style': 'font-size:13px; resize: none',
|
|
||||||
'readonly': 'readonly',
|
|
||||||
'wrap': 'soft',
|
|
||||||
'rows': '30'
|
|
||||||
}, [ res.trim() ])
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
log_modal.appendChild(E('p', _('错误')));
|
|
||||||
log_modal.appendChild(E('pre', { 'class': 'errors' }, [ _('无法打印调试报告。') ]));
|
|
||||||
}
|
|
||||||
|
|
||||||
var log_element = document.getElementById('content_debugLog') || null;
|
|
||||||
if (log_element)
|
|
||||||
log_element.scrollTop = log_element.scrollHeight;
|
|
||||||
|
|
||||||
log_modal.appendChild(E('div', { 'class': 'right' }, [
|
|
||||||
log_element ? E('button', {
|
|
||||||
'class': 'btn cbi-button-action',
|
|
||||||
'click': ui.createHandlerFn(this, function() {
|
|
||||||
var links = log_element.value.match(/https:\/\/(litter.catbox.moe|transfer.sh)\/.*.txt/g);
|
|
||||||
|
|
||||||
var textarea = document.createElement('textarea');
|
|
||||||
document.body.appendChild(textarea);
|
|
||||||
|
|
||||||
textarea.style.position = 'absolute';
|
|
||||||
textarea.style.clip = 'rect(0 0 0 0)';
|
|
||||||
textarea.value = links ? links.join('\n'): log_element.value;
|
|
||||||
textarea.select()
|
|
||||||
|
|
||||||
document.execCommand('copy', true);
|
|
||||||
document.body.removeChild(textarea);
|
|
||||||
})
|
|
||||||
}, _('复制')) : '',
|
|
||||||
E('button', {
|
|
||||||
'class': 'btn',
|
|
||||||
'click': ui.hideModal
|
|
||||||
}, _('关闭'))
|
|
||||||
]));
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}).catch(function (err) {
|
|
||||||
ui.addNotification(null, E('p', _('无法打印调试报告：%s。').format(err)));
|
|
||||||
ui.hideModal();
|
|
||||||
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
o = s.option(form.DummyValue, '_logview');
|
|
||||||
o.render = function() {
|
|
||||||
/* Thanks to luci-app-aria2 */
|
|
||||||
var css = ' \
|
|
||||||
#log_textarea { \
|
|
||||||
padding: 10px; \
|
|
||||||
text-align: left; \
|
|
||||||
} \
|
|
||||||
#log_textarea pre { \
|
|
||||||
padding: .5rem; \
|
|
||||||
word-break: break-all; \
|
|
||||||
margin: 0; \
|
|
||||||
} \
|
|
||||||
.description { \
|
|
||||||
background-color: #33ccff; \
|
|
||||||
}';
|
|
||||||
|
|
||||||
var log_textarea = E('div', { 'id': 'log_textarea' },
|
|
||||||
E('img', {
|
|
||||||
'src': L.resource(['icons/loading.gif']),
|
|
||||||
'alt': _('Loading'),
|
|
||||||
'style': 'vertical-align:middle'
|
|
||||||
}, _('Collecting data...'))
|
|
||||||
);
|
|
||||||
|
|
||||||
poll.add(L.bind(function() {
|
|
||||||
return fs.read('/tmp/unblockneteasemusic.log', 'text')
|
|
||||||
.then(function(res) {
|
|
||||||
var log = E('pre', { 'wrap': 'pre' }, [
|
|
||||||
res.trim() || _('当前无日志。')
|
|
||||||
]);
|
|
||||||
|
|
||||||
dom.content(log_textarea, log);
|
|
||||||
}).catch(function(err) {
|
|
||||||
if (err.toString().includes('NotFoundError'))
|
|
||||||
var log = E('pre', { 'wrap': 'pre' }, [
|
|
||||||
_('日志文件不存在。')
|
|
||||||
]);
|
|
||||||
else
|
|
||||||
var log = E('pre', { 'wrap': 'pre' }, [
|
|
||||||
_('未知错误：%s。').format(err)
|
|
||||||
]);
|
|
||||||
|
|
||||||
dom.content(log_textarea, log);
|
|
||||||
});
|
|
||||||
}));
|
|
||||||
|
|
||||||
return E([
|
|
||||||
E('style', [ css ]),
|
|
||||||
E('div', {'class': 'cbi-map'}, [
|
|
||||||
E('h3', {'name': 'content'}, _('运行日志')),
|
|
||||||
E('div', {'class': 'cbi-section'}, [
|
|
||||||
log_textarea,
|
|
||||||
E('div', {'style': 'text-align:right'},
|
|
||||||
E('small', {}, _('每 %s 秒刷新。').format(L.env.pollinterval))
|
|
||||||
)
|
|
||||||
])
|
|
||||||
])
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return m.render();
|
|
||||||
},
|
|
||||||
|
|
||||||
handleSaveApply: null,
|
|
||||||
handleSave: null,
|
|
||||||
handleReset: null
|
|
||||||
});
|
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
-- SPDX-License-Identifer: GPL-3.0-only
|
||||||
|
-- Copyright (C) 2019-2022 Tianling Shen <cnsztl@immortalwrt.org>
|
||||||
|
|
||||||
|
module("luci.controller.unblockneteasemusic", package.seeall)
|
||||||
|
|
||||||
|
function index()
|
||||||
|
if not nixio.fs.access("/etc/config/unblockneteasemusic") then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local page
|
||||||
|
page = entry({"admin", "services", "unblockneteasemusic"}, firstchild(), _("解除网易云音乐播放限制"), 50)
|
||||||
|
page.dependent = false
|
||||||
|
page.acl_depends = { "luci-app-unblockneteasemusic" }
|
||||||
|
|
||||||
|
entry({"admin", "services", "unblockneteasemusic", "general"}, cbi("unblockneteasemusic/main"), _("基本设定"), 1)
|
||||||
|
entry({"admin", "services", "unblockneteasemusic", "upgrade"}, form("unblockneteasemusic/upgrade"), _("更新组件"), 2).leaf = true
|
||||||
|
entry({"admin", "services", "unblockneteasemusic", "log"}, form("unblockneteasemusic/log"), _("日志"), 3)
|
||||||
|
|
||||||
|
entry({"admin", "services", "unblockneteasemusic", "status"}, call("act_status")).leaf = true
|
||||||
|
entry({"admin", "services", "unblockneteasemusic", "update_core"}, call("act_update_core"))
|
||||||
|
entry({"admin", "services", "unblockneteasemusic", "remove_core"}, call("act_remove_core"))
|
||||||
|
end
|
||||||
|
|
||||||
|
function act_status()
|
||||||
|
local stat = luci.util.ubus("service", "list", { name = "unblockneteasemusic" })
|
||||||
|
local running = next(stat) and next(stat.unblockneteasemusic) and stat.unblockneteasemusic.instances.unblockneteasemusic.running or false
|
||||||
|
|
||||||
|
local e = { running = running }
|
||||||
|
luci.http.prepare_content("application/json")
|
||||||
|
luci.http.write_json(e)
|
||||||
|
end
|
||||||
|
|
||||||
|
function update_core()
|
||||||
|
local core_cloud_ver = luci.sys.exec("uclient-fetch -qO- 'https://api.github.com/repos/UnblockNeteaseMusic/server/commits?sha=enhanced&path=precompiled' | jsonfilter -e '@[0].sha'")
|
||||||
|
local core_cloud_ver_mini = string.sub(core_cloud_ver, 1, 7)
|
||||||
|
local core_local_ver
|
||||||
|
if not core_cloud_ver or not core_cloud_ver_mini then
|
||||||
|
return "1"
|
||||||
|
else
|
||||||
|
core_local_ver = luci.sys.exec("cat '/usr/share/unblockneteasemusic/core_local_ver' 2>'/dev/null'")
|
||||||
|
if not core_local_ver or (core_local_ver ~= core_cloud_ver) then
|
||||||
|
luci.sys.call("rm -f /usr/share/unblockneteasemusic/update_core_successfully")
|
||||||
|
luci.sys.call("/usr/share/unblockneteasemusic/update.sh update_core_from_luci")
|
||||||
|
if not nixio.fs.access("/usr/share/unblockneteasemusic/update_core_successfully") then
|
||||||
|
return "2"
|
||||||
|
else
|
||||||
|
luci.sys.call("rm -f /usr/share/unblockneteasemusic/update_core_successfully")
|
||||||
|
return core_cloud_ver_mini
|
||||||
|
end
|
||||||
|
else
|
||||||
|
return "0"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function act_update_core()
|
||||||
|
luci.http.prepare_content("application/json")
|
||||||
|
luci.http.write_json({
|
||||||
|
ret = update_core();
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|
||||||
|
function act_remove_core()
|
||||||
|
local ret = {}
|
||||||
|
ret.ret = luci.sys.call("cd /usr/share/unblockneteasemusic && rm -rf core/* && rm -f core_local_ver") == 0
|
||||||
|
luci.http.prepare_content("application/json")
|
||||||
|
luci.http.write_json(ret)
|
||||||
|
end
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
local fs = require "nixio.fs"
|
||||||
|
local conffile = "/tmp/unblockneteasemusic.log"
|
||||||
|
|
||||||
|
f = SimpleForm("logview")
|
||||||
|
|
||||||
|
t = f:field(TextValue, "conf")
|
||||||
|
t.rmempty = true
|
||||||
|
t.rows = 15
|
||||||
|
function t.cfgvalue()
|
||||||
|
return fs.readfile(conffile) or ""
|
||||||
|
end
|
||||||
|
t.readonly="readonly"
|
||||||
|
|
||||||
|
return f
|
||||||
@@ -0,0 +1,247 @@
|
|||||||
|
local m, s, o
|
||||||
|
|
||||||
|
m = Map("unblockneteasemusic", translate("解除网易云音乐播放限制"))
|
||||||
|
m.description = translate("原理：采用 [Bilibili/JOOX/酷狗/酷我/咪咕/pyncmd/QQ/Youtube] 等音源，替换网易云音乐 无版权/收费 歌曲链接<br/>具体使用方法参见：<a href=\"https://github.com/UnblockNeteaseMusic/luci-app-unblockneteasemusic\" target=\"_blank\">GitHub @UnblockNeteaseMusic/luci-app-unblockneteasemusic</a>")
|
||||||
|
|
||||||
|
m:section(SimpleSection).template = "unblockneteasemusic/status"
|
||||||
|
|
||||||
|
s = m:section(NamedSection, "config", "unblockneteasemusic")
|
||||||
|
|
||||||
|
o = s:option(Flag, "enable", translate("启用本插件"))
|
||||||
|
o.description = translate("启用本插件以解除网易云音乐播放限制")
|
||||||
|
o.default = 0
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
o = s:option(Value, "music_source", translate("音源接口"))
|
||||||
|
o:value("default", translate("默认"))
|
||||||
|
o:value("bilibili", translate("Bilibili音乐"))
|
||||||
|
o:value("joox", translate("JOOX音乐"))
|
||||||
|
o:value("kugou", translate("酷狗音乐"))
|
||||||
|
o:value("kuwo", translate("酷我音乐"))
|
||||||
|
o:value("migu", translate("咪咕音乐"))
|
||||||
|
o:value("pyncmd", translate("网易云音乐（pyncmd）"))
|
||||||
|
o:value("qq", translate("QQ音乐"))
|
||||||
|
o:value("youtube", translate("Youtube音乐"))
|
||||||
|
o:value("youtubedl", translate("Youtube音乐（youtube-dl）"))
|
||||||
|
o:value("ytdlp", translate("Youtube音乐（yt-dlp）"))
|
||||||
|
o:value("ytdownload", translate("Youtube音乐（ytdownload）"))
|
||||||
|
o.description = translate("自定义模式下，多个音源请用空格隔开")
|
||||||
|
o.default = "default"
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
o = s:option(Flag, "follow_source_order", translate("顺序查询"))
|
||||||
|
o.description = translate("默认为并行查询并返回第一个结果，开启后将严格按照配置音源的顺序进行查询")
|
||||||
|
o.default = 0
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
o = s:option(Flag, "search_album", translate("附加专辑名"))
|
||||||
|
o.description = translate("在其他音源搜索歌曲时携带专辑名称（默认搜索条件 歌曲名 - 歌手，启用后搜索条件 歌曲名 - 歌手 专辑名）")
|
||||||
|
o.default = 0
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
o = s:option(Flag, "local_vip", translate("启用本地 VIP"))
|
||||||
|
o.description = translate("启用后，可以使用去广告、个性换肤、鲸云音效等本地功能")
|
||||||
|
o.default = 0
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
o = s:option(Flag, "enable_flac", translate("启用无损音质"))
|
||||||
|
o.description = translate("目前仅支持酷狗、酷我、咪咕、pyncmd、QQ 音源")
|
||||||
|
o.default = 0
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
o = s:option(Flag, "disable_upgrade_check", translate("禁用更新检查"))
|
||||||
|
o.description = translate("禁止客户端检查更新，全平台支持")
|
||||||
|
o.default = 1
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
o = s:option(ListValue, "replace_music_source", translate("强制音乐音源替换"))
|
||||||
|
o:value("dont_replace", translate("不强制替换音乐音源"))
|
||||||
|
o:value("lower_than_192kbps", translate("当音质低于 192 Kbps（中）时"))
|
||||||
|
o:value("lower_than_320kbps", translate("当音质低于 320 Kbps（高）时"))
|
||||||
|
o:value("lower_than_999kbps", translate("当音质低于 999 Kbps（无损）时"))
|
||||||
|
o:value("replace_all", translate("替换所有音乐音源"))
|
||||||
|
o.description = translate("当音乐音质低于指定数值时，尝试强制使用其他平台的高音质版本进行替换")
|
||||||
|
o.default = "dont_replace"
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
o = s:option(Flag, "use_custom_cookie", translate("使用自定义 Cookie"))
|
||||||
|
o.description = translate("使用自定义 Cookie 请求音源接口")
|
||||||
|
o.default = 0
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
o = s:option(Value, "joox_cookie", translate("JOOX Cookie"))
|
||||||
|
o.description = translate("在 joox.com 获取，需要 wmid 和 session_key 值")
|
||||||
|
o.placeholder = "wmid=; session_key="
|
||||||
|
o.datatype = "string"
|
||||||
|
o:depends("use_custom_cookie", 1)
|
||||||
|
|
||||||
|
o = s:option(Value, "migu_cookie", translate("Migu Cookie"))
|
||||||
|
o.description = translate("通过抓包手机客户端请求获取，需要 aversionid 值")
|
||||||
|
o.datatype = "string"
|
||||||
|
o:depends("use_custom_cookie", 1)
|
||||||
|
|
||||||
|
o = s:option(Value, "qq_cookie", translate("QQ Cookie"))
|
||||||
|
o.description = translate("在 y.qq.com 获取，需要 uin 和 qm_keyst值 ")
|
||||||
|
o.placeholder = "uin=; qm_keyst="
|
||||||
|
o.datatype = "string"
|
||||||
|
o:depends("use_custom_cookie", 1)
|
||||||
|
|
||||||
|
o = s:option(Value, "youtube_key", translate("Youtube API Key"))
|
||||||
|
o.description = translate("API Key 申请地址：https://developers.google.com/youtube/v3/getting-started#before-you-start")
|
||||||
|
o.datatype = "string"
|
||||||
|
o:depends("use_custom_cookie", 1)
|
||||||
|
|
||||||
|
o = s:option(Flag, "auto_update", translate("启用自动更新"))
|
||||||
|
o.description = translate("启用后，每天将定时自动检查最新版本并更新")
|
||||||
|
o.default = 0
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
o = s:option(ListValue, "update_time", translate("检查更新时间"))
|
||||||
|
for update_time_hour = 0,23 do
|
||||||
|
o:value(update_time_hour, update_time_hour..":00")
|
||||||
|
end
|
||||||
|
o.default = "3"
|
||||||
|
o.description = translate("设定每天自动检查更新时间")
|
||||||
|
o:depends("auto_update", 1)
|
||||||
|
|
||||||
|
o = s:option(Button,"certificate", translate("HTTPS 证书"))
|
||||||
|
o.inputtitle = translate("下载 CA 根证书")
|
||||||
|
o.description = translate("Linux/iOS/MacOSX 在信任根证书后方可正常使用")
|
||||||
|
o.inputstyle = "reload"
|
||||||
|
o.write = function()
|
||||||
|
act_download_cert()
|
||||||
|
end
|
||||||
|
|
||||||
|
function act_download_cert()
|
||||||
|
local t, e
|
||||||
|
t = nixio.open("/usr/share/unblockneteasemusic/core/ca.crt","r")
|
||||||
|
luci.http.header('Content-Disposition', 'attachment; filename="ca.crt"')
|
||||||
|
luci.http.prepare_content("application/octet-stream")
|
||||||
|
while true do
|
||||||
|
e = t:read(nixio.const.buffersize)
|
||||||
|
if (not e) or (#e == 0) then
|
||||||
|
break
|
||||||
|
else
|
||||||
|
luci.http.write(e)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
t:close()
|
||||||
|
luci.http.close()
|
||||||
|
end
|
||||||
|
|
||||||
|
o = s:option(Flag, "advanced_mode", translate("启用进阶设置"))
|
||||||
|
o.description = translate("非必要不推荐使用")
|
||||||
|
o.default = 0
|
||||||
|
o.rmempty = false
|
||||||
|
|
||||||
|
o = s:option(ListValue, "log_level", translate("日志等级"))
|
||||||
|
o:value("debug", translate("'调试"));
|
||||||
|
o:value("info", translate("信息（默认）"))
|
||||||
|
o:value("silent", translate("静默"))
|
||||||
|
o.default = "info";
|
||||||
|
o:depends("advanced_mode", 1)
|
||||||
|
|
||||||
|
o = s:option(Value, "http_port", translate("HTTP 监听端口"))
|
||||||
|
o.description = translate("程序监听的 HTTP 端口，不可与 其他程序/HTTPS 共用一个端口")
|
||||||
|
o.placeholder = "5200"
|
||||||
|
o.default = "5200"
|
||||||
|
o.datatype = "port"
|
||||||
|
o:depends({advanced_mode = true, hijack_ways = "dont_hijack"})
|
||||||
|
o:depends({advanced_mode = true, hijack_ways = "use_ipset"})
|
||||||
|
|
||||||
|
o = s:option(Value, "https_port", translate("HTTPS 监听端口"))
|
||||||
|
o.description = translate("程序监听的 HTTPS 端口，不可与 其他程序/HTTP 共用一个端口")
|
||||||
|
o.placeholder = "5201"
|
||||||
|
o.default = "5201"
|
||||||
|
o.datatype = "port"
|
||||||
|
o:depends({advanced_mode = true, hijack_ways = "dont_hijack"})
|
||||||
|
o:depends({advanced_mode = true, hijack_ways = "use_ipset"})
|
||||||
|
|
||||||
|
o = s:option(Value, "endpoint_url", translate("EndPoint"))
|
||||||
|
o.description = translate("具体说明参见：https://github.com/UnblockNeteaseMusic/server")
|
||||||
|
o.default = "https://music.163.com"
|
||||||
|
o.placeholder = "https://music.163.com"
|
||||||
|
o.datatype = "string"
|
||||||
|
o:depends("advanced_mode", 1)
|
||||||
|
|
||||||
|
o = s:option(Value, "cnrelay", translate("UNM bridge 服务器"))
|
||||||
|
o.description = translate("使用 UnblockNeteaseMusic 中继桥（bridge）以获取音源信息")
|
||||||
|
o.placeholder = "http(s)://host:port"
|
||||||
|
o.datatype = "string"
|
||||||
|
o:depends("advanced_mode", 1)
|
||||||
|
|
||||||
|
o = s:option(ListValue, "hijack_ways", translate("劫持方法"))
|
||||||
|
o:value("dont_hijack", translate("不开启劫持"))
|
||||||
|
o:value("use_ipset", translate("使用 IPSet 劫持"))
|
||||||
|
o:value("use_hosts", translate("使用 Hosts 劫持"))
|
||||||
|
o.description = translate("如果使用Hosts劫持，程序监听的 HTTP/HTTPS 端口将被锁定为 80/443")
|
||||||
|
o.default = "dont_hijack"
|
||||||
|
o:depends("advanced_mode", 1)
|
||||||
|
|
||||||
|
o = s:option(Flag, "keep_core_when_upgrade", translate("升级时保留核心程序"))
|
||||||
|
o.description = translate("默认情况下，在系统升级后会导致核心程序丢失，开启此选项后会保留当前下载的核心程序")
|
||||||
|
o.default = 0
|
||||||
|
o.rmempty = false
|
||||||
|
o:depends("advanced_mode", 1)
|
||||||
|
|
||||||
|
o = s:option(Flag, "pub_access", translate("部署到公网"))
|
||||||
|
o.description = translate("默认仅监听局域网，如需提供公开访问请勾选此选项")
|
||||||
|
o.default = 0
|
||||||
|
o.rmempty = false
|
||||||
|
o:depends("advanced_mode", 1)
|
||||||
|
|
||||||
|
o = s:option(Flag, "strict_mode", translate("启用严格模式"))
|
||||||
|
o.description = translate("若将服务部署到公网，则强烈建议使用严格模式，此模式下仅放行网易云音乐所属域名的请求；注意：该模式下不能使用全局代理")
|
||||||
|
o.default = 0
|
||||||
|
o.rmempty = false
|
||||||
|
o:depends("advanced_mode", 1)
|
||||||
|
|
||||||
|
o = s:option(Value, "netease_server_ip", translate("网易云服务器 IP"))
|
||||||
|
o.description = translate("通过 ping music.163.com 即可获得 IP 地址，仅限填写一个")
|
||||||
|
o.placeholder = "59.111.181.38"
|
||||||
|
o.datatype = "ipaddr"
|
||||||
|
o:depends("advanced_mode", 1)
|
||||||
|
|
||||||
|
o = s:option(Value, "proxy_server_ip", translate("代理服务器地址"))
|
||||||
|
o.description = translate("使用代理服务器获取音乐信息")
|
||||||
|
o.placeholder = "http(s)://host:port"
|
||||||
|
o.datatype = "string"
|
||||||
|
o:depends("advanced_mode", 1)
|
||||||
|
|
||||||
|
o = s:option(Value, "self_issue_cert_crt", translate("自签发证书公钥位置"))
|
||||||
|
o.description = translate("[公钥] 默认使用 UnblockNeteaseMusic 项目提供的 CA 证书，您可以指定为您自己的证书")
|
||||||
|
o.placeholder = "/usr/share/unblockneteasemusic/core/server.crt"
|
||||||
|
o.datatype = "file"
|
||||||
|
o:depends("advanced_mode", 1)
|
||||||
|
|
||||||
|
o = s:option(Value, "self_issue_cert_key", translate("自签发证书私钥位置"))
|
||||||
|
o.description = translate("[私钥] 默认使用 UnblockNeteaseMusic 项目提供的 CA 证书，您可以指定为您自己的证书")
|
||||||
|
o.placeholder = "/usr/share/unblockneteasemusic/core/server.key"
|
||||||
|
o.datatype = "file"
|
||||||
|
o:depends("advanced_mode", 1)
|
||||||
|
|
||||||
|
s = m:section(TypedSection, "acl_rule", translate("例外客户端规则"), translate("可以为局域网客户端分别设置不同的例外模式，默认无需设置"))
|
||||||
|
s.template = "cbi/tblsection"
|
||||||
|
s.sortable = true
|
||||||
|
s.anonymous = true
|
||||||
|
s.addremove = true
|
||||||
|
|
||||||
|
o = s:option(Value, "ip_addr", translate("IP 地址"))
|
||||||
|
o.width = "40%"
|
||||||
|
o.datatype = "ip4addr"
|
||||||
|
o.placeholder = "0.0.0.0/0"
|
||||||
|
luci.ip.neighbors({ family = 4 }, function(entry)
|
||||||
|
if entry.reachable then
|
||||||
|
o:value(entry.dest:string())
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
|
o = s:option(ListValue, "filter_mode", translate("规则"))
|
||||||
|
o.width = "40%"
|
||||||
|
o.default = "disable_all"
|
||||||
|
o.rmempty = false
|
||||||
|
o:value("disable_all", translate("不代理 HTTP 和 HTTPS"))
|
||||||
|
o:value("disable_http", translate("不代理 HTTP"))
|
||||||
|
o:value("disable_https", translate("不代理 HTTPS"))
|
||||||
|
|
||||||
|
return m
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
local m, o
|
||||||
|
|
||||||
|
m = SimpleForm("Version")
|
||||||
|
m.reset = false
|
||||||
|
m.submit = false
|
||||||
|
|
||||||
|
o = m:field(DummyValue, "remove_core", translate("删除核心"))
|
||||||
|
o.rawhtml = true
|
||||||
|
o.template = "unblockneteasemusic/remove_core"
|
||||||
|
o.value = translate("")
|
||||||
|
o.description = "删除核心后，需手动点击下面的按钮重新下载，有助于解决版本冲突问题"
|
||||||
|
|
||||||
|
o = m:field(DummyValue, "update_core", translate("更新核心"))
|
||||||
|
o.rawhtml = true
|
||||||
|
o.template = "unblockneteasemusic/update_core"
|
||||||
|
o.value = translate("")
|
||||||
|
o.description = "更新完毕后会自动在后台重启插件，无需手动重启"
|
||||||
|
|
||||||
|
return m
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
<%+cbi/valueheader%>
|
||||||
|
|
||||||
|
<script type="text/javascript">//<![CDATA[
|
||||||
|
function act_remove_core(btn, dataname)
|
||||||
|
{
|
||||||
|
btn.disabled = true;
|
||||||
|
btn.value = '<%:正在删除核心...%>';
|
||||||
|
XHR.get('<%=luci.dispatcher.build_url("admin", "services", "unblockneteasemusic", "remove_core")%>',
|
||||||
|
status.ret,
|
||||||
|
function(x, status)
|
||||||
|
{
|
||||||
|
var s = document.getElementById(dataname + '-status');
|
||||||
|
if (s)
|
||||||
|
{
|
||||||
|
if(status.ret)
|
||||||
|
s.innerHTML = "<font style=\"color:green\">" + "<%:删除核心成功%>" + "</font>";
|
||||||
|
else
|
||||||
|
s.innerHTML = "<font style=\"color:red\">" + "<%:删除核心失败%>"+"</font>";
|
||||||
|
}
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.value = '<%:点此删除核心%>';
|
||||||
|
}
|
||||||
|
);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
//]]></script>
|
||||||
|
|
||||||
|
|
||||||
|
<input type="button" class="btn cbi-button cbi-input-reload" value="<%:点此删除核心%>" onclick="return act_remove_core(this, '<%=self.option%>')" />
|
||||||
|
<span id="<%=self.option%>-status"><em><%=self.value%></em></span>
|
||||||
|
|
||||||
|
<%+cbi/valuefooter%>
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
<script type="text/javascript">//<![CDATA[
|
||||||
|
XHR.poll(3, '<%=url([[admin]], [[services]], [[unblockneteasemusic]], [[status]])%>', null,
|
||||||
|
function(x, data) {
|
||||||
|
var tb = document.getElementById('unblockneteasemusic_status');
|
||||||
|
if (data && tb) {
|
||||||
|
if (data.running) {
|
||||||
|
tb.innerHTML = '<em><b style=color:green>UnblockNeteaseMusic <%:运行中%></b></em>';
|
||||||
|
} else {
|
||||||
|
tb.innerHTML = '<em><b style=color:red>UnblockNeteaseMusic <%:未在运行%></b></em>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
//]]>
|
||||||
|
</script>
|
||||||
|
<style>.mar-10 {margin-left: 50px; margin-right: 10px;}</style>
|
||||||
|
<fieldset class="cbi-section">
|
||||||
|
<p id="unblockneteasemusic_status">
|
||||||
|
<em><%:Collecting data...%></em>
|
||||||
|
</p>
|
||||||
|
</fieldset>
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<%+cbi/valueheader%>
|
||||||
|
|
||||||
|
<script type="text/javascript">//<![CDATA[
|
||||||
|
function act_update_core(btn, dataname)
|
||||||
|
{
|
||||||
|
btn.disabled = true;
|
||||||
|
btn.value = '<%:正在更新核心...%>';
|
||||||
|
XHR.get('<%=luci.dispatcher.build_url("admin", "services", "unblockneteasemusic", "update_core")%>',
|
||||||
|
status.ret,
|
||||||
|
function(x, status)
|
||||||
|
{
|
||||||
|
var s = document.getElementById(dataname + '-status');
|
||||||
|
if (s)
|
||||||
|
{
|
||||||
|
if(status.ret == "0")
|
||||||
|
s.innerHTML = "<font style=\"color:green\">" + "<%:当前已是最新版本%>" + "</font>";
|
||||||
|
else if (status.ret == "1")
|
||||||
|
s.innerHTML = "<font style=\"color:red\">" + "<%:无法检测最新版本%>" + "</font>";
|
||||||
|
else if(status.ret == "2")
|
||||||
|
s.innerHTML = "<font style=\"color:red\">" + "<%:更新失败，请稍后重试%>" + "</font>";
|
||||||
|
else
|
||||||
|
s.innerHTML = "<font style=\"color:green\">" + "<%:更新成功，当前版本号：%>" + status.ret + "</font>";
|
||||||
|
}
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.value = '<%:点此更新核心%>';
|
||||||
|
}
|
||||||
|
);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
//]]></script>
|
||||||
|
|
||||||
|
|
||||||
|
<input type="button" class="btn cbi-button cbi-input-reload" value="<%:点此更新核心%>" onclick="return act_update_core(this, '<%=self.option%>')" />
|
||||||
|
<span id="<%=self.option%>-status"><em><%=self.value%></em></span>
|
||||||
|
|
||||||
|
<%+cbi/valuefooter%>
|
||||||
@@ -1,12 +1,13 @@
|
|||||||
|
|
||||||
config unblockneteasemusic 'config'
|
config unblockneteasemusic 'config'
|
||||||
option enable '0'
|
option enable '0'
|
||||||
option music_source ''
|
option music_source 'default'
|
||||||
option follow_source_order '0'
|
option follow_source_order '0'
|
||||||
option local_vip '0'
|
option local_vip '0'
|
||||||
option enable_flac '0'
|
option enable_flac '0'
|
||||||
option disable_upgrade_check '1'
|
option disable_upgrade_check '1'
|
||||||
option replace_music_source 'dont_replace'
|
option replace_music_source 'dont_replace'
|
||||||
|
option use_custom_cookie '0'
|
||||||
option auto_update '1'
|
option auto_update '1'
|
||||||
option update_time '3'
|
option update_time '3'
|
||||||
option advanced_mode '0'
|
option advanced_mode '0'
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ STOP=10
|
|||||||
NAME="unblockneteasemusic"
|
NAME="unblockneteasemusic"
|
||||||
UPGRADE_CONF="/lib/upgrade/keep.d/$NAME"
|
UPGRADE_CONF="/lib/upgrade/keep.d/$NAME"
|
||||||
|
|
||||||
|
IPT_N="iptables -t nat"
|
||||||
|
|
||||||
|
FW4="$(command -v fw4)"
|
||||||
RULES_UC="/usr/share/$NAME/rules/default.uc"
|
RULES_UC="/usr/share/$NAME/rules/default.uc"
|
||||||
RULES_NFT="/etc/nftables.d/90-$NAME-rules.nft"
|
RULES_NFT="/etc/nftables.d/90-$NAME-rules.nft"
|
||||||
|
|
||||||
@@ -47,8 +50,6 @@ append_param_boolenv() {
|
|||||||
append_filter_client() {
|
append_filter_client() {
|
||||||
local cfg="$1"
|
local cfg="$1"
|
||||||
|
|
||||||
is_enabled "$cfg" "enable" || return 1
|
|
||||||
|
|
||||||
local ip_addr filter_mode
|
local ip_addr filter_mode
|
||||||
config_get ip_addr "$cfg" "ip_addr"
|
config_get ip_addr "$cfg" "ip_addr"
|
||||||
config_get filter_mode "$cfg" "filter_mode"
|
config_get filter_mode "$cfg" "filter_mode"
|
||||||
@@ -56,14 +57,27 @@ append_filter_client() {
|
|||||||
|
|
||||||
case "${filter_mode}" in
|
case "${filter_mode}" in
|
||||||
"disable_http")
|
"disable_http")
|
||||||
acl_http_addr="${acl_http_addr:+$acl_http_addr\n}${ip_addr}"
|
if [ -n "$FW4" ]; then
|
||||||
|
acl_http_addr="${acl_http_addr:+$acl_http_addr\n}${ip_addr}"
|
||||||
|
else
|
||||||
|
ipset -! add "acl_neteasemusic_http" "${ip_addr}"
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
"disable_https")
|
"disable_https")
|
||||||
acl_https_addr="${acl_https_addr:+$acl_https_addr\n}${ip_addr}"
|
if [ -n "$FW4" ]; then
|
||||||
|
acl_https_addr="${acl_https_addr:+$acl_https_addr\n}${ip_addr}"
|
||||||
|
else
|
||||||
|
ipset -! add "acl_neteasemusic_https" "${ip_addr}"
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
"disable_all")
|
"disable_all")
|
||||||
acl_http_addr="${acl_http_addr:+$acl_http_addr\n}${ip_addr}"
|
if [ -n "$FW4" ]; then
|
||||||
acl_https_addr="${acl_https_addr:+$acl_https_addr\n}${ip_addr}"
|
acl_http_addr="${acl_http_addr:+$acl_http_addr\n}${ip_addr}"
|
||||||
|
acl_https_addr="${acl_https_addr:+$acl_https_addr\n}${ip_addr}"
|
||||||
|
else
|
||||||
|
ipset -! add "acl_neteasemusic_http" "${ip_addr}"
|
||||||
|
ipset -! add "acl_neteasemusic_https" "${ip_addr}"
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
@@ -90,19 +104,34 @@ start_service() {
|
|||||||
config_get http_port "config" "http_port" "5200"
|
config_get http_port "config" "http_port" "5200"
|
||||||
config_get https_port "config" "https_port" "5201"
|
config_get https_port "config" "https_port" "5201"
|
||||||
config_get hijack_ways "config" "hijack_ways" "use_ipset"
|
config_get hijack_ways "config" "hijack_ways" "use_ipset"
|
||||||
|
[ "${hijack_ways}" = "use_hosts" ] && { http_port="80"; https_port="443"; }
|
||||||
append_param "-p" "${http_port}":"${https_port}"
|
append_param "-p" "${http_port}":"${https_port}"
|
||||||
|
|
||||||
json_init
|
if [ -n "$FW4" ]; then
|
||||||
if is_enabled "config" "pub_access"; then
|
json_init
|
||||||
json_add_int o_pub_access "1"
|
if is_enabled "config" "pub_access"; then
|
||||||
|
json_add_int o_pub_access "1"
|
||||||
|
else
|
||||||
|
json_add_int o_pub_access "0"
|
||||||
|
fi
|
||||||
|
json_add_int o_http_port "${http_port}"
|
||||||
|
json_add_int o_https_port "${https_port}"
|
||||||
|
json_add_string o_hijack_ways "${hijack_ways}"
|
||||||
else
|
else
|
||||||
json_add_int o_pub_access "0"
|
if is_enabled "config" "pub_access"; then
|
||||||
fi
|
iptables -I "INPUT" -p "tcp" --dport "${http_port}" -j "ACCEPT"
|
||||||
json_add_int o_http_port "${http_port}"
|
iptables -I "INPUT" -p "tcp" --dport "${https_port}" -j "ACCEPT"
|
||||||
json_add_int o_https_port "${https_port}"
|
echo "${http_port}:${https_port}" > "/tmp/$NAME.ports"
|
||||||
json_add_string o_hijack_ways "${hijack_ways}"
|
|
||||||
|
mkdir -p "/var/etc/"
|
||||||
|
echo "/etc/init.d/$NAME restart" > "/var/etc/$NAME.include"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
local music_source
|
||||||
|
config_get music_source "config" "music_source" "default"
|
||||||
|
[ "${music_source}" != "default" ] && append_param -o "${music_source}"
|
||||||
|
|
||||||
append_param_arg "config" "music_source" "-o"
|
|
||||||
append_param_arg "config" "cnrelay" "-c"
|
append_param_arg "config" "cnrelay" "-c"
|
||||||
append_param_arg "config" "endpoint_url" "-e" "https://music.163.com"
|
append_param_arg "config" "endpoint_url" "-e" "https://music.163.com"
|
||||||
append_param_arg "config" "netease_server_ip" "-f"
|
append_param_arg "config" "netease_server_ip" "-f"
|
||||||
@@ -139,29 +168,57 @@ start_service() {
|
|||||||
|
|
||||||
local lan_addr="$(uci -q get network.lan.ipaddr)"
|
local lan_addr="$(uci -q get network.lan.ipaddr)"
|
||||||
if [ "${hijack_ways}" = "use_ipset" ]; then
|
if [ "${hijack_ways}" = "use_ipset" ]; then
|
||||||
|
local settype nftflag
|
||||||
|
if [ -n "$FW4" ]; then
|
||||||
|
settype="nftset"
|
||||||
|
nftflag="inet#fw4#"
|
||||||
|
else
|
||||||
|
settype="ipset"
|
||||||
|
fi
|
||||||
mkdir -p "/tmp/dnsmasq.d"
|
mkdir -p "/tmp/dnsmasq.d"
|
||||||
rm -f "/tmp/dnsmasq.d/dnsmasq-$NAME.conf"
|
rm -f "/tmp/dnsmasq.d/dnsmasq-$NAME.conf"
|
||||||
cat <<-EOF > "/tmp/dnsmasq.d/dnsmasq-$NAME.conf"
|
cat <<-EOF > "/tmp/dnsmasq.d/dnsmasq-$NAME.conf"
|
||||||
dhcp-option=252,http://${lan_addr}:${http_port}/proxy.pac
|
dhcp-option=252,http://${lan_addr}:${http_port}/proxy.pac
|
||||||
nftset=/.music.163.com/inet#fw4#neteasemusic
|
${settype}=/.music.163.com/${nftflag}neteasemusic
|
||||||
nftset=/interface.music.163.com/inet#fw4#neteasemusic
|
${settype}=/interface.music.163.com/${nftflag}neteasemusic
|
||||||
nftset=/interface3.music.163.com/inet#fw4#neteasemusic
|
${settype}=/interface3.music.163.com/${nftflag}neteasemusic
|
||||||
nftset=/apm.music.163.com/inet#fw4#neteasemusic
|
${settype}=/apm.music.163.com/${nftflag}neteasemusic
|
||||||
nftset=/apm3.music.163.com/inet#fw4#neteasemusic
|
${settype}=/apm3.music.163.com/${nftflag}neteasemusic
|
||||||
nftset=/clientlog.music.163.com/inet#fw4#neteasemusic
|
${settype}=/clientlog.music.163.com/${nftflag}neteasemusic
|
||||||
nftset=/clientlog3.music.163.com/inet#fw4#neteasemusic
|
${settype}=/clientlog3.music.163.com/${nftflag}neteasemusic
|
||||||
EOF
|
EOF
|
||||||
/etc/init.d/dnsmasq reload
|
/etc/init.d/dnsmasq reload
|
||||||
|
|
||||||
|
[ -n "$FW4" ] || {
|
||||||
|
ipset create "acl_neteasemusic_http" hash:ip
|
||||||
|
ipset create "acl_neteasemusic_https" hash:ip
|
||||||
|
ipset create "neteasemusic" hash:ip
|
||||||
|
}
|
||||||
config_foreach append_filter_client "acl_rule"
|
config_foreach append_filter_client "acl_rule"
|
||||||
|
|
||||||
local netease_music_ips="$(uclient-fetch -qO- "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" |jsonfilter -e '@.data.*.ip.*')"
|
local netease_music_ips="$(uclient-fetch -qO- "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" |jsonfilter -e '@.data.*.ip.*')"
|
||||||
local netease_music_ips2="$(uclient-fetch -qO- "https://music.httpdns.c.163.com/d" --post-data="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" |jsonfilter -e '@.dns.*["ips"].*')"
|
local netease_music_ips2="$(uclient-fetch -qO- "https://music.httpdns.c.163.com/d" --post-data="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" |jsonfilter -e '@.dns.*["ips"].*')"
|
||||||
local neteasemusic_addr="$(echo -e "${netease_music_ips}\n${netease_music_ips2}" | sort -u | awk '{print $1}')"
|
if [ -n "$FW4" ]; then
|
||||||
|
local neteasemusic_addr="$(echo -e "${netease_music_ips}\n${netease_music_ips2}" | sort -u | awk '{print $1}')"
|
||||||
|
|
||||||
json_add_string o_acl_http_addr "$(echo -e "${acl_http_addr}" | sort -u | awk '{print $1}')"
|
json_add_string o_acl_http_addr "$(echo -e "${acl_http_addr}" | sort -u | awk '{print $1}')"
|
||||||
json_add_string o_acl_https_addr "$(echo -e "${acl_https_addr}" | sort -u | awk '{print $1}')"
|
json_add_string o_acl_https_addr "$(echo -e "${acl_https_addr}" | sort -u | awk '{print $1}')"
|
||||||
json_add_string o_neteasemusic_addr "$neteasemusic_addr"
|
json_add_string o_neteasemusic_addr "$neteasemusic_addr"
|
||||||
|
else
|
||||||
|
echo -e "${netease_music_ips}\n${netease_music_ips2}" | sort -u | awk '{print "ipset add neteasemusic "$1}' | sh
|
||||||
|
|
||||||
|
$IPT_N -N "netease_cloud_music"
|
||||||
|
for local_addr in "0.0.0.0/8" "10.0.0.0/8" "127.0.0.0/8" "169.254.0.0/16" "172.16.0.0/12" "192.168.0.0/16" "224.0.0.0/4" "240.0.0.0/4"; do
|
||||||
|
$IPT_N -A "netease_cloud_music" -d "${local_addr}" -j "RETURN"
|
||||||
|
done
|
||||||
|
|
||||||
|
$IPT_N -A "netease_cloud_music" -p "tcp" -m "set" ! --match-set "acl_neteasemusic_http" "src" --dport "80" -j "REDIRECT" --to-ports "${http_port}"
|
||||||
|
$IPT_N -A "netease_cloud_music" -p "tcp" -m "set" ! --match-set "acl_neteasemusic_https" "src" --dport "443" -j "REDIRECT" --to-ports "${https_port}"
|
||||||
|
$IPT_N -I "PREROUTING" -p "tcp" -m "set" --match-set "neteasemusic" "dst" -j "netease_cloud_music"
|
||||||
|
|
||||||
|
mkdir -p "/var/etc/"
|
||||||
|
echo "/etc/init.d/$NAME restart" > "/var/etc/$NAME.include"
|
||||||
|
fi
|
||||||
elif [ "${hijack_ways}" = "use_hosts" ]; then
|
elif [ "${hijack_ways}" = "use_hosts" ]; then
|
||||||
mkdir -p "/tmp/dnsmasq.d"
|
mkdir -p "/tmp/dnsmasq.d"
|
||||||
rm -f "/tmp/dnsmasq.d/dnsmasq-$NAME.conf"
|
rm -f "/tmp/dnsmasq.d/dnsmasq-$NAME.conf"
|
||||||
@@ -181,13 +238,15 @@ start_service() {
|
|||||||
ip route add "223.252.199.10" dev lo
|
ip route add "223.252.199.10" dev lo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local nft_tmp="/tmp/$NAME"
|
if [ -n "$FW4" ]; then
|
||||||
json_dump -i > "$nft_tmp.json"
|
local nft_tmp="/tmp/$NAME"
|
||||||
if utpl -F "$nft_tmp.json" -S "$RULES_UC" > "$nft_tmp.nft" && ! cmp -s "$nft_tmp.nft" "$RULES_NFT"; then
|
json_dump -i > "$nft_tmp.json"
|
||||||
echo "table inet chk {include \"$nft_tmp.nft\";}" > "$nft_tmp.nft.chk"
|
if utpl -F "$nft_tmp.json" -S "$RULES_UC" > "$nft_tmp.nft" && ! cmp -s "$nft_tmp.nft" "$RULES_NFT"; then
|
||||||
! nft -f "$nft_tmp.nft.chk" -c || { mv -f "$nft_tmp.nft" "$RULES_NFT"; fw4 reload; }
|
echo "table inet chk {include \"$nft_tmp.nft\";}" > "$nft_tmp.nft.chk"
|
||||||
|
! nft -f "$nft_tmp.nft.chk" -c || { mv -f "$nft_tmp.nft" "$RULES_NFT"; fw4 reload; }
|
||||||
|
fi
|
||||||
|
rm -f "$nft_tmp.json" "$nft_tmp.nft" "$nft_tmp.nft.chk"
|
||||||
fi
|
fi
|
||||||
rm -f "$nft_tmp.json" "$nft_tmp.nft" "$nft_tmp.nft.chk"
|
|
||||||
|
|
||||||
procd_close_instance
|
procd_close_instance
|
||||||
}
|
}
|
||||||
@@ -213,16 +272,32 @@ stop_service() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
local chain settable
|
local chain settable
|
||||||
for chain in "netease_cloud_music_redir" "netease_cloud_music"; do
|
if [ -n "$FW4" ]; then
|
||||||
nft flush chain inet fw4 "$chain" 2>"/dev/null"
|
for chain in "netease_cloud_music_redir" "netease_cloud_music"; do
|
||||||
done
|
nft flush chain inet fw4 "$chain" 2>"/dev/null"
|
||||||
for settable in "acl_neteasemusic_http" "acl_neteasemusic_https" "local_addr" "neteasemusic"; do
|
done
|
||||||
nft flush set inet fw4 "$settable" 2>"/dev/null"
|
for settable in "acl_neteasemusic_http" "acl_neteasemusic_https" "local_addr" "neteasemusic"; do
|
||||||
done
|
nft flush set inet fw4 "$settable" 2>"/dev/null"
|
||||||
|
done
|
||||||
|
|
||||||
rm -f "$RULES_NFT"
|
rm -f "$RULES_NFT"
|
||||||
fw4 reload
|
fw4 reload
|
||||||
|
else
|
||||||
|
[ ! -e "/tmp/$NAME.ports" ] || {
|
||||||
|
iptables -D "INPUT" -p "tcp" --dport "$(awk -F ':' '{print $1}' "/tmp/$NAME.ports")" -j "ACCEPT"
|
||||||
|
iptables -D "INPUT" -p "tcp" --dport "$(awk -F ':' '{print $2}' "/tmp/$NAME.ports")" -j "ACCEPT"
|
||||||
|
rm -f "/tmp/$NAME.ports"
|
||||||
|
}
|
||||||
|
$IPT_N -D "PREROUTING" -p "tcp" -m set --match-set "neteasemusic" "dst" -j "netease_cloud_music"
|
||||||
|
$IPT_N -F "netease_cloud_music"
|
||||||
|
$IPT_N -X "netease_cloud_music"
|
||||||
|
|
||||||
|
for settable in "acl_neteasemusic_http" "acl_neteasemusic_https" "local_addr" "neteasemusic"; do
|
||||||
|
ipset destroy "$settable" 2>"/dev/null"
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "" > "/var/etc/$NAME.include"
|
||||||
|
fi
|
||||||
|
|
||||||
rm -f "/tmp/dnsmasq.d/dnsmasq-$NAME.conf"
|
rm -f "/tmp/dnsmasq.d/dnsmasq-$NAME.conf"
|
||||||
/etc/init.d/dnsmasq reload
|
/etc/init.d/dnsmasq reload
|
||||||
|
|||||||
27
luci-app-unblockneteasemusic/root/etc/uci-defaults/luci-unblockneteasemusic
Normal file → Executable file
27
luci-app-unblockneteasemusic/root/etc/uci-defaults/luci-unblockneteasemusic
Normal file → Executable file
@@ -1,22 +1,21 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
if [ "$(uci -q get unblockneteasemusic.config.music_source)" = "default" ]; then
|
uci -q batch <<-EOF >/dev/null
|
||||||
uci -q delete "unblockneteasemusic.config.music_source"
|
|
||||||
uci -q commit "unblockneteasemusic"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$(uci -q get unblockneteasemusic.config.hijack_ways)" = "use_hosts" ]; then
|
|
||||||
[ "$(uci -q get "unblockneteasemusic.config.http_port")" = "80" ] || {
|
|
||||||
uci -q set "unblockneteasemusic.config.http_port"="80"
|
|
||||||
uci -q set "unblockneteasemusic.config.https_port"="443"
|
|
||||||
uci -q commit "unblockneteasemusic"
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
uci -q batch <<-EOF >"/dev/null"
|
|
||||||
delete ucitrack.@unblockneteasemusic[-1]
|
delete ucitrack.@unblockneteasemusic[-1]
|
||||||
|
add ucitrack unblockneteasemusic
|
||||||
|
set ucitrack.@unblockneteasemusic[-1].init=unblockneteasemusic
|
||||||
commit ucitrack
|
commit ucitrack
|
||||||
EOF
|
EOF
|
||||||
|
[ -e "$(command -v fw4)" ] || {
|
||||||
|
uci -q batch <<-EOF >/dev/null
|
||||||
|
delete firewall.unblockneteasemusic
|
||||||
|
set firewall.unblockneteasemusic=include
|
||||||
|
set firewall.unblockneteasemusic.type=script
|
||||||
|
set firewall.unblockneteasemusic.path=/var/etc/unblockneteasemusic.include
|
||||||
|
set firewall.unblockneteasemusic.reload=1
|
||||||
|
commit firewall
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
rm -f /tmp/luci-indexcache
|
rm -f /tmp/luci-indexcache
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
{
|
|
||||||
"admin/services/unblockneteasemusic": {
|
|
||||||
"title": "解除网易云音乐播放限制",
|
|
||||||
"order": 50,
|
|
||||||
"action": {
|
|
||||||
"type": "firstchild"
|
|
||||||
},
|
|
||||||
"depends": {
|
|
||||||
"acl": [ "luci-app-unblockneteasemusic" ],
|
|
||||||
"uci": { "unblockneteasemusic": true }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"admin/services/unblockneteasemusic/config": {
|
|
||||||
"title": "基本设定",
|
|
||||||
"order": 10,
|
|
||||||
"action": {
|
|
||||||
"type": "view",
|
|
||||||
"path": "unblockneteasemusic/config"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"admin/services/unblockneteasemusic/status": {
|
|
||||||
"title": "状态信息",
|
|
||||||
"order": 20,
|
|
||||||
"action": {
|
|
||||||
"type": "view",
|
|
||||||
"path": "unblockneteasemusic/status"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +1,10 @@
|
|||||||
{
|
{
|
||||||
"luci-app-unblockneteasemusic": {
|
"luci-app-unblockneteasemusic": {
|
||||||
"description": "Grant access to UnblockNeteaseMusic configuration",
|
"description": "Grant UCI access for luci-app-unblockneteasemusic",
|
||||||
"read": {
|
"read": {
|
||||||
"file": {
|
|
||||||
"/etc/init.d/unblockneteasemusic": [ "exec" ],
|
|
||||||
"/tmp/unblockneteasemusic.log": [ "read" ],
|
|
||||||
"/usr/bin/unm-debug": [ "exec" ],
|
|
||||||
"/usr/share/unblockneteasemusic/update.sh": [ "exec" ],
|
|
||||||
"/usr/share/unblockneteasemusic/core/ca.crt": [ "read" ]
|
|
||||||
},
|
|
||||||
"ubus": {
|
|
||||||
"service": [ "list" ]
|
|
||||||
},
|
|
||||||
"uci": [ "unblockneteasemusic" ]
|
"uci": [ "unblockneteasemusic" ]
|
||||||
},
|
},
|
||||||
"write": {
|
"write": {
|
||||||
"file": {
|
|
||||||
"/usr/share/unblockneteasemusic/server.crt": [ "write" ],
|
|
||||||
"/usr/share/unblockneteasemusic/server.key": [ "write" ]
|
|
||||||
},
|
|
||||||
"uci": [ "unblockneteasemusic" ]
|
"uci": [ "unblockneteasemusic" ]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -71,23 +71,33 @@ echo -e "\n"
|
|||||||
|
|
||||||
[ -n "$is_stopped" ] || {
|
[ -n "$is_stopped" ] || {
|
||||||
echo -e "Firewall info:"
|
echo -e "Firewall info:"
|
||||||
[ -e "/etc/nftables.d/90-$NAME-rules.nft" ] || echo -e 'netease_cloud_music nft rule file not found.'
|
if [ -e "$(command -v fw4)" ]; then
|
||||||
echo -e ""
|
[ -e "/etc/nftables.d/90-$NAME-rules.nft" ] || echo -e 'netease_cloud_music nft rule file not found.'
|
||||||
nft list set inet fw4 "acl_neteasemusic_http" 2>&1
|
echo -e ""
|
||||||
echo -e ""
|
nft list set inet fw4 "acl_neteasemusic_http" 2>&1
|
||||||
nft list set inet fw4 "acl_neteasemusic_https" 2>&1
|
echo -e ""
|
||||||
echo -e ""
|
nft list set inet fw4 "acl_neteasemusic_https" 2>&1
|
||||||
nft list set inet fw4 "local_addr" 2>&1
|
echo -e ""
|
||||||
echo -e ""
|
nft list set inet fw4 "local_addr" 2>&1
|
||||||
nft list set inet fw4 "neteasemusic" 2>&1
|
echo -e ""
|
||||||
echo -e ""
|
nft list set inet fw4 "neteasemusic" 2>&1
|
||||||
nft list chain inet fw4 "input_wan" | grep "unblockneteasemusic-http-" 2>"/dev/null" || echo -e 'Http Port pub access rule not found.'
|
echo -e ""
|
||||||
echo -e ""
|
nft list chain inet fw4 "input_wan" | grep "unblockneteasemusic-http-" 2>"/dev/null" || echo -e 'Http Port pub access rule not found.'
|
||||||
nft list chain inet fw4 "input_wan" | grep "unblockneteasemusic-https-" 2>"/dev/null" || echo -e 'Https Port pub access rule not found.'
|
echo -e ""
|
||||||
echo -e ""
|
nft list chain inet fw4 "input_wan" | grep "unblockneteasemusic-https-" 2>"/dev/null" || echo -e 'Https Port pub access rule not found.'
|
||||||
nft list chain inet fw4 "netease_cloud_music" 2>&1
|
echo -e ""
|
||||||
echo -e ""
|
nft list chain inet fw4 "netease_cloud_music" 2>&1
|
||||||
nft list chain inet fw4 "netease_cloud_music_redir" 2>&1
|
echo -e ""
|
||||||
|
nft list chain inet fw4 "netease_cloud_music_redir" 2>&1
|
||||||
|
else
|
||||||
|
iptables -t "nat" -L "netease_cloud_music" 2>"/dev/null" || echo -e 'Chain "netease_cloud_music" not found.'
|
||||||
|
echo -e ""
|
||||||
|
ipset list "neteasemusic" 2>"/dev/null" || echo -e 'Table "neteasemusic" not found.'
|
||||||
|
echo -e ""
|
||||||
|
ipset list "acl_neteasemusic_http" 2>"/dev/null" || echo -e 'Table "acl_neteasemusic_http" not found.'
|
||||||
|
echo -e ""
|
||||||
|
ipset list "acl_neteasemusic_https" 2>"/dev/null" || echo -e 'Table "acl_neteasemusic_https" not found.'
|
||||||
|
fi
|
||||||
echo -e ""
|
echo -e ""
|
||||||
cat "/tmp/dnsmasq.d/dnsmasq-$NAME.conf"
|
cat "/tmp/dnsmasq.d/dnsmasq-$NAME.conf"
|
||||||
echo -e "\n"
|
echo -e "\n"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# SPDX-License-Identifier: GPL-3.0-only
|
# SPDX-License-Identifier: GPL-3.0-only
|
||||||
# Copyright (C) 2019-2023 Tianling Shen <cnsztl@immortalwrt.org>
|
# Copyright (C) 2019-2022 Tianling Shen <cnsztl@immortalwrt.org>
|
||||||
|
|
||||||
NAME="unblockneteasemusic"
|
NAME="unblockneteasemusic"
|
||||||
LOCK="/tmp/$NAME.update_core.lock"
|
LOCK="/tmp/$NAME.update_core.lock"
|
||||||
@@ -65,6 +65,7 @@ update_core() {
|
|||||||
}
|
}
|
||||||
done
|
done
|
||||||
|
|
||||||
|
[ -z "${update_core_from_luci}" ] || touch "/usr/share/$NAME/update_core_successfully"
|
||||||
echo -e "${core_latest_ver}" > "/usr/share/$NAME/core_local_ver"
|
echo -e "${core_latest_ver}" > "/usr/share/$NAME/core_local_ver"
|
||||||
[ -n "${non_restart}" ] || /etc/init.d/"$NAME" restart
|
[ -n "${non_restart}" ] || /etc/init.d/"$NAME" restart
|
||||||
|
|
||||||
@@ -74,17 +75,6 @@ update_core() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
"check_version")
|
|
||||||
if [ ! -e "/usr/share/$NAME/core_local_ver" ] || [ ! -e "/usr/share/$NAME/core/app.js" ]; then
|
|
||||||
echo -e "Not installed."
|
|
||||||
exit 2
|
|
||||||
else
|
|
||||||
version="$(node "/usr/share/$NAME/core/app.js" -v)"
|
|
||||||
commit="$(cat "/usr/share/$NAME/core_local_ver" | head -c7)"
|
|
||||||
echo "$version ($commit)"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
"update_core")
|
"update_core")
|
||||||
check_core_if_already_running
|
check_core_if_already_running
|
||||||
check_core_latest_version
|
check_core_latest_version
|
||||||
@@ -94,11 +84,12 @@ case "$1" in
|
|||||||
check_core_if_already_running
|
check_core_if_already_running
|
||||||
check_core_latest_version
|
check_core_latest_version
|
||||||
;;
|
;;
|
||||||
"remove_core")
|
"update_core_from_luci")
|
||||||
/etc/init.d/"$NAME" stop
|
update_core_from_luci=1
|
||||||
rm -rf "/usr/share/$NAME/core" "/usr/share/$NAME/core_local_ver" "$LOCK"
|
check_core_if_already_running
|
||||||
|
check_core_latest_version
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo -e "Usage: $0/update.sh check_version | update_core | remove_core"
|
echo -e "Usage: $0/update.sh update_core"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
BIN
luci-app-unblockneteasemusic/views/view1.jpg
Normal file
BIN
luci-app-unblockneteasemusic/views/view1.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 786 KiB |
BIN
luci-app-unblockneteasemusic/views/view2.jpg
Normal file
BIN
luci-app-unblockneteasemusic/views/view2.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 76 KiB |
BIN
luci-app-unblockneteasemusic/views/view3.jpg
Normal file
BIN
luci-app-unblockneteasemusic/views/view3.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 165 KiB |
BIN
luci-app-unblockneteasemusic/views/view4.jpg
Normal file
BIN
luci-app-unblockneteasemusic/views/view4.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 117 KiB |
@@ -21,13 +21,13 @@ define Download/geoip
|
|||||||
HASH:=a13a2ca90c15a85f4cc8169d12be24cb71f34bb75eb446000d9ec18ebefd2511
|
HASH:=a13a2ca90c15a85f4cc8169d12be24cb71f34bb75eb446000d9ec18ebefd2511
|
||||||
endef
|
endef
|
||||||
|
|
||||||
GEOSITE_VER:=20230130083113
|
GEOSITE_VER:=20230201034244
|
||||||
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
|
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
|
||||||
define Download/geosite
|
define Download/geosite
|
||||||
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
|
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
|
||||||
URL_FILE:=dlc.dat
|
URL_FILE:=dlc.dat
|
||||||
FILE:=$(GEOSITE_FILE)
|
FILE:=$(GEOSITE_FILE)
|
||||||
HASH:=2dea3ee8e87d573be9a132c395aa990d0b8baac7775af3091552840bd559556d
|
HASH:=2074e929f3886f21366fa922b8ebb06bd4fd3c0640fdf06742f572c738e13d0b
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/v2ray-geodata/template
|
define Package/v2ray-geodata/template
|
||||||
|
|||||||
Reference in New Issue
Block a user