make more resilient

Author: Uzlopak

src/fetch-wrapper.ts

@@ -146,34 +146,30 @@ export default async function fetchWrapper(
   return octokitResponse;
 }
 
-function getResponseData(response: Response): Promise<any> {
+async function getResponseData(response: Response): Promise<any> {
   const contentType = response.headers.get("content-type");
 
   if (!contentType) {
-    return response.text();
+    return response.text().catch(() => "");
   }
 
   const mimetype = safeParse(contentType);
 
   if (mimetype.type === "application/json") {
-    return (
-      response
-        .json()
-        // In the event that we get an empty response body we fallback to
-        // using .text(), but this should be investigated since if this were
-        // to occur in the GitHub API it really should not return an empty body.
-        .catch(() => response.text())
-        // `node-fetch` is throwing a "body used already for" error if `.text()` is run
-        // after a failed .json(). To account for that we fallback to an empty string
-        .catch(() => "")
-    );
+    let text = "";
+    try {
+      text = await response.text();
+      return JSON.parse(text);
+    } catch (err) {
+      return text;
+    }
   } else if (
     mimetype.type.startsWith("text/") ||
     mimetype.parameters.charset?.toLowerCase() === "utf-8"
   ) {
-    return response.text();
+    return response.text().catch(() => "");
   } else {
-    return response.arrayBuffer();
+    return response.arrayBuffer().catch(() => new ArrayBuffer(0));
   }
 }
 

test/request-native-fetch.test.ts

@@ -1397,4 +1397,23 @@ x//0u+zd/R/QRUzLOw4N72/Hu+UG6MNt5iDZFCtapRaKt6OvSBwy8w==
 
     request.closeMockServer();
   });
+
+  it("invalid json as response data", async () => {
+    expect.assertions(4);
+
+    const request = await mockRequestHttpServer(async (req, res) => {
+      expect(req.method).toBe("GET");
+      expect(req.url).toBe("/");
+
+      res.writeHead(200, {
+        "content-type": "application/json",
+      });
+      res.end('"invalid');
+    });
+
+    const response = await request("GET /");
+
+    expect(response.status).toEqual(200);
+    expect(response.data).toEqual('"invalid');
+  });
 });