diff --git a/frontend/src/app/pages/jobs.page.html b/frontend/src/app/pages/jobs.page.html index 954ce86..6455ff6 100644 --- a/frontend/src/app/pages/jobs.page.html +++ b/frontend/src/app/pages/jobs.page.html @@ -3,7 +3,7 @@
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)}}
ComfyUI Manager {{manager?.managerVersion || '—'}}Runtime controls
Current {{manager.currentVersion}}
{{controlMessage}}
Update results
ComfyUI: {{updateResult.comfyui || 'No result reported'}}
Updated custom nodes
  • {{item.title}}
Already up to date
  • {{item.title}}
Could not update
  • {{item.title}} — {{item.error}}
-
CURRENTLY RUNNING

{{runningJob.title}}

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

{{runningJob.title}}

running
{{runningJob.progress ? (runningJob.progress.percent + '% complete') : 'Working…'}}
ID {{runningJob.promptId}}Started {{formatClock(runningJob.queuedAt)}}Running for {{runningDuration()}}
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}}{{asset.width}} × {{asset.height}}{{formatFileSize(asset.sizeBytes)}}
No output assets
diff --git a/frontend/src/app/pages/jobs.page.ts b/frontend/src/app/pages/jobs.page.ts index 4894f7d..e87236f 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'; import { AuthService,AuthUser } from '../auth.service'; 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};} interface ManagerInfo{managerVersion:string;currentVersion:string;versions:string[];} interface UpdateStatus{total_count:number;done_count:number;in_progress_count:number;is_processing:boolean;} interface UpdateProgress{target:string;uiTarget:string;totalCount:number;doneCount:number;} interface UpdateItem{id:string;title:string;url:string;error:string;} interface UpdateResult{comfyui:string|null;updated:UpdateItem[];skipped:UpdateItem[];failed:UpdateItem[];completedAt: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;manager:ManagerInfo|null=null;user:AuthUser|null=null;selectedVersion='';controlBusy='';controlMessage='';updateResult:UpdateResult|null=null;updateProgress:UpdateProgress|null=null;loading=true;error='';serverError='';private http=inject(HttpClient);private auth=inject(AuthService);private refreshTimer:ReturnType;private updateStatusTimer:ReturnType|null=null;constructor(){this.auth.user$.subscribe(user=>this.user=user);this.refreshTimer=setInterval(()=>this.reload(false),5000);this.reload(true);}ngOnDestroy():void{clearInterval(this.refreshTimer);this.stopUpdateStatusPolling();}reload(showLoading=true):void{if(showLoading)this.loading=true;this.error='';this.loadServerStatus();this.loadManager();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';}});}loadManager():void{this.http.get('/api/comfy/manager').subscribe({next:x=>{this.manager=x;if(!this.selectedVersion||!x.versions.includes(this.selectedVersion))this.selectedVersion=x.versions[0]||'';},error:()=>this.manager=null});}startUpdateStatusPolling():void{this.stopUpdateStatusPolling();this.updateStatusTimer=setInterval(()=>this.loadUpdateStatus(),5000);}stopUpdateStatusPolling():void{if(this.updateStatusTimer){clearInterval(this.updateStatusTimer);this.updateStatusTimer=null;}}loadUpdateStatus():void{this.http.get<{status:UpdateStatus;progress:UpdateProgress|null;result:UpdateResult|null}>('/api/comfy/update-status').subscribe({next:x=>{if(this.controlBusy!=='update-all')return;if(x.progress)this.updateProgress=x.progress;if(x.result)this.updateResult=x.result;const status=x.status;if(status.is_processing||status.total_count>status.done_count){const current=x.progress?.target?` Current task: ${x.progress.target}.`:'';this.controlMessage=`Update all in progress: ${status.done_count} of ${status.total_count} tasks complete.${current}`;}else if(x.result){this.controlMessage='Update all completed. See the results below.';this.controlBusy='';this.stopUpdateStatusPolling();this.loadManager();}},error:()=>{if(this.controlBusy==='update-all'){this.controlMessage='Update all was started, but its status is temporarily unavailable.';}}});}runControl(action:'restart'|'update'|'update-all'|'switch'):void{if(this.controlBusy||this.user?.role!=='admin')return;const labels={restart:'restart ComfyUI',update:'update ComfyUI', 'update-all':'update ComfyUI and all custom nodes',switch:`switch ComfyUI to ${this.selectedVersion}`};if(action==='switch'&&!this.selectedVersion)return;if(!window.confirm(`Are you sure you want to ${labels[action]}?`))return;this.controlBusy=action;this.controlMessage='';if(action==='update-all'){this.updateResult=null;this.updateProgress=null;}const request=action==='restart'?this.http.post('/api/comfy/restart',{}):action==='update'?this.http.post('/api/comfy/update',{}):action==='update-all'?this.http.post('/api/comfy/update-all',{}):this.http.post('/api/comfy/switch-version',{version:this.selectedVersion});request.subscribe({next:(x:any)=>{this.controlMessage=x?.message||'Request accepted.';if(action==='update-all'){this.controlMessage='Update all started. Checking progress…';this.startUpdateStatusPolling();}else{this.controlBusy='';}this.loadManager();},error:(e:any)=>{this.controlMessage=e?.error?.error||'Request failed.';this.controlBusy='';this.stopUpdateStatusPolling();}});}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';}} +@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;manager:ManagerInfo|null=null;user:AuthUser|null=null;selectedVersion='';controlBusy='';controlMessage='';updateResult:UpdateResult|null=null;updateProgress:UpdateProgress|null=null;loading=true;error='';serverError='';now=Date.now();private http=inject(HttpClient);private auth=inject(AuthService);private refreshTimer:ReturnType;private elapsedTimer:ReturnType;private updateStatusTimer:ReturnType|null=null;constructor(){this.auth.user$.subscribe(user=>this.user=user);this.refreshTimer=setInterval(()=>this.reload(false),5000);this.elapsedTimer=setInterval(()=>this.now=Date.now(),1000);this.reload(true);}ngOnDestroy():void{clearInterval(this.refreshTimer);clearInterval(this.elapsedTimer);this.stopUpdateStatusPolling();}reload(showLoading=true):void{if(showLoading)this.loading=true;this.error='';this.loadServerStatus();this.loadManager();this.http.get<{jobs:Job[];running:Job|null}>('/api/jobs').subscribe({next:x=>{this.jobs=x.jobs;this.runningJob=x.running;this.now=Date.now();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';}});}loadManager():void{this.http.get('/api/comfy/manager').subscribe({next:x=>{this.manager=x;if(!this.selectedVersion||!x.versions.includes(this.selectedVersion))this.selectedVersion=x.versions[0]||'';},error:()=>this.manager=null});}startUpdateStatusPolling():void{this.stopUpdateStatusPolling();this.updateStatusTimer=setInterval(()=>this.loadUpdateStatus(),5000);}stopUpdateStatusPolling():void{if(this.updateStatusTimer){clearInterval(this.updateStatusTimer);this.updateStatusTimer=null;}}loadUpdateStatus():void{this.http.get<{status:UpdateStatus;progress:UpdateProgress|null;result:UpdateResult|null}>('/api/comfy/update-status').subscribe({next:x=>{if(this.controlBusy!=='update-all')return;if(x.progress)this.updateProgress=x.progress;if(x.result)this.updateResult=x.result;const status=x.status;if(status.is_processing||status.total_count>status.done_count){const current=x.progress?.target?` Current task: ${x.progress.target}.`:'';this.controlMessage=`Update all in progress: ${status.done_count} of ${status.total_count} tasks complete.${current}`;}else if(x.result){this.controlMessage='Update all completed. See the results below.';this.controlBusy='';this.stopUpdateStatusPolling();this.loadManager();}},error:()=>{if(this.controlBusy==='update-all'){this.controlMessage='Update all was started, but its status is temporarily unavailable.';}}});}runControl(action:'restart'|'update'|'update-all'|'switch'):void{if(this.controlBusy||this.user?.role!=='admin')return;const labels={restart:'restart ComfyUI',update:'update ComfyUI', 'update-all':'update ComfyUI and all custom nodes',switch:`switch ComfyUI to ${this.selectedVersion}`};if(action==='switch'&&!this.selectedVersion)return;if(!window.confirm(`Are you sure you want to ${labels[action]}?`))return;this.controlBusy=action;this.controlMessage='';if(action==='update-all'){this.updateResult=null;this.updateProgress=null;}const request=action==='restart'?this.http.post('/api/comfy/restart',{}):action==='update'?this.http.post('/api/comfy/update',{}):action==='update-all'?this.http.post('/api/comfy/update-all',{}):this.http.post('/api/comfy/switch-version',{version:this.selectedVersion});request.subscribe({next:(x:any)=>{this.controlMessage=x?.message||'Request accepted.';if(action==='update-all'){this.controlMessage='Update all started. Checking progress…';this.startUpdateStatusPolling();}else{this.controlBusy='';}this.loadManager();},error:(e:any)=>{this.controlMessage=e?.error?.error||'Request failed.';this.controlBusy='';this.stopUpdateStatusPolling();}});}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`;}formatClock(timestamp:number|null):string{if(!timestamp)return '—';return new Date(timestamp).toLocaleTimeString([], {hour:'2-digit',minute:'2-digit',second:'2-digit'});}runningDuration():string{return this.formatDuration(this.runningJob?.queuedAt ? this.now-this.runningJob.queuedAt : this.runningJob?.durationMs ?? null);}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 9463367..8b6a237 100644 --- a/server.js +++ b/server.js @@ -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 }; }