browserless 9.3.14-alpha.2 → 9.3.15

package/README.md

@@ -0,0 +1,27 @@
+# browserless
+
+<h1 align="center">
+  <img style="width: 500px; margin:3rem 0 1.5rem;" src="https://browserless.js.org/static/logo-banner.png" alt="browserless">
+  <br>
+</h1>
+
+> The headless Chrome/Chromium performance driver for Node.js
+
+See our [website](https://browserless.js.org) for more information.
+
+## Install
+
+Using npm:
+
+```sh
+npm install browserless puppeteer --save
+```
+
+## License
+
+**browserless** © [Microlink](https://microlink.io), Released under the [MIT](https://github.com/microlinkhq/browserless/blob/master/LICENSE.md) License.<br>
+Authored and maintained by [Microlink](https://microlink.io) with help from [contributors](https://github.com/microlinkhq/browserless/contributors).
+
+The [logo](https://thenounproject.com/term/browser/288309/) has been designed by [xinh studio](https://xinh.studio).
+
+> [microlink.io](https://microlink.io) · GitHub [@MicrolinkHQ](https://github.com/microlinkhq) · Twitter [@microlinkhq](https://twitter.com/microlinkhq)

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "browserless",
-  "description": "the headless Chrome/Chromium performance driver for Node.js",
+  "description": "The headless Chrome/Chromium performance driver for Node.js",
   "homepage": "https://browserless.js.org",
-  "version": "9.3.14-alpha.2",
+  "version": "9.3.15",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -31,16 +31,15 @@
     "text"
   ],
   "dependencies": {
-    "@browserless/errors": "^9.3.0",
-    "@browserless/goto": "^9.3.14-alpha.1",
-    "@browserless/pdf": "^9.3.14-alpha.1",
-    "@browserless/screenshot": "^9.3.14-alpha.2",
+    "@browserless/errors": "^9.3.15",
+    "@browserless/goto": "^9.3.15",
+    "@browserless/pdf": "^9.3.15",
+    "@browserless/screenshot": "^9.3.15",
     "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": "f53be1e3109e508656c59a6e6c56b4efbc15fa68"
+  "gitHead": "b901fa38dd8d4f501b0b9fed5579fe0c29f5b097"
 }

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,23 +60,23 @@ const getPid = childProcess => {
   return browserProcess.pid
 }
 
-const getChildrenPids = pid => pReflect(pidtree(pid)).then(({ value = [] }) => value)
+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
 
   // 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
-  await (childProcess.close
-    ? pReflect(childProcess.close())
-    : [...(await getChildrenPids(pid)), pid].map(pid =>
-        pReflect(Promise.resolve(process.kill(pid, signal)))
-      ))
+  // 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))
 
   debug('close', { pid, signal, ...debugOpts })
   return { pid }
 }
 
-module.exports = { spawn, getChildrenPids, getPid, close, defaultArgs }
+module.exports = { spawn, getPid, close, defaultArgs }