diff --git a/frontend/src/app/pages/jobs.page.html b/frontend/src/app/pages/jobs.page.html index 18b0b22..6678b13 100644 --- a/frontend/src/app/pages/jobs.page.html +++ b/frontend/src/app/pages/jobs.page.html @@ -1 +1 @@ -
REMOTE JOBS

Job monitor

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

{{error}}
Loading remote jobs…
No remote jobs were returned.

{{job.title}}

{{job.status}}
ID {{job.promptId}}{{job.outputCount}} output{{job.outputCount===1?'':'s'}}
{{asset.filename}}
+
REMOTE JOBS

Job monitor

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

SERVER

ComfyUI status

{{server?'Connected':'Unavailable'}}
{{serverError}}
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)}}
{{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
diff --git a/frontend/src/app/pages/jobs.page.scss b/frontend/src/app/pages/jobs.page.scss index 127c7eb..9b66b38 100644 --- a/frontend/src/app/pages/jobs.page.scss +++ b/frontend/src/app/pages/jobs.page.scss @@ -1 +1 @@ -.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}.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(280px,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;gap:1rem;color:#63738a;font-size:.8rem;margin-top:.8rem}.assets{display:flex;flex-wrap:wrap;gap:.35rem;margin-top:1rem}.assets span{background:#f1f5f9;border-radius:6px;padding:.25rem .4rem;font-size:.75rem}.notice{padding:1rem;background:#fff1f0;color:#b42318;border-radius:10px}.loading,.empty{padding:3rem;text-align:center;color:#63738a} +.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}.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} diff --git a/frontend/src/app/pages/jobs.page.ts b/frontend/src/app/pages/jobs.page.ts index 16b587e..0da000c 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,inject } from '@angular/core'; import { HttpClient } from '@angular/common/http'; interface Job{promptId:string;title:string;status:string;outputCount:number;assets:Array<{filename:string}>;} -@Component({standalone:true,imports:[CommonModule],templateUrl:'./jobs.page.html',styleUrls:['./jobs.page.scss']}) export class JobsPage { jobs:Job[]=[];loading=true;error='';private http=inject(HttpClient);constructor(){this.reload();}reload():void{this.loading=true;this.error='';this.http.get<{jobs:Job[]}>('/api/jobs').subscribe({next:x=>{this.jobs=x.jobs;this.loading=false;},error:e=>{this.error=e.status===502?'ComfyUI is unavailable right now.':'Unable to load jobs.';this.loading=false;}});}} +import { CommonModule } from '@angular/common'; import { Component,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 Job{promptId:string;title:string;status:string;queuedAt:number|null;durationMs:number|null;outputCount:number;assets:Asset[];models:Model[];} interface Device{name:string;type:string;vramTotal:number;vramFree:number;} interface ServerStatus{reachable:boolean;version:string;os:string;pythonVersion:string;devices:Device[];} +@Component({standalone:true,imports:[CommonModule],templateUrl:'./jobs.page.html',styleUrls:['./jobs.page.scss']}) export class JobsPage { jobs:Job[]=[];server:ServerStatus|null=null;loading=true;error='';serverError='';private http=inject(HttpClient);constructor(){this.reload();}reload():void{this.loading=true;this.error='';this.loadServerStatus();this.http.get<{jobs:Job[]}>('/api/jobs').subscribe({next:x=>{this.jobs=x.jobs;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 seconds=value/1000;if(seconds<1)return `${Math.round(value)} ms`;if(seconds<60)return `${seconds.toFixed(1)} s`;return `${Math.floor(seconds/60)}m ${Math.round(seconds%60)}s`;}formatBytes(value:number):string{if(!value)return '—';return `${(value/1073741824).toFixed(1)} GB`;}isVideo(asset:Asset):boolean{return asset.type==='video';}} diff --git a/server.js b/server.js index aea4f99..d7cfaf6 100644 --- a/server.js +++ b/server.js @@ -20,14 +20,40 @@ function requireUser(req, res) { const user = currentUser(req); if (!user) { res function comfyUrl(endpoint) { return `${comfyBase}${endpoint.startsWith('/') ? endpoint : `/${endpoint}`}`; } async function comfyJson(endpoint) { const response = await fetch(comfyUrl(endpoint)); if (!response.ok) throw new Error(`ComfyUI returned HTTP ${response.status}`); return response.json(); } function statusFromHistory(entry) { const status = entry?.status || {}; const failed = Array.isArray(status.messages) && status.messages.some((message) => String(message?.[0] || '').toLowerCase().includes('error')); return failed ? 'failed' : status.completed ? 'completed' : entry ? 'running' : 'queued'; } -function jobFromHistory(promptId, entry) { const outputs = Object.values(entry?.outputs || {}); const assets = outputs.flatMap((output) => [...(output?.images || []), ...(output?.gifs || []), ...(output?.videos || [])]).filter((asset) => asset?.filename); return { promptId, title: entry?.prompt?.extra_data?.title || `ComfyUI job ${promptId}`, status: statusFromHistory(entry), queuedAt: entry?.status?.messages?.[0]?.[1] || '', outputCount: assets.length, assets }; } +function promptPayload(entry) { const prompt = entry?.prompt; return Array.isArray(prompt) ? (prompt[2] || {}) : (prompt || {}); } +function extraData(entry) { const prompt = entry?.prompt; return Array.isArray(prompt) ? (prompt[3] || {}) : (prompt?.extra_data || {}); } +function statusTimestamp(entry, messageName) { const message = (entry?.status?.messages || []).find((item) => item?.[0] === messageName); return typeof message?.[1] === 'number' ? message[1] : null; } +function durationMs(entry) { const start = statusTimestamp(entry, 'execution_start'); const end = statusTimestamp(entry, 'execution_success') || statusTimestamp(entry, 'execution_error'); return start && end && end >= start ? end - start : null; } +function modelName(value) { if (typeof value !== 'string' || !value.trim()) return null; return value.trim(); } +function modelsFromPrompt(entry) { + const modelKeys = new Set(['ckpt_name', 'checkpoint_name', 'unet_name', 'diffusion_model', 'model_name', 'lora_name', 'control_net_name', 'vae_name', 'clip_name', 'clip_name1', 'clip_name2', 'style_model_name', 'upscale_model']); + const models = []; + for (const [nodeId, node] of Object.entries(promptPayload(entry))) { + for (const [key, value] of Object.entries(node?.inputs || {})) { + if (!modelKeys.has(key)) continue; + const values = Array.isArray(value) ? [] : [value]; + for (const item of values) { const name = modelName(item); if (name) models.push({ nodeId, type: node?.class_type || 'model', name }); } + } + } + return models.filter((model, index, all) => all.findIndex((item) => item.name === model.name) === index); +} +function assetType(asset) { return /\.(mp4|webm|mov|m4v)$/i.test(asset.filename) ? 'video' : 'image'; } +function serverStatusFromStats(stats) { const system = stats?.system || {}; return { reachable: true, version: system.comfyui_version || '', os: system.os || '', pythonVersion: system.python_version || '', devices: (stats?.devices || []).map((device) => ({ name: device.name || device.type || 'Unknown device', type: device.type || '', vramTotal: device.vram_total || 0, vramFree: device.vram_free || 0 })) }; } +function jobFromHistory(promptId, entry) { + const outputs = Object.values(entry?.outputs || {}); + 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); + return { promptId, title: metadata.title || `ComfyUI job ${promptId}`, status: statusFromHistory(entry), queuedAt: statusTimestamp(entry, 'execution_start') || '', durationMs: durationMs(entry), outputCount: assets.length, assets, models: modelsFromPrompt(entry) }; +} async function listJobs() { const history = await comfyJson('/history'); return Object.entries(history || {}).map(([promptId, entry]) => jobFromHistory(promptId, entry)).sort((a, b) => String(b.promptId).localeCompare(String(a.promptId))); } app.get('/api/health', (_req, res) => res.json({ ok: true, service: 'comfyui-portal-next' })); app.post('/api/login', (req, res) => { const user = users().find((item) => item.username === String(req.body?.username || '').trim()); if (!user || !user.active || hashPassword(req.body?.password, user.passwordSalt) !== user.passwordHash) return res.status(401).json({ error: 'Invalid credentials' }); const maxAge = req.body?.remember ? '; Max-Age=2592000' : ''; res.setHeader('Set-Cookie', `cp_auth=${encodeURIComponent(user.username)}; Path=/; HttpOnly; SameSite=Lax${maxAge}`); res.json({ user: { id: user.id, username: user.username, displayName: user.displayName, role: user.role } }); }); app.post('/api/logout', (_req, res) => { res.setHeader('Set-Cookie', 'cp_auth=; Path=/; HttpOnly; SameSite=Lax; Max-Age=0'); res.json({ ok: true }); }); 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({ jobs: 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 { res.json({ status: serverStatusFromStats(await comfyJson('/system_stats')) }); } 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', 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 })); app.use((_req, res) => { if (!fs.existsSync(indexHtml)) return res.status(500).send('Build output missing.'); res.type('html').send(fs.readFileSync(indexHtml, 'utf8')); }); diff --git a/server.test.js b/server.test.js index 65b16c0..3c80634 100644 --- a/server.test.js +++ b/server.test.js @@ -3,8 +3,8 @@ const assert = require('node:assert/strict'); const { jobFromHistory, statusFromHistory } = require('./server'); test('maps completed ComfyUI history into a read-only job summary', () => { - const job = jobFromHistory('abc123', { prompt: { extra_data: { title: 'Portrait' } }, status: { completed: true }, outputs: { '7': { images: [{ filename: 'result.png' }] } } }); - assert.deepEqual(job, { promptId: 'abc123', title: 'Portrait', status: 'completed', queuedAt: '', outputCount: 1, assets: [{ filename: 'result.png' }] }); + const job = jobFromHistory('abc123', { prompt: [1, 'abc123', { '7': { class_type: 'CheckpointLoaderSimple', inputs: { ckpt_name: 'portrait.safetensors' } } }, { title: 'Portrait' }], status: { completed: true, messages: [['execution_start', 1000], ['execution_success', 3250]] }, outputs: { '7': { images: [{ filename: 'result.png', subfolder: '', type: 'output' }] } } }); + assert.deepEqual(job, { promptId: 'abc123', title: 'Portrait', status: 'completed', queuedAt: 1000, durationMs: 2250, outputCount: 1, assets: [{ filename: 'result.png', subfolder: '', type: 'image', url: '/api/assets?filename=result.png&subfolder=&type=output' }], models: [{ nodeId: '7', type: 'CheckpointLoaderSimple', name: 'portrait.safetensors' }] }); }); test('classifies failed history without exposing mutation paths', () => {