From 04344f7f648e54e201b3951454051f66ba1a084f Mon Sep 17 00:00:00 2001 From: "chris.dumas" Date: Sat, 14 Nov 2026 19:53:01 +0000 Subject: [PATCH] Stream portal video assets with range support --- server.js | 32 +++++++++++++++++++++++++++++--- server.test.js | 27 ++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/server.js b/server.js index 6449907..67a545c 100644 --- a/server.js +++ b/server.js @@ -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 }; diff --git a/server.test.js b/server.test.js index 6fced60..98474f4 100644 --- a/server.test.js +++ b/server.test.js @@ -2,7 +2,7 @@ const test = require('node:test'); const assert = require('node:assert/strict'); const fs = require('node:fs'); const path = require('node:path'); -const { app, jobFromHistory, statusFromHistory } = require('./server'); +const { app, jobFromHistory, statusFromHistory, readVideoSize } = require('./server'); const { createJobStore } = require('./job-store'); test('serves frontend assets before authentication redirects', async (t) => { @@ -50,6 +50,31 @@ test('recognises audio output arrays used by alternate ComfyUI nodes', () => { assert.match(job.assets[0].url, /filename=result.mp3/); }); +test('reads video size with HEAD without downloading the video', async (t) => { + const originalFetch = global.fetch; + const calls = []; + global.fetch = async (_url, options = {}) => { + calls.push(options); + return new Response(null, { status: 200, headers: { 'content-length': '987654' } }); + }; + t.after(() => { global.fetch = originalFetch; }); + assert.equal(await readVideoSize('http://comfy/view?filename=clip.mp4'), 987654); + assert.deepEqual(calls, [{ method: 'HEAD' }]); +}); + +test('falls back to a one-byte range probe when video HEAD has no length', async (t) => { + const originalFetch = global.fetch; + const calls = []; + global.fetch = async (_url, options = {}) => { + calls.push(options); + if (options.method === 'HEAD') return new Response(null, { status: 200 }); + return new Response(new Uint8Array([0]), { status: 206, headers: { 'content-range': 'bytes 0-0/1234567' } }); + }; + t.after(() => { global.fetch = originalFetch; }); + assert.equal(await readVideoSize('http://comfy/view?filename=clip.mp4'), 1234567); + assert.equal(calls[1].headers.Range, 'bytes=0-0'); +}); + test('classifies failed history without exposing mutation paths', () => { assert.equal(statusFromHistory({ status: { messages: [['execution_error', {}]] } }), 'failed'); });