Skip to content

fix(runtime): close browser after partial session teardown failures #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cursor wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(runtime): close browser after partial session teardown failures #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions packages/runtime/src/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,44 @@ describe("BrowserRuntime", () => {
expect(browserClose).toHaveBeenCalled();
});

it("shuts down the browser even when a session context.close fails", async () => {
const failingClose = vi.fn().mockRejectedValue(new Error("close-boom"));
const okClose = vi.fn().mockResolvedValue(undefined);
const browserClose = vi.fn().mockResolvedValue(undefined);
const makeContext = (close: typeof failingClose) => ({
newPage: vi.fn(async () => ({
goto: vi.fn().mockResolvedValue(undefined),
url: vi.fn(() => "https://page.example"),
title: vi.fn(() => Promise.resolve("title")),
content: vi.fn(() => Promise.resolve("<html></html>")),
evaluate: vi.fn().mockResolvedValue(undefined),
$$eval: vi.fn().mockResolvedValue([]),
locator: vi.fn(() => ({
first: () => ({ click: vi.fn(), fill: vi.fn() }),
ariaSnapshot: vi.fn().mockResolvedValue(""),
})),
})),
close,
});
const browser = {
newContext: vi
.fn()
.mockResolvedValueOnce(makeContext(failingClose))
.mockResolvedValueOnce(makeContext(okClose)),
close: browserClose,
};
mockChromiumLaunch.mockResolvedValueOnce(browser);

const rt = new BrowserRuntime({ headless: true });
await rt.createSession();
await rt.createSession();
await rt.shutdown();

expect(failingClose).toHaveBeenCalled();
expect(okClose).toHaveBeenCalled();
expect(browserClose).toHaveBeenCalled();
});

it("falls back to webkit when Chromium is not installed", async () => {
const { browser } = createMockBrowserTree();
mockChromiumLaunch.mockRejectedValueOnce(
Expand Down
19 changes: 14 additions & 5 deletions packages/runtime/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,16 +211,25 @@ export class BrowserRuntime {
}

async shutdown() {
await Promise.all(
[...this.sessions.values()].map(async (session) => {
await session.context.close();
const sessions = [...this.sessions.values()];
await Promise.allSettled(
sessions.map(async (session) => {
try {
await session.context.close();
} catch {
// Best-effort per-session teardown during shutdown.
}
}),
);
this.sessions.clear();

if (this.browserPromise) {
const browser = await this.browserPromise;
await browser.close();
try {
const browser = await this.browserPromise;
await browser.close();
} catch {
// Browser may already be closed.
}
this.browserPromise = null;
}
}
Expand Down
9 changes: 6 additions & 3 deletions services/companion/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ const runtime = new BrowserRuntime({
const { app } = await createCompanionApp({ runtime });

const closeGracefully = async () => {
await runtime.shutdown();
await app.close();
process.exit(0);
try {
await runtime.shutdown();
} finally {
await app.close();
process.exit(0);
}
};

process.on("SIGINT", closeGracefully);
Expand Down
Loading