Catch storefront api error when no valid body exists (#1205)

* Catch error * update message
Shopify · Aug 8, 2023 · b29c85d · b29c85d
1 parent ed0c7e0
commit b29c85d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/.changeset/long-goats-poke.md b/.changeset/long-goats-poke.md
@@ -0,0 +1,5 @@
+---
+'@shopify/hydrogen': patch
+---
+
+Surface storefront api response errors
diff --git a/packages/hydrogen/src/cache/fetch.ts b/packages/hydrogen/src/cache/fetch.ts
@@ -152,7 +152,16 @@ export async function fetchWithServerCache(
       try {
         data = await response[returnType]();
       } catch {
-        data = await response.text();
+        try {
+          data = await response.text();
+        } catch {
+          // Getting a response without a valid body
+          throw new Error(
+            `Storefront API response code: ${
+              response.status
+            } (Request Id: ${response.headers.get('x-request-id')})`,
+          );
+        }
       }
 
       return toSerializableResponse(data, response);