v1.3.15: 四页测速加预计用时(标题/按钮/等待提示)

app.py

@@ -16,7 +16,7 @@ PORT = int(os.environ.get("PORT", "7031"))
 # ---------- CardAuth hub (免费形态: 安装统计/在线/公告/版本推送,失败开放) ----------
 HUB_URL = os.environ.get("HUB_URL", "https://auth.88531.cn/api").rstrip("/")
 HUB_PROJECT_ID = os.environ.get("HUB_PROJECT_ID", "12")
-HUB_VERSION = os.environ.get("SITE_VERSION", "1.3.13")
+HUB_VERSION = os.environ.get("SITE_VERSION", "1.3.15")
 HUB = {"ok": False, "install_id": None, "latest": "", "update_available": False,
        "update_required": False, "download_url": "", "changelog": "",
        "announcements": [], "popup": [], "ts": 0}
@@ -374,6 +374,7 @@ def api_cpu():
     return jsonify({"cpu": cache["cpu"], "load": cache["load"],
                     "active": active, "total": len(cache["procs"]),
                     "info": get_cpu_info(), "percpu": get_percpu(),
+                    "mhz": get_percpu_mhz(),
                     "items": cache["procs"][:100]})
 
 _cpu_static = {}
@@ -463,6 +464,179 @@ def get_percpu():
     except Exception:
         return []
 
+def get_percpu_mhz():
+    """每核实时频率(MHz): 优先读 cpufreq scaling_cur_freq,读不到回退 cpuinfo"""
+    mhz = []
+    try:
+        paths = sorted(glob.glob("/sys/devices/system/cpu/cpu[0-9]*/cpufreq/scaling_cur_freq"))
+        if not paths:
+            for base in ("/host/sys/devices/system/cpu", "/sys/devices/system/cpu"):
+                try:
+                    names = sorted([d for d in os.listdir(base) if d.startswith("cpu") and d[3:].isdigit()])
+                except Exception:
+                    continue
+                for n in names:
+                    paths.append(os.path.join(base, n, "cpufreq/scaling_cur_freq"))
+                if paths:
+                    break
+        for p in paths:
+            try:
+                with open(p) as f:
+                    v = float(f.read().strip())
+                mhz.append(int(round(v / 1000.0)))
+            except Exception:
+                continue
+    except Exception:
+        pass
+    if not mhz:
+        try:
+            for cp in ("/host/proc/cpuinfo", "/proc/cpuinfo"):
+                try:
+                    vals = []
+                    with open(cp) as f:
+                        for line in f:
+                            if line.startswith("cpu MHz"):
+                                vals.append(int(round(float(line.split(":")[1].strip()))))
+                    if vals:
+                        mhz = vals
+                        break
+                except Exception:
+                    continue
+        except Exception:
+            pass
+    return mhz
+
+# ---------- 各页测速: CPU/内存/硬盘/网络(非破坏,失败返回error) ----------
+import urllib.request as _urlreq
+
+def _bench_cpu():
+    import math
+    N = 200000
+    t0 = time.perf_counter()
+    x = 0
+    for i in range(N):
+        x += (i * i) % 10007
+    dt = max(time.perf_counter() - t0, 1e-6)
+    return {"ms": int(round(dt * 1000)), "kops": int(round(N / dt / 1000)),
+            "score": int(round(N / dt / 1000)), "detail": "20万次整数运算耗时"}
+
+def _bench_mem():
+    SZ = 32 * 1024 * 1024
+    t0 = time.perf_counter()
+    b = bytearray(SZ)
+    b[:] = b"\x5a" * SZ
+    dt_w = max(time.perf_counter() - t0, 1e-6)
+    t0 = time.perf_counter()
+    s = sum(b[::4096])
+    dt_r = max(time.perf_counter() - t0, 1e-6)
+    del b
+    return {"write_mbs": round(SZ / dt_w / 1048576, 1),
+            "read_mbs": round(SZ / dt_r / 1048576, 1),
+            "size_mb": 32, "detail": "32MB 内存写/读", "checksum": s % 997}
+
+def _bench_disk():
+    SZ_MB = 32
+    data = os.urandom(4 * 1024 * 1024)
+    path = ""
+    for cand in ("/host/vol1/.fnos_resmon_bench.tmp",
+                 "/host/.fnos_resmon_bench.tmp", "/tmp/.fnos_resmon_bench.tmp"):
+        try:
+            d = os.path.dirname(cand)
+            if os.path.isdir(d) and os.access(d, os.W_OK):
+                path = cand
+                break
+        except Exception:
+            continue
+    if not path:
+        return {"ok": False, "error": "无可写目录"}
+    try:
+        t0 = time.perf_counter()
+        with open(path, "wb") as f:
+            for _ in range(SZ_MB // 4):
+                f.write(data)
+            f.flush()
+            os.fsync(f.fileno())
+        dt_w = max(time.perf_counter() - t0, 1e-6)
+        t0 = time.perf_counter()
+        with open(path, "rb") as f:
+            while f.read(4 * 1024 * 1024):
+                pass
+        dt_r = max(time.perf_counter() - t0, 1e-6)
+        return {"write_mbs": round(SZ_MB / dt_w, 1),
+                "read_mbs": round(SZ_MB / dt_r, 1),
+                "size_mb": SZ_MB, "file": path.replace("/host", "") or "/",
+                "detail": "32MB 文件写(含落盘)/读"}
+    except Exception as e:
+        return {"ok": False, "error": str(e)}
+    finally:
+        try:
+            os.unlink(path)
+        except Exception:
+            pass
+
+def _bench_net():
+    out = {}
+    try:
+        url = "https://speed.cloudflare.com/__down?bytes=5000000"
+        t0 = time.perf_counter()
+        req = _urlreq.Request(url, headers={"User-Agent": "fnos-resmon"})
+        with _urlreq.urlopen(req, timeout=25) as r:
+            n = 0
+            while True:
+                ch = r.read(256 * 1024)
+                if not ch:
+                    break
+                n += len(ch)
+        dt = max(time.perf_counter() - t0, 1e-6)
+        out["down_mbps"] = round(n * 8 / dt / 1000000, 1)
+        out["down_mb"] = round(n / 1048576, 1)
+        out["down_s"] = round(dt, 1)
+    except Exception as e:
+        return {"ok": False, "error": "下载测速失败: %s" % e}
+    try:
+        payload = os.urandom(2 * 1024 * 1024)
+        t0 = time.perf_counter()
+        req = _urlreq.Request("https://speed.cloudflare.com/__up",
+                              data=payload, method="POST",
+                              headers={"Content-Type": "application/octet-stream",
+                                       "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"})
+        with _urlreq.urlopen(req, timeout=25) as r:
+            r.read()
+        dt = max(time.perf_counter() - t0, 1e-6)
+        out["up_mbps"] = round(len(payload) * 8 / dt / 1000000, 1)
+        out["up_mb"] = round(len(payload) / 1048576, 1)
+        out["up_s"] = round(dt, 1)
+    except Exception as e:
+        out["up_mbps"] = 0
+        out["up_error"] = "上传测速失败: %s" % e
+    out.update({"ok": True, "detail": "Cloudflare 测速点: 下行5MB/上行2MB"})
+    return out
+
+@app.route("/api/bench/<kind>", methods=["POST"])
+def api_bench(kind):
+    try:
+        if kind == "cpu":
+            r = _bench_cpu()
+            p = _read_perf()
+            r.update({"ok": True, "mode": p.get("mode", ""),
+                      "governor": p.get("governor", ""), "epp": p.get("epp", ""),
+                      "mhz_avg": (sum(get_percpu_mhz()) // len(get_percpu_mhz()) if get_percpu_mhz() else 0)})
+        elif kind == "mem":
+            r = _bench_mem()
+            r["ok"] = True
+        elif kind == "disk":
+            r = _bench_disk()
+            if "ok" not in r:
+                r["ok"] = True
+        elif kind == "net":
+            r = _bench_net()
+        else:
+            return jsonify({"ok": False, "error": "未知测速类型"}), 400
+        r["at"] = time.strftime("%m-%d %H:%M:%S", time.localtime())
+        return jsonify(r)
+    except Exception as e:
+        return jsonify({"ok": False, "error": str(e)}), 500
+
 # ---------- CPU 性能模式: 省电/平衡/高性能(写宿主 cpufreq,失败开放) ----------
 PERF_FILE = os.environ.get("PERF_FILE", "/run/secrets/perf_mode.json")
 PERF_FILE_FALLBACKS = [PERF_FILE, "/app/perf_mode.json"]

docker-compose.yml

@@ -8,7 +8,7 @@ services:
     environment:
       - PORT=7031
       - PROCFS_PATH=/host/proc
-      - SITE_VERSION=1.3.13
+      - SITE_VERSION=1.3.15
       - HUB_URL=https://auth.88531.cn/api
       - HUB_PROJECT_ID=12
       - HUB_KEY_FILE=/run/secrets/hub_key

promo_juejin.html

@@ -0,0 +1,136 @@
+<h2>前言：飞牛自带的监控，为什么不够用</h2>
+<p>飞牛 NAS 自带的资源监控只有一个百分比数字：CPU 多少、内存多少，没了。但实际运维中真正要回答的问题是：<strong>是哪个进程在吃 CPU？内存被谁占了？CPU 烧到多少度？风扇转不转？这台机器的配置到底顶不顶得住？哪块盘快坏了？哪个端口被谁占着？</strong></p>
+<p>于是我写了 <strong>fnos-resmon（飞牛资源管理器）</strong>：一个单文件 Flask + psutil 的轻量监控面板，专为飞牛 NAS 设计，一条 docker 命令启动，浏览器打开 <code>http://NAS-IP:7031</code> 就能看，手机也能看。</p>
+<p>开源地址：https://gitea.88531.cn/jinghui/fnos-resmon</p>
+<h2>一、它能做什么</h2>
+<ul>
+<li><strong>CPU 面板</strong>：型号 / 架构 / 物理核 / 逻辑核 / 每核频率占用，进程级 CPU 排行（进程名 / PID / 用户 / 状态 / 线程数），点表头即排序</li>
+<li><strong>🌡️ 温度 / 🌀 风扇面板</strong>：11 路温度 + 风扇实时 RPM，超温变色预警，读不到的机器显示友好提示不报错</li>
+<li><strong>📊 负载诊断</strong>：1 分钟负载 ÷ 逻辑核数 = 单核负载，直接告诉你"顶得住还是顶不住"，并点名头号吃 CPU 进程</li>
+<li><strong>🚀 一键优化系统</strong>：数据落盘 + 回收内存缓存 + 内存碎片整理，实测一次释放 500MB+</li>
+<li><strong>内存面板</strong>：每个进程 RSS / USS / SWAP 三列细分，物理内存槽位（容量 / 类型 / 频率 / 厂商）全展示，🧹 绿色大按钮一键回收内存</li>
+<li><strong>磁盘面板</strong>：SMART 健康 / 温度 / 通电时间 / 坏道重映射，阵列拓扑、挂载点用量、进程 IO 排行</li>
+<li><strong>网络面板</strong>：实时上下行速率、累计收发、连接数，所有 TCP 连接和侦听端口明细（进程 + 地址 + 状态），网卡驱动 / 速率 / 双工 / MTU</li>
+<li><strong>一键 kill 异常进程</strong>，右上角可调刷新间隔（3s / 5s / 10s / 30s / 60s）+ ⏸ 随时暂停</li>
+</ul>
+<h2>二、实现原理：容器里怎么读到宿主真实数据</h2>
+<p>监控跑在 Docker 里，默认只能看到容器自己的 namespace。要读宿主真实数据，靠三招：</p>
+<pre><code class="language-yaml">services:
+  fnos-resmon:
+    image: jpccr.ccs.tencentyun.com/jinghui/fnos-resmon:latest
+    network_mode: host
+    pid: host          # 与宿主共享 PID 命名空间
+    privileged: true
+    volumes:
+      - /proc:/host/proc:rw   # 宿主 proc
+      - /sys:/host/sys:ro     # 宿主 sysfs（温度/风扇/网卡从这读）</code></pre>
+<p><strong>1. CPU / 内存 / 进程：psutil 重定向 PROCFS。</strong>启动时把 <code>psutil.PROCFS_PATH</code> 指向 <code>/host/proc</code>，之后所有 <code>psutil.process_iter / cpu_percent / virtual_memory</code> 读到的都是宿主数据：</p>
+<pre><code class="language-python">PROCFS = os.environ.get("PROCFS_PATH", "/host/proc")
+if os.path.isdir(PROCFS):
+    psutil.PROCFS_PATH = PROCFS</code></pre>
+<p><strong>2. 网络：nsenter 进宿主 netns。</strong>容器即使 bridged 模式，直读 <code>/proc/net</code> 也只能看到容器自身。网络类数据统一经 <code>nsenter --target 1 --mount --net</code> 在宿主（PID 1）netns 里执行 <code>cat /proc/net/dev</code> 和 <code>ss -tunHn state all</code>，失败才回退到 psutil 容器视角：</p>
+<pre><code class="language-python">NSENTER = ["nsenter", "--target", "1", "--mount", "--net"]
+
+def _host_ss():
+    """宿主 tcp/udp 连接+监听,经 nsenter 在宿主 netns 执行 ss"""
+    out = _nsenter_run(["ss", "-tunHn", "state", "all"])</code></pre>
+<p>ss 行尾的 <code>("进程名",pid=1234,...)</code> 会被正则抠出来，再用进程表按 PID 补齐进程名，前 80 条连接 + 前 80 条监听返回前端。</p>
+<p><strong>3. 后台采样线程 + 2 秒缓存。</strong>进程 CPU 统计需要两次采样算差值，所以 <code>sample_procs()</code> 先全员 <code>cpu_percent(None)</code> 打点，sleep 1 秒后再读数，按 CPU 倒序，前端每 2 秒拿到的是缓存，不会每次请求都卡 1 秒：</p>
+<pre><code class="language-python">def sampler_loop():
+    while True:
+        try:
+            sample_procs()
+        except Exception:
+            pass
+        time.sleep(2)
+
+threading.Thread(target=sampler_loop, daemon=True).start()</code></pre>
+<p>每个进程采集的字段：cpu / mem / rss / uss / swap / 线程数 / 用户 / 状态 / IO 读写 / 连接数。容器内 <code>/etc/passwd</code> 没有宿主用户，纯数字 uid 会经 <code>/host/etc/passwd</code> 还原用户名（5 分钟缓存）。</p>
+<h2>三、两个最实用的接口：负载诊断与一键优化</h2>
+<p><strong>GET /api/cpu/advise —— 配置顶不顶得住，一句话结论。</strong>公式很简单：<code>单核负载 = 1分钟load ÷ 逻辑核数</code>，分四档给结论，并点名最吃 CPU 的进程、给出扩容 / 杀进程 / 属正常的建议：</p>
+<pre><code class="language-python">@app.route("/api/cpu/advise")
+def api_cpu_advise():
+    load = list(os.getloadavg())       # 1/5/15 分钟
+    per_core = load[0] / logical       # 单核负载
+    # 四档：&lt;0.7 轻松 / &lt;1.0 饱和 / &lt;2.0 吃力 / 更高 过载</code></pre>
+<p><strong>POST /api/sys/optimize —— 一键优化。</strong>依次做三件事：<code>sync</code> 数据落盘 → 写 <code>/host/proc/sys/vm/drop_caches</code> 回收 pagecache → 写 <code>/host/proc/sys/vm/compact_memory</code> 整理碎片。内存面板另有 <strong>POST /api/mem/drop</strong> 单独回收。零侵入：只调内核已有接口，不改系统文件。</p>
+<p><strong>GET /api/sensors —— 温度风扇。</strong>优先读 <code>/host/sys/class/hwmon</code>，回退 <code>/sys/class/hwmon</code>，<code>temp*_input ÷ 1000</code> 得摄氏度，<code>fan*_input</code> 即 RPM，label 优先用 <code>temp*_label</code>。超温阈值前端变色预警，风扇节点不存在（如纯 NAS 小主机无风扇上报）的机器返回空 + 友好提示，不阻塞主流程。</p>
+<h2>四、API 一览</h2>
+<table>
+<thead>
+<tr>
+<th>方法</th>
+<th>路径</th>
+<th>作用</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>GET</td>
+<td><code>/api/cpu</code></td>
+<td>CPU 信息 + 每核占用 + 进程排行 + load</td>
+</tr>
+<tr>
+<td>GET</td>
+<td><code>/api/mem</code></td>
+<td>内存占用 + RSS/USS/SWAP 进程明细 + 槽位硬件</td>
+</tr>
+<tr>
+<td>GET</td>
+<td><code>/api/disk</code></td>
+<td>挂载用量 + SMART/温度/通电时间 + 阵列 + IO 排行</td>
+</tr>
+<tr>
+<td>GET</td>
+<td><code>/api/net</code></td>
+<td>网卡速率 + TCP/监听明细 + 硬件（驱动/MTU/双工）</td>
+</tr>
+<tr>
+<td>GET</td>
+<td><code>/api/sensors</code></td>
+<td>11 路温度 + 风扇 RPM</td>
+</tr>
+<tr>
+<td>GET</td>
+<td><code>/api/cpu/advise</code></td>
+<td>负载诊断：四档结论 + 头号进程 + 建议</td>
+</tr>
+<tr>
+<td>POST</td>
+<td><code>/api/sys/optimize</code></td>
+<td>一键优化：落盘 + 回收缓存 + 内存整理</td>
+</tr>
+<tr>
+<td>POST</td>
+<td><code>/api/mem/drop</code></td>
+<td>一键内存回收</td>
+</tr>
+<tr>
+<td>POST</td>
+<td><code>/api/kill</code></td>
+<td>结束异常进程（限宿主 PID）</td>
+</tr>
+<tr>
+<td>GET</td>
+<td><code>/api/health</code></td>
+<td>健康检查</td>
+</tr>
+</tbody>
+</table>
+<h2>五、部署：一条命令</h2>
+<pre><code class="language-bash">docker run -d --name fnos-resmon -p 7031:7031 --privileged \
+  -v /proc:/host/proc:rw -v /sys:/host/sys:ro \
+  jpccr.ccs.tencentyun.com/jinghui/fnos-resmon:latest</code></pre>
+<p>浏览器打开 <code>http://NAS-IP:7031</code> 即可。前端是单个静态页（改前端必须重建镜像），后端一个 <code>app.py</code> 约 1100 行，无数据库，开箱即用。</p>
+<h2>六、实测截图（v1.3.4 当前版本）</h2>
+<p>CPU 面板：63°C 红色预警、风扇 1200 转 RPM、负载诊断四档结论、一键优化按钮：</p>
+<p><img alt="CPU面板" src="https://img.88531.cn/i/2026/11/07/6aeeca97f31e3.png" /></p>
+<p>内存面板：RSS/USS/SWAP 三列细分 + 🧹 一键回收大按钮：</p>
+<p><img alt="内存面板" src="https://img.88531.cn/i/2026/11/07/6aeeca9a62947.png" /></p>
+<p>磁盘面板：3 盘 SMART 全 PASSED + 温度通电时间：</p>
+<p><img alt="磁盘面板" src="https://img.88531.cn/i/2026/11/07/6aeeca9d2b3a2.png" /></p>
+<p>网络面板：qbittorrent 482 连接一眼揪出吃带宽进程：</p>
+<p><img alt="网络面板" src="https://img.88531.cn/i/2026/11/07/6aeeca9f70e61.png" /></p>
+<h2>七、总结</h2>
+<p>飞牛自带监控解决"有没有"，fnos-resmon 解决"是谁、多少度、顶不顶得住、能不能一键收拾"。核心就三招：<strong>psutil 重定向宿主 proc、nsenter 进宿主 netns 读网络、后台线程 2 秒缓存进程快照</strong>，剩下的都是把数据摆整齐。如果你也在飞牛上跑了很多 Docker 服务，装一个看看头号吃 CPU 的到底是谁 —— 八成有惊喜。</p>
+<p>镜像：<code>jpccr.ccs.tencentyun.com/jinghui/fnos-resmon:latest</code> ｜ 开源：https://gitea.88531.cn/jinghui/fnos-resmon ｜ 端口 7031，欢迎提 issue。</p>

public/index.html

@@ -49,6 +49,9 @@ button.refresh{background:#20a53a;color:#fff;border:none;border-radius:3px;paddi
 .corecell .ct{font-size:11px;color:#999;margin-top:2px;font-variant-numeric:tabular-nums}
 .perfbtn{border:1px solid #ddd;background:#fff;border-radius:6px;padding:8px 18px;font-size:14px;cursor:pointer;margin-right:8px}
 .perfbtn.cur{background:#20a53a;border-color:#20a53a;color:#fff;font-weight:700}
+.benchbtn{border:1px solid #20a53a;background:#20a53a;color:#fff;border-radius:6px;padding:8px 18px;font-size:14px;cursor:pointer}
+.benchbtn:disabled{background:#ccc;border-color:#ccc;cursor:wait}
+.benchhist{font-size:12px;color:#666;line-height:1.8;margin-top:4px}
 </style>
 </head>
 <body>
@@ -59,7 +62,7 @@ button.refresh{background:#20a53a;color:#fff;border:none;border-radius:3px;paddi
 <div class="tab" data-t="net">网络</div>
 <div style="margin-left:auto;display:flex;align-items:center;gap:12px;padding-right:16px;font-size:12px">
 <span id="licBell" onclick="toggleAnn()" title="公告" style="cursor:pointer;position:relative;font-size:15px">🔔<i id="licDot" style="display:none;position:absolute;top:-2px;right:-4px;width:8px;height:8px;border-radius:50%;background:#f00"></i></span>
-<span id="licVer" onclick="checkVer(true)" title="点击检查新版本" style="color:#999;cursor:pointer">v1.3.13</span>
+<span id="licVer" onclick="checkVer(true)" title="点击检查新版本" style="color:#999;cursor:pointer">v1.3.15</span>
 <label style="color:#999">刷新 <select id="ival" onchange="setIval(this.value)" style="border:1px solid #ddd;border-radius:3px;padding:2px 4px;color:#333"><option value="3">3s</option><option value="5">5s</option><option value="10">10s</option><option value="30">30s</option><option value="60">60s</option></select></label>
 <button id="pauseBtn" onclick="togglePause()" style="background:#ff9900;color:#fff;border:none;border-radius:3px;padding:3px 10px;cursor:pointer">⏸ 停止刷新</button>
 <a href="https://nav.88531.cn" target="_blank" style="color:#20a53a;text-decoration:none">资享导航站</a>
@@ -69,11 +72,15 @@ button.refresh{background:#20a53a;color:#fff;border:none;border-radius:3px;paddi
 <div class="card" id="summary"></div>
 <div class="cpuinfo" id="cpuinfo" style="display:none"></div>
 <div class="cpuinfo" id="cpuperf" style="display:none"></div>
+<div class="cpuinfo" id="cpubench" style="display:none"></div>
 <div class="cpuinfo" id="cpusensor" style="display:none"></div>
 <div class="cpuinfo" id="cpuadvise" style="display:none"></div>
 <div class="cpuinfo" id="meminfo" style="display:none"></div>
+<div class="cpuinfo" id="membench" style="display:none"></div>
 <div class="cpuinfo" id="diskinfo" style="display:none"></div>
+<div class="cpuinfo" id="diskbench" style="display:none"></div>
 <div class="cpuinfo" id="netinfo" style="display:none"></div>
+<div class="cpuinfo" id="netbench" style="display:none"></div>
 <div class="toolbar"><span id="sub"></span><span><span id="ts" style="margin-right:10px"></span><button class="refresh" onclick="load(true)">刷新</button></span></div>
 <div class="scrollarea"><table>
 <thead id="thead"></thead>
@@ -90,7 +97,7 @@ function loadSort(){try{const v=JSON.parse(localStorage.getItem('fnos_sort_'+cur
 function saveSort(){try{localStorage.setItem('fnos_sort_'+cur,JSON.stringify(sortState))}catch(e){}}
 loadSort();
 let curData=null;
-document.querySelectorAll('.tab').forEach(t=>t.onclick=()=>{document.querySelectorAll('.tab').forEach(x=>x.classList.remove('active'));t.classList.add('active');cur=t.dataset.t;loadSort();document.getElementById('disks').innerHTML='';const ci=document.getElementById('cpuinfo');if(ci)ci.style.display='none';const cs=document.getElementById('cpusensor');if(cs)cs.style.display='none';const ca=document.getElementById('cpuadvise');if(ca)ca.style.display='none';const cp=document.getElementById('cpuperf');if(cp)cp.style.display='none';const mi2=document.getElementById('meminfo');if(mi2)mi2.style.display='none';const di=document.getElementById('diskinfo');if(di)di.style.display='none';const ni=document.getElementById('netinfo');if(ni)ni.style.display='none';load(true)});
+document.querySelectorAll('.tab').forEach(t=>t.onclick=()=>{document.querySelectorAll('.tab').forEach(x=>x.classList.remove('active'));t.classList.add('active');cur=t.dataset.t;loadSort();document.getElementById('disks').innerHTML='';const ci=document.getElementById('cpuinfo');if(ci)ci.style.display='none';const cs=document.getElementById('cpusensor');if(cs)cs.style.display='none';const ca=document.getElementById('cpuadvise');if(ca)ca.style.display='none';const cp=document.getElementById('cpuperf');if(cp)cp.style.display='none';const mi2=document.getElementById('meminfo');if(mi2)mi2.style.display='none';const di=document.getElementById('diskinfo');if(di)di.style.display='none';const ni=document.getElementById('netinfo');if(ni)ni.style.display='none';['cpubench','membench','diskbench','netbench'].forEach(id=>{const e=document.getElementById(id);if(e)e.style.display='none'});load(true)});
 function fmtB(b){if(b==null)return '-';const u=['B','KB','MB','GB','TB'];let i=0;while(b>=1024&&i<4){b/=1024;i++}return b.toFixed(b>=100?0:1)+u[i]}
 function fmtR(b){return fmtB(b)+'/s'}
 function esc(s){return String(s==null?'':s).replace(/&/g,'&amp;').replace(/</g,'&lt;')}
@@ -107,7 +114,7 @@ async function cpuAdvise(){const el=document.getElementById('cpuadvise');const n
 async function kill(pid,name){if(!confirm('结束进程 '+name+' (PID '+pid+') ?'))return;const r=await fetch('/api/kill',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({pid})});const j=await r.json();alert(j.ok?'已发送结束信号':('失败: '+j.error));load(true)}
 const PERF_DESC={powersave:'省电模式：限制睿频、能效优先，适合7×24待机/下载机，功耗噪音最低',balanced:'平衡模式：按负载自动升降频，日常使用推荐，性能功耗兼顾',performance:'高性能模式：火力全开，适合转码/编译/虚拟机等重负载，功耗温度最高'};
 let perfCur='';
-async function cpuPerf(){const el=document.getElementById('cpuperf');try{const r=await fetch('/api/cpu/perf');const j=await r.json();const m=j.mode||j.saved||'balanced';const key=m+'|'+(j.governor||'')+'|'+(j.epp||'');if(perfCur===key&&el.innerHTML)return;perfCur=key;el.style.display='';el.innerHTML=`<div class="model">⚡ 系统性能：<b>${m==='powersave'?'省电模式':m==='performance'?'高性能模式':'平衡模式'}</b> <span class="mut">（governor=${esc(j.governor||'-')} epp=${esc(j.epp||'-')}，不重启电脑）</span></div><div style="margin-top:6px">${['powersave','balanced','performance'].map(k=>`<button class="perfbtn${m===k?' cur':''}" onclick="setPerf('${k}')">${k==='powersave'?'🌱 省电模式':k==='balanced'?'⚖️ 平衡模式':'🔥 高性能模式'}</button>`).join('')}</div><div class="mut" style="margin-top:6px">${PERF_DESC[m]||''}</div><div id="perfMsg" class="mut" style="margin-top:4px"></div>`}catch(e){}}
+async function cpuPerf(){const el=document.getElementById('cpuperf');try{const r=await fetch('/api/cpu/perf');const j=await r.json();const m=j.mode||j.saved||'balanced';const key=m+'|'+(j.governor||'')+'|'+(j.epp||'');if(perfCur===key&&el.innerHTML){el.style.display='';return;}perfCur=key;el.style.display='';el.innerHTML=`<div class="model">⚡ 系统性能：<b>${m==='powersave'?'省电模式':m==='performance'?'高性能模式':'平衡模式'}</b> <span class="mut">（governor=${esc(j.governor||'-')} epp=${esc(j.epp||'-')}，不重启电脑）</span></div><div style="margin-top:6px">${['powersave','balanced','performance'].map(k=>`<button class="perfbtn${m===k?' cur':''}" onclick="setPerf('${k}')">${k==='powersave'?'🌱 省电模式':k==='balanced'?'⚖️ 平衡模式':'🔥 高性能模式'}</button>`).join('')}</div><div class="mut" style="margin-top:6px">${PERF_DESC[m]||''}</div><div id="perfMsg" class="mut" style="margin-top:4px"></div>`}catch(e){}}
 async function setPerf(mode){const msg=document.getElementById('perfMsg');if(msg)msg.textContent='⏳ 正在切换…';try{const r=await fetch('/api/cpu/perf',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({mode})});const j=await r.json();if(!j.ok){if(msg)msg.textContent='❌ 切换失败：'+(j.error||'未知错误');else alert('切换失败: '+(j.error||'未知'));return}cpuPerf()}catch(e){if(msg)msg.textContent='❌ 切换失败：网络错误'}}
 function cmpVal(p,key){
  if(key==='name')return String(p.name||'');
@@ -164,11 +171,11 @@ document.getElementById('ts').textContent='更新于 '+new Date().toLocaleTimeSt
 const S=document.getElementById('summary'),H=document.getElementById('thead'),B=document.getElementById('tbody');
 if(cur==='cpu'){
 S.innerHTML=`<div class="stat"><div class="k">CPU占用</div><div class="v green">${j.cpu}%</div></div><div class="stat"><div class="k">活跃进程数</div><div class="v green">${j.active}</div></div><div class="stat"><div class="k">负载(1分钟,5分钟,15分钟)</div><div class="v num">${j.load.join(', ')}</div></div>`;
-const I=j.info||{},P=j.percpu||[];
+const I=j.info||{},P=j.percpu||[],MHZ=j.mhz||[];
 document.getElementById('cpuinfo').style.display='';
-document.getElementById('cpuinfo').innerHTML=`<div class="model">${esc(I.model||'未知CPU')} <span class="mut">${esc(I.arch||'')}</span></div><div>物理 ${I.physical||'-'} 核 / 逻辑 ${I.logical||'-'} 核 · ${I.sockets?('共 '+I.sockets+' 路 × '+I.cores_per_socket+'核 × '+I.threads_per_core+'线程'):''} · 当前 ${I.freq_cur||'-'} MHz（${I.freq_min||'-'} ~ ${I.freq_max||'-'} MHz）</div><div class="mut">L1d ${esc(I.l1d||'-')} · L1i ${esc(I.l1i||'-')} · L2 ${esc(I.l2||'-')} · L3 ${esc(I.l3||'-')}</div><div class="corebar">${P.map((v,i)=>`<div class="corecell"><div class="cb"><i style="width:${Math.min(v,100)}%"></i></div><div class="ct">#${i} ${v}%</div></div>`).join('')}</div>`;
+document.getElementById('cpuinfo').innerHTML=`<div class="model">${esc(I.model||'未知CPU')} <span class="mut">${esc(I.arch||'')}</span></div><div>物理 ${I.physical||'-'} 核 / 逻辑 ${I.logical||'-'} 核 · ${I.sockets?('共 '+I.sockets+' 路 × '+I.cores_per_socket+'核 × '+I.threads_per_core+'线程'):''} · 当前 ${I.freq_cur||'-'} MHz（${I.freq_min||'-'} ~ ${I.freq_max||'-'} MHz）</div><div class="mut">L1d ${esc(I.l1d||'-')} · L1i ${esc(I.l1i||'-')} · L2 ${esc(I.l2||'-')} · L3 ${esc(I.l3||'-')}</div><div class="corebar">${P.map((v,i)=>`<div class="corecell"><div class="cb"><i style="width:${Math.min(v,100)}%"></i></div><div class="ct">#${i} ${v}%${MHZ[i]!=null?'<br>'+MHZ[i]+'MHz':''}</div></div>`).join('')}</div>`;
 document.getElementById('sub').textContent=`共 ${j.total} 个进程,显示占用最高的前 ${j.items.length} 个（进程CPU为单进程占用，单核满=100%，16核满=1600%，进程之和÷16≈整机占用）`;
-cpuPerf();cpuAdvise();cpuSensor();
+cpuPerf();cpuAdvise();cpuSensor();showBench('cpu');
 renderHeader();
 renderBody();
 }else if(cur==='mem'){
@@ -179,6 +186,7 @@ document.getElementById('meminfo').style.display='';
 document.getElementById('meminfo').innerHTML=`<div class="model">物理 ${fmtB(H2.installed||0)}（${DM.length} 条） · 系统可用 ${fmtB(H2.system_total||j.total)} · 预留 ${fmtB(H2.reserved||0)}（核显 ${fmtB(H2.vram||0)} + BIOS/PCI 保留）</div>`
 +(DM.length?`<div class="mut">槽位：</div><div>${DM.map(d=>row(esc((d.locator||'')+' / '+(d.bank||'')), esc(fmtB(d.size_b)+' '+d.type+' '+(d.cspeed||d.speed||'')+'MT/s '+(d.maker||'')+' '+(d.part||'')))).join('')}</div>`:`<div class="mut">未读到内存槽位表（DMI 不可用）</div>`)
 +`<div class="mut">占用拆解：</div><div>${row('空闲 MemFree',fmtB(D.MemFree))+row('可用 MemAvailable',fmtB(D.MemAvailable))+row('缓冲 Buffers',fmtB(D.Buffers))+row('缓存 Cached',fmtB(D.Cached))+row('Swap缓存',fmtB(D.SwapCached))+row('匿名页 AnonPages',fmtB(D.AnonPages))+row('映射 Mapped',fmtB(D.Mapped))+row('共享 Shmem',fmtB(D.Shmem))+row('Slab',fmtB(D.Slab))+row('可回收',fmtB(D.SReclaimable))+row('不可回收',fmtB(D.SUnreclaim))+row('页表',fmtB(D.PageTables))+row('内核栈',fmtB(D.KernelStack))+row('已提交',fmtB(D.Committed_AS))+row('提交上限',fmtB(D.CommitLimit))+row('脏页',fmtB(D.Dirty))}</div>`;
+showBench('mem');
 document.getElementById('sub').textContent=`按内存占用排序,前 ${j.items.length} 个进程`;
 renderHeader();
 renderBody();
@@ -197,6 +205,7 @@ document.getElementById('diskinfo').innerHTML=`<div class="model">共 ${DS.lengt
 +(DS.length?DS.map(d=>`<div style="margin-top:8px;padding-top:8px;border-top:1px dashed #eee"><div><b>/dev/${esc(d.name||'')}</b> ${esc(d.model||d.sys_model||'')} <span class="mut">${esc(d.type||'')} · ${fmtB(d.cap_b)} · ${esc(d.iface||'')}</span> <span style="color:${String(d.health||'').includes('PASSED')?'#20a53a':'#f00'}">${esc(d.health||'')}</span></div><div>${drow('序列号',esc(d.serial||'-'))+drow('温度',d.temp_c!=null?(d.temp_c+'°C 快照'):'-')+drow('通电',d.hours!=null?(Math.floor(d.hours/24)+' 天（'+d.hours+' 小时）'):'-')+drow('通电次数',d.power_cycles!=null?d.power_cycles:'-')+drow('坏道重映射',d.realloc!=null?d.realloc:'-')+(d.wear!=null?drow('磨损',d.wear+'%'):'')+(d.helium!=null?drow('氦气',d.helium+'%'):'')+(d.rpm?drow('转速',d.rpm+' 转'):drow('转速',d.rotational?'机械':'固态'))+drow('尺寸',esc(d.form||'-'))+drow('读写累计',fmtB(d.io_read||0)+' / '+fmtB(d.io_write||0))}</div></div>`).join(''):`<div class="mut">未读到硬盘信息</div>`)
 +(AR.length?`<div class="mut" style="margin-top:8px">阵列拓扑（单成员 RAID1，无冗余）：</div><div>${AR.map(a=>drow(esc(a.md+' → '+(a.mount||'')),esc((a.level||'')+' '+(a.members||'')+' '+(a.live_status||'')+' '+(a.live_devs||'')))).join('')+(AR.some(a=>a.live_sync)?`<div class="mut">${esc((AR.find(a=>a.live_sync)||{}).live_sync||'')}</div>`:''+(EX&&EX.mount?`<div>${drow('系统盘 '+esc(EX.mount||'/'),esc((EX.part||'')+'（'+(EX.note||'')+'）'))}</div>`:''))}</div>`:'')
 +((W.note)?`<div class="mut">${esc(W.note)}</div>`:'');
+showBench('disk');
 }else{
 const up=j.nics.reduce((a,n)=>a+n.up,0),down=j.nics.reduce((a,n)=>a+n.down,0);
 S.innerHTML=`<div class="stat"><div class="k">上行速率</div><div class="v green">${fmtR(up)}</div></div><div class="stat"><div class="k">下行速率</div><div class="v green">${fmtR(down)}</div></div><div class="stat"><div class="k">累计接收</div><div class="v num">${fmtB(j.total_recv||0)}</div></div><div class="stat"><div class="k">累计发送</div><div class="v num">${fmtB(j.total_sent||0)}</div></div><div class="stat"><div class="k">连接数</div><div class="v num">${j.conns}</div></div>`;
@@ -211,9 +220,16 @@ document.getElementById('netinfo').style.display='';
 document.getElementById('netinfo').innerHTML=`<div class="model">出口 ${esc(NW.egress||'-')} · 网关 ${esc(NW.gateway||'-')} · DNS ${esc(NW.dns||'-')} <span class="mut">共 ${NN.length} 块网卡（档案快照 ${esc(NW.snapshot||'')}，地址/状态/速率为实时）</span></div>`
 +(NN.length?NN.map(n=>`<div style="margin-top:8px;padding-top:8px;border-top:1px dashed #eee"><div><b>${esc(n.name||'')}</b> ${esc(n.model||'')} <span class="mut">${esc(n.role||'')}</span> <span style="color:${(n.isup===false||n.operstate==='down')?'#999':'#20a53a'}">${esc(n.operstate||(n.isup===false?'down':'up'))}</span></div><div>${nrow('IPv4',esc((n.ipv4||[]).join(' / ')||'-'))+nrow('IPv6',esc((n.ipv6||[]).join(' / ')||'-'))+nrow('MAC',esc(n.address||n.mac||'-'))+nrow('协商速率',spd(n.speed||n.live_speed))+nrow('双工',esc(n.duplex||'-'))+nrow('MTU',esc(n.mtu||n.live_mtu||'-'))+nrow('驱动',esc(n.live_driver||n.driver||'-'))+(n.pci?nrow('PCI',esc(n.pci)):'')+(n.ssid?nrow('WiFi',esc(n.ssid)):'')+nrow('收发累计',fmtB(n.io_recv||0)+' / '+fmtB(n.io_sent||0))}</div></div>`).join(''):`<div class="mut">未读到网卡信息</div>`)
 +((NW.note)?`<div class="mut">${esc(NW.note)}</div>`:'');
+showBench('net');
 }
 }catch(e){if(manual)alert('加载失败: '+e)}
 }
+const BENCH_TXT={cpu:['🏃 系统运行速度测试','20万次整数运算，分数越高越快；自动记录当前性能模式/governor/平均MHz，方便对比省电/平衡/高性能三档效果','预计约1秒'],mem:['💾 内存读写测速','32MB内存写入/读取，测完即释放，不占内存','预计约1秒'],disk:['💽 硬盘读写测速','32MB临时文件写（含落盘）/读，测完自动删除，不占空间','预计约1~3秒'],net:['🌐 网络上下行测速','Cloudflare测速点：下行5MB/上行2MB','预计约5~15秒（看网速）']};
+function benchHist(k){try{return JSON.parse(localStorage.getItem('fnos_bench_'+k)||'[]')}catch(e){return[]}}
+function benchPush(k,t){try{const h=benchHist(k);h.unshift(t);localStorage.setItem('fnos_bench_'+k,JSON.stringify(h.slice(0,5)))}catch(e){}}
+function renderBench(k,msg){const el=document.getElementById(k+'bench');if(!el)return;const T=BENCH_TXT[k],h=benchHist(k);el.innerHTML='<div class="model">'+T[0]+' <span class="mut">⏱ '+T[2]+'</span></div><div class="mut">'+T[1]+'</div><div style="margin-top:6px"><button class="benchbtn" id="benchbtn_'+k+'" onclick="runBench(\''+k+'\')">开始测速（'+T[2]+'）</button> <span id="benchmsg_'+k+'" class="mut">'+(msg||'')+'</span></div>'+(h.length?'<div class="benchhist">历史记录（最多5条，超出自动删旧）:<br>'+h.map(x=>esc(x)).join('<br>')+'</div>':'<div class="benchhist">暂无测速记录，点「开始测速」跑一次</div>')}
+function showBench(k){const el=document.getElementById(k+'bench');if(!el)return;el.style.display='';if(!el.innerHTML)renderBench(k)}
+async function runBench(k){const b=document.getElementById('benchbtn_'+k),m=document.getElementById('benchmsg_'+k);if(b){b.disabled=true;b.textContent='测速中…'}if(m)m.textContent='正在测速，请稍候（'+BENCH_TXT[k][2]+'）';try{const r=await fetch('/api/bench/'+k,{method:'POST'});const j=await r.json();let line='';if(j.ok){if(k==='cpu')line=j.at+' ['+j.mode+'|'+(j.governor||'-')+'] '+j.ms+'ms '+j.kops+'kops AVG'+j.mhz_avg+'MHz';else if(k==='mem')line=j.at+' W'+j.write_mbs+'MB/s R'+j.read_mbs+'MB/s';else if(k==='disk')line=j.at+' W'+j.write_mbs+'MB/s R'+j.read_mbs+'MB/s '+(j.file||'');else if(k==='net')line=j.at+' DOWN'+j.down_mbps+'Mbps'+(j.up_mbps?' UP'+j.up_mbps+'Mbps':' UPFAIL');benchPush(k,line);renderBench(k,'OK '+line)}else renderBench(k,'FAIL '+(j.error||'ERR'))}catch(e){renderBench(k,'FAIL '+e)}}
 load(true);
 let ivalSec=3,timer=null,paused=false;
 function startTimer(){if(timer)clearInterval(timer);if(!paused)timer=setInterval(()=>load(false),ivalSec*1000)}
@@ -222,7 +238,7 @@ function togglePause(){paused=!paused;document.getElementById('pauseBtn').textCo
 startTimer();
 async function licPoll(){try{const r=await fetch('/api/license-config',{cache:'no-store'});const j=await r.json();LIC=j;
 const dot=document.getElementById('licDot');if(dot)dot.style.display=(j.announcements&&j.announcements.length)?'':'none';
-const v=document.getElementById('licVer');if(v)v.textContent='v'+(j.version||'1.3.13')+(j.update_available?' ●':'');
+const v=document.getElementById('licVer');if(v)v.textContent='v'+(j.version||'1.3.15')+(j.update_available?' ●':'');
 if(j.popup&&j.popup.length){try{const seen=JSON.parse(localStorage.getItem('fnos_ann_seen')||'[]');const fresh=j.popup.filter(a=>seen.indexOf(a.id)<0);if(fresh.length){const a=fresh[0];const el=document.getElementById('annPop');el.innerHTML=`<div style="display:flex;justify-content:space-between;align-items:center"><b>📢 ${esc(a.title||'公告')}</b><span onclick="dismissPop(${a.id})" style="cursor:pointer;color:#999">✕</span></div><div style="margin-top:6px">${a.content||''}</div>`;el.style.display='';}}catch(e){}}
 if(document.getElementById('annPanel').style.display!=='none')renderAnn();}catch(e){}}
 function renderAnn(){const el=document.getElementById('annPanel');const list=LIC.announcements||[];el.innerHTML=list.length?(`<b>📢 公告（${list.length}）</b>`+list.map(a=>`<div style="margin-top:8px;padding-top:8px;border-top:1px dashed #eee"><div><b>${esc(a.title||'')}</b></div><div style="color:#666">${a.content||''}</div></div>`).join('')):'<span style="color:#999">暂无公告</span>';}