mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
fix(server): stop relaying upstream and JS error text to the client
Ported onto the split provider layout: the routes now live in
server/providers/openai/{hud-summary,realtime}.js and the camera health
entry in server/providers/cctv.js.
The routes #263 names — celestrak, terrain, adsbdb — were sanitized by
#289. The same defect had moved:
- /api/openai/hud-summary relayed `data.error.message` verbatim on a
non-ok upstream. That is OpenAI's own error text, carrying request ids,
organization hints and quota wording. Its catch echoed the JS error too.
- /api/realtime/token echoed the JS error when minting failed, which for a
network fault is a resolver message naming the upstream host.
- cctvProxy stored the raw error as a camera's health `message`. This is
the least obvious of the three and the reason the PR is worth its size:
GET /api/cctv/health serializes `message`, and src/layers/cctv/frames.js
renders it as the camera's status label, so the detail reached the
screen through a different door than the sanitized 502 beside it.
Logs name the failure and the upstream status without the text, matching
the Launch Library and terrain paths; these lines get pasted into issues.
Coverage extends the existing harnesses rather than adding files —
localServices.test.mjs drives both OpenAI routes over a mocked upstream,
mediaProviders.test.mjs drives a failing media fetch and then reads
/health. All three assertions fail on the previous implementation.
Refs #263. Does not touch /api/realtime/debug-log's identical echo; that
route is the subject of the #23 PR, so the two do not overlap a line.
This commit is contained in:
1 parent
96a6b49477
commit
9e71081a5a
7 files changed
+97
-8
No files matched your search
@@ -149,3 +149,45 @@ for (const hook of ['configureServer', 'configurePreviewServer']) {
|
||||
assert.equal(cancelled, true);
|
||||
});
|
||||
}
|
||||
|
||||
test('a failed CCTV media fetch reports a fixed health message, not the error text', async (t) => {
|
||||
isolate(t);
|
||||
const root = mkdtempSync(path.join(tmpdir(), 'gev-cctv-'));
|
||||
t.after(() => rmSync(root, { recursive: true, force: true }));
|
||||
mkdirSync(path.join(root, 'config'));
|
||||
writeFileSync(
|
||||
path.join(root, 'config/cctv_sources.austin.json'),
|
||||
JSON.stringify([
|
||||
{
|
||||
id: 'leaky',
|
||||
name: 'Leaky camera',
|
||||
lat: 30.27,
|
||||
lon: -97.74,
|
||||
feedType: 'video',
|
||||
url: 'https://cams.fixture.invalid/leaky.m3u8',
|
||||
},
|
||||
]),
|
||||
);
|
||||
const leak =
|
||||
'connect ETIMEDOUT 203.0.113.9:443 C:\fixture\secret-path\cams.json';
|
||||
t.mock.restoreAll();
|
||||
t.mock.method(globalThis, 'fetch', () => {
|
||||
throw Error(leak);
|
||||
});
|
||||
|
||||
const call = install(cctvProxy({ sourceRoot: root }));
|
||||
const media = await call('/media/leaky');
|
||||
assert.equal(media.status, 502);
|
||||
assert.equal(media.body.includes('203.0.113.9'), false);
|
||||
|
||||
// GET /health is the second door: src/layers/cctv/frames.js renders each
|
||||
// entry's `message` as the camera's status label, so a raw errno stored here
|
||||
// reaches the screen even though the response above is sanitized.
|
||||
const camera = JSON.parse((await call('/health')).body).cameras.find(
|
||||
(entry) => entry.id === 'leaky',
|
||||
);
|
||||
assert.equal(camera.status, 'degraded');
|
||||
assert.equal(camera.message, 'Media fetch failed');
|
||||
assert.equal(camera.message.includes('ETIMEDOUT'), false);
|
||||
assert.equal(camera.message.includes('secret-path'), false);
|
||||
});
|
||||
Reference in new issue
Block a user