Show active job start time and elapsed duration
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
<section class="server-card"><div class="server-heading"><div><div class="eyebrow">SERVER</div><h2>ComfyUI status</h2></div><span class="connection" [class.offline]="!server">{{server?'Connected':'Unavailable'}}</span></div><div class="server-error" *ngIf="serverError">{{serverError}}</div><div class="queue-panel" *ngIf="server"><div><strong>{{server.queue.total}}</strong><span>jobs queued</span></div><div><strong>{{server.queue.running}}</strong><span>running</span></div><div><strong>{{server.queue.pending}}</strong><span>waiting</span></div></div><div class="server-info" *ngIf="server"><div><span>Version</span><strong>{{server.version || 'Unknown'}}</strong></div><div><span>Operating system</span><strong>{{server.os || 'Unknown'}}</strong></div><div><span>Python</span><strong>{{server.pythonVersion || 'Unknown'}}</strong></div></div><div class="devices" *ngIf="server?.devices?.length"><div class="device" *ngFor="let device of server?.devices || []"><strong>{{device.name}}</strong><span>{{device.type}} · {{formatBytes(device.vramFree)}} free of {{formatBytes(device.vramTotal)}}</span></div></div>
|
||||
<div class="manager-controls" *ngIf="user?.role==='admin'"><div class="manager-heading"><div><span>ComfyUI Manager {{manager?.managerVersion || '—'}}</span><strong>Runtime controls</strong></div><span *ngIf="manager">Current {{manager.currentVersion}}</span></div><div class="control-actions"><button type="button" (click)="runControl('restart')" [disabled]="!!controlBusy">{{controlBusy==='restart'?'Restarting…':'Restart ComfyUI'}}</button><button type="button" (click)="runControl('update-all')" [disabled]="!!controlBusy">{{controlBusy==='update-all'?'Updating everything…':'Update all'}}</button><button type="button" (click)="runControl('update')" [disabled]="!!controlBusy">{{controlBusy==='update'?'Updating…':'Update to latest'}}</button><select [value]="selectedVersion" (change)="selectedVersion=$any($event.target).value" [disabled]="!!controlBusy||!manager"><option value="" disabled>Choose version</option><option *ngFor="let version of manager?.versions || []" [value]="version">Switch to {{version}}</option></select><button type="button" (click)="runControl('switch')" [disabled]="!!controlBusy||!selectedVersion">{{controlBusy==='switch'?'Switching…':'Switch version'}}</button></div><div class="control-message" *ngIf="controlMessage">{{controlMessage}}</div><div class="update-result" *ngIf="updateResult"><strong>Update results</strong><div>ComfyUI: {{updateResult.comfyui || 'No result reported'}}</div><div *ngIf="updateResult.updated.length"><span>Updated custom nodes</span><ul><li *ngFor="let item of updateResult.updated">{{item.title}}</li></ul></div><div *ngIf="updateResult.skipped.length"><span>Already up to date</span><ul><li *ngFor="let item of updateResult.skipped">{{item.title}}</li></ul></div><div *ngIf="updateResult.failed.length"><span>Could not update</span><ul><li *ngFor="let item of updateResult.failed">{{item.title}}<small *ngIf="item.error"> — {{item.error}}</small></li></ul></div></div></div>
|
||||
</section>
|
||||
<section class="running-card" *ngIf="runningJob"><div class="running-heading"><div><div class="eyebrow">CURRENTLY RUNNING</div><h2>{{runningJob.title}}</h2></div><span class="status running">running</span></div><div class="progress-track" [class.indeterminate]="!runningJob.progress"><div class="progress-value" [style.width.%]="runningJob.progress?.percent || 8"></div></div><div class="progress-label">{{runningJob.progress ? (runningJob.progress.percent + '% complete') : 'Working…'}}</div><div class="meta"><span>ID {{runningJob.promptId}}</span><span>Duration {{formatDuration(runningJob.durationMs)}}</span></div><div class="models" *ngIf="runningJob.models.length"><strong>Models</strong><span *ngFor="let model of runningJob.models" [title]="model.type">{{model.name}}</span></div></section>
|
||||
<section class="running-card" *ngIf="runningJob"><div class="running-heading"><div><div class="eyebrow">CURRENTLY RUNNING</div><h2>{{runningJob.title}}</h2></div><span class="status running">running</span></div><div class="progress-track" [class.indeterminate]="!runningJob.progress"><div class="progress-value" [style.width.%]="runningJob.progress?.percent || 8"></div></div><div class="progress-label">{{runningJob.progress ? (runningJob.progress.percent + '% complete') : 'Working…'}}</div><div class="meta"><span>ID {{runningJob.promptId}}</span><span>Started {{formatClock(runningJob.queuedAt)}}</span><span>Running for {{runningDuration()}}</span></div><div class="models" *ngIf="runningJob.models.length"><strong>Models</strong><span *ngFor="let model of runningJob.models" [title]="model.type">{{model.name}}</span></div></section>
|
||||
<div class="notice" *ngIf="error">{{error}}</div><div class="loading" *ngIf="loading">Loading remote jobs…</div><div class="empty" *ngIf="!loading&&!error&&!jobs.length">No remote jobs were returned.</div>
|
||||
<div class="grid"><article class="job" *ngFor="let job of jobs"><div class="jobhead"><h2>{{job.title}}</h2><span [class]="'status '+job.status">{{job.status}}</span></div><div class="meta"><span>ID {{job.promptId}}</span><span>{{job.outputCount}} output{{job.outputCount===1?'':'s'}}</span><span>Duration {{formatDuration(job.durationMs)}}</span></div><div class="models" *ngIf="job.models.length"><strong>Models</strong><span *ngFor="let model of job.models" [title]="model.type">{{model.name}}</span></div><div class="assets" *ngIf="job.assets.length"><figure *ngFor="let asset of job.assets"><a [href]="asset.url" target="_blank" rel="noopener"><img *ngIf="!isVideo(asset)" [src]="asset.url" [alt]="asset.filename" loading="lazy"><video *ngIf="isVideo(asset)" [src]="asset.url" controls preload="metadata"></video></a><figcaption><strong>{{asset.filename}}</strong><span class="asset-meta"><span *ngIf="asset.width&&asset.height">{{asset.width}} × {{asset.height}}</span><span *ngIf="asset.sizeBytes">{{formatFileSize(asset.sizeBytes)}}</span></span></figcaption></figure></div><div class="no-assets" *ngIf="!job.assets.length">No output assets</div></article></div>
|
||||
</section>
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -11,6 +11,7 @@ const browserDir = path.join(__dirname, 'frontend', 'dist', 'browser');
|
||||
const indexHtml = path.join(browserDir, 'index.html');
|
||||
const comfyBase = String(process.env.COMFYUI_URL || 'http://127.0.0.1:8188').replace(/\/$/, '');
|
||||
const liveProgress = new Map();
|
||||
const executionStarts = new Map();
|
||||
let managerUpdateResult = null;
|
||||
let managerUpdateProgress = null;
|
||||
app.use(express.json({ limit: '1mb' }));
|
||||
@@ -75,8 +76,15 @@ function startComfyProgressSocket() {
|
||||
}
|
||||
if (!data.prompt_id) return;
|
||||
if (message.type === 'progress') liveProgress.set(data.prompt_id, { value: Number(data.value) || 0, max: Number(data.max) || 1 });
|
||||
if (message.type === 'execution_start') liveProgress.set(data.prompt_id, { value: 0, max: 1 });
|
||||
if (message.type === 'executing' && data.node === null) liveProgress.delete(data.prompt_id);
|
||||
if (message.type === 'execution_start') {
|
||||
const timestamp = Number(data.timestamp);
|
||||
executionStarts.set(data.prompt_id, Number.isFinite(timestamp) && timestamp > 0 ? timestamp : Date.now());
|
||||
liveProgress.set(data.prompt_id, { value: 0, max: 1 });
|
||||
}
|
||||
if (message.type === 'executing' && data.node === null) {
|
||||
liveProgress.delete(data.prompt_id);
|
||||
executionStarts.delete(data.prompt_id);
|
||||
}
|
||||
} catch { /* Ignore malformed progress events. */ }
|
||||
});
|
||||
socket.on('close', () => setTimeout(startComfyProgressSocket, 5000));
|
||||
@@ -88,7 +96,8 @@ function jobFromHistory(promptId, entry) {
|
||||
const assets = outputs.flatMap((output) => [...(output?.images || []), ...(output?.gifs || []), ...(output?.videos || [])]).filter((asset) => asset?.filename).map((asset) => ({ ...asset, type: assetType(asset), url: `/api/assets?filename=${encodeURIComponent(asset.filename)}&subfolder=${encodeURIComponent(asset.subfolder || '')}&type=${encodeURIComponent(asset.type || 'output')}` }));
|
||||
const metadata = extraData(entry);
|
||||
const progress = liveProgress.get(promptId);
|
||||
return { promptId, title: metadata.title || 'Untitled job', status: statusFromHistory(entry), queuedAt: statusTimestamp(entry, 'execution_start') || '', completedAt: statusTimestamp(entry, 'execution_success') || statusTimestamp(entry, 'execution_error'), durationMs: durationMs(entry), outputCount: assets.length, assets, models: modelsFromPrompt(entry), progress: progress ? { value: progress.value, max: progress.max, percent: Math.min(100, Math.round((progress.value / progress.max) * 100)) } : null };
|
||||
const startedAt = statusTimestamp(entry, 'execution_start') || executionStarts.get(promptId) || null;
|
||||
return { promptId, title: metadata.title || 'Untitled job', status: statusFromHistory(entry), queuedAt: startedAt, completedAt: statusTimestamp(entry, 'execution_success') || statusTimestamp(entry, 'execution_error'), durationMs: durationMs(entry), outputCount: assets.length, assets, models: modelsFromPrompt(entry), progress: progress ? { value: progress.value, max: progress.max, percent: Math.min(100, Math.round((progress.value / progress.max) * 100)) } : null };
|
||||
}
|
||||
function jobFromQueue(item) { const [queueNumber, promptId, prompt, extraData] = item || []; return jobFromHistory(String(promptId || `queued-${queueNumber}`), { prompt: [queueNumber, promptId, prompt || {}, extraData || {}], status: {}, outputs: {} }); }
|
||||
async function listJobs() { const [history, queue] = await Promise.all([comfyJson('/history'), comfyJson('/queue')]); const jobs = Object.entries(history || {}).map(([promptId, entry]) => jobFromHistory(promptId, entry)).sort((a, b) => (b.completedAt || b.queuedAt || 0) - (a.completedAt || a.queuedAt || 0)); const running = (queue?.queue_running || []).map(jobFromQueue)[0] || null; return { jobs, running }; }
|
||||
|
||||
Reference in New Issue
Block a user