Merge pull request #1790 from bilawalsidhu/fix/vessels-toggle-without-feed

Vessels turn on and off again when their feed fails
This commit is contained in:
Sameh Khamis authored and GitHub committed 2026-11-17 15:58:12 -08:00
commit dbe632b51f
3 files changed
+50 -2

No files matched your search

@@ -0,0 +1,3 @@
- Let AIS vessels turn on and off again when their feed fails; the live
position load no longer passes the poll's answer to `enable()`
(samehkhamis, #1790).
+30
View File
@@ -1461,6 +1461,36 @@ test('enable owns one grace timer and disable/re-enable starts a new session', a
}
});
test('the layer turns on and off when its feed fails', async () => {
const harness = installWireHarness(undefined, { enabled: false });
const priorFetch = globalThis.fetch;
const priorWarn = console.warn;
const clock = makeFakeAisRuntime();
_setAisRuntimeForTest(clock.runtime);
globalThis.fetch = async () => ({
ok: false,
status: 503,
json: async () => ({
status: 'missing-key',
error: 'AISSTREAM_API_KEY is not set',
}),
});
console.warn = () => {};
try {
// Turning it on succeeds; the failure is shown on the layer.
assert.notEqual(await aisLiveVesselsLayer.enable(harness.viewer), false);
const feed = _getVesselFeedStateForTest();
assert.equal(feed.status, 'unavailable');
assert.equal(feed.error, 'AISSTREAM_API_KEY not set');
assert.notEqual(aisLiveVesselsLayer.disable(), false);
} finally {
globalThis.fetch = priorFetch;
console.warn = priorWarn;
harness.cleanup();
_setAisRuntimeForTest();
}
});
test('vessel trail lifecycle: deselect clears the selected-vessel trail', () => {
const harness = installWireHarness(undefined);
try {
+17 -2
View File
@@ -32,7 +32,22 @@ export function createIngestion({
// may still be set while it loads (see resumeLive).
let liveLoad = null;
async function loadLivePositions(viewer, { handover = false } = {}) {
/**
* Poll the live vessels (or take the live poll already out). Resolves
* when it is done, with nothing: a feed that fails is shown on the layer,
* and turning the layer on still succeeds.
* @param {object} viewer
* @returns {Promise<void>}
*/
async function loadLivePositions(viewer) {
await pollLive(viewer);
}
/**
* The live poll: resolves what loadPositions answers (false when it could
* not be had), or that of the live poll already out.
*/
async function pollLive(viewer, { handover = false } = {}) {
// Following the world clock, the layer shows the snapshots loadAt applies.
if (followsClock()) return false;
// Back at live, a snapshot at a time still loading no longer applies:
@@ -63,7 +78,7 @@ export function createIngestion({
* @returns {Promise<boolean>}
*/
async function resumeLive(viewer) {
const applied = await loadLivePositions(viewer || readViewer(), {
const applied = await pollLive(viewer || readViewer(), {
handover: true,
});
return applied === true;