fix: 一键优化改后台线程去compact防掉线+说明+按钮变灰+进度显示 v1.3.5

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"])
+_OPT_JOB = {"running": False, "done": False, "steps": [], "freed": 0,
-def api_sys_optimize():
+            "available": 0, "started": 0}
-    """一键优化系统: drop caches + sync +  compact(若支持),返回前后对比"""
+
+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)
+        subprocess.run(["sync"], check=False, timeout=20)
-        steps.append("sync 数据落盘 ✅")
+        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)
+        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)
     try:
         after_mem = psutil.virtual_memory().available
     except Exception:
         after_mem = 0
-    return jsonify({"ok": True, "steps": steps,
+    job["steps"] = steps
-                    "freed": max(0, after_mem - before_mem),
+    job["freed"] = max(0, after_mem - before_mem)
-                    "available": after_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)

public/index.html

@@ -56,7 +56,7 @@ button.refresh{background:#20a53a;color:#fff;border:none;border-radius:3px;paddi
 <div class="tab" data-t="disk">磁盘</div>
 <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 style="color:#999">v1.3.4</span>
+<span style="color:#999">v1.3.5</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>
@@ -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,'&amp;').replace(/</g,'&lt;')}
 async function dropMem(){if(!confirm('一键回收未使用的内存（drop caches）？'))return;const r=await fetch('/api/mem/drop',{method:'POST'});const j=await r.json();alert(j.ok?('已回收，可用 '+fmtB(j.available)):('失败: '+j.error));load(true)}
-async function optimizeSys(){if(!confirm('一键优化系统：回收内存缓存 + 数据落盘 + 内存整理？'))return;const r=await fetch('/api/sys/optimize',{method:'POST'});const j=await r.json();alert(j.ok?(j.steps.join('\n')+'\n释放内存 '+fmtB(j.freed)+'，当前可用 '+fmtB(j.available)):('失败'));load(true)}
+let optPoll=null;
+async function optimizeSys(){const b=document.getElementById('optBtn');if(!b||b.disabled)return;try{const r=await fetch('/api/sys/optimize',{method:'POST'});const j=await r.json();if(r.status===409&&j.running){return}if(!j.started&&!j.ok){const s=document.getElementById('optStatus');if(s)s.textContent='启动失败，请稍后重试';return}b.disabled=true;b.style.cssText='background:#ccc;color:#fff;border:none;border-radius:3px;padding:6px 14px;cursor:not-allowed';const s=document.getElementById('optStatus');if(s)s.textContent='⏳ 正在优化系统，预计约20秒，页面数据照常刷新…';if(optPoll)clearInterval(optPoll);optPoll=setInterval(pollOptStatus,2000)}catch(e){const s=document.getElementById('optStatus');if(s)s.textContent='启动失败：网络异常'}}
+async function pollOptStatus(){try{const r=await fetch('/api/sys/optimize/status');const j=await r.json();const s=document.getElementById('optStatus');if(j.running){if(s)s.textContent='⏳ 正在优化系统，已用时 '+j.elapsed+' 秒，预计约20秒，页面数据照常刷新…';return}if(optPoll){clearInterval(optPoll);optPoll=null}const b=document.getElementById('optBtn');if(b){b.disabled=false;b.style.cssText='';b.className='bigbtn'}if(j.done&&s){s.textContent='✅ 优化完成：'+j.steps.join('；')+'，释放 '+fmtB(j.freed)+'，当前可用 '+fmtB(j.available)}load(true)}catch(e){}}
 let lastAdvise=0;
 async function cpuSensor(){const el=document.getElementById('cpusensor');try{const r=await fetch('/api/sensors');const j=await r.json();el.style.display='';let h='<div class="model">🌡️ 温度 / 🌀 风扇</div>';if(j.temps&&j.temps.length){const cpu=j.temps.filter(t=>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 `<span style="display:inline-block;margin:2px 10px 2px 0">${esc(t.name)} <b style="color:${c}">${t.value}°C</b></span>`};if(cpu.length)h+='<div>'+cpu.map(chip).join('')+'</div>';if(oth.length)h+='<div class="mut">'+oth.map(chip).join('')+'</div>'}if(j.fans&&j.fans.length){h+='<div>'+j.fans.map(f=>`<span style="display:inline-block;margin:2px 10px 2px 0">🌀 ${esc(f.name)} <b>${f.value} RPM</b></span>`).join('')+'</div>'}else{h+='<div class="mut">🌀 风扇转速：宿主未暴露（家用 NAS/主板多无此传感器，属正常）</div>'}if(j.note&&!j.temps.length)h+=`<div class="mut">${esc(j.note)}</div>`;el.innerHTML=h}catch(e){el.style.display='';el.innerHTML='<div class="mut">🌡️ 温度读取失败</div>'}}
-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=`<div class="model">📊 负载诊断：<b style="color:${col}">${j.level}</b> <span class="mut">（1分钟负载 ${j.load[0]} ÷ ${j.logical}核 = 单核 ${j.per_core}）</span></div><div style="margin:4px 0">${esc(j.verdict)}</div><div class="mut">如何更流畅：</div><div>${j.tips.map(t=>`<div>· ${esc(t)}</div>`).join('')}</div><div style="margin-top:6px"><button class="bigbtn" onclick="optimizeSys()">🚀 一键优化系统</button></div>`}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=`<div class="model">📊 负载诊断：<b style="color:${col}">${j.level}</b> <span class="mut">（1分钟负载 ${j.load[0]} ÷ ${j.logical}核 = 单核 ${j.per_core}）</span></div><div style="margin:4px 0">${esc(j.verdict)}</div><div class="mut">如何更流畅：</div><div>${j.tips.map(t=>`<div>· ${esc(t)}</div>`).join('')}</div><div style="margin-top:6px"><button class="bigbtn" id="optBtn" onclick="optimizeSys()">🚀 一键优化系统</button><div class="mut" id="optDesc" style="margin-top:4px">会做两件事：① 把内存里暂存的数据写回硬盘（sync，防断电丢数据）；② 回收系统缓存占用的内存（drop caches，只清缓存、不动正在运行的程序）。全程不重启、不杀进程，页面照常刷新。</div><div class="mut" id="optStatus"></div></div>`}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||'');