Update relewise.client.ts

Relewise · Oct 20, 2023 · c6aa057 · c6aa057
1 parent 8e90a3c
commit c6aa057
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/lib/src/relewise.client.ts b/lib/src/relewise.client.ts
@@ -32,15 +32,14 @@ export abstract class RelewiseClient {
     private requestDictionary: { [requestUrl: string]: AbortController | null } = {};
 
     private ensureAbortSignal(requestUrl: string): AbortSignal {
-        let abortController = this.requestDictionary[requestUrl];
+        const abortController = this.requestDictionary[requestUrl];
         if (abortController) {
             abortController.abort();
         }
 
-        abortController = new AbortController();
-        this.requestDictionary[requestUrl] = abortController;
-
-        return abortController.signal;
+        const newAbortController = new AbortController();
+        this.requestDictionary[requestUrl] = newAbortController;
+        return newAbortController.signal;
     }
 
     private clearAbortSignal(requestUrl: string) {
@@ -81,7 +80,7 @@ export abstract class RelewiseClient {
                 'X-Relewise-Version': version.tag,
             },
             body: JSON.stringify(data),
-            ...(this._useCancellation && { signal: this.ensureAbortSignal(requestUrl) }),
+            signal: this._useCancellation ? this.ensureAbortSignal(requestUrl) : undefined,
         });
 
         if (!response.ok) {
@@ -105,6 +104,10 @@ export abstract class RelewiseClient {
             return responseMessage as TResponse;
         } catch (err) {
             return undefined;
+        } finally {
+            if (this._useCancellation) {
+                this.clearAbortSignal(requestUrl);
+            }
         }
     }