verify automation interruption recovery and manual debug lifecycle

This commit is contained in:
2026-09-29 12:06:48 +01:00
parent 4f148a50de
commit e6a83c94e0
10 changed files with 300 additions and 17 deletions
@@ -9,7 +9,9 @@ import p.studio.core.project.ProjectLocalStudioStateStore;
import java.util.Objects;
public final class DefaultProjectSessionFactory implements ProjectSessionFactory {
public final class DefaultProjectSessionFactory implements ProjectSessionFactory, AutoCloseable {
private final java.util.Set<ProjectSession> sessions = new java.util.HashSet<>();
private boolean closed;
private final ProjectLocalStudioStateStore stateStore;
private final ProjectLocalStudioSetupStore setupStore;
private final LspLifecyclePort lsp;
@@ -27,7 +29,8 @@ public final class DefaultProjectSessionFactory implements ProjectSessionFactory
}
@Override
public ProjectSession open(ProjectReference projectReference) {
public synchronized ProjectSession open(ProjectReference projectReference) {
if (closed) throw new IllegalStateException("Project sessions are closing");
final ProjectReference project = Objects.requireNonNull(projectReference, "projectReference");
final var setup = setupStore.load(project);
final var state = stateStore.load(project);
@@ -38,6 +41,23 @@ public final class DefaultProjectSessionFactory implements ProjectSessionFactory
try { lsp.boot(project); }
catch (RuntimeException failure) { registration.unsubscribe(); throw failure; }
ready.set(true);
return new DefaultProjectSession(project, stateStore, setup, new DefaultExecutionSession(), lsp, state, automation, registration);
var session = new DefaultProjectSession(project, stateStore, setup, new DefaultExecutionSession(), lsp, state, automation, () -> {
registration.unsubscribe();
synchronized (DefaultProjectSessionFactory.this) { sessions.removeIf(s -> s.automation() == automation); }
});
sessions.add(session);
return session;
}
/** Application teardown must stop projects before their executors and LSP dependencies. */
@Override public void close() {
final java.util.List<ProjectSession> owned;
synchronized (this) { closed = true; owned = java.util.List.copyOf(sessions); }
RuntimeException failure = null;
for (var session : owned) {
try { session.close(); }
catch (RuntimeException error) { if (failure == null) failure = error; else failure.addSuppressed(error); }
}
if (failure != null) throw failure;
}
}
@@ -58,6 +58,36 @@ final class DefaultProjectSessionTest {
return new ProjectReference("Example", "1.0.0", "pbs", 1, ProjectTarget.Game, temporaryDirectory);
}
@Test void factoryTeardownClosesEveryOwnedSessionAndRejectsNewOpens() throws Exception {
var mapper = new ObjectMapper(); var lsp = new RecordingLsp();
var factory = new DefaultProjectSessionFactory(new ProjectLocalStudioStateStore(mapper),
new ProjectLocalStudioSetupStore(mapper), lsp, new p.studio.core.project.ProjectAccessRegistry(),
new p.studio.core.support.ControlledOperations());
var first = factory.open(project());
var other = new ProjectReference("Other", "1", "pbs", 1, ProjectTarget.Game,
java.nio.file.Files.createDirectory(temporaryDirectory.resolve("other")));
var second = factory.open(other);
first.automation().grant(false).toCompletableFuture().join(); first.automation().acquire();
second.automation().grant(false).toCompletableFuture().join();
factory.close(); factory.close();
assertTrue(first.automation().snapshot().closed()); assertTrue(second.automation().snapshot().closed());
assertEquals(2, lsp.shutdowns);
assertThrows(IllegalStateException.class, () -> factory.open(project()));
}
@Test void factoryTeardownAttemptsOtherProjectsEvenWhenOneCloseFails() throws Exception {
var mapper = new ObjectMapper(); var lsp = new RecordingLsp(); lsp.failShutdown = true;
var factory = new DefaultProjectSessionFactory(new ProjectLocalStudioStateStore(mapper),
new ProjectLocalStudioSetupStore(mapper), lsp, new p.studio.core.project.ProjectAccessRegistry(),
new p.studio.core.support.ControlledOperations());
factory.open(project());
factory.open(new ProjectReference("Other", "1", "pbs", 1, ProjectTarget.Game,
java.nio.file.Files.createDirectory(temporaryDirectory.resolve("other"))));
var failure = assertThrows(IllegalStateException.class, factory::close);
assertEquals(1, failure.getSuppressed().length); assertEquals(2, lsp.shutdowns);
factory.close();
}
@Test
void failedBootNeverPublishesAnOpenProjectAndRemovesItsRegistration() {
var mapper = new ObjectMapper();