Stories: a teardown that times out cannot undo the restored view

directorSettled now tells a timeout from settlement, and on a timeout
revokes the scene's layer cleanup still in flight before Close puts the
view back.
This commit is contained in:
Sameh Khamis committed 2026-11-16 13:31:51 -08:00
1 parent 0a39b05cdb
commit 4fa80fb18c
5 files changed
+105 -8

No files matched your search

+20 -3
View File
@@ -2683,13 +2683,19 @@ export class SceneDirector {
const layerIds = Array.isArray(scene?.releaseLayerIds)
? scene.releaseLayerIds
: [];
// revokeSceneRelease() ends this release's authority over layers.
this._releaseAbort ??= new AbortController();
const revoked = this._releaseAbort.signal;
const signal = token?.signal
? AbortSignal.any([token.signal, revoked])
: revoked;
let released = true;
for (const layerId of layerIds) {
if (token?.cancelled) return false;
if (token?.cancelled || revoked.aborted) return false;
try {
const settled = await this.dataManager.setEnabled(layerId, false, {
origin: 'scene',
signal: token?.signal,
signal,
});
if (settled === false) {
released = false;
@@ -2714,7 +2720,18 @@ export class SceneDirector {
});
}
}
return released && !token?.cancelled;
return released && !token?.cancelled && !revoked.aborted;
}
/**
* Stop every scene layer release still in flight from turning any further
* layer off: the one under way is aborted and the rest are skipped. For a
* caller that stopped waiting on a teardown (whenIdle) and is about to put
* layers back itself; a release started afterwards is unaffected.
*/
revokeSceneRelease() {
this._releaseAbort?.abort();
this._releaseAbort = null;
}
/**
+36
View File
@@ -2031,6 +2031,42 @@ test('startScene resolves its result, resumes after a shot without a scene id, a
} finally { await director.destroy(); restore(); }
});
test('a revoked scene release turns no further layer off', async () => {
const project = structuredClone(PROJECT_FIXTURE);
project.scenes[0].releaseLayerIds = ['flights', 'traffic'];
const { director, dataManager, restore } = makeDirector({ project });
try {
const calls = [];
let finishFirst;
dataManager.setEnabled = (id, enabled, { signal }) => {
calls.push({ id, enabled, signal });
// The first layer's disable hangs, as a stuck teardown does.
return new Promise((resolve) => {
finishFirst = resolve;
});
};
const releasing = director._releaseSceneLayers(director._project.scenes[0]);
await settle();
assert.deepEqual(calls.map(({ id }) => id), ['flights']);
director.revokeSceneRelease();
assert.equal(calls[0].signal.aborted, true, 'the disable under way is aborted');
finishFirst(true);
assert.equal(await releasing, false);
assert.deepEqual(
calls.map(({ id }) => id),
['flights'],
'the next layer is never turned off',
);
// A release started afterwards has its say again.
dataManager.setEnabled = async (id, enabled, { signal }) => {
calls.push({ id, enabled, signal });
return true;
};
assert.equal(await director._releaseSceneLayers(director._project.scenes[0]), true);
assert.deepEqual(calls.slice(1).map(({ id }) => id), ['flights', 'traffic']);
} finally { await director.destroy(); restore(); }
});
/** Drive frame-by-frame camera motion headlessly for one test. */
function installAnimationFrames() {
const original = globalThis.requestAnimationFrame;