The best way to control Claude Code, Codex and more from any computer or phone
fix(server): close scratch browser contexts when page creation fails (#34310)
Romil committed
Nov 12, 2026 at 10:21 UTC
a4ab7dd7079cb9c2507fd9943211a80077f3258b
2 files changed
+28
-3
apps/server/src/preview/ServerBrowserContexts.test.ts
+20
@@ -108,6 +108,26 @@ describe("ServerBrowserContexts", () => {
108
}
109
});
110
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
+
131
it("lazily shares one browser across concurrent isolated sessions and reuses each context", async () => {
132
const browser = makeBrowser();
133
const launch = Promise.withResolvers<Browser>();
apps/server/src/preview/ServerBrowserContexts.ts
+8
-3
@@ -227,9 +227,14 @@ export class ServerBrowserContexts {
227
async scratchPage() {
228
if (this.closing) throw new Error("The preview browser is closed.");
229
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
+ }
238
}
239
240
async connectDesktopPage(endpoint: string) {