kill-tabs 4.1.0 → 4.1.1

package/index.js

@@ -4,8 +4,7 @@ import psList from 'ps-list';
 import windows from './windows.js';
 
 export default async function killTabs(options = {}) {
-	const processList = process.platform === 'win32' ? windows : psList;
-	const list = await processList();
+	const list = process.platform === 'win32' ? await windows(options) : await psList();
 
 	const processes = {
 		chrome: process.platform === 'darwin' ? 'Chrome Helper' : 'chrome',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "kill-tabs",
-	"version": "4.1.0",
+	"version": "4.1.1",
 	"description": "Kill all Chrome tabs to improve performance, decrease battery usage, and save memory",
 	"license": "MIT",
 	"repository": "sindresorhus/kill-tabs",

package/windows.js

@@ -4,11 +4,33 @@ import execall from 'execall';
 
 const TEN_MEBIBYTE = 1024 * 1024 * 10;
 
-export default async function killTabs() {
-	const command = 'wmic process where Caption=\'chrome.exe\' get CommandLine,ProcessId /format:list';
-	const stdout = await promisify(childProcess.exec)(command, {maxBuffer: TEN_MEBIBYTE});
+export default async function killTabs(options) {
+	const browsers = [];
 
-	return execall(/CommandLine=(.+)\s+ProcessId=(\d+)/g, stdout).map(element => ({
+	if (options.chromium) {
+		browsers.push('Caption=\'chromium.exe\'');
+	}
+
+	if (options.chrome) {
+		browsers.push('Caption=\'chrome.exe\'');
+	}
+
+	if (options.brave) {
+		browsers.push('Caption=\'brave.exe\'');
+	}
+
+	if (options.edge) {
+		browsers.push('Caption=\'msedge.exe\'');
+	}
+
+	const arguments_ = ['process', 'where', browsers.join(' or '), 'get', 'CommandLine,ProcessId', '/format:list'];
+	const response = await promisify(childProcess.execFile)('wmic', arguments_, {maxBuffer: TEN_MEBIBYTE});
+
+	if (response.stderr && !response.stderr.includes('No Instance(s) Available.')) {
+		throw new Error('Failed to kill tabs.', {cause: new Error(response.stderr)});
+	}
+
+	return execall(/CommandLine=(.+)\s+ProcessId=(\d+)/g, response.stdout).map(element => ({
 		cmd: element.subMatches[0],
 		pid: Number.parseInt(element.subMatches[1], 10),
 	}));