fix(cctv): keep main's HLS leases and test them through the middleware

Drop the per-peer lease budget and the lease-to-address binding. Main's
keyless same-site gate already refuses cross-site media requests, while
the budget capped a shared address (Docker gateway, reverse proxy, NAT)
at 8 leases across both sessions and still let one address hold both.
A lease now keeps working when its viewer reconnects from a new address.

Add a middleware test that drives the HLS playlist, segment and DELETE
for viewers on one shared address, on distinct addresses and after an
address change, and fold the media cases (segment read, DELETE, no
catalog request) into the cross-site table test. Remove the redundant
puppeteer flag, the CURRENT-STATE paragraph and the changelog fragment,
which no longer describe a change.
This commit is contained in:
German Khokhlov committed 2026-11-19 19:59:01 +04:00
1 parent 90e464eb5a
commit 0699876e4e
8 files changed
+212 -162

No files matched your search

+3 -14
View File
@@ -264,10 +264,6 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
// keyless gate keeps the routes reachable behind a reverse proxy; the
// key-bearing Street View fallback below has its own check.
if (admitSameSiteKeyless(req, res)) return;
const clientId = String(req.socket?.remoteAddress || 'unknown').replace(
/^::ffff:/,
'',
);
const sources = await getCctvSources();
const sourceById = new Map(
sources.map((source) => [source.id, source]),
@@ -379,7 +375,7 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
return;
}
if (req.method === 'DELETE') {
if (leaseId) puller.release(cameraId, leaseId, clientId);
if (leaseId) puller.release(cameraId, leaseId);
res.writeHead(204);
res.end();
return;
@@ -409,7 +405,6 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
url.searchParams.get('session'),
Number(match[3]),
leaseId,
clientId,
);
res.writeHead(body ? 200 : 404, {
'Content-Type': 'video/mp2t',
@@ -421,15 +416,10 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
const downstream = watchDownstreamClose(res);
let entry;
const cancelPending = () => {
if (entry) puller.release(cameraId, leaseId, clientId);
if (entry) puller.release(cameraId, leaseId);
};
try {
entry = await puller.ensure(
cameraId,
mediaUrl,
leaseId,
clientId,
);
entry = await puller.ensure(cameraId, mediaUrl, leaseId);
if (downstream.closed) {
cancelPending();
return;
@@ -443,7 +433,6 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
entry,
cameraId,
leaseId,
clientId,
);
if (downstream.closed) return;
if (!playlist) throw new Error('Stream unavailable');
+13 -46
View File
@@ -4,7 +4,6 @@ import { randomUUID } from 'node:crypto';
export const HLS_LIMITS = Object.freeze({
sessions: 2,
leasesPerSession: 8,
leasesPerClient: 8,
playlistBytes: 256 * 1024,
// High-resolution cameras can exceed 4 MiB in a single ten-second TS segment.
// Retained data still shares the independent 24 MiB session budget below.
@@ -141,37 +140,25 @@ export function createHlsPuller({
entry.upstream.clear();
entry.bytes = 0;
};
const release = (cameraId, leaseId, clientId = 'legacy') => {
const release = (cameraId, leaseId) => {
const entry = active.get(cameraId);
const lease = entry?.leases.get(leaseId);
if (!lease || lease.clientId !== clientId) return;
if (!lease) return;
clearTimeout(lease.timer);
entry.leases.delete(leaseId);
if (!entry.leases.size) stop(cameraId, entry.token);
};
const touch = (entry, leaseId, create = false, clientId = 'legacy') => {
const touch = (entry, leaseId, create = false) => {
let lease = entry.leases.get(leaseId);
if (lease && lease.clientId !== clientId)
throw new Error('HLS lease belongs to another client');
if (!lease) {
const clientLeases = [...active.values()].reduce(
(count, session) =>
count +
[...session.leases.values()].filter(
(item) => item.clientId === clientId,
).length,
0,
);
if (clientLeases >= limits.leasesPerClient)
throw new Error('HLS client lease capacity reached');
if (!create || entry.leases.size >= limits.leasesPerSession)
throw new Error('HLS lease capacity reached');
lease = { clientId };
lease = {};
entry.leases.set(leaseId, lease);
}
clearTimeout(lease.timer);
lease.timer = setTimeout(
() => release(entry.cameraId, leaseId, clientId),
() => release(entry.cameraId, leaseId),
limits.idleMs,
);
lease.timer.unref?.();
@@ -263,12 +250,7 @@ export function createHlsPuller({
}
}
};
const ensure = async (
cameraId,
url,
leaseId = 'legacy',
clientId = 'legacy',
) => {
const ensure = async (cameraId, url, leaseId = 'legacy') => {
if (closed) throw new Error('HLS service closed');
sameOriginHlsUrl(url, url);
let entry = active.get(cameraId);
@@ -277,7 +259,7 @@ export function createHlsPuller({
entry = null;
}
if (entry) {
touch(entry, leaseId, true, clientId);
touch(entry, leaseId, true);
return entry;
}
// Reserve synchronously, before any await: concurrent creation is singleflight.
@@ -299,8 +281,8 @@ export function createHlsPuller({
pendingDiscontinuity: false,
discontinuitiesRemoved: 0,
};
touch(entry, leaseId, true, clientId);
active.set(cameraId, entry);
touch(entry, leaseId, true);
entry.polling = poll(entry);
return entry;
};
@@ -312,14 +294,9 @@ export function createHlsPuller({
}
return false;
};
const buildPlaylist = async (
entry,
cameraId,
leaseId = 'legacy',
clientId = 'legacy',
) => {
const buildPlaylist = async (entry, cameraId, leaseId = 'legacy') => {
if (entry.stopping || entry.segments.size < 2) return null;
touch(entry, leaseId, false, clientId);
touch(entry, leaseId);
const segments = [...entry.segments.values()].sort((a, b) => a.seq - b.seq);
const lines = [
'#EXTM3U',
@@ -343,22 +320,12 @@ export function createHlsPuller({
}
return lines.join('\n') + '\n';
};
const getSegment = (
cameraId,
token,
seq,
leaseId = 'legacy',
clientId = 'legacy',
) => {
const getSegment = (cameraId, token, seq, leaseId = 'legacy') => {
const entry = active.get(cameraId);
if (
!entry ||
entry.token !== token ||
entry.leases.get(leaseId)?.clientId !== clientId
)
if (!entry || entry.token !== token || !entry.leases.has(leaseId))
return null;
const body = entry.segments.get(seq)?.body;
if (body) touch(entry, leaseId, false, clientId);
if (body) touch(entry, leaseId);
return body || null;
};
const shutdown = async () => {