Merge pull request #43 from MiracleUFO/fix-error/check-undefined-resp…

…onse fix(error): fallback not working when response is undefined
MiracleUFO · Jul 14, 2024 · af9f52f · af9f52f
2 parents fee8d29 + a509095
commit af9f52f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/utils/isBadResponse.ts b/src/utils/isBadResponse.ts
@@ -0,0 +1,5 @@
+const isBadResponse = (response: Response) => (
+  !response || response.status !== 200
+);
+
+export default isBadResponse;
diff --git a/src/utils/translate.ts b/src/utils/translate.ts
@@ -7,6 +7,7 @@ import {
   PROXY_URL_RENDER,
 } from '../constants';
 import language from '../types/language';
+import isBadResponse from './isBadResponse';
 
 const translate = async (text: string, from?: language, to?: language) => {
   const requestOptions = {
@@ -26,12 +27,11 @@ const translate = async (text: string, from?: language, to?: language) => {
     ),
   } as RequestInit;
 
-  let response;
-  response = await fetch(SERVER_URL || PROXY_URL, requestOptions);
+  let response = await fetch(SERVER_URL || PROXY_URL, requestOptions);
 
-  if (response.status !== 200) response = await fetch(SERVER_URL || PROXY_URL_ALT, requestOptions);
+  if (isBadResponse(response)) response = await fetch(SERVER_URL || PROXY_URL_ALT, requestOptions);
 
-  if (response.status !== 200) {
+  if (isBadResponse(response)) {
     // unstable (fallback) server
     response = await fetch(SERVER_URL || PROXY_URL_RENDER, requestOptions);
   }