Persist job history and show model usage stats
Test, build, and deploy ComfyUI Jobs / test-build (push) Successful in 5m14s
Test, build, and deploy ComfyUI Jobs / deploy (push) Successful in 16s
Test, build, and deploy ComfyUI Jobs / browser-test (push) Successful in 1m58s
Test, build, and deploy ComfyUI Jobs / qa-gate (push) Successful in 5s
Test, build, and deploy ComfyUI Jobs / test-build (push) Successful in 5m14s
Test, build, and deploy ComfyUI Jobs / deploy (push) Successful in 16s
Test, build, and deploy ComfyUI Jobs / browser-test (push) Successful in 1m58s
Test, build, and deploy ComfyUI Jobs / qa-gate (push) Successful in 5s
This commit is contained in:
@@ -3,6 +3,7 @@ const path = require('path');
|
||||
const fs = require('fs');
|
||||
const crypto = require('crypto');
|
||||
const sharp = require('sharp');
|
||||
const { createJobStore } = require('./job-store');
|
||||
const app = express();
|
||||
const port = Number(process.env.PORT || 7002);
|
||||
const dataDir = path.join(__dirname, 'data');
|
||||
@@ -12,6 +13,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();
|
||||
const executionStarts = new Map();
|
||||
const jobStore = createJobStore();
|
||||
let managerUpdateResult = null;
|
||||
let managerUpdateProgress = null;
|
||||
app.use(express.json({ limit: '1mb' }));
|
||||
@@ -103,12 +105,13 @@ function jobFromHistory(promptId, entry) {
|
||||
return { promptId, title: metadata.title || 'Untitled job', status: statusFromHistory(entry), queuedAt: startedAt, completedAt: statusTimestamp(entry, 'execution_success') || statusTimestamp(entry, 'execution_error'), durationMs: durationMs(entry, promptId), 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, historyEntry) { const [queueNumber, promptId, prompt, extraData] = item || []; const id = String(promptId || `queued-${queueNumber}`); return jobFromHistory(id, historyEntry || { 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 runningItems = Array.isArray(queue?.queue_running) ? queue.queue_running : []; const running = runningItems.map((item) => jobFromQueue(item, history?.[String(item?.[1] || '')])).at(0) || null; return { jobs, running }; }
|
||||
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 runningItems = Array.isArray(queue?.queue_running) ? queue.queue_running : []; const running = runningItems.map((item) => jobFromQueue(item, history?.[String(item?.[1] || '')])).at(0) || null; jobStore.sync(running ? [...jobs, running] : jobs); 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(await listJobs()); } catch (error) { res.status(502).json({ error: error.message || 'Unable to read ComfyUI jobs' }); } });
|
||||
app.get('/api/model-stats', (req, res) => { if (!requireUser(req, res)) return; res.json(jobStore.stats()); });
|
||||
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/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' }); } });
|
||||
@@ -123,4 +126,4 @@ app.use(express.static(browserDir, { index: false }));
|
||||
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((_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) { startComfyProgressSocket(); app.listen(port, () => console.log(`ComfyUiPortal Next listening on ${port}`)); }
|
||||
module.exports = { app, jobFromHistory, statusFromHistory };
|
||||
module.exports = { app, jobFromHistory, statusFromHistory, jobStore };
|
||||
|
||||
Reference in New Issue
Block a user