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

luci-app-clash: merge upstream source

Browse Source
This commit is contained in:
CN_SZTL 2020-01-02 17:19:01 +08:00
parent 36269b00fd
commit 16bd84ea86
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
13 changed files with 57 additions and 2598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package/jsda/luci-app-clash/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-clash PKG_NAME:=luci-app-clash
PKG_VERSION:=1.4.0 PKG_VERSION:=1.4.1
#PKG_RELEASE:=3 #PKG_RELEASE:=3
PKG_MAINTAINER:=frainzy1477 PKG_MAINTAINER:=frainzy1477
@ -13,7 +13,7 @@ define Package/luci-app-clash
CATEGORY:=LuCI CATEGORY:=LuCI
SUBMENU:=3. Applications SUBMENU:=3. Applications
TITLE:=LuCI app for clash TITLE:=LuCI app for clash
DEPENDS:=+luci +luci-base +clash +wget +iptables +coreutils-base64 +coreutils +coreutils-nohup +bash +ipset DEPENDS:=+luci +luci-base +clash +wget +iptables +coreutils-base64 +coreutils +coreutils-nohup +bash +ipset +libustream-openssl +libopenssl +openssl-util
PKGARCH:=all PKGARCH:=all
MAINTAINER:=frainzy1477 MAINTAINER:=frainzy1477
endef endef
@ -116,9 +116,9 @@ fi
if [ -f "/etc/init.d/clash" ]; then if [ -f "/etc/init.d/clash" ]; then
/etc/init.d/clash disable 2>/dev/null /etc/init.d/clash disable 2>/dev/null
fi fi
echo "Clash for OpenWRT" >/usr/share/clash/clash_real.txt 2>/dev/null
echo "0" > /usr/share/clash/logstatus_check 2>/dev/null echo "0" > /usr/share/clash/logstatus_check 2>/dev/null
echo "" > /tmp/clash.txt 2>/dev/null
endef endef
@ -130,6 +130,7 @@ define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DIR) $(1)/etc/clash $(INSTALL_DIR) $(1)/etc/clash
$(INSTALL_DIR) $(1)/tmp
$(INSTALL_DIR) $(1)/usr/lib/lua/luci $(INSTALL_DIR) $(1)/usr/lib/lua/luci
$(INSTALL_DIR) $(1)/usr/share/ $(INSTALL_DIR) $(1)/usr/share/
$(INSTALL_DIR) $(1)/usr/share/clash $(INSTALL_DIR) $(1)/usr/share/clash
@ -171,12 +172,15 @@ define Package/$(PKG_NAME)/install
$(INSTALL_BIN) ./root/usr/share/clash/list.sh $(1)/usr/share/clash/ $(INSTALL_BIN) ./root/usr/share/clash/list.sh $(1)/usr/share/clash/
$(INSTALL_BIN) ./root/usr/share/clash/v2ssr.sh $(1)/usr/share/clash/ $(INSTALL_BIN) ./root/usr/share/clash/v2ssr.sh $(1)/usr/share/clash/
$(INSTALL_BIN) ./root/usr/share/clash/server.list $(1)/usr/share/clash/ $(INSTALL_BIN) ./root/usr/share/clash/server.list $(1)/usr/share/clash/
$(INSTALL_BIN) ./root/usr/share/clash/clash_real.txt $(1)/usr/share/clash/
$(INSTALL_BIN) ./root/usr/share/clash/logstatus_check $(1)/usr/share/clash/
$(INSTALL_BIN) ./root/usr/share/clash/clash.txt $(1)/tmp/
$(INSTALL_BIN) ./root/usr/share/clash/dashboard/index.html $(1)/usr/share/clash/dashboard/ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/index.html $(1)/usr/share/clash/dashboard/
$(INSTALL_BIN) ./root/usr/share/clash/dashboard/main.aee3e3fc24cd46786598.css $(1)/usr/share/clash/dashboard/ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/main.d6bae0fbee6ba95bd65b.css $(1)/usr/share/clash/dashboard/
$(INSTALL_BIN) ./root/usr/share/clash/dashboard/img/33343e6117c37aaef8886179007ba6b5.png $(1)/usr/share/clash/dashboard/img/ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/img/33343e6117c37aaef8886179007ba6b5.png $(1)/usr/share/clash/dashboard/img/
$(INSTALL_BIN) ./root/usr/share/clash/dashboard/js/1.bundle.aee3e3fc24cd46786598.min.js $(1)/usr/share/clash/dashboard/js/ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/js/1.bundle.d6bae0fbee6ba95bd65b.min.js $(1)/usr/share/clash/dashboard/js/
$(INSTALL_BIN) ./root/usr/share/clash/dashboard/js/bundle.aee3e3fc24cd46786598.min.js $(1)/usr/share/clash/dashboard/js/ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/js/bundle.d6bae0fbee6ba95bd65b.min.js $(1)/usr/share/clash/dashboard/js/
$(INSTALL_DATA) ./luasrc/clash.lua $(1)/usr/lib/lua/luci/ $(INSTALL_DATA) ./luasrc/clash.lua $(1)/usr/lib/lua/luci/
$(INSTALL_DATA) ./luasrc/controller/*.lua $(1)/usr/lib/lua/luci/controller/ $(INSTALL_DATA) ./luasrc/controller/*.lua $(1)/usr/lib/lua/luci/controller/

2575
package/jsda/luci-app-clash/config
View File

File diff suppressed because it is too large Load Diff

5
package/jsda/luci-app-clash/luasrc/model/cbi/clash/access.lua
View File

@ -37,6 +37,11 @@ o:depends("proxylan", 1)
o = s:option(FileUpload, "",translate("Update GEOIP Database")) o = s:option(FileUpload, "",translate("Update GEOIP Database"))
o.description = translate("NB: Upload GEOIP Database file Country.mmdb") o.description = translate("NB: Upload GEOIP Database file Country.mmdb")
.."<br />"
..translate("https://github.com/Dreamacro/maxmind-geoip/releases")
.."<br />"
..translate("https://static.clash.to/GeoIP2/GeoIP2-Country.tar.gz")
o.title = translate("Update GEOIP Database") o.title = translate("Update GEOIP Database")
o.template = "clash/clash_upload" o.template = "clash/clash_upload"
um = s:option(DummyValue, "", nil) um = s:option(DummyValue, "", nil)

17
package/jsda/luci-app-clash/root/etc/init.d/clash
View File

@ -458,14 +458,7 @@ if [ -f $CONFIG_YAML ] && [ "$(ls -l $CONFIG_YAML|awk '{print int($5/1024)}')"
uci set network.lan.dns="${landns}" && uci commit network && /etc/init.d/network reload >/dev/null 2>&1 uci set network.lan.dns="${landns}" && uci commit network && /etc/init.d/network reload >/dev/null 2>&1
fi fi
yml_dns_change >/dev/null 2>&1 yml_dns_change >/dev/null 2>&1
if [ "${lang}" == "en" ] || [ $lang == "auto" ];then
echo "$(date "+%Y-%m-%d %H:%M:%S") - Starting Client..." >$REAL_LOG
elif [ "${lang}" == "zh_cn" ];then
echo "$(date "+%Y-%m-%d %H:%M:%S") - 启动客户端..." >$REAL_LOG
fi
if [ "${core}" -eq 1 ];then if [ "${core}" -eq 1 ];then
nohup $CLASH -d "$CLASH_CONFIG" > /tmp/clash.txt 2>&1 & nohup $CLASH -d "$CLASH_CONFIG" > /tmp/clash.txt 2>&1 &
@ -619,9 +612,9 @@ lang=$(uci get luci.main.lang 2>/dev/null)
done done
fake=$(iptables -nvL OUTPUT -t nat |sed 1,2d |sed -n '/198.18.0.0\/16/=' |sort -r) fake=$(iptables -nvL OUTPUT -t nat |sed 1,2d |sed -n '/198.18.0.0\/16/=' |sort -r)
for fake in $fake; do for fake in $fake; do
iptables -t nat -D OUTPUT $fake >/dev/null 2>&1 iptables -t nat -D OUTPUT $fake >/dev/null 2>&1
done done
# flush iptables rules # flush iptables rules
ip6tables -t nat -F clash_ipv6 >/dev/null 2>&1 && ip6tables -t nat -X clash_ipv6 >/dev/null 2>&1 ip6tables -t nat -F clash_ipv6 >/dev/null 2>&1 && ip6tables -t nat -X clash_ipv6 >/dev/null 2>&1
@ -665,7 +658,7 @@ lang=$(uci get luci.main.lang 2>/dev/null)
revert_dns >/dev/null 2>&1 revert_dns >/dev/null 2>&1
/etc/init.d/dnsmasq restart >/dev/null 2>&1 /etc/init.d/dnsmasq restart >/dev/null 2>&1
sleep 1 sleep 1
if [ "${lang}" == "en" ] || [ $lang == "auto" ];then if [ "${lang}" == "en" ] || [ $lang == "auto" ];then
echo "Deleting Cron Job" >$REAL_LOG echo "Deleting Cron Job" >$REAL_LOG
@ -674,7 +667,7 @@ lang=$(uci get luci.main.lang 2>/dev/null)
fi fi
del_cron >/dev/null 2>&1 del_cron >/dev/null 2>&1
sleep 1 sleep 1
echo "" >/tmp/clash.txt >/dev/null 2>&1 echo "" >/tmp/clash.txt >/dev/null 2>&1

2
package/jsda/luci-app-clash/root/usr/share/clash/clash.sh
View File

@ -14,7 +14,7 @@ CONFIG_YAML="/usr/share/clash/config/sub/config.yaml"
sleep 1 sleep 1
if pidof clash >/dev/null; then if pidof clash >/dev/null; then
if [ $subtype == "clash" ];then if [ $subtype == "clash" ];then
wget --no-check-certificate --user-agent="Clash/OpenWRT" $subscribe_url -O 2>&1 >1 $CONFIG_YAML wget --no-check-certificate --user-agent="Clash/OpenWRT" $subscribe_url -O 2>&1 >1 $CONFIG_YAML
fi fi
if [ $lang == "en" ] || [ $lang == "auto" ];then if [ $lang == "en" ] || [ $lang == "auto" ];then

0
package/jsda/luci-app-clash/root/usr/share/clash/clash.txt Normal file
View File

1
package/jsda/luci-app-clash/root/usr/share/clash/clash_real.txt Normal file
View File

@ -0,0 +1 @@
Clash for OpenWRT

4
package/jsda/luci-app-clash/root/usr/share/clash/dashboard/index.html
View File

@ -5,8 +5,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="icon" type="image/x-icon" href="https://cdn.jsdelivr.net/gh/Dreamacro/clash/docs/logo.png" /> <link rel="icon" type="image/x-icon" href="https://cdn.jsdelivr.net/gh/Dreamacro/clash/docs/logo.png" />
<title>Clash Dashboard</title> <title>Clash Dashboard</title>
<link href="main.aee3e3fc24cd46786598.css" rel="stylesheet"></head> <link href="main.d6bae0fbee6ba95bd65b.css" rel="stylesheet"></head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script type="text/javascript" src="js/1.bundle.aee3e3fc24cd46786598.min.js"></script><script type="text/javascript" src="js/bundle.aee3e3fc24cd46786598.min.js"></script></body> <script type="text/javascript" src="js/1.bundle.d6bae0fbee6ba95bd65b.min.js"></script><script type="text/javascript" src="js/bundle.d6bae0fbee6ba95bd65b.min.js"></script></body>
</html> </html>

2
package/jsda/luci-app-clash/root/usr/share/clash/dashboard/js/1.bundle.d6bae0fbee6ba95bd65b.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
package/jsda/luci-app-clash/root/usr/share/clash/dashboard/js/bundle.d6bae0fbee6ba95bd65b.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

27
package/jsda/luci-app-clash/root/usr/share/clash/dashboard/main.d6bae0fbee6ba95bd65b.css Normal file
View File

File diff suppressed because one or more lines are too long

1
package/jsda/luci-app-clash/root/usr/share/clash/logstatus_check Normal file
View File

@ -0,0 +1 @@
0

2
package/jsda/luci-app-clash/root/usr/share/clash/luci_version
View File

@ -1 +1 @@
1.4.0 1.4.1