@browserless/function 13.6.10 → 13.7.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/function",
   "description": "Execute arbitrary JavaScript code in a secure browser sandbox with access to page DOM and network.",
   "homepage": "https://browserless.js.org",
-  "version": "13.6.10",
+  "version": "13.7.0",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -32,14 +32,13 @@
   ],
   "dependencies": {
     "@browserless/errors": "13.6.10",
-    "@cloudflare/puppeteer": "~1.1.0",
-    "acorn": "~8.17.0",
+    "@cloudflare/puppeteer": "~1.2.0",
+    "acorn": "~8.18.0",
     "acorn-walk": "~8.3.5",
     "isolated-function": "~0.2.0",
     "require-one-of": "~1.0.24"
   },
   "devDependencies": {
-    "@browserless/test": "13.6.10",
     "ava": "5",
     "lodash": "latest"
   },
@@ -58,5 +57,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "0bdae87d4aff5b26de301b2947b70d8ae6c0dcfd"
+  "gitHead": "518aa3f6d07c2794d0f58edd9805bbe08f06d6a3"
 }

package/src/index.js

@@ -6,8 +6,15 @@ const requireOneOf = require('require-one-of')
 const createRunFunction = require('./function')
 const path = require('path')
 
+// `isolated-function` reads these to know which dependencies a snippet requires
+// are already on disk, so it can skip installing them. Walking up from a
+// dependency only lands on the consumer's `node_modules` under a flat install:
+// with pnpm it lands inside the isolated store, which holds that dependency's
+// own dependencies and nothing else, so every snippet paid a fresh install.
+// `module.paths` is the resolution chain Node itself would use from here, so it
+// reaches the consumer under either layout.
 const cloudflareDir = path.dirname(require.resolve('@cloudflare/puppeteer/package.json'))
-const nodePaths = [path.resolve(cloudflareDir, '..', '..')]
+const nodePaths = [...new Set([path.resolve(cloudflareDir, '..', '..'), ...module.paths])]
 
 const stringify = fn => fn.toString().trim().replace(/;$/, '')
 
@@ -69,42 +76,44 @@ module.exports = ({ tmpdir } = {}) => {
       const browser = await getBrowser()
       const browserless = await browser.createContext()
 
-      return browserless.withPage((page, goto) => async () => {
-        const { device, response } = await goto(page, { url, timeout, ...gotoOpts })
-
-        const targetId = await getTargetId(page)
-
-        const runFunctionOpts = {
-          url,
-          code,
-          device,
-          ...opts,
-          ...fnOpts,
-          ...(isHttpResponse(response) && { _response: serializeResponse(response) })
-        }
-
-        if (runFunctionOpts.code === code) {
-          runFunctionOpts.needsNetwork = needsNetwork
-          runFunctionOpts.source = source
-        }
-
-        const browserFromPage = typeof page.browser === 'function' ? page.browser() : undefined
-        const browserWSEndpoint =
-          browserFromPage && typeof browserFromPage.wsEndpoint === 'function'
-            ? browserFromPage.wsEndpoint()
-            : undefined
-
-        if (!browserWSEndpoint) throw new Error('Browser WebSocket endpoint not found')
-        runFunctionOpts.browserWSEndpoint = browserWSEndpoint
-        runFunctionOpts.targetId = targetId
-
-        const result = await runFunction(runFunctionOpts)
-
-        if (result.isFulfilled) return result
-        const error = ensureError(result.value)
-        if (isBrowserlessError(error)) throw error
-        return result
-      })()
+      return browserless
+        .withPage((page, goto) => async () => {
+          const { device, response } = await goto(page, { url, timeout, ...gotoOpts })
+
+          const targetId = await getTargetId(page)
+
+          const runFunctionOpts = {
+            url,
+            code,
+            device,
+            ...opts,
+            ...fnOpts,
+            ...(isHttpResponse(response) && { _response: serializeResponse(response) })
+          }
+
+          if (runFunctionOpts.code === code) {
+            runFunctionOpts.needsNetwork = needsNetwork
+            runFunctionOpts.source = source
+          }
+
+          const browserFromPage = typeof page.browser === 'function' ? page.browser() : undefined
+          const browserWSEndpoint =
+            browserFromPage && typeof browserFromPage.wsEndpoint === 'function'
+              ? browserFromPage.wsEndpoint()
+              : undefined
+
+          if (!browserWSEndpoint) throw new Error('Browser WebSocket endpoint not found')
+          runFunctionOpts.browserWSEndpoint = browserWSEndpoint
+          runFunctionOpts.targetId = targetId
+
+          const result = await runFunction(runFunctionOpts)
+
+          if (result.isFulfilled) return result
+          const error = ensureError(result.value)
+          if (isBrowserlessError(error)) throw error
+          return result
+        })()
+        .finally(() => browserless.destroyContext())
     }
 
     const runWithoutBrowser = async (url, fnOpts) => {