Add detailed router update outcomes and fix mobile terminal layout
This commit is contained in:
1 parent
2a47adb32a
commit
e5048f260b
5 files changed
+135
-12
No files matched your search
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-updates-control-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-updates-mobile-v117
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
|
||||
@@ -70,6 +70,9 @@ required = (
|
||||
"OWRT_UPDATE_OUTPUT_TEXT=",
|
||||
"refreshRouters",
|
||||
"queue-dashboard",
|
||||
"queueOutcomePanel",
|
||||
"function renderOutcomes(){",
|
||||
"grid-template-columns:minmax(0,1fr)",
|
||||
"def clear_finished(self, job_id):",
|
||||
"\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0432\u0441\u0451",
|
||||
"routerUpdatesGroup",
|
||||
|
||||
+28
-5
@@ -12226,7 +12226,9 @@ def router_updates_html(csrf):
|
||||
.wrap{max-width:1100px;margin:auto;padding:20px}.panel{margin-bottom:14px;padding:18px;border:1px solid var(--line);border-radius:12px;background:#191226e8}.head,.actions{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}h1{font-size:22px;margin:0}h2{font-size:16px;margin:0 0 10px}.hint{color:var(--muted);font-size:13px}.note{margin:14px 0;padding:10px 12px;border:1px solid #f59e0b70;border-left:3px solid #f59e0b;border-radius:8px;background:#f59e0b12;color:#fde68a}
|
||||
label{display:block;margin:14px 0 6px;font-weight:700}textarea,input{display:block;width:100%;min-width:0;border:1px solid var(--line);border-radius:8px;background:#0d0917;color:#f7f2ff;padding:11px;font:14px/1.5 ui-monospace,Consolas,monospace}textarea{min-height:110px;resize:vertical}input{max-width:480px}button,.btn{display:inline-flex;align-items:center;justify-content:center;min-height:42px;border:1px solid var(--line);border-radius:8px;padding:9px 14px;background:#393044;color:#f7f2ff;font:700 13px system-ui;cursor:pointer;text-decoration:none}.primary{background:#7c3aed}button:disabled{opacity:.5;cursor:default}.actions{justify-content:flex-start;margin-top:16px}.ok{color:#86efac}.error{color:#fda4af}.warn{color:#fde68a}#status{margin:12px 0;overflow-wrap:anywhere}.router{border-top:1px solid var(--line);padding:13px 0}.router:first-child{border-top:0}.router strong{display:block;overflow-wrap:anywhere}.router p{margin:5px 0;overflow-wrap:anywhere}.router small{color:var(--muted)}pre{max-height:260px;overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;background:#0d0917;border:1px solid var(--line);border-radius:8px;padding:10px;font:12px/1.5 ui-monospace,Consolas,monospace}summary{cursor:pointer;color:var(--muted)}
|
||||
.head-actions{display:flex;gap:8px;flex-wrap:wrap}.queue-dashboard{margin:18px 0 14px;padding:18px;border:1px solid var(--line);border-radius:12px;background:linear-gradient(120deg,#30203e90,#141521b0)}.queue-heading{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:12px}.queue-heading h2{margin:0;font-size:17px}.queue-badge{padding:4px 10px;border:1px solid #a78bfa50;border-radius:20px;background:#a78bfa12;color:#d8c8ff;font-size:12px;font-weight:700}.progress-label{display:flex;justify-content:space-between;gap:12px;margin-bottom:7px;color:var(--muted);font-size:12px}.progress-track{height:7px;overflow:hidden;border-radius:8px;background:#ffffff0b}.progress-fill{height:100%;width:0;background:linear-gradient(90deg,#8b5cf6,#38bdf8);border-radius:8px;transition:width .25s}.metrics{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:10px;margin-top:16px}.metric{--accent:#c4b5fd;min-width:0;padding:13px 12px;border:1px solid #ffffff12;border-top:2px solid var(--accent);border-radius:9px;background:#100b1b90}.metric[data-state=success]{--accent:#86efac}.metric[data-state=error]{--accent:#fda4af}.metric[data-state=unknown]{--accent:#fcd34d}.metric[data-state=cancelled]{--accent:#fdba74}.metric[data-state=skipped]{--accent:#b9adc9}.metric[data-state=active]{--accent:#7dd3fc}.metric span{display:block;color:var(--muted);font-size:12px;overflow-wrap:anywhere}.metric strong{display:block;margin-top:5px;color:var(--accent);font-size:27px;line-height:1.1;font-variant-numeric:tabular-nums}.router-live{display:flex;align-items:center;gap:7px;flex-wrap:wrap;margin:7px 0;color:var(--muted);font-size:12px}.live-badge{padding:2px 8px;border-radius:20px;background:#ffffff08;border:1px solid #ffffff16}.live-badge.online{color:#86efac;border-color:#86efac40;background:#86efac0a}.live-badge.offline{color:#fda4af;border-color:#fda4af40;background:#fda4af0a}
|
||||
@media(max-width:680px){.wrap{padding:10px}.panel{padding:12px}.head{align-items:stretch;flex-direction:column}h1{font-size:19px}.actions,.head-actions{display:grid;grid-template-columns:1fr}.btn,button{width:100%}input{max-width:none}body{background-attachment:scroll}.queue-dashboard{padding:12px}.queue-heading{align-items:flex-start}.queue-heading h2{font-size:16px}.metrics{grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}.metric{padding:12px}.metric strong{font-size:26px}}
|
||||
.metrics{grid-auto-rows:1fr}.metric.outcome-toggle{display:block;width:100%;text-align:left;font:inherit}.outcome-toggle::after{content:'Подробнее ›';display:block;margin-top:7px;color:var(--muted);font-size:11px}.outcome-toggle:hover,.outcome-toggle[aria-pressed=true]{background:#ffffff0c;border-color:var(--accent)}.outcome-toggle:focus-visible{outline:2px solid var(--accent);outline-offset:3px}.queue-outcomes{margin-top:16px;padding-top:16px;border-top:1px solid var(--line)}.outcome-heading{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}.outcome-heading h3{margin:0;font-size:15px}.outcome-list{max-height:440px;overflow:auto;scrollbar-gutter:stable;margin-top:10px}.outcome-router{padding:12px;border:1px solid var(--line);border-radius:8px;background:#100b1b70}.outcome-router+.outcome-router{margin-top:8px}.outcome-title{display:flex;align-items:center;gap:8px;justify-content:space-between;flex-wrap:wrap}.outcome-title strong{min-width:0;overflow-wrap:anywhere}.outcome-badge{flex-shrink:0;font-size:12px}.outcome-router small{display:block;color:var(--muted);overflow-wrap:anywhere}.outcome-reason{margin:7px 0 0;white-space:pre-wrap;overflow-wrap:anywhere}.outcome-router details{margin-top:7px}.outcome-empty{margin:8px 0;color:var(--muted)}[hidden]{display:none!important}
|
||||
.wrap,.panel,form,.head,.head-actions,.actions,.queue-dashboard,.queue-heading,.queue-outcomes,.outcome-heading,.outcome-list,.router,.outcome-router{min-width:0;max-width:100%}.head>*{min-width:0}h1,h2,h3,.hint,.note,.router small,.router-live span,.outcome-badge{overflow-wrap:anywhere}button,.btn{white-space:normal;overflow-wrap:anywhere}textarea{white-space:pre-wrap;overflow-wrap:anywhere}pre{max-width:100%;min-width:0}.outcome-title strong{flex:1 1 160px}.outcome-badge{max-width:100%}
|
||||
@media(max-width:680px){body{background-attachment:scroll;-webkit-text-size-adjust:100%;text-size-adjust:100%}.wrap{width:100%;padding:10px;padding-top:max(10px,env(safe-area-inset-top,0px));padding-right:max(10px,env(safe-area-inset-right,0px));padding-bottom:max(10px,env(safe-area-inset-bottom,0px));padding-left:max(10px,env(safe-area-inset-left,0px))}.panel{padding:12px}.head{align-items:stretch;flex-direction:column;gap:12px}h1{font-size:19px;line-height:1.35}.actions,.head-actions{display:grid;grid-template-columns:minmax(0,1fr);width:100%;gap:8px}.btn,button{width:100%;min-height:44px;padding:11px 12px}.head-actions .btn,.head-actions button,.actions button{font-size:14px}textarea,input{max-width:100%;font-size:16px;line-height:1.5}textarea{min-height:150px}input{max-width:none;min-height:46px}.note{margin:14px 0;padding:10px 12px;font-size:12px}.hint{font-size:12px}label{line-height:1.4}.queue-dashboard{padding:12px}.queue-heading{align-items:flex-start;flex-wrap:wrap;gap:8px}.queue-heading h2{font-size:16px;flex:1 1 160px}.queue-badge{max-width:100%;overflow-wrap:anywhere}.progress-label{font-size:11px}.progress-label>:first-child{min-width:0;overflow-wrap:anywhere}#progressPercent{flex-shrink:0}.metrics{grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}.metric{padding:12px 10px}.metric span{font-size:12px;line-height:1.4}.metric strong{font-size:26px}.outcome-heading{align-items:stretch}.outcome-heading h3{width:100%;line-height:1.4}.outcome-list{max-height:min(440px,60vh);-webkit-overflow-scrolling:touch}.outcome-router{padding:10px}.outcome-title{align-items:flex-start}.outcome-badge{flex-shrink:1;text-align:left}summary{min-height:44px;padding:10px 0;line-height:1.5}.router{padding:14px 0}.router-live{align-items:flex-start;gap:6px}.router-live span{max-width:100%}pre{max-height:240px;padding:9px;font-size:12px}.outcome-reason{font-size:13px}}
|
||||
</style></head><body><main class="wrap">
|
||||
<section class="panel"><div class="head"><h1>Обновить все роутеры разом</h1><div class="head-actions"><button id="refreshRouters" type="button" disabled>Обновить список роутеров</button><a class="btn" href="/">Вернуться в Hub</a></div></div>
|
||||
<blockquote class="note">Команда выполняется на роутерах по очереди через SSH. Укажи один общий SSH-пароль root. Для каждого роутера будет отдельный итог. Если туннель не работает, обновить этот роутер через VPS не получится.</blockquote>
|
||||
@@ -12238,14 +12240,16 @@ label{display:block;margin:14px 0 6px;font-weight:700}textarea,input{display:blo
|
||||
<div class="hint">«Остановить всё» сразу прекращает очередь и отправляет остановку текущей задачи. Уже внесённые установщиком изменения не откатываются. Если SSH недоступен, панель покажет, что остановка на роутере не подтверждена.</div>
|
||||
<section class="queue-dashboard" aria-label="Статистика очереди"><div class="queue-heading"><h2 id="queueTitle">Список роутеров</h2><span class="queue-badge" id="queueBadge">Загрузка</span></div>
|
||||
<div class="progress-label"><span id="progressText">Получаю данные…</span><span id="progressPercent">0%</span></div><div class="progress-track" id="queueProgress" role="progressbar" aria-label="Ход очереди" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-fill" id="progressFill"></div></div>
|
||||
<div class="metrics"><div class="metric" data-state="total"><span>Всего роутеров</span><strong id="countTotal">0</strong></div><div class="metric" data-state="active"><span>Обновляются</span><strong id="countActive">0</strong></div><div class="metric" data-state="queued"><span>Ожидают</span><strong id="countQueued">0</strong></div><div class="metric" data-state="success"><span>Успешно</span><strong id="countSuccess">0</strong></div><div class="metric" data-state="error"><span>Ошибок</span><strong id="countError">0</strong></div><div class="metric" data-state="unknown"><span>Не подтверждено</span><strong id="countUnknown">0</strong></div><div class="metric" data-state="cancelled"><span>Остановлено</span><strong id="countCancelled">0</strong></div><div class="metric" data-state="skipped"><span>Пропущено</span><strong id="countSkipped">0</strong></div></div></section>
|
||||
<div class="metrics"><div class="metric" data-state="total"><span>Всего роутеров</span><strong id="countTotal">0</strong></div><div class="metric" data-state="active"><span>Обновляются</span><strong id="countActive">0</strong></div><div class="metric" data-state="queued"><span>Ожидают</span><strong id="countQueued">0</strong></div><div class="metric" data-state="success"><span>Успешно</span><strong id="countSuccess">0</strong></div><button type="button" class="metric outcome-toggle" data-state="error" aria-controls="queueOutcomePanel" aria-pressed="false"><span>Ошибок</span><strong id="countError">0</strong></button><button type="button" class="metric outcome-toggle" data-state="unknown" aria-controls="queueOutcomePanel" aria-pressed="false"><span>Не подтверждено</span><strong id="countUnknown">0</strong></button><button type="button" class="metric outcome-toggle" data-state="cancelled" aria-controls="queueOutcomePanel" aria-pressed="false"><span>Остановлено</span><strong id="countCancelled">0</strong></button><button type="button" class="metric outcome-toggle" data-state="skipped" aria-controls="queueOutcomePanel" aria-pressed="false"><span>Пропущено</span><strong id="countSkipped">0</strong></button></div>
|
||||
<section class="queue-outcomes" id="queueOutcomePanel" aria-labelledby="outcomeTitle" hidden><div class="outcome-heading"><h3 id="outcomeTitle">Проблемы обновления</h3><button type="button" id="showAllOutcomes" hidden>Показать все категории</button></div><p class="hint" id="outcomeHint">Здесь перечислены роутеры без подтверждённого успешного обновления и причины результата.</p><div class="outcome-list" id="outcomeList"></div></section></section>
|
||||
<div id="status" role="status" aria-live="polite">Получаю список роутеров…</div></section>
|
||||
<section class="panel"><h2>Роутеры</h2><div class="hint">Текущая связь определяется по Heartbeat. Итог установки показан отдельно и не означает, что роутер сейчас онлайн.</div><div id="results"></div></section>
|
||||
</main><script>
|
||||
(()=>{
|
||||
const csrf=__CSRF__, endpoint='/api/router-updates', form=document.getElementById('updateForm'), command=document.getElementById('command'), password=document.getElementById('sshPassword'), start=document.getElementById('start'), cancel=document.getElementById('cancel'), status=document.getElementById('status'), results=document.getElementById('results');
|
||||
const refreshRouters=document.getElementById('refreshRouters');
|
||||
let timer=null, pending=false, refreshing=false, job=null, routers=[], lastRender='', stopped=false, generation=0;
|
||||
const refreshRouters=document.getElementById('refreshRouters'),outcomePanel=document.getElementById('queueOutcomePanel'),outcomeList=document.getElementById('outcomeList'),showAllOutcomes=document.getElementById('showAllOutcomes');
|
||||
const outcomeLabels={error:'Ошибка',unknown:'Не подтверждено',cancelled:'Остановлено',skipped:'Пропущено'},outcomeTitles={error:'Ошибки',unknown:'Не подтверждено',cancelled:'Остановлено',skipped:'Пропущено'};
|
||||
let timer=null, pending=false, refreshing=false, job=null, routers=[], lastRender='', stopped=false, generation=0,outcomeFilter='all',lastOutcomeRender='',outcomeJobId=null;
|
||||
let requestId='';
|
||||
const requestKey='owrt-router-update-request';
|
||||
try{requestId=sessionStorage.getItem(requestKey)||'';}catch(error){}
|
||||
@@ -12260,8 +12264,25 @@ label{display:block;margin:14px 0 6px;font-weight:700}textarea,input{display:blo
|
||||
document.getElementById('progressText').textContent=job?'Обработано '+done+' из '+counts.Total:'Актуальный список · '+routers.filter(x=>x.online===true).length+' в сети';
|
||||
document.getElementById('progressPercent').textContent=percent+'%';document.getElementById('progressFill').style.width=percent+'%';document.getElementById('queueProgress').setAttribute('aria-valuenow',percent);
|
||||
}
|
||||
function renderOutcomes(){
|
||||
const jobId=job?job.id:null;
|
||||
if(jobId!==outcomeJobId){outcomeJobId=jobId;outcomeFilter='all';lastOutcomeRender='';outcomeList.scrollTop=0;}
|
||||
outcomePanel.hidden=!job&&outcomeFilter==='all';showAllOutcomes.hidden=outcomeFilter==='all';
|
||||
document.querySelectorAll('.outcome-toggle').forEach(button=>button.setAttribute('aria-pressed',String(button.dataset.state===outcomeFilter)));
|
||||
const items=(job?job.items:[]).filter(item=>Object.hasOwn(outcomeLabels,item.state)&&(outcomeFilter==='all'||item.state===outcomeFilter));
|
||||
document.getElementById('outcomeTitle').textContent=(outcomeFilter==='all'?'Проблемы обновления':outcomeTitles[outcomeFilter])+' · '+items.length;
|
||||
const signature=JSON.stringify([jobId,outcomeFilter,items]);if(signature===lastOutcomeRender)return;lastOutcomeRender=signature;
|
||||
const scrollTop=outcomeList.scrollTop,open=new Map(Array.from(outcomeList.querySelectorAll('article')).map(row=>[row.dataset.router,{open:!!row.querySelector('details[open]'),top:row.querySelector('pre')?.scrollTop||0}])),fragment=document.createDocumentFragment();
|
||||
if(!items.length){const empty=document.createElement('p');empty.className='outcome-empty';empty.textContent=!job?'Сначала запусти очередь обновления.':outcomeFilter==='all'?'Роутеров с ошибками, без подтверждения, остановленных или пропущенных пока нет.':'Роутеров в этой категории нет.';fragment.append(empty);}
|
||||
items.forEach(item=>{
|
||||
const row=document.createElement('article'),header=document.createElement('div'),name=document.createElement('strong'),badge=document.createElement('span'),id=document.createElement('small'),reason=document.createElement('p');
|
||||
row.className='outcome-router';row.dataset.router=item.id;header.className='outcome-title';name.textContent=item.name||'Имя роутера не получено';badge.className='outcome-badge '+(item.state==='error'?'error':'warn');badge.textContent=outcomeLabels[item.state];header.append(name,badge);id.textContent='ID: '+item.id;reason.className='outcome-reason';reason.textContent=item.message||'Причина не получена от задачи обновления.';row.append(header,id,reason);
|
||||
if(item.output){const details=document.createElement('details'),summary=document.createElement('summary'),output=document.createElement('pre');summary.textContent='Вывод команды';output.textContent=item.output;details.open=!!open.get(item.id)?.open;details.append(summary,output);row.append(details);}fragment.append(row);
|
||||
});
|
||||
outcomeList.replaceChildren(fragment);outcomeList.scrollTop=scrollTop;outcomeList.querySelectorAll('article').forEach(row=>{const output=row.querySelector('pre');if(output)output.scrollTop=open.get(row.dataset.router)?.top||0;});
|
||||
}
|
||||
function render(data){
|
||||
job=data.job;routers=data.routers||[];controls();dashboard();const items=job?job.items:routers, signature=JSON.stringify([items,routers]);if(signature===lastRender)return;lastRender=signature;
|
||||
job=data.job;routers=data.routers||[];controls();dashboard();renderOutcomes();const items=job?job.items:routers, signature=JSON.stringify([items,routers]);if(signature===lastRender)return;lastRender=signature;
|
||||
const open=new Map(Array.from(results.querySelectorAll('article')).map(row=>[row.dataset.router,{open:!!row.querySelector('details[open]'),top:row.querySelector('pre')?.scrollTop||0}])), fragment=document.createDocumentFragment();
|
||||
items.forEach(item=>{const row=document.createElement('article'), title=document.createElement('strong'), detail=document.createElement('p'), id=document.createElement('small');
|
||||
row.className='router';row.dataset.router=item.id;title.textContent=(item.state==='success'?'Успешно — ':item.state==='error'?'Ошибка — ':item.state==='unknown'?'Не подтверждено — ':item.state==='cancelled'?'Остановлено — ':'')+(item.name||'Имя роутера не получено');title.className=item.state==='success'?'ok':item.state==='error'?'error':['unknown','cancelled'].includes(item.state)?'warn':'';detail.textContent=item.message||'Готов к постановке в очередь';id.textContent='ID: '+item.id;row.append(title,id,detail);
|
||||
@@ -12274,6 +12295,8 @@ label{display:block;margin:14px 0 6px;font-weight:700}textarea,input{display:blo
|
||||
async function refresh(){if(stopped||pending)return;const current=++generation;if(timer!==null)clearTimeout(timer);timer=null;try{const data=await api('');if(current!==generation||pending)return;render(data);status.className='';status.textContent=summary();if(job&&job.state!=='running'&&job.request_id===requestId)forgetRequest();}catch(error){if(current===generation){status.className='error';status.textContent='Не удалось получить состояние: '+error.message;}}finally{if(!stopped&&!pending&¤t===generation)timer=setTimeout(refresh,3000);}}
|
||||
form.addEventListener('submit',async event=>{event.preventDefault();if(pending||(job&&job.state==='running'))return;generation++;pending=true;controls();if(timer!==null)clearTimeout(timer);try{const body={command:command.value,ssh_password:password.value,request_id:requestToken()};const data=await api('/start',body);password.value='';render(data);status.className='';status.textContent=summary();}catch(error){password.value='';status.className='error';status.textContent='Запуск не подтверждён: '+error.message+'. Проверяю состояние очереди.';}finally{pending=false;controls();if(!stopped)timer=setTimeout(refresh,1000);}});
|
||||
cancel.addEventListener('click',async()=>{if(!job||pending)return;generation++;if(timer!==null)clearTimeout(timer);pending=true;controls();status.textContent='Останавливаю текущую задачу и очередь…';try{const data=await api('/cancel',{id:job.id});render(data);status.textContent=summary();}catch(error){status.textContent='Остановка не подтверждена: '+error.message;}finally{pending=false;controls();if(!stopped)timer=setTimeout(refresh,1000);}});
|
||||
document.querySelectorAll('.outcome-toggle').forEach(button=>button.addEventListener('click',()=>{outcomeFilter=button.dataset.state;outcomeList.scrollTop=0;renderOutcomes();}));
|
||||
showAllOutcomes.addEventListener('click',()=>{outcomeFilter='all';outcomeList.scrollTop=0;renderOutcomes();});
|
||||
refreshRouters.addEventListener('click',async()=>{if(pending)return;const current=++generation;if(timer!==null)clearTimeout(timer);pending=true;refreshing=true;controls();status.className='';status.textContent='Обновляю список и статусы роутеров…';try{const data=await api('/refresh',{id:job?job.id:''});if(current!==generation)return;render(data);if(!job)forgetRequest();status.textContent=job?'Статусы обновлены. '+summary():'Список и статусы обновлены. Можно запустить новую очередь.';}catch(error){status.className='error';status.textContent='Не удалось обновить список: '+error.message;}finally{pending=false;refreshing=false;controls();if(!stopped)timer=setTimeout(refresh,3000);}});
|
||||
window.addEventListener('pagehide',()=>{stopped=true;if(timer!==null)clearTimeout(timer);password.value='';});
|
||||
window.addEventListener('pageshow',()=>{if(stopped){stopped=false;refresh();}});refresh();
|
||||
|
||||
Reference in new issue
Block a user