diff --git a/app.py b/app.py index 2c3d8dd..66f00c0 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.15") +HUB_VERSION = os.environ.get("SITE_VERSION", "1.3.16") HUB = {"ok": False, "install_id": None, "latest": "", "update_available": False, "update_required": False, "download_url": "", "changelog": "", "announcements": [], "popup": [], "ts": 0} diff --git a/docker-compose.yml b/docker-compose.yml index 807cba2..083ccdf 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.15 + - SITE_VERSION=1.3.16 - 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 bbb3290..82557a4 100644 --- a/public/index.html +++ b/public/index.html @@ -62,7 +62,7 @@ button.refresh{background:#20a53a;color:#fff;border:none;border-radius:3px;paddi
网络
🔔 -v1.3.15 +v1.3.16 资享导航站 @@ -227,9 +227,11 @@ showBench('net'); 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='
'+T[0]+' ⏱ '+T[2]+'
'+T[1]+'
'+(msg||'')+'
'+(h.length?'
历史记录(最多5条,超出自动删旧):
'+h.map(x=>esc(x)).join('
')+'
':'
暂无测速记录,点「开始测速」跑一次
')} +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('
')+'
':'
暂无测速记录,点「开始测速」跑一次
')} +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);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)}} +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.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]}} load(true); let ivalSec=3,timer=null,paused=false; function startTimer(){if(timer)clearInterval(timer);if(!paused)timer=setInterval(()=>load(false),ivalSec*1000)} @@ -238,7 +240,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.15')+(j.update_available?' ●':''); +const v=document.getElementById('licVer');if(v)v.textContent='v'+(j.version||'1.3.16')+(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('')):'暂无公告';}