kill-tabs 4.1.0 → 4.2.0

package/cli.js

@@ -7,10 +7,11 @@ const cli = meow(`
 	  $ kill-tabs
 
 	Options
-	  --no-chromium  Don't kill tabs in Chromium
-	  --no-chrome    Don't kill tabs in Chrome
-	  --no-brave     Don't kill tabs in Brave
-	  --no-edge      Don't kill tabs in Edge
+	  --no-chromium        Don't kill tabs in Chromium
+	  --no-chrome          Don't kill tabs in Chrome
+	  --no-chrome-canary   Don't kill tabs in Chrome Canary
+	  --no-brave           Don't kill tabs in Brave
+	  --no-edge            Don't kill tabs in Edge
 `, {
 	importMeta: import.meta,
 	flags: {
@@ -22,6 +23,10 @@ const cli = meow(`
 			type: 'boolean',
 			default: true,
 		},
+		chromeCanary: {
+			type: 'boolean',
+			default: true,
+		},
 		brave: {
 			type: 'boolean',
 			default: true,

package/index.js

@@ -4,11 +4,11 @@ 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',
+		chromeCanary: process.platform === 'darwin' ? 'Chrome Canary Helper' : 'chrome',
 		chromium: process.platform === 'darwin' ? 'Chromium Helper' : 'chromium',
 		brave: process.platform === 'darwin' ? 'Brave Browser Helper' : 'brave',
 		edge: process.platform === 'darwin' ? 'Microsoft Edge Helper' : 'edge',
@@ -22,6 +22,10 @@ export default async function killTabs(options = {}) {
 		delete processes.chrome;
 	}
 
+	if (options.chromeCanary === false) {
+		delete processes.chromeCanary;
+	}
+
 	if (options.brave === false) {
 		delete processes.brave;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "kill-tabs",
-	"version": "4.1.0",
+	"version": "4.2.0",
 	"description": "Kill all Chrome tabs to improve performance, decrease battery usage, and save memory",
 	"license": "MIT",
 	"repository": "sindresorhus/kill-tabs",
@@ -13,6 +13,7 @@
 	"type": "module",
 	"bin": "./cli.js",
 	"exports": "./index.js",
+	"sideEffects": false,
 	"engines": {
 		"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 	},

package/readme.md

@@ -23,10 +23,11 @@ $ kill-tabs --help
     $ kill-tabs
 
   Options
-    --no-chromium  Don't kill tabs in Chromium
-    --no-chrome    Don't kill tabs in Chrome
-    --no-brave     Don't kill tabs in Brave
-    --no-edge      Don't kill tabs in Edge
+    --no-chromium        Don't kill tabs in Chromium
+    --no-chrome          Don't kill tabs in Chrome
+    --no-chrome-canary   Don't kill tabs in Chrome Canary
+    --no-brave           Don't kill tabs in Brave
+    --no-edge            Don't kill tabs in Edge
 ```
 
 ## API

package/windows.js

@@ -4,11 +4,37 @@ 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.chromeCanary && !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),
 	}));