@browserless/function 12.0.0 → 13.0.1

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": "12.0.0",
+  "version": "13.0.1",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -31,16 +31,16 @@
     "vm"
   ],
   "dependencies": {
-    "@browserless/errors": "^12.0.0",
+    "@browserless/errors": "^13.0.0",
     "acorn": "~8.16.0",
     "acorn-walk": "~8.3.5",
-    "isolated-function": "~0.1.55",
+    "isolated-function": "~0.1.56",
     "require-one-of": "~1.0.24"
   },
   "devDependencies": {
+    "@browserless/test": "13.0.0",
     "ava": "5",
-    "lodash": "latest",
-    "@browserless/test": "12.0.0"
+    "lodash": "latest"
   },
   "engines": {
     "node": ">= 20"
@@ -54,6 +54,7 @@
     "timeout": "2m",
     "workerThreads": false
   },
+  "gitHead": "b4f677642547f5f9ea0dd35539aeca7dede213f3",
   "scripts": {
     "test": "ava"
   }

package/src/index.js

@@ -59,7 +59,7 @@ module.exports = ({ tmpdir } = {}) => {
       return browserPromise
     }
 
-    return async (url, fnOpts = {}) => {
+    const runWithBrowser = async (url, fnOpts) => {
       const browser = await getBrowser()
       const browserless = await browser.createContext()
 
@@ -82,17 +82,15 @@ module.exports = ({ tmpdir } = {}) => {
           runFunctionOpts.source = source
         }
 
-        if (runFunctionOpts.needsNetwork !== false) {
-          const browserFromPage = typeof page.browser === 'function' ? page.browser() : undefined
-          const browserWSEndpoint =
-            browserFromPage && typeof browserFromPage.wsEndpoint === 'function'
-              ? browserFromPage.wsEndpoint()
-              : undefined
+        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
-        }
+        if (!browserWSEndpoint) throw new Error('Browser WebSocket endpoint not found')
+        runFunctionOpts.browserWSEndpoint = browserWSEndpoint
+        runFunctionOpts.targetId = targetId
 
         const result = await runFunction(runFunctionOpts)
 
@@ -102,6 +100,30 @@ module.exports = ({ tmpdir } = {}) => {
         return result
       })()
     }
+
+    const runWithoutBrowser = async (url, fnOpts) => {
+      const runFunctionOpts = {
+        url,
+        code,
+        ...opts,
+        ...fnOpts
+      }
+
+      if (runFunctionOpts.code === code) {
+        runFunctionOpts.needsNetwork = false
+        runFunctionOpts.source = source
+      }
+
+      const result = await runFunction(runFunctionOpts)
+
+      if (result.isFulfilled) return result
+      const error = ensureError(result.value)
+      if (isBrowserlessError(error)) throw error
+      return result
+    }
+
+    return async (url, fnOpts = {}) =>
+      needsNetwork ? runWithBrowser(url, fnOpts) : runWithoutBrowser(url, fnOpts)
   }
 
   createFunction.teardown = () => isolatedFunction.teardown()