Stream portal video assets with range support
Test, build, and deploy ComfyUI Jobs / test-build (push) Successful in 3m46s
Test, build, and deploy ComfyUI Jobs / deploy (push) Successful in 15s
Test, build, and deploy ComfyUI Jobs / browser-test (push) Successful in 2m7s
Test, build, and deploy ComfyUI Jobs / qa-gate (push) Successful in 4s

This commit is contained in:
2026-11-14 19:53:01 +00:00
parent 0e204ada43
commit 04344f7f64
2 changed files with 55 additions and 4 deletions
+29 -3
View File
@@ -2,6 +2,7 @@ const express = require('express');
const path = require('path');
const fs = require('fs');
const crypto = require('crypto');
const { Readable } = require('stream');
const sharp = require('sharp');
const { createJobStore } = require('./job-store');
const app = express();
@@ -52,6 +53,31 @@ function assetType(asset) {
if (/\.(mp4|webm|mov|m4v)$/i.test(asset?.filename || '')) return 'video';
return 'image';
}
function isVideoFilename(filename) { return /\.(mp4|webm|mov|m4v)$/i.test(String(filename || '')); }
function assetViewUrl(filename, subfolder, type) { return comfyUrl(`/view?filename=${encodeURIComponent(filename)}&subfolder=${encodeURIComponent(subfolder)}&type=${encodeURIComponent(type)}`); }
function copyAssetHeaders(response, res) {
for (const name of ['content-type', 'content-length', 'content-range', 'accept-ranges', 'etag', 'last-modified']) {
const value = response.headers.get(name);
if (value) res.setHeader(name, value);
}
res.setHeader('Content-Disposition', 'inline');
res.setHeader('Cache-Control', 'private, max-age=300');
res.setHeader('Vary', 'Range');
}
async function readVideoSize(url) {
let response = await fetch(url, { method: 'HEAD' });
if (response.ok) {
const length = Number(response.headers.get('content-length'));
if (Number.isFinite(length) && length > 0) return length;
}
response = await fetch(url, { headers: { Range: 'bytes=0-0' } });
if (!response.ok) throw new Error(`Asset unavailable (${response.status})`);
const range = response.headers.get('content-range') || '';
const match = range.match(/\/([0-9]+)$/);
const length = match ? Number(match[1]) : Number(response.headers.get('content-length'));
try { await response.body?.cancel(); } catch { /* best effort */ }
return Number.isFinite(length) ? length : null;
}
function startComfyProgressSocket() {
let WebSocket;
try { WebSocket = require('ws'); } catch { return; }
@@ -132,10 +158,10 @@ app.post('/api/comfy/update-all', async (req, res) => { const user = requireUser
app.get('/api/comfy/update-status', async (req, res) => { if (!requireUser(req, res)) return; try { res.json({ status: await comfyRequest('/manager/queue/status'), progress: managerUpdateProgress, result: managerUpdateResult }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to read update status' }); } });
app.post('/api/comfy/switch-version', async (req, res) => { const user = requireUser(req, res); if (!user) return; if (user.role !== 'admin') return res.status(403).json({ error: 'Forbidden' }); const requested = String(req.body?.version || '').trim(); if (!requested) return res.status(400).json({ error: 'A ComfyUI version is required' }); try { const versions = await comfyJson('/comfyui_manager/comfyui_versions'); if (!Array.isArray(versions.versions) || !versions.versions.includes(requested)) return res.status(400).json({ error: 'That ComfyUI version is not available' }); await comfyRequest('/comfyui_manager/comfyui_switch_version', 'POST', { ver: requested }); res.json({ ok: true, message: `ComfyUI version switch to ${requested} requested.` }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to switch ComfyUI version' }); } });
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/meta', 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).json({ error: 'Asset unavailable' }); const buffer = Buffer.from(await response.arrayBuffer()); let width = null; let height = null; try { const image = await sharp(buffer).metadata(); width = image.width || null; height = image.height || null; } catch { /* Video metadata is not available from sharp. */ } res.json({ width, height, sizeBytes: buffer.length }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to read asset metadata' }); } });
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.get('/api/assets/meta', 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' }); const url = assetViewUrl(filename, subfolder, type); try { if (isVideoFilename(filename)) return res.json({ width: null, height: null, sizeBytes: await readVideoSize(url) }); const response = await fetch(url); if (!response.ok) return res.status(response.status).json({ error: 'Asset unavailable' }); const buffer = Buffer.from(await response.arrayBuffer()); let width = null; let height = null; try { const image = await sharp(buffer).metadata(); width = image.width || null; height = image.height || null; } catch { /* Metadata is not available for this asset. */ } res.json({ width, height, sizeBytes: buffer.length }); } catch (error) { res.status(502).json({ error: error.message || 'Unable to read asset metadata' }); } });
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' }); const url = assetViewUrl(filename, subfolder, type); const controller = new AbortController(); const abort = () => { if (!res.writableEnded) controller.abort(); }; req.on('aborted', abort); res.on('close', abort); try { const headers = {}; if (req.headers.range) headers.Range = req.headers.range; const response = await fetch(url, { headers, signal: controller.signal }); if (!response.ok) return res.status(response.status).send('Asset unavailable'); copyAssetHeaders(response, res); res.status(response.status); if (!response.body) return res.end(); Readable.fromWeb(response.body).on('error', (error) => { if (!res.headersSent) res.status(502); res.destroy(error); }).pipe(res); } catch (error) { if (error.name === 'AbortError') return; if (!res.headersSent) res.status(502).json({ error: error.message || 'Unable to read ComfyUI asset' }); else res.destroy(error); } });
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, jobStore };
module.exports = { app, jobFromHistory, statusFromHistory, jobStore, readVideoSize };