improve remote job details and server status
Test, build, and deploy ComfyUI Jobs / test-build (push) Successful in 3m54s
Test, build, and deploy ComfyUI Jobs / deploy (push) Successful in 15s

This commit is contained in:
2026-10-02 22:58:00 +00:00
parent eb2ba4d19d
commit b834f55581
5 changed files with 33 additions and 7 deletions
+27 -1
View File
@@ -20,14 +20,40 @@ function requireUser(req, res) { const user = currentUser(req); if (!user) { res
function comfyUrl(endpoint) { return `${comfyBase}${endpoint.startsWith('/') ? endpoint : `/${endpoint}`}`; }
async function comfyJson(endpoint) { const response = await fetch(comfyUrl(endpoint)); if (!response.ok) throw new Error(`ComfyUI returned HTTP ${response.status}`); return response.json(); }
function statusFromHistory(entry) { const status = entry?.status || {}; const failed = Array.isArray(status.messages) && status.messages.some((message) => String(message?.[0] || '').toLowerCase().includes('error')); return failed ? 'failed' : status.completed ? 'completed' : entry ? 'running' : 'queued'; }
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); return { promptId, title: entry?.prompt?.extra_data?.title || `ComfyUI job ${promptId}`, status: statusFromHistory(entry), queuedAt: entry?.status?.messages?.[0]?.[1] || '', outputCount: assets.length, assets }; }
function promptPayload(entry) { const prompt = entry?.prompt; return Array.isArray(prompt) ? (prompt[2] || {}) : (prompt || {}); }
function extraData(entry) { const prompt = entry?.prompt; return Array.isArray(prompt) ? (prompt[3] || {}) : (prompt?.extra_data || {}); }
function statusTimestamp(entry, messageName) { const message = (entry?.status?.messages || []).find((item) => item?.[0] === messageName); return typeof message?.[1] === 'number' ? message[1] : null; }
function durationMs(entry) { const start = statusTimestamp(entry, 'execution_start'); const end = statusTimestamp(entry, 'execution_success') || statusTimestamp(entry, 'execution_error'); return start && end && end >= start ? end - start : null; }
function modelName(value) { if (typeof value !== 'string' || !value.trim()) return null; return value.trim(); }
function modelsFromPrompt(entry) {
const modelKeys = new Set(['ckpt_name', 'checkpoint_name', 'unet_name', 'diffusion_model', 'model_name', 'lora_name', 'control_net_name', 'vae_name', 'clip_name', 'clip_name1', 'clip_name2', 'style_model_name', 'upscale_model']);
const models = [];
for (const [nodeId, node] of Object.entries(promptPayload(entry))) {
for (const [key, value] of Object.entries(node?.inputs || {})) {
if (!modelKeys.has(key)) continue;
const values = Array.isArray(value) ? [] : [value];
for (const item of values) { const name = modelName(item); if (name) models.push({ nodeId, type: node?.class_type || 'model', name }); }
}
}
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 serverStatusFromStats(stats) { const system = stats?.system || {}; 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 })) }; }
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) };
}
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' }));
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/server-status', async (req, res) => { if (!requireUser(req, res)) return; try { res.json({ status: serverStatusFromStats(await comfyJson('/system_stats')) }); } 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')); });