Hitonabi/mission-control
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Live-Download-Fortschritt + Jobs abbrechen

Browse Source 
Job-Engine:
- Ausgabe wird binaer + byteweise gelesen und CRLF-bewusst verarbeitet:
  einzelnes \r (tqdm/hf-Fortschritt) ueberschreibt die letzte Logzeile statt
  sie zu fluten; \r\n bzw. \n = echte neue Zeile. So kommt der Download-
  Fortschritt live an. (Text-Modus wuerde \r zu \n uebersetzen -> daher binaer.)
- cancel_job(): laufenden Prozess terminieren, Status "canceled", _PROCS-Registry
- POST /api/jobs/{id}/cancel

Frontend:
- Aktivitaet: Fortschrittsbalken + %-Anzeige aus der letzten Logzeile,
  "Abbrechen"-Button je laufendem Job, Status "abgebrochen"
- Server/Aktueller Vorgang: Fortschrittsbalken + Abbrechen (mit Rueckfrage),
  "abgebrochen"-Behandlung

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Hitonabi
2026-06-21 18:21:21 +02:00
parent 720b47a6e1
commit 2cde6ba5a5
4 changed files with 148 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/js/panels/jobs.js
+26 -4
View File
@@ -1,7 +1,8 @@
// jobs.js — Aktivität (v3): Live-System-Metriken + Hintergrund-Jobs mit Log.
// Exportiert track(id), damit andere Panels einen Job auto-aufklappen.
import { $, esc, fmtBytes } from "../core/ui.js";
import { api } from "../core/api.js";
import { $, esc, fmtBytes, toast } from "../core/ui.js";
const tracked = new Set();
let JOBS = [];
@@ -12,8 +13,21 @@ export function track(id) { tracked.add(id); renderJobs(); }
const hist = { cpu: [], ram: [], gpu: [] };
const MAX_HIST = 60;
function statusBadge(s) { return s === "done" ? '<span class="badge b-run">fertig</span>' : s === "failed" ? '<span class="badge b-err">fehler</span>' : '<span class="badge b-load">läuft…</span>'; }
function dotClass(s) { return s === "done" ? "on" : s === "failed" ? "" : "load"; }
function statusBadge(s) { return s === "done" ? '<span class="badge b-run">fertig</span>' : s === "failed" ? '<span class="badge b-err">fehler</span>' : s === "canceled" ? '<span class="badge">abgebrochen</span>' : '<span class="badge b-load">läuft…</span>'; }
function dotClass(s) { return s === "done" ? "on" : (s === "failed" || s === "canceled") ? "" : "load"; }
// Fortschritt in % aus der letzten Log-Zeile ziehen (tqdm schreibt z.B. " 45%|…").
function jobPct(j) {
if (j.state !== "running") return null;
const last = (j.log || [])[j.log.length - 1] || "";
const m = last.match(/(\d+(?:\.\d+)?)\s*%/);
return m ? Math.min(100, parseFloat(m[1])) : null;
}
async function cancelJob(id) {
try { await api(`/api/jobs/${id}/cancel`, { method: "POST" }); toast("Abbruch angefordert…"); renderJobs(); }
catch (e) { toast(e.message, true); }
}
function tile(label, value, sub) {
return `<div class="tile"><div class="t-l">${label}</div><div class="t-v">${value}</div><div class="t-s">${sub}</div></div>`;
@@ -76,6 +90,8 @@ function mount() {
<div id="jobs-empty" class="empty-c"><div class="e-t">Gerade nichts los.</div><div class="e-s">Alles ruhig — keine laufenden Aufgaben.</div></div>`;
$("#v-activity").addEventListener("click", e => {
const cancel = e.target.closest("[data-cancel]");
if (cancel) { e.stopPropagation(); cancelJob(cancel.getAttribute("data-cancel")); return; }
const h = e.target.closest(".job-h"); if (!h) return;
const id = h.getAttribute("data-id");
tracked.has(id) ? tracked.delete(id) : tracked.add(id);
@@ -91,8 +107,14 @@ function renderJobs() {
$("#job-count").textContent = JOBS.length ? (failed ? failed + " Fehler" : JOBS.length + " gesamt") : "";
c.innerHTML = JOBS.map(j => {
const log = tracked.has(j.id) ? `<div class="log">${esc((j.log || []).join("\n"))}</div>` : "";
const p = jobPct(j);
const prog = p != null ? `<div class="bar" style="margin-top:8px"><i style="width:${p}%"></i></div>` : "";
const pctTxt = p != null ? `<span class="mono-sm" style="margin-left:auto">${Math.round(p)} %</span>` : "";
const cancelBtn = j.state === "running"
? `<button class="ghost" data-cancel="${esc(j.id)}" style="${p != null ? "" : "margin-left:auto;"}margin-right:2px;padding:2px 9px;font-size:12px">Abbrechen</button>`
: "";
return `<div class="job"><div class="job-h" data-id="${esc(j.id)}">
<span class="li-dot ${dotClass(j.state)}"></span><span class="mid">${esc(j.label)}</span>${statusBadge(j.state)}</div>${log}</div>`;
<span class="li-dot ${dotClass(j.state)}"></span><span class="mid">${esc(j.label)}</span>${pctTxt}${cancelBtn}${statusBadge(j.state)}</div>${prog}${log}</div>`;
}).join("");
}
static/js/panels/server.js
+32 -5
View File
@@ -39,8 +39,11 @@ function mount() {
</div>
<div class="card" id="w-update-card" style="display:none">
<div class="card-h"><h3>Aktueller Vorgang</h3><span id="w-update-badge" style="margin-left:auto"></span></div>
<div class="card-h"><h3>Aktueller Vorgang</h3>
<button class="ghost" id="w-update-cancel" style="margin-left:auto;display:none;padding:3px 12px">Abbrechen</button>
<span id="w-update-badge" style="margin-left:10px"></span></div>
<div class="card-sub" id="w-update-label">—</div>
<div id="w-update-bar" class="bar" style="display:none;margin-bottom:10px"><i style="width:0%"></i></div>
<div id="w-update-log" class="log" style="max-height:280px"></div>
</div>
@@ -67,9 +70,17 @@ function mount() {
$("#w-os-update").addEventListener("click", osUpdate);
$("#w-reboot").addEventListener("click", rebootServer);
$("#w-console-sel").addEventListener("change", connectConsole);
$("#w-update-cancel").addEventListener("click", cancelActive);
connectConsole();
}
async function cancelActive() {
if (!activeJob) return;
if (!await confirmModal({ title: activeJob.label + " abbrechen?", body: "Der laufende Vorgang wird gestoppt. Bei einem Download bleibt eine unvollständige Datei zurück (kannst du später neu starten).", confirmLabel: "Abbrechen", danger: true })) return;
try { await api(`/api/jobs/${activeJob.id}/cancel`, { method: "POST" }); toast("Abbruch angefordert…"); }
catch (e) { toast(e.message, true); }
}
let ws = null;
function connectConsole() {
if (ws) { ws.close(); ws = null; }
@@ -122,16 +133,32 @@ function onJobs(jobs) {
card.style.display = "";
const logEl = $("#w-update-log");
if (logEl) { logEl.textContent = (j.log || []).join("\n"); logEl.scrollTop = logEl.scrollHeight; }
const done = j.state === "done", failed = j.state === "failed", canceled = j.state === "canceled";
const terminal = done || failed || canceled;
const badge = $("#w-update-badge");
const done = j.state === "done", failed = j.state === "failed";
if (badge) badge.innerHTML = done ? '<span class="badge b-run">✓ fertig</span>'
: failed ? '<span class="badge b-err">✗ fehlgeschlagen</span>'
: canceled ? '<span class="badge">abgebrochen</span>'
: '<span class="badge b-load">läuft…</span>';
if (done || failed) {
$("#w-update-label").textContent = activeJob.label + (done ? " — erfolgreich abgeschlossen." : " — fehlgeschlagen (siehe Protokoll).");
// Fortschrittsbalken aus der letzten Log-Zeile (tqdm: " 45%|…")
const last = (j.log || [])[j.log.length - 1] || "";
const pm = !terminal && last.match(/(\d+(?:\.\d+)?)\s*%/);
const bar = $("#w-update-bar");
if (bar) {
if (pm) { bar.style.display = ""; bar.querySelector("i").style.width = Math.min(100, parseFloat(pm[1])) + "%"; }
else bar.style.display = "none";
}
$("#w-update-cancel").style.display = terminal ? "none" : "";
if (terminal) {
$("#w-update-label").textContent = activeJob.label +
(done ? " — erfolgreich abgeschlossen." : canceled ? " — abgebrochen." : " — fehlgeschlagen (siehe Protokoll).");
if (!notified.has(j.id)) {
notified.add(j.id);
toast(done ? "✓ " + activeJob.label + " abgeschlossen." : "✗ " + activeJob.label + " fehlgeschlagen.", failed);
toast(done ? "✓ " + activeJob.label + " abgeschlossen."
: canceled ? activeJob.label + " abgebrochen."
: "✗ " + activeJob.label + " fehlgeschlagen.", failed);
if (done) setTimeout(refreshSoon, 800);
}
}