cancel timeout promise on successful http response #172

src/main/ts/common/GenUtils.ts

@@ -1480,5 +1480,30 @@ export default class GenUtils {
     }
     return undefined;
   }
+
+  /**
+   * Resolve the given promise with a timeout.
+   * 
+   * @param promise the promise to resolve within the timeout
+   * @param timeoutMs the timeout in milliseconds to resolve the promise
+   * @return the result of the promise unless error thrown
+   */
+  static async executeWithTimeout(promise, timeoutMs): Promise<any> {
+    return new Promise((resolve, reject) => {
+      const timeoutId = setTimeout(() => {
+        reject('Execution timed out in ' + timeoutMs + ' milliseconds')
+      }, timeoutMs);
+      promise.then(
+        (result) => {
+          clearTimeout(timeoutId);
+          resolve(result);
+        },
+        (error) => {
+          clearTimeout(timeoutId);
+          reject(error);
+        }
+      );
+    });
+  }
 }
 

src/main/ts/common/HttpClient.ts

@@ -92,13 +92,7 @@ export default class HttpClient {
     // request using fetch or xhr with timeout
     let timeout = request.timeout === undefined ? HttpClient.DEFAULT_TIMEOUT : request.timeout === 0 ? HttpClient.MAX_TIMEOUT : request.timeout;
     let requestPromise = request.requestApi === "fetch" ? HttpClient.requestFetch(request) : HttpClient.requestXhr(request);
-    let timeoutPromise = new Promise((resolve, reject) => {
-      let id = setTimeout(() => {
-        clearTimeout(id);
-        reject('Request timed out in '+ timeout + ' milliseconds')
-      }, timeout);
-    });
-    return Promise.race([requestPromise, timeoutPromise]);
+    return GenUtils.executeWithTimeout(requestPromise, timeout);
   }
 
   // ----------------------------- PRIVATE HELPERS ----------------------------