@browserless/function 10.9.10 → 10.9.11

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/function",
   "description": "Run abritrary JavaScript inside a browser sandbox",
   "homepage": "https://browserless.js.org",
-  "version": "10.9.10",
+  "version": "10.9.11",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -30,11 +30,11 @@
   ],
   "dependencies": {
     "@browserless/errors": "^10.9.7",
-    "isolated-function": "~0.1.39",
+    "isolated-function": "~0.1.46",
     "require-one-of": "~1.0.24"
   },
   "devDependencies": {
-    "@browserless/test": "^10.9.8",
+    "@browserless/test": "^10.9.11",
     "acorn": "~8.15.0",
     "acorn-walk": "~8.3.4",
     "ava": "5",
@@ -55,5 +55,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "49b473c5e77d6932287e70956d98304109c2da64"
+  "gitHead": "01e4b9a320e1f0f7a7005710e1eec841fed917b6"
 }

package/src/function.js

@@ -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

package/src/index.js

@@ -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),

package/src/template.js

@@ -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')
@@ -40,3 +44,6 @@ module.exports = code => {
       }
     }`
 }
+
+module.exports = template
+module.exports.isUsingPage = isUsingPage