From 1ddeb1f396f1de14480d53e017e0b14ee0304e28 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 4 May 2016 11:49:09 +0200 Subject: [PATCH 1/2] bumps graceful-fs to avoid node>= v6 breakage npm WARN deprecated graceful-fs@3.0.8: graceful-fs v3.0.0 and before will fail on node releases >= v6.0. Please update to graceful-fs@^4.0.0 as soon as possible. Use 'npm ls graceful-fs' to find it in the tree. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 77cd980..8949fbc 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,8 @@ "node >=0.7.00" ], "dependencies": { - "graceful-fs": "~3.0.4", "cross-spawn": "^0.2.3", + "graceful-fs": "^4.1.3", "tmp": "~0.0.25" }, "optionalDependencies": { From fbaf7b18617e982aba5247db016e959e84cb2dca Mon Sep 17 00:00:00 2001 From: James Diacono Date: Wed, 6 Dec 2017 12:26:05 +1100 Subject: [PATCH 2/2] ensure phantom process ends after JS error --- lib/webshot.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/webshot.js b/lib/webshot.js index 5b8a21c..edbc821 100644 --- a/lib/webshot.js +++ b/lib/webshot.js @@ -234,6 +234,10 @@ function spawnPhantom(site, path, streaming, options, cb) { phantomProc.stderr.on('data', function(data) { if (options.errorIfJSException) { calledCallback = true; + + // Send the kill signal + phantomProc.kill('SIGKILL'); + clearTimeout(timeoutID); cb(new Error('' + data)) }