fix: fixed AbortPendingRequest

Author: lwin-kyaw

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

@@ -84,28 +84,30 @@ export class PollingWithTimeoutAndAbort {
 
   /**
    * Abort the pending request.
-   * This will clean up the request entry if it exists, and abort the pending request if it exists.
-   * Note: this needs to be called before making a new request (with await) to avoid race conditions with the new request.
+   * To make sure that the request is actually aborted, we will listen to the abort event and resolve the promise when the abort event is triggered.
    *
    * @param requestId - The ID of the request to abort.
-   * @returns A promise that resolves when the request is aborted.
+   * @returns A promise that resolves when the request is aborted and cleaned up.
    */
-  async abortPendingRequest(requestId: string) {
-    return new Promise((resolve) => {
-      // firstly clean up the request entry if it exists
-      // note: this does not abort the request, it only cleans up the request entry from the map.
-      const removedEntry = this.#cleanUp(requestId);
-      // if there's no existing entry, then we can just resolve the promise
-      if (!removedEntry) {
-        resolve(undefined);
+  abortPendingRequest(requestId: string): Promise<void> {
+    return new Promise<void>((resolve) => {
+      const entry = this.#requestEntries.get(requestId);
+      if (!entry) {
+        resolve();
         return;
       }
-      // otherwise, we will abort the existing/pending request
-      removedEntry.abortController.abort(this.ABORT_REASON_CANCELLED);
-      // we want to make sure that the request is actually aborted, before inserting the new request entry
-      if (removedEntry.abortController.signal.aborted) {
-        resolve(undefined);
-      }
+
+      // Listen for the abort event to ensure cleanup completes before resolving
+      const cleanupCompleteHandler = () => {
+        resolve();
+      };
+      entry.abortController.signal.addEventListener(
+        'abort',
+        cleanupCompleteHandler,
+        { once: true },
+      );
+
+      entry.abortController.abort(this.ABORT_REASON_CANCELLED);
     });
   }