Handle kill signals

LitoMore · Jun 9, 2024 · 0ec9d5d · 0ec9d5d
1 parent ac83ccf
commit 0ec9d5d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/source/index.ts b/source/index.ts
@@ -1,4 +1,4 @@
-import {execa} from 'execa';
+import {ExecaError, execa} from 'execa';
 import {killRunningSay} from './utils.js';
 
 export type SayOptions = {
@@ -15,20 +15,28 @@ export type SayOptions = {
 export async function say(text: string, options: SayOptions = {}) {
 	await killRunningSay();
 	const {voice, rate, audioDevice, quality, inputFile, outputFile, networkSend, channels} = options;
-	await execa(
-		'say',
-		[
-			text,
-			voice && ['--voice', voice],
-			rate && ['--rate', rate],
-			audioDevice && ['--audio-device', audioDevice],
-			quality && ['--quality', quality],
-			inputFile && ['--input-file', inputFile],
-			outputFile && ['--output-file', outputFile],
-			networkSend && ['--network-send', networkSend],
-			channels && ['--channels', channels],
-		].flat().filter(Boolean) as string[],
-	);
+	try {
+		await execa(
+			'say',
+			[
+				text,
+				voice && ['--voice', voice],
+				rate && ['--rate', rate],
+				audioDevice && ['--audio-device', audioDevice],
+				quality && ['--quality', quality],
+				inputFile && ['--input-file', inputFile],
+				outputFile && ['--output-file', outputFile],
+				networkSend && ['--network-send', networkSend],
+				channels && ['--channels', channels],
+			].flat().filter(Boolean) as string[],
+		);
+	} catch (error) {
+		if (error instanceof ExecaError && error.signal === 'SIGKILL') {
+			return;
+		}
+
+		throw error;
+	}
 }
 
 export {

diff --git a/source/utils.ts b/source/utils.ts
@@ -67,6 +67,6 @@ export const checkIfSayIsRunning = async () => {
 export const killRunningSay = async () => {
 	const sayProcess = await checkIfSayIsRunning();
 	if (sayProcess) {
-		await fkill(sayProcess.pid, {force: true});
+		await fkill(sayProcess.pid, {force: true, silent: true});
 	}
 };