diff --git a/server.js b/server.js index 8b6a237..c8091ca 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(); const executionStarts = new Map(); +const runningObservedAt = new Map(); let managerUpdateResult = null; let managerUpdateProgress = null; app.use(express.json({ limit: '1mb' })); @@ -96,11 +97,11 @@ function jobFromHistory(promptId, entry) { 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); const progress = liveProgress.get(promptId); - const startedAt = statusTimestamp(entry, 'execution_start') || executionStarts.get(promptId) || null; + const startedAt = statusTimestamp(entry, 'execution_start') || executionStarts.get(promptId) || runningObservedAt.get(promptId) || null; return { promptId, title: metadata.title || 'Untitled job', status: statusFromHistory(entry), queuedAt: startedAt, 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 }; } -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 }; } +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 : []; for (const item of runningItems) { const promptId = String(item?.[1] || ''); if (promptId && !executionStarts.has(promptId) && !statusTimestamp(history?.[promptId], 'execution_start')) runningObservedAt.set(promptId, runningObservedAt.get(promptId) || Date.now()); } const activeIds = new Set(runningItems.map((item) => String(item?.[1] || ''))); for (const promptId of runningObservedAt.keys()) if (!activeIds.has(promptId)) runningObservedAt.delete(promptId); const running = runningItems.map((item) => jobFromQueue(item, history?.[String(item?.[1] || '')])).at(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 }); });