diff --git a/server.js b/server.js index 6bf942e..21aabfb 100644 --- a/server.js +++ b/server.js @@ -22,7 +22,7 @@ async function comfyJson(endpoint) { const response = await fetch(comfyUrl(endpo 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 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 statusTimestamp(entry, messageName) { const message = (entry?.status?.messages || []).find((item) => item?.[0] === messageName); const payload = message?.[1]; return typeof payload === 'number' ? payload : typeof payload?.timestamp === 'number' ? payload.timestamp : 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) { diff --git a/server.test.js b/server.test.js index 3c80634..bd68390 100644 --- a/server.test.js +++ b/server.test.js @@ -3,7 +3,7 @@ const assert = require('node:assert/strict'); const { jobFromHistory, statusFromHistory } = require('./server'); test('maps completed ComfyUI history into a read-only job summary', () => { - const job = jobFromHistory('abc123', { prompt: [1, 'abc123', { '7': { class_type: 'CheckpointLoaderSimple', inputs: { ckpt_name: 'portrait.safetensors' } } }, { title: 'Portrait' }], status: { completed: true, messages: [['execution_start', 1000], ['execution_success', 3250]] }, outputs: { '7': { images: [{ filename: 'result.png', subfolder: '', type: 'output' }] } } }); + const job = jobFromHistory('abc123', { prompt: [1, 'abc123', { '7': { class_type: 'CheckpointLoaderSimple', inputs: { ckpt_name: 'portrait.safetensors' } } }, { title: 'Portrait' }], status: { completed: true, messages: [['execution_start', { timestamp: 1000 }], ['execution_success', { timestamp: 3250 }]] }, outputs: { '7': { images: [{ filename: 'result.png', subfolder: '', type: 'output' }] } } }); assert.deepEqual(job, { promptId: 'abc123', title: 'Portrait', status: 'completed', queuedAt: 1000, durationMs: 2250, outputCount: 1, assets: [{ filename: 'result.png', subfolder: '', type: 'image', url: '/api/assets?filename=result.png&subfolder=&type=output' }], models: [{ nodeId: '7', type: 'CheckpointLoaderSimple', name: 'portrait.safetensors' }] }); });