fix(fetch): AbortController not support issue

Alwatr · Dec 19, 2023 · 10f6dbc · 10f6dbc
1 parent 4e0c272
commit 10f6dbc
Showing 1 changed file with 15 additions and 23 deletions.
diff --git a/packages/fetch/src/fetch.ts b/packages/fetch/src/fetch.ts
@@ -33,8 +33,7 @@ export async function serviceRequest<T extends AlwatrServiceResponse = AlwatrSer
   let response: Response;
   try {
     response = await fetch(options);
-  }
-  catch (err) {
+  } catch (err) {
     const errMessage = (err as Error).message;
     if (errMessage !== 'fetch_cache_not_found') {
       logger.error('serviceRequest', (err as Error).message || 'fetch_failed', err, options);
@@ -45,8 +44,7 @@ export async function serviceRequest<T extends AlwatrServiceResponse = AlwatrSer
   let responseText: string;
   try {
     responseText = await response.text();
-  }
-  catch (err) {
+  } catch (err) {
     logger.error('serviceRequest', 'invalid_response', err, {
       response,
     });
@@ -56,8 +54,7 @@ export async function serviceRequest<T extends AlwatrServiceResponse = AlwatrSer
   let responseJson: T;
   try {
     responseJson = JSON.parse(responseText);
-  }
-  catch (err) {
+  } catch (err) {
     logger.error('serviceRequest', 'invalid_json', err, {responseText});
     throw err;
   }
@@ -66,8 +63,7 @@ export async function serviceRequest<T extends AlwatrServiceResponse = AlwatrSer
     if (typeof responseJson.errorCode === 'string') {
       logger.accident('serviceRequest', responseJson.errorCode, {responseJson});
       throw new Error(responseJson.errorCode);
-    }
-    else {
+    } else {
       logger.error('serviceRequest', 'fetch_nok', {responseJson});
       throw new Error('fetch_nok');
     }
@@ -204,8 +200,7 @@ async function _handleCacheStrategy(options: Required<FetchOptions>): Promise<Re
           cacheStorage.put(request, networkResponse.clone());
         }
         return networkResponse;
-      }
-      catch (err) {
+      } catch (err) {
         const cachedResponse = await cacheStorage.match(request);
         if (cachedResponse != null) {
           return cachedResponse;
@@ -268,8 +263,7 @@ async function _handleRemoveDuplicate(options: Required<FetchOptions>): Promise<
     }
 
     return response.clone();
-  }
-  catch (err) {
+  } catch (err) {
     // clean cache on any error.
     delete duplicateRequestStorage[cacheKey];
     throw err;
@@ -295,8 +289,7 @@ async function _handleRetryPattern(options: Required<FetchOptions>): Promise<Res
     }
     // else
     throw new Error('fetch_server_error');
-  }
-  catch (err) {
+  } catch (err) {
     logger.accident('fetch', 'fetch_failed_retry', err);
 
     if (globalScope.navigator?.onLine === false) {
@@ -320,21 +313,20 @@ function _handleTimeout(options: FetchOptions): Promise<Response> {
   // else
   logger.logMethod?.('_handleTimeout');
   return new Promise((resolved, reject) => {
-    // TODO: AbortController polyfill
-    const abortController = new AbortController();
+    const abortController = typeof globalScope.AbortController === 'function' ? new AbortController() : null;
     const externalAbortSignal = options.signal;
-    options.signal = abortController.signal;
+    options.signal = abortController?.signal;
 
-    const timeoutId = setTimeout(() => {
-      reject(new Error('fetch_timeout'));
-      abortController.abort('fetch_timeout');
-    }, options.timeout);
-
-    if (externalAbortSignal != null) {
+    if (abortController !== null && externalAbortSignal != null) {
       // Respect external abort signal
       externalAbortSignal.addEventListener('abort', () => abortController.abort(), {once: true});
     }
 
+    const timeoutId = setTimeout(() => {
+      reject(new Error('fetch_timeout'));
+      abortController?.abort('fetch_timeout');
+    }, options.timeout);
+
     // abortController.signal.addEventListener('abort', () => {
     //   logger.incident('fetch', 'fetch_abort_signal', {
     //     reason: abortController.signal.reason,