diff --git a/luci-app-easytier/luci-app-easytier/luasrc/controller/easytier.lua b/luci-app-easytier/luci-app-easytier/luasrc/controller/easytier.lua index 395c67a4..51e3594a 100644 --- a/luci-app-easytier/luci-app-easytier/luasrc/controller/easytier.lua +++ b/luci-app-easytier/luci-app-easytier/luasrc/controller/easytier.lua @@ -147,7 +147,7 @@ function act_status() end e.no_tun = uci:get_first("easytier", "easytier", "no_tun") == "1" - e.dev_name = uci:get_first("easytier", "easytier", "dev_name") or "tun0" + e.dev_name = uci:get_first("easytier", "easytier", "tunname") or "tun0" luci.http.prepare_content("application/json") luci.http.write_json(e) diff --git a/luci-app-easytier/luci-app-easytier/luasrc/view/easytier/easytier_cli.htm b/luci-app-easytier/luci-app-easytier/luasrc/view/easytier/easytier_cli.htm index 38b71400..ed9ae4eb 100644 --- a/luci-app-easytier/luci-app-easytier/luasrc/view/easytier/easytier_cli.htm +++ b/luci-app-easytier/luci-app-easytier/luasrc/view/easytier/easytier_cli.htm @@ -1232,6 +1232,18 @@ function refreshConnInfo() { } } }; + xhr.onerror = function() { + isRefreshing = false; + btn.disabled = false; + btn.classList.remove('loading'); + btnText.textContent = originalText; + }; + xhr.onabort = function() { + isRefreshing = false; + btn.disabled = false; + btn.classList.remove('loading'); + btnText.textContent = originalText; + }; xhr.send(); } @@ -1496,7 +1508,7 @@ function loadContributors() { // 自动刷新 XHR.poll(5, '<%=url("admin", "vpn", "easytier", "api_conninfo")%>', null, function(x, data) { - if (!isRefreshing) { + if (!isRefreshing && data) { updateConnInfo(data); } }); diff --git a/luci-app-easytier/luci-app-easytier/luasrc/view/easytier/easytier_status.htm b/luci-app-easytier/luci-app-easytier/luasrc/view/easytier/easytier_status.htm index c49c4924..9608eefb 100644 --- a/luci-app-easytier/luci-app-easytier/luasrc/view/easytier/easytier_status.htm +++ b/luci-app-easytier/luci-app-easytier/luasrc/view/easytier/easytier_status.htm @@ -1075,6 +1075,7 @@ function updateTunInterface(coreRunning, noTun, devName) { var firstLoad = true; XHR.poll(3, '<%=url("admin", "vpn", "easytier", "api_status")%>', null, function(x, data) { + if (!data) return; updateStatus(data); updateTunInterface(data.crunning, data.no_tun, data.dev_name); diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index 622bf49c..17c5a78c 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=e9002979e0df72bce1c8751ff70725386594c551db684b7a232935b8b2bb8aa2 endef -GEOSITE_VER:=20260527110433 +GEOSITE_VER:=20260529001745 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=50a1f17d12f1d44495ddea7d32a8c5d852ccefe848cf375f5adff22346b68cef + HASH:=0bd09c81640f34b22e9fb08ca67462c2ef49ac8ea9eeafe9d0ae92a73604670c endef GEOSITE_IRAN_VER:=202605250156