@browserless/function 9.6.6 → 9.7.0-beta.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/function",
   "description": "Run abritrary JavaScript inside a browser sandbox",
   "homepage": "https://browserless.js.org",
-  "version": "9.6.6",
+  "version": "9.7.0-beta.0",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -29,22 +29,21 @@
     "serverless"
   ],
   "dependencies": {
-    "@browserless/errors": "^9.6.6",
+    "@browserless/errors": "9.6.6",
     "debug-logfmt": "~1.0.4",
     "deepmerge": "~4.2.2",
-    "execa": "~5.1.1",
-    "p-event": "~4.2.0",
     "p-reflect": "~2.1.0",
     "p-retry": "~4.6.1",
     "p-timeout": "~4.1.0",
     "require-one-of": "~1.0.16",
     "serialize-error": "~8.1.0",
-    "vm2": "~3.9.9"
+    "vm2": "~3.9.11"
   },
   "devDependencies": {
-    "@browserless/test": "latest",
+    "@browserless/test": "9.6.6",
     "ava": "3",
-    "browserless": "latest"
+    "browserless": "9.7.0-beta.0",
+    "lodash": "latest"
   },
   "engines": {
     "node": ">= 12"
@@ -61,5 +60,5 @@
     "timeout": "30s",
     "verbose": true
   },
-  "gitHead": "74da0ac7388ee354aec0517218afb143ec6a095d"
+  "gitHead": "9ad58b35b63036848f22662a04ed913e364e1297"
 }

package/src/function.js

@@ -42,9 +42,9 @@ async ({ url, gotoOpts, browserWSEndpoint, ...opts }) => {
   }
 }`
 
-process.on('message', async ({ url, code, vmOpts, gotoOpts, browserWSEndpoint, ...opts }) => {
+module.exports = ({ url, code, vmOpts, gotoOpts, browserWSEndpoint, ...opts }) => {
   const vm = createVm(vmOpts)
   const fn = createFn(code)
   const run = vm(fn, scriptPath)
-  process.send(await run({ url, gotoOpts, browserWSEndpoint, ...opts }))
-})
+  return run({ url, gotoOpts, browserWSEndpoint, ...opts })
+}

package/src/index.js

@@ -3,16 +3,18 @@
 const { ensureError, browserTimeout } = require('@browserless/errors')
 const debug = require('debug-logfmt')('browserless:function')
 const requireOneOf = require('require-one-of')
-const { driver } = require('browserless')
 const pTimeout = require('p-timeout')
 const pRetry = require('p-retry')
-const pEvent = require('p-event')
-const execa = require('execa')
-const path = require('path')
 
 const { AbortError } = pRetry
 
-const execPath = path.resolve(__dirname, 'function.js')
+const runFunction = require('./function')
+
+const stringify = fn =>
+  fn
+    .toString()
+    .trim()
+    .replace(/;$/, '')
 
 module.exports = (
   fn,
@@ -21,37 +23,20 @@ module.exports = (
   return async (url, fnOpts = {}) => {
     const browserlessPromise = getBrowserless()
     let isRejected = false
-    let subprocess
 
     async function run () {
       const browserless = await browserlessPromise
       const browser = await browserless.browser()
       const browserWSEndpoint = browser.wsEndpoint()
 
-      subprocess = execa.node(execPath, {
-        detached: process.platform !== 'win32'
-      })
-
-      if (opts && opts.vmOpts && opts.vmOpts.console === 'inherit') {
-        subprocess.stderr.pipe(process.stderr)
-        subprocess.stdout.pipe(process.stdout)
-      }
-
-      debug('spawn', { pid: subprocess.pid })
-
-      subprocess.send({
+      const { value, reason, isFulfilled } = await runFunction({
         url,
-        code: fn
-          .toString()
-          .trim()
-          .replace(/;$/, ''),
+        code: stringify(fn),
         browserWSEndpoint,
         ...opts,
         ...fnOpts
       })
 
-      const { value, reason, isFulfilled } = await pEvent(subprocess, 'message')
-      await driver.close(subprocess)
       if (isFulfilled) return value
       throw ensureError(reason)
     }
@@ -71,7 +56,6 @@ module.exports = (
     // main
     const result = await pTimeout(task(), timeout, () => {
       isRejected = true
-      if (subprocess) subprocess.kill('SIGKILL')
       throw browserTimeout({ timeout })
     })
 

package/src/vm.js

@@ -8,6 +8,7 @@ const path = require('path')
 const DEFAULT_VM_OPTS = {
   console: 'off',
   sandbox: {},
+  strict: true,
   require: {
     resolve: pkgName => path.resolve(process.cwd(), 'node_modules', pkgName),
     external: {
@@ -19,7 +20,7 @@ const DEFAULT_VM_OPTS = {
 const createVm = (opts = {}) => new NodeVM(merge(DEFAULT_VM_OPTS, opts))
 
 const compile = (vm, fn, scriptPath) => {
-  const code = `'use strict'; module.exports = ${fn.toString()}`
+  const code = `module.exports = ${fn.toString()}`
   return vm.run(code, scriptPath)
 }