CCTV Street View fallback: the browser's pose at the catalog position

The fallback keeps the catalog position but takes heading, field of view
and pitch from the request again, as before, clamped as before. A catalog
camera with no pose (every world-cameras row on main) otherwise asked
Google for heading 0, pitch 0, FOV 80 while the browser draws it at the
id-hash heading, pitch -17 and FOV 74, and a calibrated camera lost its
calibration. Cost and the per-IP budget are unchanged.

- The Street View budget is built per proxy, so tests no longer depend on
  GEV_RATELIMIT_GOOGLE_PER_MIN in the shell; the fixture pins it.
- New tests: a pose-less catalog camera, and the per-IP budget (no call
  without a key, the cap, a separate budget per address).
- The client no longer sends lat/lon on /frame.
- CURRENT-STATE, the changelog fragment and SECURITY.md say the fallback
  has its own per-client limit, and that unlisted (seed) cameras get the
  placeholder.
This commit is contained in:
German Khokhlov committed 2026-11-19 19:06:53 +04:00
1 parent f579b23f52
commit 11e1c9d26d
8 files changed
+235 -36

No files matched your search

+46 -2
View File
@@ -111,6 +111,7 @@ function mount(t, respond) {
austin: process.env.CCTV_FORCE_AUSTIN,
serverKey: process.env.GOOGLE_MAPS_SERVER_API_KEY,
browserKey: process.env.GOOGLE_MAPS_API_KEY,
rateLimit: process.env.GEV_RATELIMIT_GOOGLE_PER_MIN,
};
process.env.CCTV_SOURCES_JSON = JSON.stringify([
STILL,
@@ -125,6 +126,8 @@ function mount(t, respond) {
// than a network call this file does not model.
delete process.env.GOOGLE_MAPS_SERVER_API_KEY;
delete process.env.GOOGLE_MAPS_API_KEY;
// The default Google budget, whatever the shell sets.
delete process.env.GEV_RATELIMIT_GOOGLE_PER_MIN;
const nativeFetch = globalThis.fetch;
const requests = [];
globalThis.fetch = async (url, init = {}) => {
@@ -139,6 +142,7 @@ function mount(t, respond) {
['CCTV_FORCE_AUSTIN', before.austin],
['GOOGLE_MAPS_SERVER_API_KEY', before.serverKey],
['GOOGLE_MAPS_API_KEY', before.browserKey],
['GEV_RATELIMIT_GOOGLE_PER_MIN', before.rateLimit],
]) {
if (value === undefined) delete process.env[name];
else process.env[name] = value;
@@ -155,9 +159,9 @@ function mount(t, respond) {
});
assert.ok(handler, 'the CCTV provider must mount a middleware');
const call = async (path, headers = {}) => {
const call = async (path, headers = {}, socket) => {
const { res, done } = recordingResponse();
await handler({ url: path, headers, method: 'GET', on() {} }, res);
await handler({ url: path, headers, method: 'GET', on() {}, socket }, res);
await done;
return res;
};
@@ -554,4 +558,44 @@ test('the Street View fallback frames catalog cameras only, from the catalog pos
assert.equal(steered.headers['X-CCTV-Source'], 'streetview');
const location = new URL(streetView()[0].url).searchParams.get('location');
assert.equal(location, `${STILL.lat},${STILL.lon}`);
assert.equal(new URL(streetView()[0].url).searchParams.get('heading'), '90');
});
test('the Street View fallback spends a per-IP Google budget, and only with a key', async (t) => {
const app = mount(t, ({ url }) =>
url.startsWith('https://maps.googleapis.com/')
? trackedUpstream({
headers: { 'content-type': 'image/jpeg' },
body: 'street-view',
}).response
: upstreamResponse({ status: 503 }),
);
// Read when the first keyed fallback builds the limiter, so after mount().
process.env.GEV_RATELIMIT_GOOGLE_PER_MIN = '2';
const streetViewCalls = () =>
app.requests.filter(({ url }) =>
url.startsWith('https://maps.googleapis.com/'),
).length;
const first = { remoteAddress: '203.0.113.7' };
const frameSource = async (socket) =>
(await app.call(`/frame/${STILL.id}`, {}, socket)).headers['X-CCTV-Source'];
// Without a key nothing is spent.
for (let i = 0; i < 3; i++)
assert.equal(await frameSource(first), 'synthetic');
assert.equal(streetViewCalls(), 0);
process.env.GOOGLE_MAPS_SERVER_API_KEY = 'fixture-key';
assert.deepEqual(
[await frameSource(first), await frameSource(first), await frameSource(first)],
['streetview', 'streetview', 'synthetic'],
);
assert.equal(streetViewCalls(), 2, 'no Google call over the budget');
// Another address has a budget of its own.
assert.equal(
await frameSource({ remoteAddress: '203.0.113.8' }),
'streetview',
);
assert.equal(streetViewCalls(), 3);
});
+141
View File
@@ -0,0 +1,141 @@
// When a catalog camera has no pose, the browser sends /frame a heading derived
// from the camera ID, a pitch of -17°, and a field of view of 74°. Street View
// uses that pose at the camera's catalog coordinates.
import { test } from 'node:test';
import assert from 'node:assert/strict';
import { cctvProxy } from '../../server/providers/cctv.js';
// Same shape as a world-cameras row: an image URL, position, and no
// headingDeg / pitchDeg / fovDeg.
const POSELESS = {
id: 'world-or-fixture',
name: 'Pose-less fixture',
lat: 44.05,
lon: -123.09,
feedType: 'image',
url: 'https://cams.upstream.invalid/still.jpg',
};
/** The browser's id-hash heading (src/layers/cctv/model.js headingFromId). */
function browserHeadingFromId(id) {
let acc = 0;
for (let i = 0; i < id.length; i++) acc = (acc * 33 + id.charCodeAt(i)) >>> 0;
return ((((acc % 16) * 22.5) % 360) + 360) % 360;
}
function response({ status = 200, headers = {}, body = '' }) {
return new Response(status === 204 ? null : String(body), {
status,
headers,
});
}
function recording() {
const chunks = [];
let finished;
const done = new Promise((resolve) => (finished = resolve));
const res = {
statusCode: 0,
headers: {},
writableEnded: false,
writeHead(status, headers) {
res.statusCode = status;
res.headers = { ...res.headers, ...headers };
},
setHeader(name, value) {
res.headers[name] = value;
},
write(chunk) {
chunks.push(Buffer.from(chunk));
return true;
},
end(chunk) {
if (chunk) chunks.push(Buffer.from(chunk));
res.writableEnded = true;
res.body = Buffer.concat(chunks).toString('utf8');
finished();
},
on() {},
once() {},
emit() {},
destroy() {},
};
return { res, done };
}
test('the Street View fallback frames a pose-less catalog camera the way the browser draws it', async (t) => {
const saved = Object.fromEntries(
[
'CCTV_SOURCES_JSON',
'CCTV_SOURCES_FILE',
'CCTV_FORCE_AUSTIN',
'GOOGLE_MAPS_SERVER_API_KEY',
'GOOGLE_MAPS_API_KEY',
'GEV_RATELIMIT_GOOGLE_PER_MIN',
].map((name) => [name, process.env[name]]),
);
process.env.CCTV_SOURCES_JSON = JSON.stringify([POSELESS]);
process.env.CCTV_SOURCES_FILE = 'absent-source-file.json';
process.env.CCTV_FORCE_AUSTIN = '0';
process.env.GOOGLE_MAPS_SERVER_API_KEY = 'fixture-key';
delete process.env.GOOGLE_MAPS_API_KEY;
delete process.env.GEV_RATELIMIT_GOOGLE_PER_MIN;
const nativeFetch = globalThis.fetch;
const streetView = [];
globalThis.fetch = async (url) => {
const href = String(url);
if (href.startsWith('https://maps.googleapis.com/')) {
streetView.push(new URL(href));
return response({
headers: { 'content-type': 'image/jpeg' },
body: 'street-view',
});
}
return response({ status: 503 }); // the camera's upstream is down
};
t.after(() => {
globalThis.fetch = nativeFetch;
for (const [name, value] of Object.entries(saved)) {
if (value === undefined) delete process.env[name];
else process.env[name] = value;
}
});
let handler;
cctvProxy().configureServer({
middlewares: { use: (_route, fn) => (handler = fn) },
});
// What src/layers/cctv/source.js sends for this camera with no calibration.
const heading = Math.round(browserHeadingFromId(POSELESS.id));
const params = new URLSearchParams({
label: POSELESS.name,
city: '',
lat: POSELESS.lat.toFixed(6),
lon: POSELESS.lon.toFixed(6),
heading: String(heading),
fov: '74',
pitch: '-17',
ts: '1',
});
const { res, done } = recording();
await handler(
{
url: `/frame/${POSELESS.id}?${params}`,
headers: {},
method: 'GET',
on() {},
},
res,
);
await done;
assert.equal(res.headers['X-CCTV-Source'], 'streetview');
assert.equal(streetView.length, 1);
const sv = streetView[0].searchParams;
assert.equal(sv.get('location'), `${POSELESS.lat},${POSELESS.lon}`);
assert.equal(Number(sv.get('heading')), heading, 'heading the browser draws');
assert.equal(Number(sv.get('fov')), 74, 'FOV the browser draws');
assert.equal(Number(sv.get('pitch')), -17, 'pitch the browser draws');
});