Fix timeout validation

sindresorhus · Jun 11, 2019 · 19ae036 · 19ae036
1 parent 9dad85d
commit 19ae036
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -240,12 +240,12 @@ function isSigterm(signal) {
 		(typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM');
 }
 
-function getForceKillAfterTimeout({forceKillAfter}) {
-	if (Number.isInteger(forceKillAfter)) {
-		return forceKillAfter;
+function getForceKillAfterTimeout({forceKillAfter = DEFAULT_FORCE_KILL_TIMEOUT}) {
+	if (!Number.isInteger(forceKillAfter) || forceKillAfter < 0) {
+		throw new TypeError(`Option 'forceKillAfter' ${forceKillAfter} should be a positive integer`);
 	}
 
-	return DEFAULT_FORCE_KILL_TIMEOUT;
+	return forceKillAfter;
 }
 
 const execa = (file, args, options) => {

diff --git a/test.js b/test.js
@@ -175,6 +175,14 @@ if (process.platform !== 'win32') {
 		const {signal} = await t.throwsAsync(subprocess);
 		t.is(signal, 'SIGKILL');
 	});
+
+	test('.kill() `forceKillAfter` should not be a float', t => {
+		t.throws(() => execa('noop').kill('SIGTERM', {forceKillAfter: 0.5}), TypeError);
+	});
+
+	test('.kill() `forceKillAfter` should not be negative', t => {
+		t.throws(() => execa('noop').kill('SIGTERM', {forceKillAfter: -1}), TypeError);
+	});
 }
 
 test('stripFinalNewline: true', async t => {