Let Retry finish a frame event a throwing listener cut short

Cesium's Event.raiseEvent leaves an event mid-raise when a listener throws, so listeners added or removed afterwards stay queued. Retry now applies that queue for the frame and clock events: the notice's frame watchers see the next frame, and a listener removed since, such as a layer turned off, is not called again.
This commit is contained in:
German Khokhlov committed 2026-11-06 14:45:42 +04:00
1 parent 628de8386d
commit 02a8442e6e
4 files changed
+175

No files matched your search

+35
View File
@@ -42,6 +42,17 @@ export function installRenderFailureNotice(
locationRef.reload();
return;
}
[
scene.preUpdate,
scene.postUpdate,
scene.preRender,
scene.postRender,
scene.camera?.changed,
scene.camera?.moveStart,
scene.camera?.moveEnd,
viewer.clock?.onTick,
viewer.clock?.onStop,
].forEach(finishRaise);
viewer.useDefaultRenderLoop = true;
scene.requestRender?.();
}
@@ -124,6 +135,30 @@ export function installRenderFailureNotice(
};
}
/**
* Finish the raise a throwing listener cut short. Cesium's `Event.raiseEvent`
* marks the event as raising until every listener returns, and until then it
* only queues the listeners added or removed: the frame watchers the notice
* adds, or the throwing listener of a layer turned off since. Apply the queue
* as the raise would have.
*/
function finishRaise(event) {
if (!event?._invokingListeners) return;
event._invokingListeners = false;
for (const [listener, scopes] of event._toAdd) {
const added = event._listeners.get(listener) ?? new Set();
scopes.forEach((scope) => added.add(scope));
event._listeners.set(listener, added);
}
event._toAdd.clear();
for (const [listener, scopes] of event._toRemove) {
const left = event._listeners.get(listener);
scopes.forEach((scope) => left?.delete(scope));
if (left?.size === 0) event._listeners.delete(listener);
}
event._toRemove.clear();
}
/**
* Wrap `target[name]` so an error it throws is reported and thrown on, for
* the caller to handle as before. Returns a function that unwraps it.