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
2 changes: 1 addition & 1 deletion packages/function/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
],
"dependencies": {
"@browserless/errors": "^10.9.7",
"isolated-function": "~0.1.39",
"isolated-function": "~0.1.46",
"require-one-of": "~1.0.24"
},
"devDependencies": {
Expand Down
6 changes: 5 additions & 1 deletion packages/function/src/function.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
const isolatedFunction = require('isolated-function')
const template = require('./template')

const [nodeMajor] = process.version.slice(1).split('.').map(Number)

module.exports = async ({ url, code, vmOpts, browserWSEndpoint, ...opts }) => {
const [fn, teardown] = isolatedFunction(template(code), { ...vmOpts, throwError: false })
const needsNetwork = template.isUsingPage(code)
const allow = needsNetwork && nodeMajor >= 25 ? ['net'] : []
const [fn, teardown] = isolatedFunction(template(code), { ...vmOpts, allow, throwError: false })
const result = await fn(url, browserWSEndpoint, opts)
await teardown()
return result
Expand Down
4 changes: 4 additions & 0 deletions packages/function/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ module.exports =

return browserless.withPage((page, goto) => async () => {
const { device } = await goto(page, { url, timeout, ...gotoOpts })

const browserWSEndpoint = (await browserless.browser()).wsEndpoint()
if (!browserWSEndpoint) throw new Error('Browser WebSocket endpoint not found')

const result = await runFunction({
url,
code: stringify(fn),
Expand Down
19 changes: 13 additions & 6 deletions packages/function/src/template.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,34 @@
const walk = require('acorn-walk')
const acorn = require('acorn')

module.exports = code => {
const isUsingPage = code => {
const ast = acorn.parse(code, { ecmaVersion: 2023, sourceType: 'module' })

let isUsingPage = false
let result = false

walk.simple(ast, {
ObjectPattern (node) {
node.properties.forEach(prop => {
if (prop.type === 'Property' && prop.key.name === 'page') {
isUsingPage = true
result = true
}
if (prop.type === 'RestElement' && prop.argument.name === 'page') {
isUsingPage = true
result = true
}
})
},
MemberExpression (node) {
if (node.property.name === 'page' || node.property.value === 'page') {
isUsingPage = true
result = true
}
}
})

if (!isUsingPage) return `async (url, _, opts) => (${code})(opts)`
return result
}

const template = code => {
if (!isUsingPage(code)) return `async (url, _, opts) => (${code})(opts)`
return `
async (url, browserWSEndpoint, opts) => {
const puppeteer = require('@cloudflare/puppeteer')
Expand All @@ -40,3 +44,6 @@ module.exports = code => {
}
}`
}

module.exports = template
module.exports.isUsingPage = isUsingPage
14 changes: 14 additions & 0 deletions packages/function/test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -267,3 +267,17 @@ test('interact with npm modules', async t => {
t.true(!!profiling)
t.true(!!logging)
})

test('throws error when browser is launched with pipe mode', async t => {
const createTestUtil = require('@browserless/test/util/create')
const { getBrowser } = createTestUtil({ pipe: true })

const code = ({ page }) => page.title()

const myFn = browserlessFunction(code, {
getBrowserless: () => getBrowser()
})

const error = await t.throwsAsync(myFn(fileUrl))
t.is(error.message, 'Browser WebSocket endpoint not found')
})
Loading