@browserless/function 10.6.1 → 10.6.2

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.6.1",
+  "version": "10.6.2",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -35,12 +35,14 @@
   },
   "devDependencies": {
     "@browserless/test": "^10.6.0",
+    "acorn": "~8.12.1",
+    "acorn-walk": "~8.3.4",
     "ava": "5",
     "browserless": "^10.6.0",
     "lodash": "latest"
   },
   "engines": {
-    "node": ">= 12"
+    "node": ">= 20"
   },
   "files": [
     "src"
@@ -54,5 +56,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "44f9a1f22ea2020949e8d7465362908e3fd8e1a7"
+  "gitHead": "ed2a375a7f7c26625261dd7b5a83aa1f5f578867"
 }

package/src/function.js

@@ -1,21 +1,10 @@
 'use strict'
 
 const isolatedFunction = require('isolated-function')
-
-const createFn = code => `
-async (url, browserWSEndpoint, opts) => {
-  const puppeteer = require('@cloudflare/puppeteer')
-  const browser = await puppeteer.connect({ browserWSEndpoint })
-  const page = (await browser.pages())[1]
-  try {
-    return await (${code})({ page, ...opts })
-  } finally {
-    await browser.disconnect()
-  }
-}`
+const template = require('./template')
 
 module.exports = async ({ url, code, vmOpts, browserWSEndpoint, ...opts }) => {
-  const [fn, teardown] = isolatedFunction(createFn(code), { ...vmOpts, throwError: false })
+  const [fn, teardown] = isolatedFunction(template(code), { ...vmOpts, throwError: false })
   const result = await fn(url, browserWSEndpoint, opts)
   await teardown()
   return result

package/src/template.js

@@ -0,0 +1,41 @@
+'use strict'
+
+const walk = require('acorn-walk')
+const acorn = require('acorn')
+
+module.exports = code => {
+  const ast = acorn.parse(code, { ecmaVersion: 2023, sourceType: 'module' })
+
+  let isUsingPage = false
+
+  walk.simple(ast, {
+    ObjectPattern (node) {
+      node.properties.forEach(prop => {
+        if (prop.type === 'Property' && prop.key.name === 'page') {
+          isUsingPage = true
+        }
+        if (prop.type === 'RestElement' && prop.argument.name === 'page') {
+          isUsingPage = true
+        }
+      })
+    },
+    MemberExpression (node) {
+      if (node.property.name === 'page' || node.property.value === 'page') {
+        isUsingPage = true
+      }
+    }
+  })
+
+  if (!isUsingPage) return `async (url, _, opts) => (${code})(opts)`
+  return `
+    async (url, browserWSEndpoint, opts) => {
+      const puppeteer = require('@cloudflare/puppeteer')
+      const browser = await puppeteer.connect({ browserWSEndpoint })
+      const page = (await browser.pages())[1]
+      try {
+        return await (${code})({ page, ...opts })
+      } finally {
+        await browser.disconnect()
+      }
+    }`
+}