browserless 9.3.19 → 9.4.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "browserless",
   "description": "The headless Chrome/Chromium performance driver for Node.js",
   "homepage": "https://browserless.js.org",
-  "version": "9.3.19",
+  "version": "9.4.0",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -31,11 +31,12 @@
     "text"
   ],
   "dependencies": {
-    "@browserless/errors": "^9.3.19",
-    "@browserless/goto": "^9.3.19",
-    "@browserless/pdf": "^9.3.19",
-    "@browserless/screenshot": "^9.3.19",
+    "@browserless/errors": "^9.3.21",
+    "@browserless/goto": "^9.3.21",
+    "@browserless/pdf": "^9.3.21",
+    "@browserless/screenshot": "^9.3.21",
     "debug-logfmt": "~1.0.4",
+    "kill-process-group": "~1.0.2",
     "mutexify": "~1.4.0",
     "p-reflect": "~2.1.0",
     "p-retry": "~4.6.1",
@@ -60,5 +61,5 @@
     "timeout": "2m",
     "verbose": true
   },
-  "gitHead": "dc3e62e73696d8ff878dd6a8881bad5d69426d21"
+  "gitHead": "b7b9b8bd304ff3246840c32d024856f122cbf9f3"
 }

package/src/driver.js

@@ -1,11 +1,9 @@
 'use strict'
 
+const killProcessGroup = require('kill-process-group')
 const debug = require('debug-logfmt')('browserless')
 const requireOneOf = require('require-one-of')
 const pReflect = require('p-reflect')
-const { promisify } = require('util')
-
-const exec = promisify(require('child_process').exec)
 
 // flags explained: https://peter.sh/experiments/chromium-command-line-switches
 // default flags: https://github.com/puppeteer/puppeteer/blob/edb01972b9606d8b05b979a588eda0d622315981/src/node/Launcher.ts#L183
@@ -51,31 +49,24 @@ const spawn = ({
   ...launchOpts
 } = {}) => puppeteer[mode]({ ignoreHTTPSErrors: true, args, ...launchOpts })
 
-const getPid = childProcess => {
-  if (!childProcess) return null
-  if (childProcess.pid) return childProcess.pid
-  const browserProcess = childProcess.process ? childProcess.process() : undefined
-  if (!browserProcess) return null
-  return browserProcess.pid
+const pid = subprocess => {
+  if ('pid' in subprocess) return subprocess.pid
+  const browserProcess = 'process' in subprocess ? subprocess.process() : undefined
+  if (browserProcess === undefined || browserProcess === null) return
+  return 'pid' in browserProcess ? browserProcess.pid : undefined
 }
 
-const killProcesssGroupPID = (pid, signal) =>
-  process.platform === 'win32'
-    ? exec(`taskkill /pid ${this.proc.pid} /T /F`)
-    : Promise.resolve(process.kill(-pid, signal))
-
-const close = async (childProcess, { signal = 'SIGKILL', ...debugOpts } = {}) => {
-  const pid = getPid(childProcess)
-  if (!pid) return
+const close = async (subprocess, { signal = 'SIGKILL', ...debugOpts } = {}) => {
+  if (pid(subprocess) === undefined) return
 
   // It's necessary to call `browser.close` for removing temporal files associated
   // and remove listeners attached to the main process; check
   // - https://github.com/puppeteer/puppeteer/blob/778ac92469d66c542c3c12fe0aa23703dd6315c2/src/node/BrowserRunner.ts#L146
   // - https://github.com/puppeteer/puppeteer/blob/69d85e874416d62de6e821bef30e5cebcfd42f15/src/node/BrowserRunner.ts#L189
-  await pReflect(childProcess.close ? childProcess.close() : killProcesssGroupPID(pid, signal))
+  await pReflect('close' in subprocess ? subprocess.close() : killProcessGroup(subprocess, signal))
 
-  debug('close', { pid, signal, ...debugOpts })
-  return { pid }
+  debug('close', { pid: subprocess.pid, signal, ...debugOpts })
+  return { pid: subprocess.pid }
 }
 
-module.exports = { spawn, getPid, close, defaultArgs }
+module.exports = { spawn, pid, close, defaultArgs }

package/src/index.js

@@ -46,11 +46,9 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
 
     promise.then(async browser => {
       browser.once('disconnected', getBrowser)
-      const pid = driver.getPid(browser)
-
       debug('spawn', {
         respawn: isRespawn,
-        pid: pid || launchOpts.mode,
+        pid: driver.pid(browser) || launchOpts.mode,
         version: await browser.version()
       })
     })
@@ -99,7 +97,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
         getBrowserContext()
       ])
       const page = await browserContext.newPage()
-      debug('createPage', { pid: driver.getPid(browserProcess), id: browserContext._id })
+      debug('createPage', { pid: driver.pid(browserProcess), id: browserContext._id })
       return page
     }
 
@@ -110,7 +108,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
           getBrowserContext(),
           pReflect(page.close())
         ])
-        debug('closePage', { pid: driver.getPid(browserProcess), id: browserContext._id })
+        debug('closePage', { pid: driver.pid(browserProcess), id: browserContext._id })
       }
     }
 
@@ -156,8 +154,8 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
     const evaluate = (fn, gotoOpts) =>
       wrapError(
         page => async (url, opts) => {
-          const { response } = await goto(page, { url, ...gotoOpts, ...opts })
-          return fn(page, response)
+          const { response, error } = await goto(page, { url, ...gotoOpts, ...opts })
+          return fn(page, response, error)
         },
         gotoOpts
       )
@@ -170,7 +168,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
       const id = browserContext._id
       await pReflect(browserContext.close())
 
-      debug('destroyContext', { pid: driver.getPid(browserProcess), id })
+      debug('destroyContext', { pid: driver.pid(browserProcess), id })
     }
 
     return {