From 970264135aa4ffea0129fa0fa0d363b8eac2f3c6 Mon Sep 17 00:00:00 2001
From: Sankalp Kotewar <98868223+kotewar@users.noreply.github.com>
Date: Wed, 3 Aug 2022 11:11:30 +0000
Subject: [PATCH] Added abort controller for timer

---
 packages/cache/src/internal/downloadUtils.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/cache/src/internal/downloadUtils.ts b/packages/cache/src/internal/downloadUtils.ts
index af2a46f1..1c0950c7 100644
--- a/packages/cache/src/internal/downloadUtils.ts
+++ b/packages/cache/src/internal/downloadUtils.ts
@@ -251,6 +251,7 @@ export async function downloadCacheStorageSDK(
     try {
       downloadProgress.startDisplayTimer()
       const controller = new AbortController();
+      const timerController = new AbortController();
       const abortSignal = controller.signal;
       while (!downloadProgress.isDone()) {
         const segmentStart =
@@ -262,7 +263,6 @@ export async function downloadCacheStorageSDK(
         )
 
         downloadProgress.nextSegment(segmentSize)
-
         const result = await Promise.race([client.downloadToBuffer(
             segmentStart,
             segmentSize,
@@ -272,11 +272,14 @@ export async function downloadCacheStorageSDK(
               onProgress: downloadProgress.onProgress()
             }
           ),
-          timer.setTimeout(options.abortTimeInMs, 'timeout')]);
+          timer.setTimeout(options.abortTimeInMs, 'timeout',{ signal: timerController.signal })]);
           
         if(result === 'timeout') {
           controller.abort();
           throw new Error("Download aborted, segment download timed out.");
+        } else {
+          timerController.abort();
+          core.debug("Download completely successfully, cancelling timer.")
         }
 
         fs.writeFileSync(fd, result)