feat: Update race conition to break on return

kevintyj · Jun 28, 2024 · 2f5fa22 · 2f5fa22
1 parent f2ec49b
commit 2f5fa22
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -40928,12 +40928,15 @@ async function run() {
  */
 void (async () => {
     const timeoutInput = core.getInput('timeout') ?? '25';
-    const timeout = Number.parseInt(timeoutInput, 10) * 1000;
+    const timeoutSeconds = Number.parseInt(timeoutInput, 10) * 1000;
+    let timeoutId = setTimeout(() => { }, 0); // Default to timeout
     const timeoutPromise = new Promise((_, reject) => {
-        setTimeout(() => reject(new Error('Action timed out')), timeout);
+        timeoutId = setTimeout(() => reject(new Error('Action timed out')), timeoutSeconds);
     });
     try {
-        return await Promise.race([run(), timeoutPromise]);
+        const result = await Promise.race([run(), timeoutPromise]);
+        clearTimeout(timeoutId);
+        return result;
     }
     catch (err) {
         errHandle(err);

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/index.ts b/src/index.ts
@@ -38,15 +38,17 @@ async function run(): Promise<boolean> {
  */
 void (async () => {
 	const timeoutInput: string = core.getInput('timeout') ?? '25';
+	const timeoutSeconds = Number.parseInt(timeoutInput, 10) * 1000;
 
-	const timeout = Number.parseInt(timeoutInput, 10) * 1000;
-
+	let timeoutId: NodeJS.Timeout = setTimeout(() => {}, 0); // Default to timeout
 	const timeoutPromise = new Promise((_, reject) => {
-		setTimeout(() => reject(new Error('Action timed out')), timeout);
+		timeoutId = setTimeout(() => reject(new Error('Action timed out')), timeoutSeconds);
 	});
 
 	try {
-		return await Promise.race([run(), timeoutPromise]);
+		const result = await Promise.race([run(), timeoutPromise]);
+		clearTimeout(timeoutId);
+		return result;
 	}
 	catch (err) {
 		handleError(err);