Skip to content
TypeScript

fix(server): preview tabs that fail during setup no longer leave their page open (#29885)

Alex Southwell350dcf4c042a
diff --git a/apps/server/src/preview/ServerBrowser.test.ts b/apps/server/src/preview/ServerBrowser.test.ts
index 90b1fc44072..c558631fd2a 100644
--- a/apps/server/src/preview/ServerBrowser.test.ts
+++ b/apps/server/src/preview/ServerBrowser.test.ts
@@ -52,6 +52,12 @@ vi.mock("./ServerBrowserContexts.ts", () => ({
if (contextFailure) throw contextFailure;
await contextGate?.promise;
const context = makeContext(this.onClose);
+ const setupFailure = pageSetupFailure;
+ if (setupFailure) {
+ context.newCDPSession = async () => {
+ throw setupFailure;
+ };
+ }
contexts.push(context);
return context as unknown as BrowserContext;
}
@@ -298,6 +304,7 @@ let pageCopy = "";
let keyCopy = "";
let focusedFrame: ReturnType<typeof makeFrame> | null = null;
let contextFailure: Error | null = null;
+let pageSetupFailure: Error | null = null;
let initialNavigation: (() => Promise<void>) | null = null;
let desktopRendersNext = false;
let desktopPageUrl = "about:blank";
@@ -442,6 +449,7 @@ beforeEach(() => {
contextRequests.length = 0;
contextGate = null;
contextFailure = null;
+ pageSetupFailure = null;
initialNavigation = null;
pageCopy = "";
keyCopy = "";
@@ -2284,6 +2292,13 @@ it.live("failed session and browser launches release capacity, as does closing a
// A failed launch must not leave a session a viewer can relaunch past the budget.
expect((yield* manager.list({ threadId: scope.thread.threadId })).sessions).toHaveLength(7);
contextFailure = null;
+ pageSetupFailure = new Error("Target page, context or browser has been closed");
+ expect(yield* open.pipe(Effect.result)).toMatchObject({ _tag: "Failure" });
+ pageSetupFailure = null;
+ // Setup that fails after the page exists must not leave the page or its context open.
+ expect(contexts.at(-1)!.close).toHaveBeenCalled();
+ expect(contexts.at(-1)!.page.isClosed()).toBe(true);
+ expect((yield* manager.list({ threadId: scope.thread.threadId })).sessions).toHaveLength(7);
expect((yield* open).available).toBe(true);
expect(yield* open.pipe(Effect.flip)).toMatchObject({ reason: "tabLimit" });
expect(
diff --git a/apps/server/src/preview/ServerBrowser.ts b/apps/server/src/preview/ServerBrowser.ts
index 5206e67ddad..e03d7e3b35d 100644
--- a/apps/server/src/preview/ServerBrowser.ts
+++ b/apps/server/src/preview/ServerBrowser.ts
@@ -784,12 +784,27 @@ const make = Effect.gen(function* () {
};
const createTab = async (snapshot: PreviewSessionSnapshot): Promise<ServerTab> => {
+ const opened: Array<() => Promise<void>> = [];
+ try {
+ return await setUpTab(snapshot, opened);
+ } catch (cause) {
+ // An unpublished tab is in no list, so nothing else would ever close it.
+ for (const close of opened.reverse()) await close().catch(constVoid);
+ throw cause;
+ }
+ };
+
+ const setUpTab = async (
+ snapshot: PreviewSessionSnapshot,
+ opened: Array<() => Promise<void>>,
+ ): Promise<ServerTab> => {
const adopted = adoptedPages.get(tabKey(snapshot.threadId, snapshot.tabId));
adoptedPages.delete(tabKey(snapshot.threadId, snapshot.tabId));
const desktop =
adopted === undefined && (await desktopRenders(snapshot))
? await connectDesktop(snapshot)
: null;
+ if (desktop) opened.push(desktop.close);
// Otherwise a desktop that attaches late shows its own page, and the agent drives another.
if (!desktop && desktopChannel.available) {
await runPromise(
@@ -810,9 +825,11 @@ const make = Effect.gen(function* () {
snapshot.profileId ?? "default",
isolatedContext ? tabKey(snapshot.threadId, snapshot.tabId) : undefined,
));
+ if (isolatedContext) opened.push(() => context.close());
if (adopted?.page.isClosed()) throw new Error("The popup closed before it opened.");
if (!desktop) await prepareContext(context);
const page = adopted?.page ?? desktop?.page ?? (await context.newPage());
+ if (!desktop) opened.push(() => page.close());
const cdp = await context.newCDPSession(page);
await installPdfDocumentNavigation(cdp);
// The desktop's page is already a normal browser. A popup's first request
@@ -986,9 +1003,6 @@ const make = Effect.gen(function* () {
const key = tabKey(tab.threadId, tab.tabId);
if (closedPendingTabs.delete(key)) {
await control.close().catch(constVoid);
- if (desktop) await desktop.close().catch(constVoid);
- else await page.close().catch(constVoid);
- if (isolatedContext) await context.close().catch(constVoid);
throw new ServerBrowserTabNotFoundError({ threadId: tab.threadId, tabId: tab.tabId });
}
page.on("close", () => dropTab(tab, true));