fix: failed to execute json on response error in console on message send

FlowCrypt · Dec 30, 2024 · c03bea1 · c03bea1
1 parent e7636ca
commit c03bea1
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/extension/js/common/api/shared/api.ts b/extension/js/common/api/shared/api.ts
@@ -246,7 +246,14 @@ export class Api {
       } else if (resFmt === 'json') {
         try {
           const transformed = transformResponseWithProgressAndTimeout();
-          return (await Promise.all([transformed.response.json(), transformed.pipe()]))[0] as FetchResult<T, RT>;
+          return (
+            await Promise.all([
+              transformed.response.text().then(text => {
+                return (text ? JSON.parse(text) : {}) as T; // Handle empty response body
+              }),
+              transformed.pipe(),
+            ])
+          )[0] as FetchResult<T, RT>;
         } catch (e) {
           // handle empty response https://github.com/FlowCrypt/flowcrypt-browser/issues/5601
           if (e instanceof SyntaxError && (e.message === 'Unexpected end of JSON input' || e.message.startsWith('JSON.parse: unexpected end of data'))) {