fix: parse error from coverage-result responses

Author: lwin-kyaw

packages/shield-controller/src/backend.test.ts

@@ -144,12 +144,11 @@ describe('ShieldRemoteBackend', () => {
     // Mock get coverage result: result unavailable.
     fetchMock.mockResolvedValue({
       status: 404,
-      json: jest.fn().mockResolvedValue({ status: 'unavailable' }),
     } as unknown as Response);
 
     const txMeta = generateMockTxMeta();
     await expect(backend.checkCoverage({ txMeta })).rejects.toThrow(
-      'Timeout waiting for coverage result: unavailable',
+      'Failed to get coverage result: 404',
     );
 
     // Waiting here ensures coverage of the unexpected error and lets us know
@@ -171,12 +170,16 @@ describe('ShieldRemoteBackend', () => {
 
     // Mock get coverage result: result unavailable.
     fetchMock.mockResolvedValue({
-      status: 404,
+      status: 412,
+      json: jest.fn().mockResolvedValue({
+        message: 'Results are not available yet',
+        statusCode: 412,
+      }),
     } as unknown as Response);
 
     const txMeta = generateMockTxMeta();
     await expect(backend.checkCoverage({ txMeta })).rejects.toThrow(
-      'Timeout waiting for coverage result',
+      'Failed to get coverage result: Results are not available yet',
     );
 
     // Waiting here ensures coverage of the unexpected error and lets us know

packages/shield-controller/src/backend.ts

@@ -235,9 +235,9 @@ export class ShieldRemoteBackend implements ShieldBackend {
       let errorMessage = 'Timeout waiting for coverage result';
       try {
         const errorJson = await res.json();
-        errorMessage = `Timeout waiting for coverage result: ${errorJson.status}`;
+        errorMessage = `Failed to get coverage result: ${errorJson.message || errorJson.status}`;
       } catch {
-        errorMessage = 'Timeout waiting for coverage result';
+        errorMessage = `Failed to get coverage result: ${res.status}`;
       }
       throw new HttpError(res.status, errorMessage);
     };
@@ -339,9 +339,10 @@ function computePollingIntervalAndRetryCount(
   const backoff = new ConstantBackoff(pollInterval);
   const computedMaxRetries = Math.floor(timeout / pollInterval) + 1;
 
-  const maxRetries = isNaN(computedMaxRetries)
-    ? DEFAULT_MAX_RETRIES
-    : computedMaxRetries;
+  const maxRetries =
+    isNaN(computedMaxRetries) || !isFinite(computedMaxRetries)
+      ? DEFAULT_MAX_RETRIES
+      : computedMaxRetries;
 
   return {
     backoff,