diff --git a/modules/stats/dashboard_lib.py b/modules/stats/dashboard_lib.py index 1ed8140..bdda7c1 100644 --- a/modules/stats/dashboard_lib.py +++ b/modules/stats/dashboard_lib.py @@ -282,11 +282,14 @@ def build_dashboard_payload( risk = build_risk_overview( conn, get_setting, equity=equity, margin_used=margin_used, ) + from modules.stats.server_status_lib import build_server_status + return { "ok": True, "updated_at": now_iso, "trading_mode_label": trading_mode_label(get_setting), "ctp_status": ctp_st, + "server": build_server_status(), "account": { "equity": round(equity, 2), "margin_used": margin_used, diff --git a/modules/stats/server_status_lib.py b/modules/stats/server_status_lib.py new file mode 100644 index 0000000..c000795 --- /dev/null +++ b/modules/stats/server_status_lib.py @@ -0,0 +1,218 @@ +# Copyright (c) 2025-2026 马建军. All rights reserved. +# 专有软件 — 未经授权禁止复制、传播、转售。 +# 详见 LICENSE.zh-CN.txt + +"""数据看板:本机服务器状态(IP、CPU、内存、硬盘)。""" +from __future__ import annotations + +import os +import shutil +import socket +import time +from datetime import datetime +from typing import Any, Optional +from zoneinfo import ZoneInfo + +_TZ = ZoneInfo("Asia/Shanghai") + +_PUBLIC_IP_CACHE: dict[str, Any] = {"ip": None, "ts": 0.0} +_PUBLIC_IP_TTL = 300.0 + +_NET_SAMPLE: dict[str, Any] = {"rx": 0, "tx": 0, "ts": 0.0} + +_CPU_SAMPLE: dict[str, Any] = {"total": 0, "idle": 0, "ts": 0.0} + + +def _env_ip(name: str) -> Optional[str]: + val = (os.getenv(name) or "").strip() + return val or None + + +def get_private_ip() -> Optional[str]: + override = _env_ip("SERVER_PRIVATE_IP") + if override: + return override + try: + with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s: + s.connect(("8.8.8.8", 80)) + return s.getsockname()[0] + except Exception: + pass + try: + host = socket.gethostname() + return socket.gethostbyname(host) + except Exception: + return None + + +def get_public_ip() -> Optional[str]: + override = _env_ip("SERVER_PUBLIC_IP") + if override: + return override + now = time.time() + cached = _PUBLIC_IP_CACHE.get("ip") + if cached and (now - float(_PUBLIC_IP_CACHE.get("ts") or 0)) < _PUBLIC_IP_TTL: + return str(cached) + ip = None + try: + import requests + + resp = requests.get("https://api.ipify.org?format=text", timeout=4) + if resp.ok: + ip = (resp.text or "").strip() or None + except Exception: + pass + if not ip: + try: + import requests + + resp = requests.get("https://ifconfig.me/ip", timeout=4) + if resp.ok: + ip = (resp.text or "").strip() or None + except Exception: + pass + if ip: + _PUBLIC_IP_CACHE["ip"] = ip + _PUBLIC_IP_CACHE["ts"] = now + return ip + + +def _read_mem_linux() -> tuple[Optional[float], Optional[float], Optional[float]]: + try: + info: dict[str, int] = {} + with open("/proc/meminfo", encoding="utf-8") as f: + for line in f: + parts = line.split() + if len(parts) >= 2 and parts[1].isdigit(): + info[parts[0].rstrip(":")] = int(parts[1]) + total_kb = info.get("MemTotal") + avail_kb = info.get("MemAvailable") or info.get("MemFree") + if not total_kb or avail_kb is None: + return None, None, None + used_kb = max(0, total_kb - avail_kb) + total_gb = total_kb / 1024 / 1024 + used_gb = used_kb / 1024 / 1024 + pct = round(used_kb / total_kb * 100, 1) if total_kb > 0 else None + return pct, round(used_gb, 2), round(total_gb, 2) + except Exception: + return None, None, None + + +def _read_cpu_percent() -> Optional[float]: + try: + with open("/proc/stat", encoding="utf-8") as f: + line = f.readline() + if not line.startswith("cpu "): + return None + parts = [int(x) for x in line.split()[1:]] + if len(parts) < 4: + return None + idle = parts[3] + (parts[4] if len(parts) > 4 else 0) + total = sum(parts) + now = time.time() + prev_total = int(_CPU_SAMPLE.get("total") or 0) + prev_idle = int(_CPU_SAMPLE.get("idle") or 0) + prev_ts = float(_CPU_SAMPLE.get("ts") or 0) + _CPU_SAMPLE.update({"total": total, "idle": idle, "ts": now}) + if prev_total <= 0 or now <= prev_ts: + load1, _, _ = os.getloadavg() + cores = os.cpu_count() or 1 + return round(min(100.0, load1 / cores * 100), 1) + dt_total = total - prev_total + dt_idle = idle - prev_idle + if dt_total <= 0: + return None + return round((1.0 - dt_idle / dt_total) * 100, 1) + except Exception: + try: + load1, _, _ = os.getloadavg() + cores = os.cpu_count() or 1 + return round(min(100.0, load1 / cores * 100), 1) + except Exception: + return None + + +def _read_disk(path: str) -> tuple[Optional[float], Optional[float], Optional[float]]: + try: + usage = shutil.disk_usage(path) + total = usage.total + used = usage.used + if total <= 0: + return None, None, None + pct = round(used / total * 100, 1) + return pct, round(used / 1024 ** 3, 2), round(total / 1024 ** 3, 2) + except Exception: + return None, None, None + + +def _read_net_rates() -> tuple[Optional[float], Optional[float]]: + try: + rx = tx = 0 + with open("/proc/net/dev", encoding="utf-8") as f: + for line in f.readlines()[2:]: + if ":" not in line: + continue + _, data = line.split(":", 1) + cols = data.split() + if len(cols) < 10: + continue + iface = line.split(":", 1)[0].strip() + if iface == "lo": + continue + rx += int(cols[0]) + tx += int(cols[8]) + now = time.time() + prev_rx = int(_NET_SAMPLE.get("rx") or 0) + prev_tx = int(_NET_SAMPLE.get("tx") or 0) + prev_ts = float(_NET_SAMPLE.get("ts") or 0) + _NET_SAMPLE.update({"rx": rx, "tx": tx, "ts": now}) + if prev_ts <= 0 or now <= prev_ts: + return None, None + dt = now - prev_ts + down = max(0.0, (rx - prev_rx) / dt / 1024) + up = max(0.0, (tx - prev_tx) / dt / 1024) + return round(up, 1), round(down, 1) + except Exception: + return None, None + + +def _format_uptime(seconds: float) -> str: + sec = max(0, int(seconds)) + days, rem = divmod(sec, 86400) + hours, _ = divmod(rem, 3600) + if days > 0: + return f"{days}天{hours}时" + if hours > 0: + return f"{hours}时{rem % 3600 // 60}分" + return f"{sec // 60}分" + + +def build_server_status(*, disk_path: Optional[str] = None) -> dict[str, Any]: + root = disk_path or os.getenv("SERVER_DISK_PATH") or "/" + mem_pct, mem_used_gb, mem_total_gb = _read_mem_linux() + disk_pct, disk_used_gb, disk_total_gb = _read_disk(root) + net_up, net_down = _read_net_rates() + uptime_sec = None + try: + with open("/proc/uptime", encoding="utf-8") as f: + uptime_sec = float(f.read().split()[0]) + except Exception: + pass + hostname = (os.getenv("SERVER_HOSTNAME") or "").strip() or socket.gethostname() + return { + "hostname": hostname, + "public_ip": get_public_ip(), + "private_ip": get_private_ip(), + "cpu_pct": _read_cpu_percent(), + "cpu_cores": os.cpu_count(), + "memory_pct": mem_pct, + "memory_used_gb": mem_used_gb, + "memory_total_gb": mem_total_gb, + "disk_pct": disk_pct, + "disk_used_gb": disk_used_gb, + "disk_total_gb": disk_total_gb, + "net_up_kbps": net_up, + "net_down_kbps": net_down, + "uptime_label": _format_uptime(uptime_sec) if uptime_sec is not None else None, + "updated_at": datetime.now(_TZ).strftime("%Y-%m-%d %H:%M:%S"), + } diff --git a/modules/web/static/css/dashboard.css b/modules/web/static/css/dashboard.css index 4cff042..70748c7 100644 --- a/modules/web/static/css/dashboard.css +++ b/modules/web/static/css/dashboard.css @@ -42,6 +42,165 @@ font-weight: 700; } +.dashboard-server-card { + margin-bottom: 0; +} + +.dash-server-head { + display: flex; + align-items: flex-start; + justify-content: space-between; + gap: 0.75rem; + flex-wrap: wrap; + margin-bottom: 0.75rem; +} + +.dash-server-title { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 0.45rem; + font-size: 0.95rem; + font-weight: 600; +} + +.dash-server-dot { + width: 0.55rem; + height: 0.55rem; + border-radius: 50%; + background: var(--profit); + box-shadow: 0 0 8px rgba(76, 217, 127, 0.55); + flex-shrink: 0; +} + +.dash-server-host { + font-size: 0.78rem; + font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; +} + +.dash-server-head-meta { + display: flex; + flex-direction: column; + align-items: flex-end; + gap: 0.15rem; + font-size: 0.74rem; +} + +.dash-server-ip-row { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 0.65rem; + margin-bottom: 0.85rem; +} + +.dash-server-ip-item { + padding: 0.55rem 0.7rem; + border: 1px solid rgba(255, 255, 255, 0.06); + border-radius: 0.55rem; + background: rgba(0, 0, 0, 0.18); +} + +.dash-server-ip-item .label { + display: block; + font-size: 0.72rem; + color: var(--text-muted); + margin-bottom: 0.2rem; +} + +.dash-server-ip-item .value { + font-size: 0.92rem; + font-weight: 600; + font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; + word-break: break-all; +} + +.dash-server-metrics { + display: grid; + grid-template-columns: repeat(4, minmax(0, 1fr)); + gap: 0.65rem; +} + +.dash-server-metric { + padding: 0.6rem 0.7rem; + border: 1px solid rgba(255, 255, 255, 0.06); + border-radius: 0.55rem; + background: rgba(0, 0, 0, 0.14); + min-width: 0; +} + +.dash-server-metric-top { + display: flex; + align-items: center; + justify-content: space-between; + gap: 0.35rem; + margin-bottom: 0.45rem; +} + +.dash-server-metric-top .label { + font-size: 0.74rem; + color: var(--text-muted); +} + +.dash-server-metric-top .value { + font-size: 0.95rem; + font-weight: 700; + color: var(--profit); +} + +.dash-server-bar { + height: 0.35rem; + border-radius: 999px; + background: rgba(255, 255, 255, 0.08); + overflow: hidden; + margin-bottom: 0.35rem; +} + +.dash-server-bar > span { + display: block; + height: 100%; + width: 0; + border-radius: inherit; + background: linear-gradient(90deg, #3ecf7d, #67e8a5); + transition: width 0.35s ease; +} + +.dash-server-metric-sub { + font-size: 0.7rem; + line-height: 1.35; +} + +.dash-server-net { + display: flex; + flex-direction: column; + gap: 0.25rem; + font-size: 0.78rem; + font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; + color: var(--text-muted); +} + +.dash-server-net-live { + font-size: 0.72rem; + color: var(--text-muted); + font-weight: 500; +} + +@media (max-width: 900px) { + .dash-server-metrics { + grid-template-columns: repeat(2, minmax(0, 1fr)); + } +} + +@media (max-width: 520px) { + .dash-server-ip-row, + .dash-server-metrics { + grid-template-columns: 1fr; + } + + .dash-server-head-meta { + align-items: flex-start; + } +} + .dashboard-section h2 { margin-bottom: 0.65rem; } diff --git a/modules/web/static/js/dashboard.js b/modules/web/static/js/dashboard.js index 77bc1ad..19a4bd4 100644 --- a/modules/web/static/js/dashboard.js +++ b/modules/web/static/js/dashboard.js @@ -25,6 +25,22 @@ var detailTitleEl = document.getElementById('dash-detail-title'); var detailGridEl = document.getElementById('dash-detail-grid'); var detailCloseBtn = document.getElementById('dash-detail-close'); + var serverHostEl = document.getElementById('dash-server-host'); + var serverUptimeEl = document.getElementById('dash-server-uptime'); + var serverUpdatedEl = document.getElementById('dash-server-updated'); + var serverPublicIpEl = document.getElementById('dash-server-public-ip'); + var serverPrivateIpEl = document.getElementById('dash-server-private-ip'); + var serverCpuEl = document.getElementById('dash-server-cpu'); + var serverCpuBarEl = document.getElementById('dash-server-cpu-bar'); + var serverCpuSubEl = document.getElementById('dash-server-cpu-sub'); + var serverMemEl = document.getElementById('dash-server-mem'); + var serverMemBarEl = document.getElementById('dash-server-mem-bar'); + var serverMemSubEl = document.getElementById('dash-server-mem-sub'); + var serverDiskEl = document.getElementById('dash-server-disk'); + var serverDiskBarEl = document.getElementById('dash-server-disk-bar'); + var serverDiskSubEl = document.getElementById('dash-server-disk-sub'); + var serverNetUpEl = document.getElementById('dash-server-net-up'); + var serverNetDownEl = document.getElementById('dash-server-net-down'); var pollTimer = null; var pollInFlight = false; @@ -489,6 +505,70 @@ } } + function setServerBar(el, pct) { + if (!el) return; + var n = Number(pct); + if (isNaN(n)) { + el.style.width = '0%'; + return; + } + el.style.width = Math.max(0, Math.min(100, n)) + '%'; + } + + function fmtRateKbps(v) { + if (v == null || isNaN(Number(v))) return '—'; + var n = Number(v); + if (n >= 1024) return (n / 1024).toFixed(1) + ' MB/s'; + return n.toFixed(1) + ' KB/s'; + } + + function applyServer(server) { + if (!server) return; + if (serverHostEl) serverHostEl.textContent = server.hostname || '—'; + if (serverUptimeEl) { + serverUptimeEl.textContent = server.uptime_label + ? ('运行 ' + server.uptime_label) : ''; + } + if (serverUpdatedEl) { + serverUpdatedEl.textContent = server.updated_at + ? ('更新 ' + server.updated_at) : ''; + } + if (serverPublicIpEl) serverPublicIpEl.textContent = server.public_ip || '—'; + if (serverPrivateIpEl) serverPrivateIpEl.textContent = server.private_ip || '—'; + if (serverCpuEl) { + serverCpuEl.textContent = server.cpu_pct != null ? (server.cpu_pct + '%') : '—'; + } + setServerBar(serverCpuBarEl, server.cpu_pct); + if (serverCpuSubEl) { + serverCpuSubEl.textContent = server.cpu_cores != null + ? (server.cpu_cores + ' 核') : ''; + } + if (serverMemEl) { + serverMemEl.textContent = server.memory_pct != null ? (server.memory_pct + '%') : '—'; + } + setServerBar(serverMemBarEl, server.memory_pct); + if (serverMemSubEl) { + serverMemSubEl.textContent = (server.memory_used_gb != null && server.memory_total_gb != null) + ? (server.memory_used_gb + ' GB / ' + server.memory_total_gb + ' GB') + : ''; + } + if (serverDiskEl) { + serverDiskEl.textContent = server.disk_pct != null ? (server.disk_pct + '%') : '—'; + } + setServerBar(serverDiskBarEl, server.disk_pct); + if (serverDiskSubEl) { + serverDiskSubEl.textContent = (server.disk_used_gb != null && server.disk_total_gb != null) + ? (server.disk_used_gb + ' GB / ' + server.disk_total_gb + ' GB') + : ''; + } + if (serverNetUpEl) { + serverNetUpEl.textContent = '↑ ' + fmtRateKbps(server.net_up_kbps); + } + if (serverNetDownEl) { + serverNetDownEl.textContent = '↓ ' + fmtRateKbps(server.net_down_kbps); + } + } + function applyAccount(data) { if (!data) return; var acc = data.account || {}; @@ -949,6 +1029,7 @@ return; } applyAccount(data); + applyServer(data.server); applyRisk(data.risk, data.account); applyKeys(data.keys || []); applyCloses(data.closes || []); diff --git a/modules/web/templates/dashboard.html b/modules/web/templates/dashboard.html index ea27a66..55c5866 100644 --- a/modules/web/templates/dashboard.html +++ b/modules/web/templates/dashboard.html @@ -32,6 +32,66 @@ +