diff --git a/frontend/src/app/pages/jobs.page.ts b/frontend/src/app/pages/jobs.page.ts index 95d9df7..4894f7d 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 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;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;result:UpdateResult|null}>('/api/comfy/update-status').subscribe({next:x=>{if(this.controlBusy!=='update-all')return;if(x.result)this.updateResult=x.result;const status=x.status;if(status.is_processing||status.total_count>status.done_count){this.controlMessage=`Update all in progress: ${status.done_count} of ${status.total_count} tasks complete.`;}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;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';}} +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';}} diff --git a/server.js b/server.js index b3fabde..9463367 100644 --- a/server.js +++ b/server.js @@ -12,6 +12,7 @@ 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(); let managerUpdateResult = null; +let managerUpdateProgress = null; app.use(express.json({ limit: '1mb' })); function readJson(file, fallback) { try { return JSON.parse(fs.readFileSync(file, 'utf8')); } catch { return fallback; } } function writeJson(file, value) { fs.mkdirSync(dataDir, { recursive: true }); fs.writeFileSync(file, `${JSON.stringify(value, null, 2)}\n`, { mode: 0o600 }); } @@ -65,6 +66,11 @@ function startComfyProgressSocket() { else failed.push(item); } managerUpdateResult = { comfyui: nodepack.comfyui || null, updated, skipped, failed, completedAt: Date.now() }; + managerUpdateProgress = null; + return; + } + if (message.type === 'cm-queue-status' && data.status === 'in_progress') { + managerUpdateProgress = { target: String(data.target || 'next task'), uiTarget: String(data.ui_target || ''), totalCount: Number(data.total_count) || 0, doneCount: Number(data.done_count) || 0 }; return; } if (!data.prompt_id) return; @@ -95,8 +101,8 @@ app.get('/api/server-status', async (req, res) => { if (!requireUser(req, res)) app.get('/api/comfy/manager', async (req, res) => { if (!requireUser(req, res)) return; try { const [version, versions] = await Promise.all([comfyRequest('/manager/version'), comfyJson('/comfyui_manager/comfyui_versions')]); res.json({ managerVersion: String(version?.message || version || '').trim(), currentVersion: versions.current || '', versions: Array.isArray(versions.versions) ? versions.versions : [] }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to read ComfyUI Manager information' }); } }); app.post('/api/comfy/restart', async (req, res) => { const user = requireUser(req, res); if (!user) return; if (user.role !== 'admin') return res.status(403).json({ error: 'Forbidden' }); try { await comfyRequest('/manager/reboot', 'POST', {}); res.json({ ok: true, message: 'ComfyUI restart requested.' }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to restart ComfyUI' }); } }); app.post('/api/comfy/update', async (req, res) => { const user = requireUser(req, res); if (!user) return; if (user.role !== 'admin') return res.status(403).json({ error: 'Forbidden' }); try { await comfyRequest('/manager/queue/update_comfyui', 'POST', {}); res.json({ ok: true, message: 'ComfyUI update queued. Restart may be required when it completes.' }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to queue ComfyUI update' }); } }); -app.post('/api/comfy/update-all', async (req, res) => { const user = requireUser(req, res); if (!user) return; if (user.role !== 'admin') return res.status(403).json({ error: 'Forbidden' }); let stage = 'ComfyUI update'; try { const current = await comfyRequest('/manager/queue/status'); if (current.is_processing) return res.status(409).json({ error: `An update is already in progress (${current.done_count} of ${current.total_count} tasks complete).` }); managerUpdateResult = null; await comfyRequest('/manager/queue/update_comfyui', 'POST', {}); stage = 'custom node update discovery'; await comfyRequest('/manager/queue/update_all', 'POST', { mode: 'default' }); stage = 'starting update queue'; await comfyRequest('/manager/queue/start', 'POST', {}); res.json({ ok: true, message: 'ComfyUI and all custom node updates queued.' }); } catch (error) { if (String(error.message).includes('HTTP 401')) return res.status(409).json({ error: 'An update is already in progress on ComfyUI.' }); res.status(502).json({ error: `${stage}: ${error.message || 'request rejected'}` }); } }); -app.get('/api/comfy/update-status', async (req, res) => { if (!requireUser(req, res)) return; try { res.json({ status: await comfyRequest('/manager/queue/status'), result: managerUpdateResult }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to read update status' }); } }); +app.post('/api/comfy/update-all', async (req, res) => { const user = requireUser(req, res); if (!user) return; if (user.role !== 'admin') return res.status(403).json({ error: 'Forbidden' }); let stage = 'ComfyUI update'; try { const current = await comfyRequest('/manager/queue/status'); if (current.is_processing) return res.status(409).json({ error: `An update is already in progress (${current.done_count} of ${current.total_count} tasks complete).` }); managerUpdateResult = null; managerUpdateProgress = null; await comfyRequest('/manager/queue/update_comfyui', 'POST', {}); stage = 'custom node update discovery'; await comfyRequest('/manager/queue/update_all', 'POST', { mode: 'default' }); stage = 'starting update queue'; await comfyRequest('/manager/queue/start', 'POST', {}); res.json({ ok: true, message: 'ComfyUI and all custom node updates queued.' }); } catch (error) { if (String(error.message).includes('HTTP 401')) return res.status(409).json({ error: 'An update is already in progress on ComfyUI.' }); res.status(502).json({ error: `${stage}: ${error.message || 'request rejected'}` }); } }); +app.get('/api/comfy/update-status', async (req, res) => { if (!requireUser(req, res)) return; try { res.json({ status: await comfyRequest('/manager/queue/status'), progress: managerUpdateProgress, result: managerUpdateResult }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to read update status' }); } }); app.post('/api/comfy/switch-version', async (req, res) => { const user = requireUser(req, res); if (!user) return; if (user.role !== 'admin') return res.status(403).json({ error: 'Forbidden' }); const requested = String(req.body?.version || '').trim(); if (!requested) return res.status(400).json({ error: 'A ComfyUI version is required' }); try { const versions = await comfyJson('/comfyui_manager/comfyui_versions'); if (!Array.isArray(versions.versions) || !versions.versions.includes(requested)) return res.status(400).json({ error: 'That ComfyUI version is not available' }); await comfyRequest('/comfyui_manager/comfyui_switch_version', 'POST', { ver: requested }); res.json({ ok: true, message: `ComfyUI version switch to ${requested} requested.` }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to switch ComfyUI version' }); } }); 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' }); } });