From 942eab85036d4062db71843e9fefa6d9c76fed75 Mon Sep 17 00:00:00 2001 From: 3970260761 <3970260761@qq.com> Date: Sun, 8 Nov 2026 01:37:53 +0800 Subject: [PATCH] =?UTF-8?q?v1.3.19=20=E6=B5=8B=E9=80=9F=E6=97=B6=E9=95=BF?= =?UTF-8?q?=E9=BB=98=E8=AE=A410=E7=A7=92+=E4=B8=8B=E6=8B=8910=E6=A1=A3(10/?= =?UTF-8?q?30/..190s)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.py | 112 ++++++++++++++++++++++++++++++++------------- docker-compose.yml | 2 +- public/index.html | 13 ++++-- 3 files changed, 90 insertions(+), 37 deletions(-) diff --git a/app.py b/app.py index 787c1c5..f2c84a9 100644 --- a/app.py +++ b/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.18") +HUB_VERSION = os.environ.get("SITE_VERSION", "1.3.19") HUB = {"ok": False, "install_id": None, "latest": "", "update_available": False, "update_required": False, "download_url": "", "changelog": "", "announcements": [], "popup": [], "ts": 0} @@ -509,34 +509,62 @@ def get_percpu_mhz(): # ---------- 各页测速: CPU/内存/硬盘/网络(非破坏,失败返回error) ---------- import urllib.request as _urlreq -def _bench_cpu(): - import math - N = 200000 - t0 = time.perf_counter() +def _bench_cpu(dur=10): + try: + dur = max(1, min(200, int(dur))) + except Exception: + dur = 10 + N_total = 0 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() + batch = 200000 + while True: + for i in range(batch): + x += (i * i) % 10007 + N_total += batch + if time.perf_counter() - t0 >= dur: + break + dt = max(time.perf_counter() - t0, 1e-6) + return {"ms": int(round(dt * 1000)), "kops": int(round(N_total / dt / 1000)), + "score": int(round(N_total / dt / 1000)), "dur": round(dt, 1), + "detail": "整数运算持续约%s秒" % dur} + +def _bench_mem(dur=10): + try: + dur = max(1, min(200, int(dur))) + except Exception: + dur = 10 + SZ = 32 * 1024 * 1024 b = bytearray(SZ) - b[:] = b"\x5a" * SZ + t0 = time.perf_counter() + w_bytes = 0 + while True: + b[:] = b"\x5a" * SZ + w_bytes += SZ + if time.perf_counter() - t0 >= dur / 2.0: + break dt_w = max(time.perf_counter() - t0, 1e-6) t0 = time.perf_counter() - s = sum(b[::4096]) + r_bytes = 0 + s = 0 + while True: + s += sum(b[::4096]) + r_bytes += SZ + if time.perf_counter() - t0 >= dur / 2.0: + break 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} + return {"write_mbs": round(w_bytes / dt_w / 1048576, 1), + "read_mbs": round(r_bytes / dt_r / 1048576, 1), + "size_mb": 32, "dur": dur, "detail": "内存写/读持续约%s秒" % dur, "checksum": s % 997} -def _bench_disk(): - SZ_MB = 32 - data = os.urandom(4 * 1024 * 1024) +def _bench_disk(dur=10): + try: + dur = max(1, min(200, int(dur))) + except Exception: + dur = 10 + CHUNK = 4 * 1024 * 1024 + data = os.urandom(CHUNK) path = "" for cand in ("/host/vol1/.fnos_resmon_bench.tmp", "/host/.fnos_resmon_bench.tmp", "/tmp/.fnos_resmon_bench.tmp"): @@ -550,22 +578,34 @@ def _bench_disk(): if not path: return {"ok": False, "error": "无可写目录"} try: + w_bytes = 0 t0 = time.perf_counter() with open(path, "wb") as f: - for _ in range(SZ_MB // 4): + while True: f.write(data) + w_bytes += CHUNK + if time.perf_counter() - t0 >= dur / 2.0: + break f.flush() os.fsync(f.fileno()) dt_w = max(time.perf_counter() - t0, 1e-6) t0 = time.perf_counter() + r_bytes = 0 with open(path, "rb") as f: - while f.read(4 * 1024 * 1024): - pass + while True: + ch = f.read(CHUNK) + if not ch: + f.seek(0) + continue + r_bytes += len(ch) + if time.perf_counter() - t0 >= dur / 2.0: + break 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 文件写(含落盘)/读"} + return {"write_mbs": round(w_bytes / dt_w / 1048576, 1), + "read_mbs": round(r_bytes / dt_r / 1048576, 1), + "size_mb": round(w_bytes / 1048576, 0), "dur": dur, + "file": path.replace("/host", "") or "/", + "detail": "文件写(含落盘)/读持续约%s秒" % dur} except Exception as e: return {"ok": False, "error": str(e)} finally: @@ -615,8 +655,18 @@ def _bench_net(): @app.route("/api/bench/", methods=["POST"]) def api_bench(kind): try: + dur = 10 + try: + j0 = request.get_json(silent=True) or {} + if isinstance(j0, dict) and "dur" in j0: + dur = int(j0["dur"]) + elif request.values.get("dur"): + dur = int(request.values.get("dur")) + except Exception: + dur = 10 + dur = max(1, min(200, dur)) if kind == "cpu": - r = _bench_cpu() + r = _bench_cpu(dur) p = _read_perf() r.update({"ok": True, "mode": p.get("mode", ""), "governor": p.get("governor", ""), "epp": p.get("epp", ""), @@ -625,10 +675,10 @@ def api_bench(kind): "capped": p.get("capped", False), "mhz_avg": (sum(get_percpu_mhz()) // len(get_percpu_mhz()) if get_percpu_mhz() else 0)}) elif kind == "mem": - r = _bench_mem() + r = _bench_mem(dur) r["ok"] = True elif kind == "disk": - r = _bench_disk() + r = _bench_disk(dur) if "ok" not in r: r["ok"] = True elif kind == "net": diff --git a/docker-compose.yml b/docker-compose.yml index 9145689..af7d80a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: environment: - PORT=7031 - PROCFS_PATH=/host/proc - - SITE_VERSION=1.3.18 + - SITE_VERSION=1.3.19 - HUB_URL=https://auth.88531.cn/api - HUB_PROJECT_ID=12 - HUB_KEY_FILE=/run/secrets/hub_key diff --git a/public/index.html b/public/index.html index 9bf8741..a846d53 100644 --- a/public/index.html +++ b/public/index.html @@ -69,7 +69,7 @@ button.refresh{background:#20a53a;color:#fff;border:none;border-radius:3px;paddi
网络
🔔 -v1.3.18 +v1.3.19 资享导航站 @@ -232,14 +232,17 @@ 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秒（看网速）']}; +const BENCH_DURS=[10,30,50,70,90,110,130,150,170,190]; +function benchDur(k){try{const v=parseInt(localStorage.getItem('fnos_benchdur_'+k)||'10');return BENCH_DURS.indexOf(v)>=0?v:10}catch(e){return 10}} +const BENCH_TXT={cpu:['🏃 系统运行速度测试','整数运算跑满所选时长，分数越高越快；自动记录当前性能模式/governor/平均MHz，方便对比省电/平衡/高性能三档效果','默认10秒'],mem:['💾 内存读写测速','32MB内存块循环写/读，跑满所选时长（前半写后半读），测完即释放，不占内存','默认10秒'],disk:['💽 硬盘读写测速','临时文件循环写（含落盘）/读，跑满所选时长，测完自动删除，不占空间','默认10秒'],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='
'+T[0]+' ⏱ '+T[2]+'
'+T[1]+'
'+(msg||'')+'
'+(h.length?'
历史记录（最多5条，超出自动删旧）:
'+h.map(x=>esc(x)).join('
')+'
':'
暂无测速记录，点「开始测速」跑一次
')} +function setBenchDur(k,v){try{localStorage.setItem('fnos_benchdur_'+k,String(parseInt(v)||10))}catch(e){}renderBench(k)} +function renderBench(k,msg){const el=document.getElementById(k+'bench');if(!el)return;const T=BENCH_TXT[k],h=benchHist(k);const canDur=(k==='cpu'||k==='mem'||k==='disk');const dur=benchDur(k);const durSel=canDur?'':'';el.innerHTML='
'+T[0]+' ⏱ '+(canDur?('约'+dur+'秒'):T[2])+'
'+T[1]+'
'+durSel+' '+(msg||'')+'
'+(h.length?'
历史记录（最多5条，超出自动删旧）:
'+h.map(x=>esc(x)).join('
')+'
':'
暂无测速记录，点「开始测速」跑一次
')} const BENCH_CTL={}; function stopBench(k){const c=BENCH_CTL[k];if(c){try{c.abort()}catch(e){}}} 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),st=document.getElementById('benchstop_'+k);if(b){b.disabled=true;b.textContent='测速中…'}if(st)st.style.display='';if(m)m.textContent='正在测速，请稍候（'+BENCH_TXT[k][2]+'），可点 ⏹ 停止';const ctl=new AbortController();BENCH_CTL[k]=ctl;try{const r=await fetch('/api/bench/'+k,{method:'POST',signal:ctl.signal});const j=await r.json();let line='';if(j.ok){if(k==='cpu')line=j.at+' ['+j.mode+'|'+(j.governor||'-')+(j.capped?('|🔒'+j.cap_max_mhz+'MHz'):'')+'] '+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,'✅ '+line)}else renderBench(k,'❌ '+(j.error||'测速失败'))}catch(e){if(e&&e.name==='AbortError'){renderBench(k,'⏹ 已停止（本次不记录）')}else renderBench(k,'❌ 测速失败: '+e)}finally{delete BENCH_CTL[k]}} +async function runBench(k){const b=document.getElementById('benchbtn_'+k),m=document.getElementById('benchmsg_'+k),st=document.getElementById('benchstop_'+k);const dur=(k==='cpu'||k==='mem'||k==='disk')?benchDur(k):0;if(b){b.disabled=true;b.textContent='测速中…'}if(st)st.style.display='';if(m)m.textContent='正在测速，请稍候（'+(dur?('约'+dur+'秒'):BENCH_TXT[k][2])+'），可点 ⏹ 停止';const ctl=new AbortController();BENCH_CTL[k]=ctl;try{const r=await fetch('/api/bench/'+k,{method:'POST',headers:{'Content-Type':'application/json'},body:dur?JSON.stringify({dur:dur}):'{}',signal:ctl.signal});const j=await r.json();let line='';if(j.ok){if(k==='cpu')line=j.at+' ['+j.mode+'|'+(j.governor||'-')+(j.capped?('|🔒'+j.cap_max_mhz+'MHz'):'')+'] 约'+(j.dur||dur)+'秒 '+j.ms+'ms '+j.kops+'kops AVG'+j.mhz_avg+'MHz';else if(k==='mem')line=j.at+' 约'+(j.dur||dur)+'秒 W'+j.write_mbs+'MB/s R'+j.read_mbs+'MB/s';else if(k==='disk')line=j.at+' 约'+(j.dur||dur)+'秒 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,'✅ '+line)}else renderBench(k,'❌ '+(j.error||'测速失败'))}catch(e){if(e&&e.name==='AbortError'){renderBench(k,'⏹ 已停止（本次不记录）')}else renderBench(k,'❌ 测速失败: '+e)}finally{delete BENCH_CTL[k]}} load(true); let ivalSec=3,timer=null,paused=false; function startTimer(){if(timer)clearInterval(timer);if(!paused)timer=setInterval(()=>load(false),ivalSec*1000)} @@ -248,7 +251,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.18')+(j.update_available?' ●':''); +const v=document.getElementById('licVer');if(v)v.textContent='v'+(j.version||'1.3.19')+(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=`
📢 ${esc(a.title||'公告')}✕
${a.content||''}
`;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?(`📢 公告（${list.length}）`+list.map(a=>`
${esc(a.title||'')}
${a.content||''}
`).join('')):'暂无公告';}