show live running job progress
This commit is contained in:
@@ -9,6 +9,7 @@ const usersPath = path.join(dataDir, 'users.json');
|
||||
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();
|
||||
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 }); }
|
||||
@@ -38,24 +39,47 @@ function modelsFromPrompt(entry) {
|
||||
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 startComfyProgressSocket() {
|
||||
let WebSocket;
|
||||
try { WebSocket = require('ws'); } catch { return; }
|
||||
const base = new URL(comfyBase);
|
||||
base.protocol = base.protocol === 'https:' ? 'wss:' : 'ws:';
|
||||
base.pathname = '/ws';
|
||||
base.search = `?clientId=${crypto.randomUUID()}`;
|
||||
const socket = new WebSocket(base);
|
||||
socket.on('message', (raw) => {
|
||||
try {
|
||||
const message = JSON.parse(String(raw));
|
||||
const data = message?.data || {};
|
||||
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);
|
||||
} catch { /* Ignore malformed progress events. */ }
|
||||
});
|
||||
socket.on('close', () => setTimeout(startComfyProgressSocket, 5000));
|
||||
socket.on('error', () => socket.close());
|
||||
}
|
||||
function serverStatusFromStats(stats, queue) { const system = stats?.system || {}; const running = Array.isArray(queue?.queue_running) ? queue.queue_running.length : 0; const pending = Array.isArray(queue?.queue_pending) ? queue.queue_pending.length : 0; 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 })), queue: { running, pending, total: running + pending } }; }
|
||||
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 || '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) };
|
||||
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 };
|
||||
}
|
||||
async function listJobs() { const history = await comfyJson('/history'); return Object.entries(history || {}).map(([promptId, entry]) => jobFromHistory(promptId, entry)).sort((a, b) => (b.completedAt || b.queuedAt || 0) - (a.completedAt || a.queuedAt || 0)); }
|
||||
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 }; }
|
||||
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/jobs', async (req, res) => { if (!requireUser(req, res)) return; try { res.json(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 { const [stats, queue] = await Promise.all([comfyJson('/system_stats'), comfyJson('/queue')]); res.json({ status: serverStatusFromStats(stats, queue) }); } 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')); });
|
||||
if (require.main === module) app.listen(port, () => console.log(`ComfyUiPortal Next listening on ${port}`));
|
||||
if (require.main === module) { startComfyProgressSocket(); app.listen(port, () => console.log(`ComfyUiPortal Next listening on ${port}`)); }
|
||||
module.exports = { app, jobFromHistory, statusFromHistory };
|
||||
|
||||
Reference in New Issue
Block a user