browserless 9.3.14-alpha.0 → 9.3.14-alpha.3

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.14-alpha.0",
+  "version": "9.3.14-alpha.3",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -32,15 +32,14 @@
   ],
   "dependencies": {
     "@browserless/errors": "^9.3.0",
-    "@browserless/goto": "^9.3.14-alpha.0",
-    "@browserless/pdf": "^9.3.14-alpha.0",
-    "@browserless/screenshot": "^9.3.14-alpha.0",
+    "@browserless/goto": "^9.3.14-alpha.1",
+    "@browserless/pdf": "^9.3.14-alpha.1",
+    "@browserless/screenshot": "^9.3.14-alpha.2",
     "debug-logfmt": "~1.0.4",
     "mutexify": "~1.4.0",
     "p-reflect": "~2.1.0",
     "p-retry": "~4.6.1",
     "p-timeout": "~4.1.0",
-    "pidtree": "~0.5.0",
     "require-one-of": "~1.0.15"
   },
   "devDependencies": {
@@ -61,5 +60,5 @@
     "timeout": "2m",
     "verbose": true
   },
-  "gitHead": "fe55af014debe242ee3823464a5e760afafca821"
+  "gitHead": "331f2fdf8f3de1c9534451b2adc36dc9c0e936f6"
 }

package/src/driver.js

@@ -3,7 +3,9 @@
 const debug = require('debug-logfmt')('browserless')
 const requireOneOf = require('require-one-of')
 const pReflect = require('p-reflect')
-const pidtree = require('pidtree')
+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
@@ -58,30 +60,23 @@ const getPid = childProcess => {
   return browserProcess.pid
 }
 
-const getPids = async pid => {
-  const { value: pids = [] } = await pReflect(pidtree(pid))
-  return pids.includes(pid) ? pids : [...pids, pid]
-}
+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 pids = await getPids(pid)
-  pids.forEach(pid => {
-    try {
-      process.kill(pid, signal)
-    } catch (_) {}
-  })
-
   // It's necessary to call `browser.close` for removing temporal files associated
-  // and remove listeners attached to the main process
-  // see https://github.com/puppeteer/puppeteer/blob/778ac92469d66c542c3c12fe0aa23703dd6315c2/src/node/BrowserRunner.ts#L146
-  if (childProcess.close) await childProcess.close()
-
-  debug('close', { pids, signal, ...debugOpts })
+  // 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))
 
-  return { pids }
+  debug('close', { pid, signal, ...debugOpts })
+  return { pid }
 }
 
 module.exports = { spawn, getPid, close, defaultArgs }

package/src/index.js

@@ -46,10 +46,11 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
 
     promise.then(async browser => {
       browser.once('disconnected', getBrowser)
+      const pid = driver.getPid(browser)
 
       debug('spawn', {
         respawn: isRespawn,
-        pid: driver.getPid(browser) || launchOpts.mode,
+        pid: pid || launchOpts.mode,
         version: await browser.version()
       })
     })
@@ -80,26 +81,36 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
   }
 
   const createContext = async ({ retry = 2, timeout: contextTimeout } = {}) => {
-    let contextPromise = createBrowserContext()
+    let _contextPromise = createBrowserContext()
 
-    contextPromise.then(context => {
+    const getBrowserContext = () => _contextPromise
+
+    getBrowserContext().then(context => {
       const browserProcess = context.browser()
       browserProcess.once('disconnected', async () => {
         await getBrowser()
-        contextPromise = createBrowserContext()
+        _contextPromise = createBrowserContext()
       })
     })
 
     const createPage = async () => {
-      const browserProcess = await getBrowser()
-      const page = await (await contextPromise).newPage()
-      debug('createPage', { pid: driver.getPid(browserProcess) })
+      const [browserProcess, browserContext] = await Promise.all([
+        getBrowser(),
+        getBrowserContext()
+      ])
+      const page = await browserContext.newPage()
+      debug('createPage', { pid: driver.getPid(browserProcess), id: browserContext._id })
       return page
     }
 
     const closePage = async page => {
       if (page && !page.isClosed()) {
-        debug('closePage', await pReflect(page.close()))
+        const [browserProcess, browserContext] = await Promise.all([
+          getBrowser(),
+          getBrowserContext(),
+          pReflect(page.close())
+        ])
+        debug('closePage', { pid: driver.getPid(browserProcess), id: browserContext._id })
       }
     }
 
@@ -128,7 +139,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
             debug('onFailedAttempt', { name: error.name, code: error.code, isRejected })
             if (error.name === 'AbortError') throw error
             if (isRejected) throw new AbortError()
-            if (error.code === 'EBRWSRCONTEXTCONNRESET') contextPromise = createBrowserContext()
+            if (error.code === 'EBRWSRCONTEXTCONNRESET') _contextPromise = createBrowserContext()
             const { message, attemptNumber, retriesLeft } = error
             debug('retry', { attemptNumber, retriesLeft, message })
           }
@@ -152,15 +163,19 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
       )
 
     const destroyContext = async () => {
-      const { isRejected, reason: error } = await pReflect(
-        contextPromise.then(context => context.close())
-      )
-      debug('destroyContext', isRejected ? { error } : {})
+      const [browserProcess, browserContext] = await Promise.all([
+        getBrowser(),
+        getBrowserContext()
+      ])
+      const id = browserContext._id
+      await pReflect(browserContext.close())
+
+      debug('destroyContext', { pid: driver.getPid(browserProcess), id })
     }
 
     return {
       respawn,
-      context: () => contextPromise,
+      context: getBrowserContext,
       browser: getBrowser,
       evaluate,
       goto,