cwx/op-packages
1
0
Fork 0
mirror of https://github.com/kiddin9/op-packages.git synced 2026-09-11 02:44:57 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
Files
66aa583dfa7805b153d9980115df331a6614ea27
op-packages/.github/diy/patches/luci-app-passwall2.patch
T

261 lines
9.5 KiB
Diff
Raw Blame History

--- a/luci-app-passwall2/Makefile
+++ b/luci-app-passwall2/Makefile
@@ -31,7 +31,26 @@ LUCI_PKGARCH:=all
LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \
+ip-full +libuci-lua +lua +luci-compat +luci-lib-jsonc +lyaml +resolveip +tcping \
+geoview +v2ray-geoip +v2ray-geosite \
- +unzip
+ +unzip \
+ +PACKAGE_$(PKG_NAME)_Basic_Core_Xray:xray-core \
+ +PACKAGE_$(PKG_NAME)_Basic_Core_SingBox:sing-box \
+ +PACKAGE_$(PKG_NAME)_Basic_Core_All:xray-core \
+ +PACKAGE_$(PKG_NAME)_Basic_Core_All:sing-box \
+ +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_tuic_client:tuic-client \
+ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin:v2ray-plugin \
define Package/$(PKG_NAME)/config
menu "Configuration"
@@ -39,7 +58,7 @@ menu "Configuration"
choice
prompt "Basic Core"
- default PACKAGE_$(PKG_NAME)_Basic_Core_All if aarch64||arm||i386||x86_64
+ default PACKAGE_$(PKG_NAME)_Basic_Core_All if aarch64||i386||x86_64
default PACKAGE_$(PKG_NAME)_Basic_Core_Xray
config PACKAGE_$(PKG_NAME)_Basic_Core_Xray
--- a/luci-app-passwall2/luasrc/controller/passwall2.lua
+++ b/luci-app-passwall2/luasrc/controller/passwall2.lua
@@ -32,6 +32,7 @@ function index()
end
e.dependent = true
e.acl_depends = { "luci-app-passwall2" }
+ entry({"admin", "services", appname, "ip"}, call('check_ip')).leaf = true
--[[ Client ]]
entry({"admin", "services", appname, "settings"}, cbi(appname .. "/client/global"), _("Basic Settings"), 1).dependent = true
entry({"admin", "services", appname, "node_list"}, cbi(appname .. "/client/node_list"), _("Node List"), 2).dependent = true
@@ -137,6 +138,61 @@ local function http_write_json_error(data)
http.write(jsonStringify({code = 0, data = data}))
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 reset_config()
uci:revert(c_config)
luci.sys.call("echo '' > /tmp/log/passwall2.log")
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua
@@ -383,7 +383,7 @@ for k, v in pairs(nodes_table) do
end
m:appendTemplate("/global/footer", {shunt_list = api.jsonc.stringify(shunt_list)})
-
+m:appendTemplate("/global/status_bottom")
m:appendTemplate("/cbi/sortable", {sectiontype = s2.sectiontype})
return api.return_map(m)
diff --git a/luci-app-passwall2/luasrc/view/passwall2/global/status_bottom.htm b/luci-app-passwall2/luasrc/view/passwall2/global/status_bottom.htm
new file mode 100644
index 000000000000..a00fff9c79b3
--- /dev/null
+++ b/luci-app-passwall2/luasrc/view/passwall2/global/status_bottom.htm
@@ -0,0 +1,129 @@
+<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: 999;
+ box-sizing: border-box;
+}
+
+.status-bar .inner {
+ margin: 0.5em;
+}
+
+.status-bar .inner .flag {
+ height: 2.6em;
+ display: block;
+ float: left;
+ margin: 0 1em;
+}
+
+.status-bar .inner .status-info {
+ font-weight: bold;
+}
+
+.status-bar .icon-con {
+ height: 2.6em;
+ text-align: right;
+}
+
+.pure-u-1-2 {
+ width: 50%;
+ display: inline-block;
+}
+
+@media screen and (max-width: 720px) {
+ .pure-u-1-2 {
+ width: 100%;
+ }
+ }
+
+@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/passwall2/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/passwall2/img/site_icon1_01.png" class="pure-img i1">
+ <img src="/luci-static/passwall2/img/site_icon1_02.png" class="pure-img i2">
+ <img src="/luci-static/passwall2/img/site_icon1_03.png" class="pure-img i3">
+ <img src="/luci-static/passwall2/img/site_icon1_04.png" class="pure-img i4">
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script>
+const _ASSETS = '/luci-static/passwall2/';
+const CHECK_IP_URL = '<%=url([[admin]], [[services]], [[passwall2]], [[ip]])%>';
+
+let statusBar = document.querySelector(".status-bar");
+
+function resize() {
+ statusBar.style.width = document.getElementById("maincontent").offsetWidth + '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 + "&nbsp;" + 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()",100)
+ fetch(CHECK_IP_URL)
+ .then(response => response.json())
+ .then(data => {
+ write_status(data);
+ })
+ .catch(error => console.error('Error:', error));
+});
+
+window.addEventListener('resize', resize);
+document.body.appendChild(statusBar);
+</script>
Reference in New Issue View Git Blame Copy Permalink