From 2d5250ca2df319c4639bc9deb2642b8b3b6bf592 Mon Sep 17 00:00:00 2001 From: "chris.dumas" Date: Sat, 3 Oct 2026 04:25:06 +0000 Subject: [PATCH] show asset resolution and file size --- frontend/src/app/pages/jobs.page.html | 23 ++++------------------- frontend/src/app/pages/jobs.page.scss | 1 + frontend/src/app/pages/jobs.page.ts | 4 ++-- server.js | 2 ++ 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/frontend/src/app/pages/jobs.page.html b/frontend/src/app/pages/jobs.page.html index e32ede7..63a7f03 100644 --- a/frontend/src/app/pages/jobs.page.html +++ b/frontend/src/app/pages/jobs.page.html @@ -1,22 +1,7 @@
-
-
REMOTE JOBS

Job monitor

Read-only view of the remote ComfyUI queue and history.

- -
-
-
SERVER

ComfyUI status

{{server?'Connected':'Unavailable'}}
-
{{serverError}}
-
{{server.queue.total}}jobs queued
{{server.queue.running}}running
{{server.queue.pending}}waiting
-
Version{{server.version || 'Unknown'}}
Operating system{{server.os || 'Unknown'}}
Python{{server.pythonVersion || 'Unknown'}}
-
{{device.name}}{{device.type}} · {{formatBytes(device.vramFree)}} free of {{formatBytes(device.vramTotal)}}
-
-
-
CURRENTLY RUNNING

{{runningJob.title}}

running
-
-
{{runningJob.progress ? (runningJob.progress.percent + '% complete') : 'Working…'}}
-
ID {{runningJob.promptId}}Duration {{formatDuration(runningJob.durationMs)}}
-
Models{{model.name}}
-
+
REMOTE JOBS

Job monitor

Read-only view of the remote ComfyUI queue and history.

+
SERVER

ComfyUI status

{{server?'Connected':'Unavailable'}}
{{serverError}}
{{server.queue.total}}jobs queued
{{server.queue.running}}running
{{server.queue.pending}}waiting
Version{{server.version || 'Unknown'}}
Operating system{{server.os || 'Unknown'}}
Python{{server.pythonVersion || 'Unknown'}}
{{device.name}}{{device.type}} · {{formatBytes(device.vramFree)}} free of {{formatBytes(device.vramTotal)}}
+
CURRENTLY RUNNING

{{runningJob.title}}

running
{{runningJob.progress ? (runningJob.progress.percent + '% complete') : 'Working…'}}
ID {{runningJob.promptId}}Duration {{formatDuration(runningJob.durationMs)}}
Models{{model.name}}
{{error}}
Loading remote jobs…
No remote jobs were returned.
-

{{job.title}}

{{job.status}}
ID {{job.promptId}}{{job.outputCount}} output{{job.outputCount===1?'':'s'}}Duration {{formatDuration(job.durationMs)}}
Models{{model.name}}
{{asset.filename}}
No output assets
+

{{job.title}}

{{job.status}}
ID {{job.promptId}}{{job.outputCount}} output{{job.outputCount===1?'':'s'}}Duration {{formatDuration(job.durationMs)}}
Models{{model.name}}
{{asset.filename}}{{asset.width}} × {{asset.height}}{{formatFileSize(asset.sizeBytes)}}
No output assets
diff --git a/frontend/src/app/pages/jobs.page.scss b/frontend/src/app/pages/jobs.page.scss index 71c3721..b27b77d 100644 --- a/frontend/src/app/pages/jobs.page.scss +++ b/frontend/src/app/pages/jobs.page.scss @@ -1,2 +1,3 @@ .heading{display:flex;justify-content:space-between;align-items:start;gap:1rem;margin-bottom:2rem}.eyebrow{font-size:.75rem;font-weight:800;letter-spacing:.12em;color:#3b82f6}h1{margin:.35rem 0}.heading p{color:#63738a}.refresh{padding:.65rem 1rem;border:1px solid #cbd5e1;border-radius:8px;background:#fff;cursor:pointer}.server-card{background:#18283d;color:#fff;border-radius:14px;padding:1.25rem;margin-bottom:1.5rem}.server-heading{display:flex;justify-content:space-between;align-items:start}.server-heading h2{margin:.35rem 0 0;font-size:1.05rem}.connection{background:#bbf7d0;color:#166534;border-radius:999px;padding:.3rem .6rem;font-size:.75rem;font-weight:700}.connection.offline{background:#fecaca;color:#991b1b}.queue-panel{display:flex;gap:1.5rem;align-items:center;margin-top:1.25rem;padding:1rem;background:#243952;border-radius:10px}.queue-panel div{display:flex;flex-direction:column;gap:.15rem}.queue-panel strong{font-size:1.35rem}.queue-panel span{color:#aab8cb;font-size:.75rem}.server-info{display:grid;grid-template-columns:repeat(auto-fit,minmax(150px,1fr));gap:1rem;margin-top:1.25rem}.server-info div{display:flex;flex-direction:column;gap:.25rem}.server-info span,.device span{color:#aab8cb;font-size:.75rem}.server-info strong{font-size:.85rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.devices{display:grid;gap:.5rem;margin-top:1.25rem}.device{display:flex;justify-content:space-between;gap:1rem;border-top:1px solid #34465d;padding-top:.7rem}.server-error{color:#fecaca;margin-top:1rem;font-size:.85rem}.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(340px,1fr));gap:1rem}.job{background:#fff;border:1px solid #dce3ed;border-radius:14px;padding:1.25rem}.jobhead{display:flex;justify-content:space-between;gap:1rem}.job h2{font-size:1rem;margin:0;color:#18283d}.status{font-size:.75rem;border-radius:999px;padding:.25rem .55rem;background:#e8eef7}.status.completed{background:#dcfce7;color:#166534}.status.failed{background:#fee2e2;color:#991b1b}.meta{display:flex;flex-wrap:wrap;gap:.5rem 1rem;color:#63738a;font-size:.8rem;margin-top:.8rem}.models{display:flex;flex-wrap:wrap;align-items:center;gap:.4rem;margin-top:1rem;font-size:.75rem}.models strong{color:#42526b}.models span{background:#eef2ff;color:#3730a3;border-radius:6px;padding:.3rem .45rem;max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.assets{display:grid;grid-template-columns:repeat(auto-fill,minmax(120px,1fr));gap:.6rem;margin-top:1rem}.assets figure{margin:0;min-width:0}.assets a{display:block;aspect-ratio:1;background:#f1f5f9;border-radius:8px;overflow:hidden}.assets img,.assets video{display:block;width:100%;height:100%;object-fit:cover}.assets figcaption{font-size:.7rem;color:#63738a;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-top:.3rem}.no-assets{margin-top:1rem;color:#94a3b8;font-size:.8rem}.notice{padding:1rem;background:#fff1f0;color:#b42318;border-radius:10px}.loading,.empty{padding:3rem;text-align:center;color:#63738a} .running-card{background:#fff;border:1px solid #93c5fd;border-radius:14px;padding:1.25rem;margin-bottom:1.5rem;box-shadow:0 6px 20px rgba(59,130,246,.08)}.running-heading{display:flex;justify-content:space-between;align-items:start;gap:1rem}.running-heading h2{margin:.35rem 0 0;font-size:1.05rem;color:#18283d}.progress-track{height:10px;background:#dbeafe;border-radius:999px;overflow:hidden;margin-top:1.25rem}.progress-value{height:100%;background:#2563eb;border-radius:inherit;transition:width .4s ease}.progress-track.indeterminate .progress-value{width:35%!important;animation:progress-slide 1.4s ease-in-out infinite}.progress-label{color:#42526b;font-size:.75rem;margin-top:.45rem}@keyframes progress-slide{0%{margin-left:-35%}100%{margin-left:100%}} +.assets figcaption{display:flex;flex-direction:column;gap:.2rem;font-size:.7rem;color:#63738a;overflow:hidden;margin-top:.3rem}.assets figcaption strong{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-weight:600}.asset-meta{display:flex;gap:.5rem;color:#94a3b8;font-size:.68rem} diff --git a/frontend/src/app/pages/jobs.page.ts b/frontend/src/app/pages/jobs.page.ts index 3b8828b..957b7d2 100644 --- a/frontend/src/app/pages/jobs.page.ts +++ b/frontend/src/app/pages/jobs.page.ts @@ -1,2 +1,2 @@ -import { CommonModule } from '@angular/common'; import { Component,OnDestroy,inject } from '@angular/core'; import { HttpClient } from '@angular/common/http'; interface Asset{filename:string;url:string;type:string;} interface Model{nodeId:string;type:string;name:string;} interface Progress{value:number;max:number;percent:number;} interface Job{promptId:string;title:string;status:string;queuedAt:number|null;durationMs:number|null;outputCount:number;assets:Asset[];models:Model[];progress:Progress|null;} interface Device{name:string;type:string;vramTotal:number;vramFree:number;} interface ServerStatus{reachable:boolean;version:string;os:string;pythonVersion:string;devices:Device[];queue:{running:number;pending:number;total:number};} -@Component({standalone:true,imports:[CommonModule],templateUrl:'./jobs.page.html',styleUrls:['./jobs.page.scss']}) export class JobsPage implements OnDestroy { jobs:Job[]=[];runningJob:Job|null=null;server:ServerStatus|null=null;loading=true;error='';serverError='';private http=inject(HttpClient);private refreshTimer:ReturnType;constructor(){this.refreshTimer=setInterval(()=>this.reload(false),5000);this.reload(true);}ngOnDestroy():void{clearInterval(this.refreshTimer);}reload(showLoading=true):void{if(showLoading)this.loading=true;this.error='';this.loadServerStatus();this.http.get<{jobs:Job[];running:Job|null}>('/api/jobs').subscribe({next:x=>{this.jobs=x.jobs;this.runningJob=x.running;this.loading=false;},error:e=>{this.error=e.status===502?'ComfyUI is unavailable right now.':'Unable to load jobs.';this.loading=false;}});}loadServerStatus():void{this.serverError='';this.http.get<{status:ServerStatus}>('/api/server-status').subscribe({next:x=>this.server=x.status,error:()=>{this.server=null;this.serverError='Unable to read server status';}});}formatDuration(value:number|null):string{if(value===null)return '—';const totalSeconds=Math.max(0,Math.round(value/1000));return `${Math.floor(totalSeconds/60)}m ${totalSeconds%60}s`;}formatBytes(value:number):string{if(!value)return '—';return `${(value/1073741824).toFixed(1)} GB`;}isVideo(asset:Asset):boolean{return asset.type==='video';}} +import { CommonModule } from '@angular/common'; import { Component,OnDestroy,inject } from '@angular/core'; import { HttpClient } from '@angular/common/http'; interface Asset{filename:string;url:string;type:string;width?:number|null;height?:number|null;sizeBytes?:number|null;} interface Model{nodeId:string;type:string;name:string;} interface Progress{value:number;max:number;percent:number;} interface Job{promptId:string;title:string;status:string;queuedAt:number|null;durationMs:number|null;outputCount:number;assets:Asset[];models:Model[];progress:Progress|null;} interface Device{name:string;type:string;vramTotal:number;vramFree:number;} interface ServerStatus{reachable:boolean;version:string;os:string;pythonVersion:string;devices:Device[];queue:{running:number;pending:number;total:number};} +@Component({standalone:true,imports:[CommonModule],templateUrl:'./jobs.page.html',styleUrls:['./jobs.page.scss']}) export class JobsPage implements OnDestroy { jobs:Job[]=[];runningJob:Job|null=null;server:ServerStatus|null=null;loading=true;error='';serverError='';private http=inject(HttpClient);private refreshTimer:ReturnType;constructor(){this.refreshTimer=setInterval(()=>this.reload(false),5000);this.reload(true);}ngOnDestroy():void{clearInterval(this.refreshTimer);}reload(showLoading=true):void{if(showLoading)this.loading=true;this.error='';this.loadServerStatus();this.http.get<{jobs:Job[];running:Job|null}>('/api/jobs').subscribe({next:x=>{this.jobs=x.jobs;this.runningJob=x.running;this.loadAssetMetadata(this.jobs);this.loading=false;},error:e=>{this.error=e.status===502?'ComfyUI is unavailable right now.':'Unable to load jobs.';this.loading=false;}});}loadAssetMetadata(jobs:Job[]):void{for(const job of jobs)for(const asset of job.assets)this.http.get<{width:number|null;height:number|null;sizeBytes:number|null}>(asset.url.replace('/api/assets?', '/api/assets/meta?')).subscribe({next:meta=>Object.assign(asset,meta)});}loadServerStatus():void{this.serverError='';this.http.get<{status:ServerStatus}>('/api/server-status').subscribe({next:x=>this.server=x.status,error:()=>{this.server=null;this.serverError='Unable to read server status';}});}formatDuration(value:number|null):string{if(value===null)return '—';const totalSeconds=Math.max(0,Math.round(value/1000));return `${Math.floor(totalSeconds/60)}m ${totalSeconds%60}s`;}formatBytes(value:number):string{if(!value)return '—';return `${(value/1073741824).toFixed(1)} GB`;}formatFileSize(value:number|null|undefined):string{if(!value)return '—';if(value<1024*1024)return `${(value/1024).toFixed(0)} KB`;return `${(value/1048576).toFixed(1)} MB`;}isVideo(asset:Asset):boolean{return asset.type==='video';}} diff --git a/server.js b/server.js index 125ad62..67004e0 100644 --- a/server.js +++ b/server.js @@ -2,6 +2,7 @@ const express = require('express'); const path = require('path'); const fs = require('fs'); const crypto = require('crypto'); +const sharp = require('sharp'); const app = express(); const port = Number(process.env.PORT || 7002); const dataDir = path.join(__dirname, 'data'); @@ -77,6 +78,7 @@ app.get('/api/me', (req, res) => res.json({ user: currentUser(req) })); app.get('/api/jobs', async (req, res) => { if (!requireUser(req, res)) return; try { res.json(await listJobs()); } catch (error) { res.status(502).json({ error: error.message || 'Unable to read ComfyUI jobs' }); } }); app.get('/api/server-status', async (req, res) => { if (!requireUser(req, res)) return; try { const [stats, queue] = await Promise.all([comfyJson('/system_stats'), comfyJson('/queue')]); res.json({ status: serverStatusFromStats(stats, queue) }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to read ComfyUI server status' }); } }); app.get('/api/jobs/:promptId', async (req, res) => { if (!requireUser(req, res)) return; try { const history = await comfyJson(`/history/${encodeURIComponent(req.params.promptId)}`); const entry = history?.[req.params.promptId] || history; if (!entry) return res.status(404).json({ error: 'Job not found' }); res.json({ job: jobFromHistory(req.params.promptId, entry) }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to read ComfyUI job' }); } }); +app.get('/api/assets/meta', async (req, res) => { if (!requireUser(req, res)) return; const filename = String(req.query.filename || ''); const subfolder = String(req.query.subfolder || ''); const type = String(req.query.type || 'output'); if (!filename || !['output', 'input', 'temp'].includes(type) || filename.includes('..') || subfolder.includes('..')) return res.status(400).json({ error: 'Invalid asset reference' }); try { const response = await fetch(comfyUrl(`/view?filename=${encodeURIComponent(filename)}&subfolder=${encodeURIComponent(subfolder)}&type=${encodeURIComponent(type)}`)); if (!response.ok) return res.status(response.status).json({ error: 'Asset unavailable' }); const buffer = Buffer.from(await response.arrayBuffer()); let width = null; let height = null; try { const image = await sharp(buffer).metadata(); width = image.width || null; height = image.height || null; } catch { /* Video metadata is not available from sharp. */ } res.json({ width, height, sizeBytes: buffer.length }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to read asset metadata' }); } }); app.get('/api/assets', async (req, res) => { if (!requireUser(req, res)) return; const filename = String(req.query.filename || ''); const subfolder = String(req.query.subfolder || ''); const type = String(req.query.type || 'output'); if (!filename || !['output', 'input', 'temp'].includes(type) || filename.includes('..') || subfolder.includes('..')) return res.status(400).json({ error: 'Invalid asset reference' }); try { const response = await fetch(comfyUrl(`/view?filename=${encodeURIComponent(filename)}&subfolder=${encodeURIComponent(subfolder)}&type=${encodeURIComponent(type)}`)); if (!response.ok) return res.status(response.status).send('Asset unavailable'); res.setHeader('Content-Type', response.headers.get('content-type') || 'application/octet-stream'); res.setHeader('Content-Disposition', 'inline'); res.setHeader('Cache-Control', 'private, max-age=300'); res.send(Buffer.from(await response.arrayBuffer())); } catch (error) { res.status(502).json({ error: error.message || 'Unable to read ComfyUI asset' }); } }); app.use((req, res, next) => { if (req.path.startsWith('/login') || req.path.startsWith('/api/')) return next(); if (!currentUser(req)) return res.redirect('/login'); next(); }); app.use(express.static(browserDir, { index: false }));