Skip to content

Commit 63a670f

Browse files
fix(server): release scratch browser contexts when page creation fails
1 parent d835e43 commit 63a670f

2 files changed

Lines changed: 28 additions & 3 deletions

File tree

‎apps/server/src/preview/ServerBrowserContexts.test.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,26 @@ describe("ServerBrowserContexts", () => {
108108
}
109109
});
110110

111+
it("closes a scratch context when creating its page fails", async () => {
112+
const browser = makeBrowser();
113+
launches.launch.mockResolvedValue(browser as unknown as Browser);
114+
const pool = new ServerBrowserContexts(options());
115+
const peer = await pool.contextFor("default", "peer");
116+
const context = await browser.newContext();
117+
const failure = new Error("newPage failed");
118+
browser.created[1]!.newPage.mockRejectedValueOnce(failure);
119+
browser.newContext.mockResolvedValueOnce(context);
120+
try {
121+
await expect(pool.scratchPage()).rejects.toBe(failure);
122+
expect(context.close).toHaveBeenCalledOnce();
123+
expect(browser.contexts()).toEqual([peer]);
124+
expect(peer.close).not.toHaveBeenCalled();
125+
expect(browser.close).not.toHaveBeenCalled();
126+
} finally {
127+
await pool.close();
128+
}
129+
});
130+
111131
it("lazily shares one browser across concurrent isolated sessions and reuses each context", async () => {
112132
const browser = makeBrowser();
113133
const launch = Promise.withResolvers<Browser>();

‎apps/server/src/preview/ServerBrowserContexts.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,14 @@ export class ServerBrowserContexts {
227227
async scratchPage() {
228228
if (this.closing) throw new Error("The preview browser is closed.");
229229
const context = await this.sharedContext();
230-
const page = await context.newPage();
231-
page.once("close", () => void context.close().catch(constVoid));
232-
return page;
230+
try {
231+
const page = await context.newPage();
232+
page.once("close", () => void context.close().catch(constVoid));
233+
return page;
234+
} catch (cause) {
235+
await context.close().catch(constVoid);
236+
throw cause;
237+
}
233238
}
234239

235240
async connectDesktopPage(endpoint: string) {

0 commit comments

Comments
 (0)