gru/pve-ha-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refator_comm1

Browse Source
This commit is contained in:
Mateusz Gruszczyński
2025-10-18 22:27:39 +02:00
parent 5b0431fbec
commit fda2b721b3
3 changed files with 67 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
static/js/admin.js
View File

@@ -1,4 +1,4 @@
import { badge, rowHTML, setRows, safe, showToast } from './helpers.js';
import { rowHTML, setRows, safe, showToast } from './helpers.js';
import { api } from './api.js';
const liveSockets = new Map();
@@ -6,11 +6,21 @@ let slowTimer = null;
let fastTimer = null;
const activeSids = new Set();
function injectOnceCSS() {
if (document.getElementById('vmadmin-live-css')) return;
const style = document.createElement('style');
style.id = 'vmadmin-live-css';
style.textContent = `
.pulse-dot{display:inline-block;width:8px;height:8px;border-radius:50%;background:#22c55e;margin-left:.5rem;opacity:.25;animation:pulse-vm 1s ease-in-out 4}
@keyframes pulse-vm {0%,100%{opacity:.25;transform:scale(1)}50%{opacity:1;transform:scale(1.25)}}
`;
document.head.appendChild(style);
}
function closeForSid(sid) {
const entry = liveSockets.get(sid);
if (!entry) return;
try { entry.obs && entry.obs.close(); } catch {}
try { entry.task && entry.task.close(); } catch {}
liveSockets.delete(sid);
}
@@ -21,20 +31,24 @@ export function stopAllAdminWatches() {
for (const sid of Array.from(liveSockets.keys())) closeForSid(sid);
}
function setBadge(cell, val) {
function flashDot(cell) {
if (!cell) return;
cell.innerHTML = val;
}
function setMigrateDisabled(tr, disabled) {
const btn = tr.querySelector('.act-migrate');
if (btn) btn.disabled = !!disabled;
const nameWrap = cell.querySelector('.vm-name-wrap') || (() => {
const w = document.createElement('span'); w.className = 'vm-name-wrap';
while (cell.firstChild) w.appendChild(cell.firstChild);
cell.appendChild(w);
return w;
})();
const dot = document.createElement('span');
dot.className = 'pulse-dot';
nameWrap.appendChild(dot);
setTimeout(() => { try { dot.remove(); } catch {} }, 4200);
}
function rebuildTargetSelect(selectEl, currentNode, nodes) {
if (!selectEl) return;
const html = nodes.map(n =>
`<option value="${n}" ${n === currentNode ? 'disabled selected' : ''}>${n}${n === currentNode ? ' (src)' : ''}</option>`
`<option value="${n}" ${n === currentNode ? 'disabled selected' : ''}>${n}</option>`
).join('');
selectEl.innerHTML = html;
const idx = Array.from(selectEl.options).findIndex(o => !o.disabled);
@@ -42,6 +56,7 @@ function rebuildTargetSelect(selectEl, currentNode, nodes) {
}
export async function renderVMAdmin() {
injectOnceCSS();
stopAllAdminWatches();
const data = await api.listAllVmct();
@@ -52,7 +67,7 @@ export async function renderVMAdmin() {
const rows = arr.map(x => {
const sid = safe(x.sid), type = safe(x.type), name = safe(x.name), node = safe(x.node);
const st = /running/i.test(x.status || '') ? badge('running','ok') : badge(x.status || '—','dark');
const nameCell = `<span class="vm-name-wrap">${name}</span>`;
const actions = `
<div class="btn-group btn-group-sm" role="group">
<button class="btn btn-outline-secondary act-unlock">Unlock</button>
@@ -61,166 +76,75 @@ export async function renderVMAdmin() {
<button class="btn btn-outline-danger act-stop">Stop</button>
</div>`;
const sel = `<select class="form-select form-select-sm target-node" style="min-width:160px">
${availableNodes.map(n => `<option value="${n}" ${n === x.node ? 'disabled selected' : ''}>${n}${n === x.node ? ' (src)' : ''}</option>`).join('')}
${availableNodes.map(n => `<option value="${n}" ${n === x.node ? 'disabled selected' : ''}>${n}</option>`).join('')}
</select>`;
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>
<button class="btn btn-outline-secondary btn-sm act-status">Details</button>
</div>`;
return rowHTML([sid, type.toUpperCase(), name, node, st, actions, sel, tools], `data-sid="${sid}"`);
// Kolumny: SID | TYPE | NAME | NODE | ACTIONS | TARGET | TOOLS
return rowHTML([sid, type.toUpperCase(), nameCell, node, 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 colSpan = tr.children.length;
const nodeCell = tr.children[3];
const badgeCell = tr.children[4];
const nameCell = tr.children[2];
const targetSel = tr.querySelector('.target-node');
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);
const setRowBusy = (busy) => {
const nameCell = tr.children[2];
let spin = nameCell.querySelector('.op-spin');
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 getTarget = () => targetSel?.value || '';
const openTaskWS = (upid, node) => {
if (!upid) return;
toggleSub(true);
logPre.textContent = `UPID: ${upid} @ ${node}\n`;
const entry = liveSockets.get(sid) || {};
try { entry.task && entry.task.close(); } catch {}
const wsTask = new WebSocket(api.wsTaskURL(upid, node));
entry.task = wsTask;
liveSockets.set(sid, entry);
activeSids.add(sid);
wsTask.onmessage = (ev) => {
try {
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 s = String(msg.status.status||'').toLowerCase();
setBadge(badgeCell, ok ? badge('running','ok') :
(s === 'stopped' ? badge('stopped','dark') : badge('working','info')));
} else if (msg.type === 'done') {
const ok = !!msg.ok;
setBadge(badgeCell, ok ? badge('running','ok') : badge('error','err'));
setRowBusy(false);
setTimeout(() => toggleSub(false), 1000);
setTimeout(() => activeSids.delete(sid), 5000);
}
} catch {}
};
};
const ensureWatchOn = () => {
const existing = liveSockets.get(sid);
if (existing && existing.obs && existing.obs.readyState <= 1) return;
closeForSid(sid);
const wsObs = new WebSocket(api.wsObserveURL(sid));
liveSockets.set(sid, { obs: wsObs, task: null });
liveSockets.set(sid, { obs: wsObs });
wsObs.onmessage = (ev) => {
try {
const msg = JSON.parse(ev.data);
if (msg.type === 'vm' && msg.current) {
const st = String(msg.current.status || msg.current.qmpstatus || '').toLowerCase();
const isRunning = /running|online|started/.test(st);
setBadge(badgeCell, isRunning ? badge('running','ok') :
(/stopp|shutdown|offline/.test(st) ? badge('stopped','dark') : badge(st||'—','info')));
setMigrateDisabled(tr, isRunning);
if (!isRunning && st) activeSids.add(sid);
}
else if (msg.type === 'task-start' && msg.upid && msg.node) {
openTaskWS(msg.upid, msg.node);
if (msg.type === 'task-start') {
activeSids.add(sid);
flashDot(nameCell);
}
else if (msg.type === 'task' && msg.upid && msg.status) {
const stopped = String(msg.status||'').toLowerCase() === 'stopped';
if (stopped && typeof msg.exitstatus !== 'undefined') {
const ok = String(msg.exitstatus||'').toUpperCase() === 'OK';
setBadge(badgeCell, ok ? badge('running','ok') : badge('error','err'));
setTimeout(() => activeSids.delete(sid), 5000);
} else {
setBadge(badgeCell, badge('working','info'));
activeSids.add(sid);
}
else if (msg.type === 'task') {
activeSids.add(sid);
flashDot(nameCell);
}
else if (msg.type === 'moved' && msg.new_node) {
if (nodeCell) nodeCell.textContent = msg.new_node;
rebuildTargetSelect(targetSel, msg.new_node, Array.from(new Set([...(window.__nodesCache||[]), msg.new_node])));
if (nodeCell && nodeCell.textContent.trim() !== msg.new_node) {
nodeCell.textContent = msg.new_node;
rebuildTargetSelect(targetSel, msg.new_node, window.__nodesCache || []);
flashDot(nameCell);
}
activeSids.add(sid);
}
else if (msg.type === 'done' && typeof msg.ok === 'boolean') {
setBadge(badgeCell, msg.ok ? badge('running','ok') : badge('error','err'));
setTimeout(() => activeSids.delete(sid), 5000);
else if (msg.type === 'done') {
setTimeout(() => activeSids.delete(sid), 4000);
flashDot(nameCell);
}
} catch {}
};
wsObs.onclose = () => {
const e = liveSockets.get(sid);
if (e && e.obs === wsObs) {
liveSockets.set(sid, { obs: null, task: e.task || null });
}
if (e && e.obs === wsObs) liveSockets.set(sid, { obs: null });
};
};
const doAction = async (action, withTarget=false) => {
setRowBusy(true);
try {
const target = withTarget ? getTarget() : undefined;
ensureWatchOn();
if (action !== 'unlock') {
setBadge(badgeCell, badge('working','info'));
toggleSub(true);
activeSids.add(sid);
}
if (action !== 'unlock') activeSids.add(sid);
const target = withTarget ? (targetSel?.value || '') : undefined;
const resp = await api.vmAction(sid, action, target);
if (!resp.ok) throw new Error(resp.error || 'unknown');
if (!resp.upid) {
logPre.textContent = `Waiting for task… (${action})\n`;
setRowBusy(false);
activeSids.add(sid);
return;
}
openTaskWS(resp.upid, resp.source_node);
flashDot(nameCell);
} catch (e) {
showToast('Error', 'ERROR: ' + (e.message || e), 'danger');
setRowBusy(false);
toggleSub(false);
activeSids.delete(sid);
}
};
@@ -230,16 +154,17 @@ export async function renderVMAdmin() {
tr.querySelector('.act-stop')?.addEventListener('click', () => doAction('stop'));
tr.querySelector('.act-shutdown')?.addEventListener('click',() => doAction('shutdown'));
tr.querySelector('.act-migrate')?.addEventListener('click', () => doAction('migrate', true));
tr.querySelector('.act-status')?.addEventListener('click', () => toggleSub(sub.classList.contains('d-none')));
tr.querySelector('.act-status')?.addEventListener('click', async () => {
flashDot(nameCell);
});
ensureWatchOn();
const initialRunning = /running/i.test(tr.querySelector('td:nth-child(5)')?.innerText || '');
setMigrateDisabled(tr, initialRunning);
});
window.__nodesCache = availableNodes.slice();
// pełna lista – co 30 s
slowTimer = setInterval(async () => {
try {
const latest = await api.listAllVmct();
@@ -254,22 +179,20 @@ export async function renderVMAdmin() {
if (!rowData) return;
const nodeCell = tr.children[3];
const badgeCell = tr.children[4];
const nameCell = tr.children[2];
const targetSel = tr.querySelector('.target-node');
const newNode = String(rowData.node || '').trim();
if (nodeCell && newNode && nodeCell.textContent.trim() !== newNode) {
nodeCell.textContent = newNode;
rebuildTargetSelect(targetSel, newNode, nodesNow);
flashDot(nameCell);
}
const isRunning = /running/i.test(rowData.status || '');
setBadge(badgeCell, isRunning ? badge('running','ok') : badge(rowData.status || '—','dark'));
setMigrateDisabled(tr, isRunning);
});
} catch {}
}, 30000);
// tylko aktywne – co 10 s
fastTimer = setInterval(async () => {
try {
const sids = Array.from(activeSids);
@@ -280,26 +203,18 @@ export async function renderVMAdmin() {
const tr = tbody.querySelector(`tr[data-sid="${sid}"]`);
if (!tr) continue;
const nodeCell = tr.children[3];
const badgeCell = tr.children[4];
const nameCell = tr.children[2];
const targetSel = tr.querySelector('.target-node');
const stRaw = String((detail.current && (detail.current.status || detail.current.qmpstatus)) || '').toLowerCase();
const isRunning = /running|online|started/.test(stRaw);
setBadge(badgeCell, isRunning ? badge('running','ok') :
(/stopp|shutdown|offline/.test(stRaw) ? badge('stopped','dark') : badge(stRaw||'—','info')));
setMigrateDisabled(tr, isRunning);
const newNode = String(detail.node || (detail.meta && detail.meta.node) || '').trim();
if (newNode) {
if (nodeCell && nodeCell.textContent.trim() !== newNode) {
nodeCell.textContent = newNode;
flashDot(nameCell);
}
rebuildTargetSelect(targetSel, newNode, window.__nodesCache || []);
}
if (stRaw && /running|stopped|shutdown/.test(stRaw)) {
setTimeout(() => activeSids.delete(sid), 5000);
}
setTimeout(() => activeSids.delete(sid), 4000);
}
} catch {}
}, 10000);