Finish an interrupted frame event as soon as its error surfaces

Retry used to apply the queued listener changes of a Cesium event a
throwing listener left mid-raise, adds first and removes second. A layer
turned off and on while the notice was up landed in both queues and was
removed. The render and resize wrapper now finishes those events before
it raises the render error, so later adds and removes apply at once and
in order.
This commit is contained in:
German Khokhlov committed 2026-11-10 14:28:01 +04:00
1 parent 02a8442e6e
commit d9e34f10c6
3 files changed
+95 -22

No files matched your search

+70
View File
@@ -132,3 +132,73 @@ test('a throwing postRender listener removed before Retry is not called again',
restore();
}
});
const listenerCount = (event) =>
[...event._listeners.values()].reduce((sum, scopes) => sum + scopes.size, 0);
test('a listener turned off and on while the loop is stopped runs after Retry', () => {
const { scene, viewer, store, runFrames, restore } = setup();
try {
let broken = true;
scene.postRender.addEventListener(() => {
if (broken) throw new TypeError('layer listener failed');
});
let calls = 0;
const frame = () => {
calls += 1;
};
let removeFrame = scene.postRender.addEventListener(frame);
scene.requestRender();
viewer.useDefaultRenderLoop = true;
runFrames(1);
assert.equal(store.renderFailure?.reason, 'render-error');
removeFrame(); // another layer is turned off
removeFrame = scene.postRender.addEventListener(frame); // and on again
broken = false;
store.renderFailure.retry();
calls = 0;
scene.requestRender();
runFrames(3);
assert.ok(calls > 0, 'the re-added listener runs after Retry');
assert.ok(scene.postRender._listeners.has(frame));
assert.equal(
scene.postRender.numberOfListeners,
listenerCount(scene.postRender),
);
} finally {
restore();
}
});
test('a listener added, removed and added again while the loop is stopped runs after Retry', () => {
const { scene, viewer, store, runFrames, restore } = setup();
try {
let broken = true;
scene.postRender.addEventListener(() => {
if (broken) throw new TypeError('layer listener failed');
});
scene.requestRender();
viewer.useDefaultRenderLoop = true;
runFrames(1);
assert.equal(store.renderFailure?.reason, 'render-error');
let calls = 0;
const onGroundFrame = () => {
calls += 1;
};
// worldAnnotationRenderer: a ground task starts, times out, the next starts
scene.postRender.addEventListener(onGroundFrame);
scene.postRender.removeEventListener(onGroundFrame);
scene.postRender.addEventListener(onGroundFrame);
broken = false;
store.renderFailure.retry();
scene.requestRender();
runFrames(3);
assert.ok(calls > 0, 'the re-added listener runs after Retry');
assert.equal(
scene.postRender.numberOfListeners,
listenerCount(scene.postRender),
);
} finally {
restore();
}
});