diff --git a/frontend/src/app/pages/jobs.page.ts b/frontend/src/app/pages/jobs.page.ts index 0da000c..7567120 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 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';}} +@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 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';}} diff --git a/server.js b/server.js index d7cfaf6..db368fd 100644 --- a/server.js +++ b/server.js @@ -43,7 +43,7 @@ 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) }; + return { promptId, title: metadata.title || 'Untitled job', 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' }));