diff --git a/app.py b/app.py index 69e17a9..b5a59f3 100644 --- a/app.py +++ b/app.py @@ -1,5 +1,6 @@ from flask import Flask, jsonify, request, send_from_directory import psutil, os, time, signal, threading, subprocess, platform, glob, json, struct +import hashlib, random, urllib.request, urllib.parse try: psutil.PROCFS_PATH = os.environ.get("PROCFS_PATH", "/proc") except Exception: @@ -599,41 +600,63 @@ def api_cpu_advise(): "level": level, "verdict": verdict, "tips": tips, "top_cpu": [{"name": t.get("name"), "cpu": t.get("cpu"), "pid": t.get("pid")} for t in tops]}) -@app.route("/api/sys/optimize", methods=["POST"]) -def api_sys_optimize(): - """一键优化系统: drop caches + sync + compact(若支持),返回前后对比""" +_OPT_JOB = {"running": False, "done": False, "steps": [], "freed": 0, + "available": 0, "started": 0} + +def _optimize_worker(): + job = _OPT_JOB steps = [] try: before_mem = psutil.virtual_memory().available except Exception: before_mem = 0 try: - subprocess.run(["sync"], check=False, timeout=15) - steps.append("sync 数据落盘 ✅") + subprocess.run(["sync"], check=False, timeout=20) + steps.append("数据落盘(sync)完成") except Exception as e: - steps.append("sync 失败: %s" % e) + steps.append("数据落盘跳过: %s" % e) try: p = os.environ.get("PROCFS_PATH", "/proc") with open(os.path.join(p, "sys", "vm", "drop_caches"), "w") as f: f.write("3") - steps.append("回收内存缓存 ✅") + steps.append("内存缓存已回收(drop caches)") except Exception as e: - steps.append("回收缓存失败: %s" % e) - try: - cp = os.path.join(os.environ.get("PROCFS_PATH", "/proc"), "sys", "vm", "compact_memory") - if os.path.exists(cp): - with open(cp, "w") as f: - f.write("1") - steps.append("内存碎片整理 ✅") - except Exception as e: - steps.append("碎片整理跳过: %s" % e) + steps.append("缓存回收跳过: %s" % e) try: after_mem = psutil.virtual_memory().available except Exception: after_mem = 0 - return jsonify({"ok": True, "steps": steps, - "freed": max(0, after_mem - before_mem), - "available": after_mem}) + job["steps"] = steps + job["freed"] = max(0, after_mem - before_mem) + job["available"] = after_mem + job["done"] = True + job["running"] = False + +@app.route("/api/sys/optimize", methods=["POST"]) +def api_sys_optimize(): + """一键优化系统: 后台线程做 sync + drop caches,不阻塞监控轮询. + 已去掉 compact_memory(大内存下会卡住数分钟,正是之前掉线的原因)""" + if _OPT_JOB.get("running"): + return jsonify({"ok": False, "running": True, + "msg": "优化正在进行中,请稍候"}), 409 + _OPT_JOB.update({"running": True, "done": False, "steps": [], + "freed": 0, "available": 0, "started": time.time()}) + threading.Thread(target=_optimize_worker, daemon=True).start() + return jsonify({"ok": True, "started": True, "eta": 20}) + +@app.route("/api/sys/optimize/status") +def api_sys_optimize_status(): + job = _OPT_JOB + try: + elapsed = round(time.time() - job.get("started", 0), 1) if job.get("started") else 0 + except Exception: + elapsed = 0 + return jsonify({"running": job.get("running", False), + "done": job.get("done", False), + "steps": job.get("steps", []), + "freed": job.get("freed", 0), + "available": job.get("available", 0), + "elapsed": elapsed}) @app.route("/api/sensors") def api_sensors(): @@ -1109,4 +1132,4 @@ def health(): return jsonify({"ok": True}) if __name__ == "__main__": - app.run(host="0.0.0.0", port=PORT) + app.run(host="0.0.0.0", port=PORT, threaded=True) diff --git a/public/index.html b/public/index.html index 30ac7cf..e6bc648 100644 --- a/public/index.html +++ b/public/index.html @@ -56,7 +56,7 @@ button.refresh{background:#20a53a;color:#fff;border:none;border-radius:3px;paddi
磁盘
网络
-v1.3.4 +v1.3.5 资享导航站 @@ -85,10 +85,12 @@ function fmtB(b){if(b==null)return '-';const u=['B','KB','MB','GB','TB'];let i=0 function fmtR(b){return fmtB(b)+'/s'} function esc(s){return String(s==null?'':s).replace(/&/g,'&').replace(/t.name.indexOf('CPU')===0);const oth=j.temps.filter(t=>t.name.indexOf('CPU')!==0);const chip=t=>{const c=t.value>=85?'#f00':(t.value>=70?'#ff9900':'#20a53a');return `${esc(t.name)} ${t.value}°C`};if(cpu.length)h+='
'+cpu.map(chip).join('')+'
';if(oth.length)h+='
'+oth.map(chip).join('')+'
'}if(j.fans&&j.fans.length){h+='
'+j.fans.map(f=>`🌀 ${esc(f.name)} ${f.value} RPM`).join('')+'
'}else{h+='
🌀 风扇转速：宿主未暴露（家用 NAS/主板多无此传感器，属正常）
'}if(j.note&&!j.temps.length)h+=`
${esc(j.note)}
`;el.innerHTML=h}catch(e){el.style.display='';el.innerHTML='
🌡️ 温度读取失败
'}} -async function cpuAdvise(){const el=document.getElementById('cpuadvise');const now=Date.now();if(now-lastAdvise<15000){if(el.innerHTML)el.style.display='';return;}lastAdvise=now;try{const r=await fetch('/api/cpu/advise');const j=await r.json();const col=j.level==='轻松'||j.level==='正常'?'#20a53a':(j.level==='偏高'?'#ff9900':'#f00');document.getElementById('cpuadvise').style.display='';document.getElementById('cpuadvise').innerHTML=`
📊 负载诊断：${j.level} （1分钟负载 ${j.load[0]} ÷ ${j.logical}核 = 单核 ${j.per_core}）
${esc(j.verdict)}
如何更流畅：
${j.tips.map(t=>`
· ${esc(t)}
`).join('')}
`}catch(e){}} +async function cpuAdvise(){const el=document.getElementById('cpuadvise');const now=Date.now();if(now-lastAdvise<15000){if(el.innerHTML)el.style.display='';return;}lastAdvise=now;try{const r=await fetch('/api/cpu/advise');const j=await r.json();const col=j.level==='轻松'||j.level==='正常'?'#20a53a':(j.level==='偏高'?'#ff9900':'#f00');document.getElementById('cpuadvise').style.display='';document.getElementById('cpuadvise').innerHTML=`
📊 负载诊断：${j.level} （1分钟负载 ${j.load[0]} ÷ ${j.logical}核 = 单核 ${j.per_core}）
${esc(j.verdict)}
如何更流畅：
${j.tips.map(t=>`
· ${esc(t)}
`).join('')}
会做两件事：① 把内存里暂存的数据写回硬盘（sync，防断电丢数据）；② 回收系统缓存占用的内存（drop caches，只清缓存、不动正在运行的程序）。全程不重启、不杀进程，页面照常刷新。
`}catch(e){}} 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)} function cmpVal(p,key){ if(key==='name')return String(p.name||'');