show live manager update task
Test, build, and deploy ComfyUI Jobs / test-build (push) Failing after 1m46s
Test, build, and deploy ComfyUI Jobs / deploy (push) Skipped

This commit is contained in:
2026-10-03 14:00:55 +00:00
parent 0e1ffc6774
commit 46194a4d54
2 changed files with 10 additions and 4 deletions
+8 -2
View File
@@ -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' }); } });