Skip to content

Commit

Permalink
build: ensure close browser
Browse files Browse the repository at this point in the history
  • Loading branch information
Kikobeats committed Aug 19, 2019
1 parent a37487d commit 1c1155d
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions packages/browserless/src/index.js
Expand Up @@ -15,21 +15,15 @@ const EVALUATE_HTML = page => page.content()

const killBrowser = async browser => {
while (waitpid2.waitpid(-1, 0 | waitpid2.WNOHANG) === -1);
await browser.close()
const pid = browser.process().pid
await fkill(pid)
const deletedPaths = await del([
'/tmp/core.chromium.*',
'/tmp/puppeteer_dev_profile*'
])
const deletedPaths = await del(['/tmp/core.chromium.*', '/tmp/puppeteer_dev_profile*'])
debug('killBrowser', { pid, deletedPaths })
}

module.exports = ({
puppeteer = requireOneOf([
'puppeteer',
'puppeteer-core',
'puppeteer-firefox'
]),
puppeteer = requireOneOf(['puppeteer', 'puppeteer-core', 'puppeteer-firefox']),
incognito = false,
timeout = 30000,
...launchOpts
Expand Down Expand Up @@ -69,9 +63,7 @@ module.exports = ({

const createPage = () =>
Promise.resolve(browser).then(async browser => {
const context = incognito
? await browser.createIncognitoBrowserContext()
: browser
const context = incognito ? await browser.createIncognitoBrowserContext() : browser
const page = await context.newPage()
page.setDefaultNavigationTimeout(timeout)
return page
Expand Down

0 comments on commit 1c1155d

Please sign in to comment.