fix: rejects if AbortSignal triggers in delay method

Author: lwin-kyaw

packages/shield-controller/src/polling-with-timeout-abort.ts

@@ -63,15 +63,15 @@ export class PollingWithTimeoutAndAbort {
         abortController.abort();
         return result;
       } catch {
-        if (abortController.signal.aborted) {
-          // request failed due to the abort signal being triggered,
-          // then we will break out of the polling loop
-          break;
-        }
         // otherwise, we will wait for the next polling cycle
         // and continue the polling loop
-        await this.#delayWithAbortSignal(pollInterval, abortController.signal);
-        continue;
+        await this.#delayWithAbortSignal(
+          pollInterval,
+          abortController.signal,
+        ).catch(() => {
+          // delayWithAbortSignal rejects, which means the abort signal was triggered
+          // so we will break out of the polling loop
+        });
       }
     }
     // At this point, the polling loop has exited and abortController is aborted
@@ -169,19 +169,23 @@ export class PollingWithTimeoutAndAbort {
    *
    * @param ms - The number of milliseconds to delay.
    * @param abortSignal - The abort signal to listen to.
-   * @returns A promise that resolves when the delay is complete.
+   * @returns A promise that resolves when the delay is complete or rejects if the abort signal is triggered.
    */
   async #delayWithAbortSignal(ms: number, abortSignal: AbortSignal) {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
       let timer: NodeJS.Timeout | null = null;
 
+      if (abortSignal.aborted) {
+        reject(new Error(this.ABORT_REASON_CANCELLED));
+      }
+
       const abortHandlerForDelay = () => {
         // clear the timeout and resolve the promise
         // Note: we don't reject the promise as this is only a dummy delay
         if (timer) {
           clearTimeout(timer);
         }
-        resolve(undefined);
+        reject(new Error(this.ABORT_REASON_CANCELLED));
       };
 
       timer = setTimeout(() => {