Skip to content

fix: close browser after export #4373

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

Open
howenyap wants to merge 2 commits into
base: master
Choose a base branch
from
+20 −13
Open

fix: close browser after export #4373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c91c289
fix: close browser after export
howenyap Mar 24, 2026
07a68ec
fix: remove optional chain
howenyap Mar 24, 2026
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
16 changes: 9 additions & 7 deletions export/src/handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as Sentry from '@sentry/node';
import type { VercelApiHandler, VercelRequest, VercelResponse } from '@vercel/node';
import type { Page } from 'puppeteer-core';
import type { Browser, Page } from 'puppeteer-core';

import * as render from './render-serverless';
import config from './config';
Expand Down Expand Up @@ -56,9 +56,10 @@ export function makeExportHandler<T>(

// Prepare browser for export
const url = config.page;
let browser: Browser;
let page: Page;
try {
page = await render.open(url);
({ browser, page } = await render.open(url));
} catch (error) {
if (error.message.includes('ERR_CONNECTION_REFUSED')) {
throw new HttpError(
Expand All @@ -70,11 +71,12 @@ export function makeExportHandler<T>(
throw new HttpError(500, 'Cannot start browser', error);
}

// Export
await performExport(response, page, data);

// Cleanup
await page.close();
try {
// Export
await performExport(response, page, data);
} finally {
await browser.close();
}
} catch (error) {
const eventId = Sentry.captureException(error.original || error);

Expand Down
17 changes: 11 additions & 6 deletions export/src/render-serverless.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import chromium from '@sparticuz/chromium';
import puppeteer, { Page } from 'puppeteer-core';
import puppeteer, { Browser, Page } from 'puppeteer-core';

import { resolveChromeExecutable } from './chrome-executable';
import { getModules } from './data';
Expand All @@ -23,7 +23,7 @@ async function setViewport(page: Page, options: ViewportOptions = {}) {
});
}

export async function open(url: string) {
export async function open(url: string): Promise<{ browser: Browser; page: Page }> {
const executablePath = await resolveChromeExecutable(() => chromium.executablePath());

chromium.setGraphicsMode = false;
Expand All @@ -35,11 +35,16 @@ export async function open(url: string) {
headless: 'shell',
});

const page = await browser.newPage();
await page.goto(url, { waitUntil: 'load' });
await setViewport(page);
try {
const page = await browser.newPage();
await page.goto(url, { waitUntil: 'load' });
await setViewport(page);

return page;
return { browser, page };
} catch (error) {
await browser.close();
throw error;
}
}

async function injectData(page: Page, data: ExportData) {
Expand Down