mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-08-02 23:49:34 +08:00
384 lines
14 KiB
Diff
384 lines
14 KiB
Diff
--- a/luci-app-passwall/root/etc/uci-defaults/luci-passwall
|
|
+++ b/luci-app-passwall/root/etc/uci-defaults/luci-passwall
|
|
@@ -1,5 +1,10 @@
|
|
#!/bin/sh
|
|
|
|
+[ "`which nft`" ] && uci -q set passwall.@global_forwarding[0].use_nft=1
|
|
+
|
|
+grep -q ip-api.com /usr/share/passwall/rules/proxy_host ||
|
|
+ sed -i '$a ip-api.com' /usr/share/passwall/rules/proxy_host
|
|
+
|
|
if [ -e "/etc/config/ucitrack" ]; then
|
|
uci -q batch <<-EOF
|
|
delete ucitrack.@passwall[-1]
|
|
|
|
--- a/luci-app-passwall/Makefile
|
|
+++ b/luci-app-passwall/Makefile
|
|
@@ -39,7 +39,30 @@ LUCI_PKGARCH:=all
|
|
LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \
|
|
+chinadns-ng +dns2socks +dnsmasq-full +ip-full \
|
|
+libuci-lua +lua +luci-compat +luci-lib-jsonc \
|
|
- +microsocks +resolveip +tcping
|
|
+ +microsocks +resolveip +tcping \
|
|
+ +ipt2socks \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Geoview:geoview \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy:haproxy \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria:hysteria \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-local \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-redir \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server:shadowsocks-libev-ss-server \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client:shadowsocks-rust-sslocal \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server:shadowsocks-rust-ssserver \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client:shadowsocksr-libev-ssr-local \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client:shadowsocksr-libev-ssr-redir \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server:shadowsocksr-libev-ssr-server \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs:simple-obfs-client \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_SingBox:sing-box \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus:trojan-plus \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_tuic_client:tuic-client \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Geodata:v2ray-geoip \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Geodata:v2ray-geosite \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin:v2ray-plugin \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:unzip \
|
|
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin:xray-plugin
|
|
|
|
define Package/$(PKG_NAME)/config
|
|
menu "Configuration"
|
|
@@ -74,8 +97,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Geoview
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy
|
|
bool "Include Haproxy"
|
|
- select PACKAGE_haproxy
|
|
- default y if aarch64||arm||i386||x86_64
|
|
+ default y if aarch64||i386||x86_64
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
|
|
bool "Include Hysteria"
|
|
@@ -90,19 +112,15 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client
|
|
bool "Include Shadowsocks Libev Client"
|
|
- select PACKAGE_shadowsocks-libev-ss-local
|
|
- select PACKAGE_shadowsocks-libev-ss-redir
|
|
default y
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server
|
|
bool "Include Shadowsocks Libev Server"
|
|
- select PACKAGE_shadowsocks-libev-ss-server
|
|
default y if aarch64||arm||i386||x86_64
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client
|
|
bool "Include Shadowsocks Rust Client"
|
|
depends on !i386
|
|
- select PACKAGE_shadowsocks-rust-sslocal
|
|
default y if aarch64||x86_64
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server
|
|
@@ -113,8 +131,6 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client
|
|
bool "Include ShadowsocksR Libev Client"
|
|
- select PACKAGE_shadowsocksr-libev-ssr-local
|
|
- select PACKAGE_shadowsocksr-libev-ssr-redir
|
|
default y
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server
|
|
@@ -130,22 +146,20 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Shadow_TLS
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs
|
|
bool "Include Simple-Obfs (Shadowsocks Plugin)"
|
|
- select PACKAGE_simple-obfs-client
|
|
default y
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_SingBox
|
|
bool "Include Sing-Box"
|
|
select PACKAGE_sing-box
|
|
- default y if aarch64||arm||i386||x86_64
|
|
+ default y if aarch64||i386||x86_64
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus
|
|
bool "Include Trojan-Plus"
|
|
- select PACKAGE_trojan-plus
|
|
- default y
|
|
+ default y if aarch64||i386||x86_64
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_tuic_client
|
|
bool "Include tuic-client"
|
|
- depends on aarch64||arm||i386||x86_64
|
|
+ depends on aarch64||i386||x86_64
|
|
select PACKAGE_tuic-client
|
|
default n
|
|
|
|
@@ -157,14 +171,11 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Geodata
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin
|
|
bool "Include V2ray-Plugin (Shadowsocks Plugin)"
|
|
- select PACKAGE_v2ray-plugin
|
|
- default y if aarch64||arm||i386||x86_64
|
|
+ default y if aarch64||i386||x86_64
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_Xray
|
|
bool "Include Xray"
|
|
- select PACKAGE_xray-core
|
|
- select PACKAGE_unzip
|
|
- default y if aarch64||arm||i386||x86_64
|
|
+ default y
|
|
|
|
config PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin
|
|
bool "Include Xray-Plugin (Shadowsocks Plugin)"
|
|
|
|
--- a/luci-app-passwall/luasrc/controller/passwall.lua
|
|
+++ b/luci-app-passwall/luasrc/controller/passwall.lua
|
|
@@ -21,6 +21,7 @@ function index()
|
|
entry({"admin", "services", appname, "reset_config"}, call("reset_config")).leaf = true
|
|
entry({"admin", "services", appname, "show"}, call("show_menu")).leaf = true
|
|
entry({"admin", "services", appname, "hide"}, call("hide_menu")).leaf = true
|
|
+ entry({"admin", "services", appname, "ip"}, call('check_ip')).leaf = true
|
|
local e
|
|
if uci:get(appname, "@global[0]", "hide_from_luci") ~= "1" then
|
|
e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), _("Pass Wall"), -1)
|
|
@@ -211,6 +212,61 @@ function clear_log()
|
|
luci.sys.call("echo '' > /tmp/log/passwall.log")
|
|
end
|
|
|
|
+function check_site(host, port)
|
|
+ local nixio = require "nixio"
|
|
+ local socket = nixio.socket("inet", "stream")
|
|
+ socket:setopt("socket", "rcvtimeo", 2)
|
|
+ socket:setopt("socket", "sndtimeo", 2)
|
|
+ local ret = socket:connect(host, port)
|
|
+ socket:close()
|
|
+ return ret
|
|
+end
|
|
+
|
|
+function get_ip_geo_info()
|
|
+ local result = luci.sys.exec('curl --retry 3 -m 10 -LfsA "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36" http://ip-api.com/json/')
|
|
+ local json = require "luci.jsonc"
|
|
+ local info = json.parse(result)
|
|
+
|
|
+ return {
|
|
+ flag = string.lower(info.countryCode) or "un",
|
|
+ country = get_country_name(info.countryCode) or "Unknown",
|
|
+ ip = info.query,
|
|
+ isp = info.isp
|
|
+ }
|
|
+end
|
|
+
|
|
+function get_country_name(countryCode)
|
|
+ local country_names = {
|
|
+ US = "美国", CN = "中国", JP = "日本", GB = "英国", DE = "德国",
|
|
+ FR = "法国", BR = "巴西", IT = "意大利", RU = "俄罗斯", CA = "加拿大",
|
|
+ KR = "韩国", ES = "西班牙", AU = "澳大利亚", MX = "墨西哥", ID = "印度尼西亚",
|
|
+ NL = "荷兰", TR = "土耳其", CH = "瑞士", SA = "沙特阿拉伯", SE = "瑞典",
|
|
+ PL = "波兰", BE = "比利时", AR = "阿根廷", NO = "挪威", AT = "奥地利",
|
|
+ TW = "台湾", ZA = "南非", TH = "泰国", DK = "丹麦", MY = "马来西亚",
|
|
+ PH = "菲律宾", SG = "新加坡", IE = "爱尔兰", HK = "香港", FI = "芬兰",
|
|
+ CL = "智利", PT = "葡萄牙", GR = "希腊", IL = "以色列", NZ = "新西兰",
|
|
+ CZ = "捷克", RO = "罗马尼亚", VN = "越南", UA = "乌克兰", HU = "匈牙利",
|
|
+ AE = "阿联酋", CO = "哥伦比亚", IN = "印度", EG = "埃及", PE = "秘鲁", TW = "台湾"
|
|
+ }
|
|
+ return country_names[countryCode]
|
|
+end
|
|
+
|
|
+function check_ip()
|
|
+ local e = {}
|
|
+ local port = 80
|
|
+ local geo_info = get_ip_geo_info(ip)
|
|
+ e.ip = geo_info.ip
|
|
+ e.flag = geo_info.flag
|
|
+ e.country = geo_info.country
|
|
+ e.isp = geo_info.isp
|
|
+ e.baidu = check_site('www.baidu.com', port)
|
|
+ e.taobao = check_site('www.taobao.com', port)
|
|
+ e.google = check_site('www.google.com', port)
|
|
+ e.youtube = check_site('www.youtube.com', port)
|
|
+ luci.http.prepare_content('application/json')
|
|
+ luci.http.write_json(e)
|
|
+end
|
|
+
|
|
function index_status()
|
|
local e = {}
|
|
e.dns_mode_status = luci.sys.call("netstat -apn | grep ':15353 ' >/dev/null") == 0
|
|
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
|
|
index 0c33ccd90f..258da6a551 100644
|
|
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
|
|
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
|
|
@@ -953,5 +953,6 @@ footer.api = api
|
|
footer.global_cfgid = global_cfgid
|
|
footer.shunt_list = api.jsonc.stringify(shunt_list)
|
|
m:append(footer)
|
|
+m:append(Template(appname .. "/global/status_bottom"))
|
|
|
|
return m
|
|
diff --git a/luci-app-passwall/luasrc/view/passwall/global/status_bottom.htm b/luci-app-passwall/luasrc/view/passwall/global/status_bottom.htm
|
|
new file mode 100644
|
|
index 000000000000..a00fff9c79b3
|
|
--- /dev/null
|
|
+++ b/luci-app-passwall/luasrc/view/passwall/global/status_bottom.htm
|
|
@@ -0,0 +1,128 @@
|
|
+<style>
|
|
+.pure-img {
|
|
+ max-height: 100%;
|
|
+ width: auto;
|
|
+}
|
|
+.flag .pure-img {
|
|
+ max-height: none;
|
|
+ margin-top: -0.34rem;
|
|
+}
|
|
+.status-bar {
|
|
+ position: fixed;
|
|
+ bottom: 0;
|
|
+ right: 0;
|
|
+ box-shadow: 0 0 2rem 0 rgba(136, 152, 170, .3);
|
|
+ color: #525f7f;
|
|
+ background: #fff;
|
|
+ z-index: 5;
|
|
+ box-sizing: border-box;
|
|
+}
|
|
+
|
|
+.status-bar .inner {
|
|
+ margin: 0.5em;
|
|
+}
|
|
+
|
|
+.status-bar .inner .flag {
|
|
+ height: 2.6em;
|
|
+ display: block;
|
|
+ float: left;
|
|
+ margin-right: 1em;
|
|
+}
|
|
+
|
|
+.status-bar .inner .status-info {
|
|
+ font-weight: bold;
|
|
+}
|
|
+
|
|
+.status-bar .icon-con {
|
|
+ height: 2.6em;
|
|
+ text-align: right;
|
|
+}
|
|
+
|
|
+#cbi-passwall+.cbi-page-actions.control-group.fixed {
|
|
+ bottom: 3.3rem;
|
|
+}
|
|
+
|
|
+footer{
|
|
+display:block !important;
|
|
+}
|
|
+
|
|
+@media screen and (max-width: 700px) {
|
|
+.status-bar .icon-con {
|
|
+ height: 2.5em;
|
|
+}
|
|
+}
|
|
+</style>
|
|
+<div class="status-bar">
|
|
+ <div class="inner">
|
|
+ <div class="pure-g">
|
|
+ <div class="pure-u-1-2">
|
|
+ <span class="flag"><img src="/luci-static/passwall/flags/loading.svg" class="pure-img"></span> <span
|
|
+ class="status-info">获取中...</span>
|
|
+ </div>
|
|
+ <div class="pure-u-1-2">
|
|
+ <div class="icon-con">
|
|
+ <img src="/luci-static/passwall/img/site_icon1_01.png" class="pure-img i1">
|
|
+ <img src="/luci-static/passwall/img/site_icon1_02.png" class="pure-img i2">
|
|
+ <img src="/luci-static/passwall/img/site_icon1_03.png" class="pure-img i3">
|
|
+ <img src="/luci-static/passwall/img/site_icon1_04.png" class="pure-img i4">
|
|
+ </div>
|
|
+ </div>
|
|
+ </div>
|
|
+ </div>
|
|
+</div>
|
|
+
|
|
+<script>
|
|
+const _ASSETS = '/luci-static/passwall/';
|
|
+const CHECK_IP_URL = '<%=url([[admin]], [[services]], [[passwall]], [[ip]])%>';
|
|
+
|
|
+let wW = window.innerWidth;
|
|
+
|
|
+function resize() {
|
|
+ wW = window.innerWidth;
|
|
+ let lw = document.querySelector(".main-left")?.offsetWidth ?? 5;
|
|
+ let statusBar = document.querySelector(".status-bar");
|
|
+ statusBar.style.width = (wW - lw) + 'px';
|
|
+ let flagElement = statusBar.querySelector(".flag");
|
|
+ flagElement.style.width = (flagElement.offsetHeight / 3 * 4) + 'px';
|
|
+
|
|
+ document.querySelectorAll(".flag-icon").forEach(function(el) {
|
|
+ if (el.offsetHeight < 60) {
|
|
+ el.parentElement.style.height = '60px';
|
|
+ el.style.width = '60px';
|
|
+ } else {
|
|
+ el.style.width = el.offsetHeight + 'px';
|
|
+ }
|
|
+ });
|
|
+}
|
|
+
|
|
+function write_status(data) {
|
|
+ document.querySelector(".flag img").src = _ASSETS + "flags/" + data.flag + ".svg";
|
|
+ document.querySelector(".status-info").innerHTML = data.ip + "<br>" + data.country + " " + data.isp;
|
|
+ document.querySelector(".i1").src = data.baidu ? _ASSETS + "img/site_icon_01.png" : _ASSETS + "img/site_icon1_01.png";
|
|
+ document.querySelector(".i2").src = data.taobao ? _ASSETS + "img/site_icon_02.png" : _ASSETS + "img/site_icon1_02.png";
|
|
+ document.querySelector(".i3").src = data.google ? _ASSETS + "img/site_icon_03.png" : _ASSETS + "img/site_icon1_03.png";
|
|
+ document.querySelector(".i4").src = data.youtube ? _ASSETS + "img/site_icon_04.png" : _ASSETS + "img/site_icon1_04.png";
|
|
+ setTimeout(function() {
|
|
+ let event = new Event('iploaded');
|
|
+ document.body.dispatchEvent(event);
|
|
+ }, 200);
|
|
+}
|
|
+
|
|
+XHR.poll(5, CHECK_IP_URL, null,
|
|
+ function (x, data) {
|
|
+ write_status(data);
|
|
+ }
|
|
+ );
|
|
+
|
|
+document.addEventListener('DOMContentLoaded', function() {
|
|
+ setTimeout("resize()",200)
|
|
+ fetch(CHECK_IP_URL)
|
|
+ .then(response => response.json())
|
|
+ .then(data => {
|
|
+ write_status(data);
|
|
+ })
|
|
+ .catch(error => console.error('Error:', error));
|
|
+});
|
|
+
|
|
+window.addEventListener('resize', resize);
|
|
+</script>
|
|
|
|
--- a/luci-app-passwall/root/usr/share/passwall/0_default_config
|
|
+++ b/luci-app-passwall/root/usr/share/passwall/0_default_config
|
|
@@ -57,13 +57,17 @@ config global_other
|
|
option show_node_info '0'
|
|
|
|
config global_rules
|
|
- option auto_update '0'
|
|
+ option auto_update '1'
|
|
option chnlist_update '1'
|
|
option chnroute_update '1'
|
|
option chnroute6_update '1'
|
|
option gfwlist_update '1'
|
|
- option geosite_update '0'
|
|
- option geoip_update '0'
|
|
+ option geosite_update '1'
|
|
+ option geoip_update '1'
|
|
+ option enable_geoview '1'
|
|
+ option geo2rule '1'
|
|
+ option week_update '7'
|
|
+ option time_update '4'
|
|
list gfwlist_url 'https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/gfw.txt'
|
|
list chnroute_url 'https://ispip.clang.cn/all_cn.txt'
|
|
list chnroute_url 'https://cdn.jsdelivr.net/gh/gaoyifan/china-operator-ip@ip-lists/china.txt'
|
|
@@ -72,8 +76,8 @@ config global_rules
|
|
list chnlist_url 'https://cdn.jsdelivr.net/gh/felixonmars/dnsmasq-china-list/accelerated-domains.china.conf'
|
|
list chnlist_url 'https://cdn.jsdelivr.net/gh/felixonmars/dnsmasq-china-list/apple.china.conf'
|
|
option v2ray_location_asset '/usr/share/v2ray/'
|
|
- option geoip_url 'https://github.com/Loyalsoldier/geoip/releases/latest/download/geoip.dat'
|
|
- option geosite_url 'https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat'
|
|
+ option geoip_url 'https://cdn.jsdelivr.net/gh/Loyalsoldier/geoip@release/geoip.dat'
|
|
+ option geosite_url 'https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geosite.dat'
|
|
|
|
config global_app
|
|
option sing_box_file '/usr/bin/sing-box'
|