gui(routes): show resolve summary + timeout recheck badges
This commit is contained in:
@@ -156,6 +156,15 @@ class TrafficModeView:
|
||||
message: str
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class RoutesResolveSummaryView:
|
||||
available: bool
|
||||
text: str
|
||||
recheck_text: str
|
||||
color: str
|
||||
recheck_color: str
|
||||
|
||||
|
||||
# ---------------------------
|
||||
# Controller
|
||||
# ---------------------------
|
||||
@@ -605,6 +614,10 @@ class DashboardController:
|
||||
res = self.client.routes_cache_restore()
|
||||
return ActionView(ok=res.ok, pretty_text=self._pretty_cmd(res))
|
||||
|
||||
def routes_precheck_debug(self, run_now: bool = True) -> ActionView:
|
||||
res = self.client.routes_precheck_debug(run_now=run_now)
|
||||
return ActionView(ok=res.ok, pretty_text=self._pretty_cmd(res))
|
||||
|
||||
def routes_fix_policy_route(self) -> ActionView:
|
||||
res = self.client.routes_fix_policy_route()
|
||||
return ActionView(ok=res.ok, pretty_text=self._pretty_cmd(res))
|
||||
@@ -617,6 +630,70 @@ class DashboardController:
|
||||
res = self.client.routes_timer_set(bool(enabled))
|
||||
return ActionView(ok=res.ok, pretty_text=self._pretty_cmd(res))
|
||||
|
||||
def routes_resolve_summary_view(self) -> RoutesResolveSummaryView:
|
||||
dump = self.client.trace_get("full")
|
||||
lines = list(getattr(dump, "lines", []) or [])
|
||||
line = ""
|
||||
for raw in reversed(lines):
|
||||
s = str(raw or "")
|
||||
if "resolve summary:" in s:
|
||||
line = s
|
||||
break
|
||||
if not line:
|
||||
return RoutesResolveSummaryView(
|
||||
available=False,
|
||||
text="Resolve summary: no data yet",
|
||||
recheck_text="Timeout recheck: —",
|
||||
color="gray",
|
||||
recheck_color="gray",
|
||||
)
|
||||
|
||||
tail = line.split("resolve summary:", 1)[1]
|
||||
pairs: dict[str, int] = {}
|
||||
for m in re.finditer(r"([a-zA-Z0-9_]+)=(-?\d+)", tail):
|
||||
k = str(m.group(1) or "").strip().lower()
|
||||
try:
|
||||
pairs[k] = int(m.group(2))
|
||||
except Exception:
|
||||
continue
|
||||
|
||||
unique_ips = int(pairs.get("unique_ips", 0))
|
||||
direct_ips = int(pairs.get("direct_ips", 0))
|
||||
wildcard_ips = int(pairs.get("wildcard_ips", 0))
|
||||
unresolved = int(pairs.get("unresolved", 0))
|
||||
q_hits = int(pairs.get("quarantine_hits", 0))
|
||||
dns_attempts = int(pairs.get("dns_attempts", 0))
|
||||
dns_timeout = int(pairs.get("dns_timeout", 0))
|
||||
|
||||
r_checked = int(pairs.get("timeout_recheck_checked", 0))
|
||||
r_recovered = int(pairs.get("timeout_recheck_recovered", 0))
|
||||
r_recovered_ips = int(pairs.get("timeout_recheck_recovered_ips", 0))
|
||||
r_still_timeout = int(pairs.get("timeout_recheck_still_timeout", 0))
|
||||
r_now_nx = int(pairs.get("timeout_recheck_now_nxdomain", 0))
|
||||
r_now_tmp = int(pairs.get("timeout_recheck_now_temporary", 0))
|
||||
|
||||
text = (
|
||||
f"Resolve: ips={unique_ips} (direct={direct_ips}, wildcard={wildcard_ips}, "
|
||||
f"+recheck_ips={r_recovered_ips}) | unresolved={unresolved} | "
|
||||
f"quarantine_hits={q_hits} | dns_timeout={dns_timeout} | attempts={dns_attempts}"
|
||||
)
|
||||
recheck_text = (
|
||||
f"Timeout recheck: checked={r_checked} recovered={r_recovered} "
|
||||
f"still_timeout={r_still_timeout} now_nxdomain={r_now_nx} now_temporary={r_now_tmp}"
|
||||
)
|
||||
|
||||
color = "green" if unresolved < 4000 else ("#b58900" if unresolved < 10000 else "red")
|
||||
if dns_timeout > 500 and color == "green":
|
||||
color = "#b58900"
|
||||
recheck_color = "green" if r_still_timeout <= 20 else ("#b58900" if r_still_timeout <= 100 else "red")
|
||||
return RoutesResolveSummaryView(
|
||||
available=True,
|
||||
text=text,
|
||||
recheck_text=recheck_text,
|
||||
color=color,
|
||||
recheck_color=recheck_color,
|
||||
)
|
||||
|
||||
def traffic_mode_view(self) -> TrafficModeView:
|
||||
st: TrafficModeStatus = self.client.traffic_mode_get()
|
||||
return TrafficModeView(
|
||||
@@ -884,6 +961,7 @@ class DashboardController:
|
||||
timeout_ms: int = 1800,
|
||||
attempts: int = 1,
|
||||
concurrency: int = 6,
|
||||
profile: str = "load",
|
||||
) -> DNSBenchmarkResponse:
|
||||
return self.client.dns_benchmark(
|
||||
upstreams=upstreams,
|
||||
@@ -891,6 +969,7 @@ class DashboardController:
|
||||
timeout_ms=timeout_ms,
|
||||
attempts=attempts,
|
||||
concurrency=concurrency,
|
||||
profile=profile,
|
||||
)
|
||||
|
||||
def dns_status_view(self) -> DNSStatus:
|
||||
|
||||
Reference in New Issue
Block a user