refator_comm1
This commit is contained in:
Mateusz Gruszczyński
@@ -21,130 +21,160 @@ export async function renderVMAdmin() {
|
||||
const sel = `<select class="form-select form-select-sm target-node" style="min-width:140px">
|
||||
${nodes.map(n => `<option value="${n}" ${n === x.node ? 'disabled' : ''}>${n}${n === x.node ? ' (src)' : ''}</option>`).join('')}
|
||||
</select>`;
|
||||
const migrateBtn = `<div class="d-flex align-items-center gap-2">
|
||||
const tools = `<div class="d-flex align-items-center gap-2">
|
||||
<button class="btn btn-outline-primary btn-sm act-migrate">Migrate (offline)</button>
|
||||
<button class="btn btn-outline-secondary btn-sm act-status">Status</button></div>`;
|
||||
return rowHTML([sid, type.toUpperCase(), name, node, st, actions, sel, migrateBtn], `data-sid="${sid}"`);
|
||||
<button class="btn btn-outline-secondary btn-sm act-status">Status</button>
|
||||
<button class="btn btn-outline-info btn-sm act-watch" title="Live observe">Watch 🔔</button>
|
||||
</div>`;
|
||||
return rowHTML([sid, type.toUpperCase(), name, node, st, actions, sel, tools], `data-sid="${sid}"`);
|
||||
});
|
||||
|
||||
setRows(tbody, rows);
|
||||
|
||||
Array.from(tbody.querySelectorAll('tr[data-sid]')).forEach(tr => {
|
||||
const sid = tr.getAttribute('data-sid');
|
||||
const getTarget = () => tr.querySelector('.target-node')?.value || '';
|
||||
const colSpan = tr.children.length;
|
||||
const badgeCell = tr.children[4];
|
||||
|
||||
// subpanel (log)
|
||||
let sub = tr.nextElementSibling;
|
||||
if (!sub || !sub.classList.contains('mig-row')) {
|
||||
sub = document.createElement('tr'); sub.className = 'mig-row d-none';
|
||||
const td = document.createElement('td'); td.colSpan = colSpan;
|
||||
td.innerHTML = '<div class="p-3 border rounded bg-body-tertiary"><div class="fw-semibold mb-1">Task status</div><pre class="small mb-0 mig-log">—</pre></div>';
|
||||
sub.appendChild(td); tr.parentNode.insertBefore(sub, tr.nextSibling);
|
||||
}
|
||||
const logPre = sub.querySelector('.mig-log');
|
||||
const toggleSub = (show) => sub.classList.toggle('d-none', !show);
|
||||
|
||||
let wsObs = null; // observe websocket
|
||||
let wsTask = null; // tail websocket (auto z observe)
|
||||
|
||||
const closeWS = () => { try { wsObs && wsObs.close(); } catch {} try { wsTask && wsTask.close(); } catch {} wsObs = wsTask = null; };
|
||||
|
||||
const setRowBusy = (busy) => {
|
||||
const nameCell = tr.children[2]; if (!nameCell) return;
|
||||
const nameCell = tr.children[2];
|
||||
let spin = nameCell.querySelector('.op-spin');
|
||||
if (busy) {
|
||||
if (!spin) {
|
||||
const span = document.createElement('span');
|
||||
span.className = 'op-spin spinner-border spinner-border-sm align-middle ms-2';
|
||||
span.setAttribute('role','status'); span.setAttribute('aria-hidden','true');
|
||||
nameCell.appendChild(span);
|
||||
}
|
||||
} else { if (spin) spin.remove(); }
|
||||
};
|
||||
|
||||
const ensureMigRow = () => {
|
||||
let nxt = tr.nextElementSibling;
|
||||
if (!nxt || !nxt.classList.contains('mig-row')) {
|
||||
nxt = document.createElement('tr'); nxt.className = 'mig-row d-none';
|
||||
const td = document.createElement('td'); td.colSpan = colSpan;
|
||||
td.innerHTML = '<div class="p-3 border rounded bg-body-tertiary"><div class="fw-semibold mb-1">Migration status</div><pre class="small mb-0 mig-log">—</pre></div>';
|
||||
nxt.appendChild(td); tr.parentNode.insertBefore(nxt, tr.nextSibling);
|
||||
} return nxt;
|
||||
};
|
||||
const setMigRowVisible = (row, vis) => row.classList.toggle('d-none', !vis);
|
||||
|
||||
const tailTaskLog = async (upid, node, preEl, stopSignal) => {
|
||||
let start = 0; const delay = (ms)=>new Promise(r=>setTimeout(r,ms));
|
||||
const append = (txt) => { if (!preEl) return; preEl.textContent = (preEl.textContent?preEl.textContent+'\n':'') + txt; preEl.scrollTop = preEl.scrollHeight; };
|
||||
while (!stopSignal.done) {
|
||||
try {
|
||||
const d = await api.taskLog(upid, node, start);
|
||||
if (d && d.ok) {
|
||||
const lines = Array.isArray(d.lines) ? d.lines : [];
|
||||
for (const ln of lines) if (ln && typeof ln.t === 'string') append(ln.t);
|
||||
start = d.next_start ?? start;
|
||||
}
|
||||
} catch {}
|
||||
await delay(1500);
|
||||
if (busy && !spin) {
|
||||
const span = document.createElement('span');
|
||||
span.className = 'op-spin spinner-border spinner-border-sm align-middle ms-2';
|
||||
span.setAttribute('role','status'); span.setAttribute('aria-hidden','true');
|
||||
nameCell.appendChild(span);
|
||||
}
|
||||
if (!busy && spin) spin.remove();
|
||||
};
|
||||
|
||||
const pollTask = async (upid, node, onUpdate, onDone) => {
|
||||
let lastSt = null; if (!upid || !node) return;
|
||||
const started = Date.now(); const maxMs = 5*60*1000;
|
||||
const delay = (ms)=>new Promise(r=>setTimeout(r,ms));
|
||||
while (Date.now() - started < maxMs) {
|
||||
try {
|
||||
const d = await api.taskStatus(upid, node);
|
||||
if (d && d.ok) {
|
||||
const st = d.status || {}; lastSt = st;
|
||||
try { onUpdate && onUpdate(st); } catch {}
|
||||
const s = (st.status||'').toLowerCase();
|
||||
if (s === 'stopped' || st.exitstatus) break;
|
||||
}
|
||||
} catch {}
|
||||
await delay(2000);
|
||||
}
|
||||
try { onDone && onDone(lastSt); } catch {}
|
||||
};
|
||||
const getTarget = () => tr.querySelector('.target-node')?.value || '';
|
||||
|
||||
const bind = (selector, action, needsTarget=false) => {
|
||||
const btn = tr.querySelector(selector); if (!btn) return;
|
||||
btn.onclick = async () => {
|
||||
setRowBusy(true); btn.disabled = true;
|
||||
const openTaskWS = (upid, node) => {
|
||||
if (!upid) return;
|
||||
toggleSub(true);
|
||||
logPre.textContent = `UPID: ${upid} @ ${node}\n`;
|
||||
wsTask = new WebSocket(api.wsTaskURL(upid, node));
|
||||
wsTask.onmessage = (ev) => {
|
||||
try {
|
||||
if (action === 'migrate') {
|
||||
const target = getTarget();
|
||||
const resp = await api.vmAction(sid, action, target);
|
||||
const row = ensureMigRow(); setMigRowVisible(row, true);
|
||||
const log = row.querySelector('.mig-log');
|
||||
const srcNode = resp.source_node; const upid = resp.upid; const stopSig = { done:false };
|
||||
tailTaskLog(upid, srcNode, log, stopSig);
|
||||
log.textContent = `Starting offline migrate to ${target} (UPID: ${upid || '—'})...`;
|
||||
const badgeCell = tr.children[4]; if (badgeCell) badgeCell.innerHTML = badge('migrating','info');
|
||||
await pollTask(upid, srcNode, (st) => {
|
||||
const keys = ['type','status','pid','starttime','user','node','endtime','exitstatus'];
|
||||
const lines = keys.filter(k=>st && st[k]!==undefined).map(k=>`${k}: ${st[k]}`);
|
||||
log.textContent = lines.join('\n') || '—';
|
||||
}, async (finalSt) => {
|
||||
stopSig.done = true;
|
||||
const exit = (finalSt && finalSt.exitstatus) ? String(finalSt.exitstatus) : '';
|
||||
const ok = exit.toUpperCase() === 'OK';
|
||||
const badgeCell = tr.children[4];
|
||||
if (badgeCell) badgeCell.innerHTML = ok ? badge('running','ok') : badge('migrate error','err');
|
||||
log.textContent += (log.textContent ? '\n' : '') + (ok ? 'Migration finished successfully.' : ('Migration failed: ' + (exit || 'unknown error')));
|
||||
setRowBusy(false);
|
||||
// odśwież minimalnie: tylko ten wiersz przez szybkie /api/list-all-vmct? (tu prosty full-refresh stanu)
|
||||
try { document.getElementById('btnRefresh').click(); } catch {}
|
||||
if (ok) setTimeout(()=>{ const row = tr.nextElementSibling; if (row && row.classList.contains('mig-row')) setMigRowVisible(row,false); }, 2000);
|
||||
});
|
||||
} else {
|
||||
await api.vmAction(sid, action, needsTarget ? getTarget() : undefined);
|
||||
showToast('Success', `${action} executed for ${sid}`, 'success');
|
||||
const msg = JSON.parse(ev.data);
|
||||
if (msg.type === 'log' && msg.line) {
|
||||
logPre.textContent += msg.line + '\n';
|
||||
logPre.scrollTop = logPre.scrollHeight;
|
||||
} else if (msg.type === 'status' && msg.status) {
|
||||
const ok = String(msg.status.exitstatus||'').toUpperCase() === 'OK';
|
||||
const stopped = String(msg.status.status||'').toLowerCase() === 'stopped';
|
||||
if (badgeCell) badgeCell.innerHTML = ok ? badge('running','ok') : (stopped ? badge('stopped','dark') : badge('working','info'));
|
||||
} else if (msg.type === 'done') {
|
||||
const ok = !!msg.ok;
|
||||
if (badgeCell) badgeCell.innerHTML = ok ? badge('running','ok') : badge('error','err');
|
||||
setRowBusy(false);
|
||||
setTimeout(() => toggleSub(false), 1200);
|
||||
try { document.getElementById('btnRefresh').click(); } catch {}
|
||||
}
|
||||
} catch (e) { showToast('Error', 'ERROR: ' + (e.message || e), 'danger'); setRowBusy(false); }
|
||||
btn.disabled = false;
|
||||
} catch {}
|
||||
};
|
||||
wsTask.onerror = () => {};
|
||||
};
|
||||
|
||||
bind('.act-unlock','unlock');
|
||||
bind('.act-start','start');
|
||||
bind('.act-stop','stop');
|
||||
bind('.act-shutdown','shutdown');
|
||||
bind('.act-migrate','migrate', true);
|
||||
|
||||
const statusBtn = tr.querySelector('.act-status');
|
||||
if (statusBtn) statusBtn.onclick = () => {
|
||||
const row = tr.nextElementSibling && tr.nextElementSibling.classList.contains('mig-row') ? tr.nextElementSibling : null;
|
||||
if (!row) return;
|
||||
const vis = row.classList.contains('d-none'); row.classList.toggle('d-none', !vis);
|
||||
const openObserveWS = () => {
|
||||
if (wsObs) return;
|
||||
const url = api.wsObserveURL(sid);
|
||||
wsObs = new WebSocket(url);
|
||||
wsObs.onmessage = (ev) => {
|
||||
try {
|
||||
const msg = JSON.parse(ev.data);
|
||||
if (msg.type === 'vm' && msg.current) {
|
||||
// aktualizuj badge na podstawie bieżącego statusu
|
||||
const st = String(msg.current.status || msg.current.qmpstatus || '').toLowerCase();
|
||||
const ok = /running|online|started/.test(st);
|
||||
badgeCell.innerHTML = ok ? badge('running','ok') :
|
||||
(/stopp|shutdown|offline/.test(st) ? badge('stopped','dark') : badge(st||'—','info'));
|
||||
} else if (msg.type === 'task-start' && msg.upid && msg.node) {
|
||||
// automatycznie podłącz tail do nowo wykrytego taska
|
||||
openTaskWS(msg.upid, msg.node);
|
||||
} else if (msg.type === 'task' && msg.upid && msg.status) {
|
||||
// szybkie mrugnięcie statusem
|
||||
const stopped = String(msg.status||'').toLowerCase() === 'stopped';
|
||||
if (stopped && typeof msg.exitstatus !== 'undefined') {
|
||||
const ok = String(msg.exitstatus||'').toUpperCase() === 'OK';
|
||||
badgeCell.innerHTML = ok ? badge('running','ok') : badge('error','err');
|
||||
} else {
|
||||
badgeCell.innerHTML = badge('working','info');
|
||||
}
|
||||
} else if (msg.type === 'done' && msg.upid) {
|
||||
// koniec zewnętrznego zadania (bez naszego taila)
|
||||
if (msg.ok) badgeCell.innerHTML = badge('running','ok');
|
||||
else badgeCell.innerHTML = badge('error','err');
|
||||
try { document.getElementById('btnRefresh').click(); } catch {}
|
||||
}
|
||||
} catch {}
|
||||
};
|
||||
wsObs.onclose = () => { wsObs = null; };
|
||||
wsObs.onerror = () => {};
|
||||
};
|
||||
|
||||
const doAction = async (action, withTarget=false) => {
|
||||
setRowBusy(true);
|
||||
try {
|
||||
const target = withTarget ? getTarget() : undefined;
|
||||
const resp = await api.vmAction(sid, action, target);
|
||||
if (!resp.ok) throw new Error(resp.error || 'unknown');
|
||||
// unlock – brak UPID
|
||||
if (!resp.upid) {
|
||||
showToast('Success', `${action} executed for ${sid}`, 'success');
|
||||
setRowBusy(false); toggleSub(false);
|
||||
try { document.getElementById('btnRefresh').click(); } catch {}
|
||||
return;
|
||||
}
|
||||
// UPID → WS tail
|
||||
openTaskWS(resp.upid, resp.source_node);
|
||||
} catch (e) {
|
||||
showToast('Error', 'ERROR: ' + (e.message || e), 'danger');
|
||||
setRowBusy(false);
|
||||
}
|
||||
};
|
||||
|
||||
tr.querySelector('.act-unlock')?.addEventListener('click', () => doAction('unlock'));
|
||||
tr.querySelector('.act-start')?.addEventListener('click', () => { toggleSub(true); doAction('start'); });
|
||||
tr.querySelector('.act-stop')?.addEventListener('click', () => { toggleSub(true); doAction('stop'); });
|
||||
tr.querySelector('.act-shutdown')?.addEventListener('click', () => { toggleSub(true); doAction('shutdown'); });
|
||||
tr.querySelector('.act-migrate')?.addEventListener('click', () => { toggleSub(true); doAction('migrate', true); });
|
||||
|
||||
// Status – pokaz/ukryj subpanel (bez WS)
|
||||
tr.querySelector('.act-status')?.addEventListener('click', () => toggleSub(sub.classList.contains('d-none')));
|
||||
|
||||
// NEW: Watch 🔔 – włącz/wyłącz broadcast observe
|
||||
const watchBtn = tr.querySelector('.act-watch');
|
||||
if (watchBtn) {
|
||||
watchBtn.addEventListener('click', () => {
|
||||
if (wsObs) {
|
||||
closeWS();
|
||||
watchBtn.classList.remove('btn-info'); watchBtn.classList.add('btn-outline-info');
|
||||
watchBtn.textContent = 'Watch 🔔';
|
||||
} else {
|
||||
openObserveWS();
|
||||
watchBtn.classList.remove('btn-outline-info'); watchBtn.classList.add('btn-info');
|
||||
watchBtn.textContent = 'Watching 🔔';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
@@ -18,6 +18,16 @@ export const api = {
|
||||
const body = { sid, action }; if (target) body.target = target;
|
||||
return fetch('/api/vm-action', { method:'POST', headers:{'Content-Type':'application/json'}, body: JSON.stringify(body)}).then(r=>r.json());
|
||||
},
|
||||
taskStatus: (upid, node) => fetch(`/api/task-status?upid=${encodeURIComponent(upid)}&node=${encodeURIComponent(node)}`).then(r=>r.json()),
|
||||
taskLog: (upid, node, start=0) => fetch(`/api/task-log?upid=${encodeURIComponent(upid)}&node=${encodeURIComponent(node)}&start=${start}`).then(r=>r.json())
|
||||
|
||||
wsTaskURL: (upid, node) => {
|
||||
const proto = (location.protocol === 'https:') ? 'wss' : 'ws';
|
||||
return `${proto}://${location.host}/ws/task?upid=${encodeURIComponent(upid)}&node=${encodeURIComponent(node)}`;
|
||||
},
|
||||
// NEW:
|
||||
wsObserveURL: (sid) => {
|
||||
const proto = (location.protocol === 'https:') ? 'wss' : 'ws';
|
||||
return `${proto}://${location.host}/ws/observe?sid=${encodeURIComponent(sid)}`;
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user