Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ Every browser context is isolated. They won't share cookies/cache with other bro

#### options

Any [browser.createIncognitoBrowserContext#options](https://pptr.dev/next/api/puppeteer.browsercontextoptions) can be passed.

Additionally, you can setup:

##### retry

type: `number`</br>
Expand Down
14 changes: 8 additions & 6 deletions packages/browserless/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {

let browserProcessPromise = spawn()

const createBrowserContext = () =>
getBrowser().then(browser => browser.createIncognitoBrowserContext())
const createBrowserContext = contextOpts =>
getBrowser().then(browser => browser.createIncognitoBrowserContext(contextOpts))

const getBrowser = async () => {
if (isClosed) return browserProcessPromise
Expand All @@ -73,16 +73,16 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
return browserProcess || getBrowser()
}

const createContext = async ({ retry = 2, timeout: contextTimeout } = {}) => {
let _contextPromise = createBrowserContext()
const createContext = async ({ retry = 2, timeout: contextTimeout, ...contextOpts } = {}) => {
let _contextPromise = createBrowserContext(contextOpts)

const getBrowserContext = () => _contextPromise

getBrowserContext().then(context => {
const browserProcess = context.browser()
browserProcess.once('disconnected', async () => {
await getBrowser()
_contextPromise = createBrowserContext()
_contextPromise = createBrowserContext(contextOpts)
})
})

Expand Down Expand Up @@ -132,7 +132,9 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
debug('onFailedAttempt', { name: error.name, code: error.code, isRejected })
if (error.name === 'AbortError') throw error
if (isRejected) throw new AbortError()
if (error.code === 'EBRWSRCONTEXTCONNRESET') _contextPromise = createBrowserContext()
if (error.code === 'EBRWSRCONTEXTCONNRESET') {
_contextPromise = createBrowserContext(contextOpts)
}
const { message, attemptNumber, retriesLeft } = error
debug('retry', { attemptNumber, retriesLeft, message })
}
Expand Down
45 changes: 41 additions & 4 deletions packages/browserless/test/index.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,51 @@
'use strict'

const { initBrowserless, getBrowserless } = require('@browserless/test/util')
const http = require('http')

const test = require('ava')
const createBrowserless = require('../src')

require('@browserless/test')(createBrowserless())
const browserlessFactory = getBrowserless()

require('@browserless/test')(browserlessFactory)

test('pass specific options to a context', async t => {
const proxiedRequestUrls = []

const proxy = http
.createServer((req, res) => {
proxiedRequestUrls.push(req.url)

const proxyRequest = http.request(
req.url,
{
method: req.method,
headers: req.headers
},
proxyResponse => {
res.writeHead(proxyResponse.statusCode, proxyResponse.headers)
proxyResponse.pipe(res, { end: true })
}
)

req.pipe(proxyRequest, { end: true })
})
.listen()

const proxyServer = `http://[::]:${proxy.address().port}`

const browserless = await browserlessFactory.createContext({ proxyServer: proxyServer })
const page = await browserless.page()

await browserless.goto(page, { url: 'http://example.com' })

t.deepEqual(proxiedRequestUrls, ['http://example.com/'])
})

test('ensure to destroy browser contexts', async t => {
const browserlessFactory = createBrowserless()
const browserlessFactory = initBrowserless()

const browser = await browserlessFactory.browser()
t.teardown(() => browser.close())

t.is(browser.browserContexts().length, 1)

Expand Down