Catch network error (#74)

- I saw some S3 uploading failures, probably due to large file size. - This is a stopgap solution. The plan is to retry and log more information about the error and the offending files first. - Will probably need to implement multipart uploading in the future. Issue: #75
stoat-dev · Dec 15, 2022 · 0c2379a · 0c2379a
1 parent 34ba15b
commit 0c2379a
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 30 deletions.
diff --git a/action/__tests__/plugins/staticHosting/helpers.test.ts b/action/__tests__/plugins/staticHosting/helpers.test.ts
@@ -47,4 +47,23 @@ describe('uploadFileWithSignedUrl', function () {
       });
     });
   });
+
+  describe('when there is network error', () => {
+    beforeEach(() => {
+      mockFetch
+        .mockRejectedValueOnce('Network error')
+        .mockResolvedValue({ ok: true, status: 204, statusText: 'No content' } as Response);
+    });
+
+    it('retries', async () => {
+      await uploadFileWithSignedUrl('https://localhost', {}, 'object-key', 'package.json');
+      expect(mockFetch).toHaveBeenCalledTimes(2);
+
+      const warnings = mockCore.error.mock.calls;
+      expect(warnings.length).toEqual(1);
+      warnings.forEach((warning) => {
+        expect(warning[0]).toContain('Network error');
+      });
+    });
+  });
 });
diff --git a/action/dist/index.js b/action/dist/index.js
@@ -28776,25 +28776,31 @@ const uploadFileWithSignedUrl = (signedUrl, fields, objectKey, localFilePath, dr
     form.append('key', objectKey);
     form.append('Content-Type', mime_types.lookup(localFilePath) || 'application/octet-stream');
     form.append('file', external_fs_default().readFileSync(localFilePath));
+    // TODO: replace the following code with a retry library
     let retry = 0;
     const maxRetry = 6;
     while (retry <= maxRetry) {
-        const { ok, status, statusText } = yield node_ponyfill_default()(signedUrl, {
-            method: 'POST',
-            body: form
-        });
-        const retryStatus = retry > 0 ? ` (retry ${retry})` : '';
-        core.info(`-- Upload ${localFilePath} -> ${objectKey}: ${status} - ${statusText}${retryStatus}`);
-        if (ok) {
-            break;
-        }
-        else if (status === 503) {
-            const waitingMillis = Math.pow(2, retry) * 100;
-            core.warning(`-- Hit 503 error, waiting for ${waitingMillis}ms before retry (${retry})...`);
-            yield new Promise((r) => setTimeout(r, waitingMillis));
+        try {
+            const { ok, status, statusText } = yield node_ponyfill_default()(signedUrl, {
+                method: 'POST',
+                body: form
+            });
+            const retryStatus = retry > 0 ? ` (retry ${retry})` : '';
+            core.info(`-- Upload ${localFilePath} -> ${objectKey}: ${status} - ${statusText}${retryStatus}`);
+            if (ok) {
+                break;
+            }
+            else if (status === 503) {
+                const waitingMillis = Math.pow(2, retry) * 100;
+                core.warning(`-- Hit 503 error, waiting for ${waitingMillis}ms before retry (${retry})...`);
+                yield new Promise((r) => setTimeout(r, waitingMillis));
+            }
+            else {
+                core.error(`-- Failed to upload ${localFilePath}: ${status} - ${statusText}`);
+            }
         }
-        else {
-            throw new Error(statusText);
+        catch (e) {
+            core.error(`-- Failed to upload ${localFilePath}: ${e}`);
         }
         ++retry;
     }

diff --git a/action/dist/index.js.map b/action/dist/index.js.map
diff --git a/action/src/plugins/staticHosting/helpers.ts b/action/src/plugins/staticHosting/helpers.ts
@@ -49,24 +49,29 @@ export const uploadFileWithSignedUrl = async (
   form.append('Content-Type', mime.lookup(localFilePath) || 'application/octet-stream');
   form.append('file', fs.readFileSync(localFilePath));
 
+  // TODO: replace the following code with a retry library
   let retry = 0;
   const maxRetry = 6;
   while (retry <= maxRetry) {
-    const { ok, status, statusText } = await fetch(signedUrl, {
-      method: 'POST',
-      body: form as any
-    });
-    const retryStatus = retry > 0 ? ` (retry ${retry})` : '';
-    core.info(`-- Upload ${localFilePath} -> ${objectKey}: ${status} - ${statusText}${retryStatus}`);
+    try {
+      const { ok, status, statusText } = await fetch(signedUrl, {
+        method: 'POST',
+        body: form as any
+      });
+      const retryStatus = retry > 0 ? ` (retry ${retry})` : '';
+      core.info(`-- Upload ${localFilePath} -> ${objectKey}: ${status} - ${statusText}${retryStatus}`);
 
-    if (ok) {
-      break;
-    } else if (status === 503) {
-      const waitingMillis = 2 ** retry * 100;
-      core.warning(`-- Hit 503 error, waiting for ${waitingMillis}ms before retry (${retry})...`);
-      await new Promise((r) => setTimeout(r, waitingMillis));
-    } else {
-      throw new Error(statusText);
+      if (ok) {
+        break;
+      } else if (status === 503) {
+        const waitingMillis = 2 ** retry * 100;
+        core.warning(`-- Hit 503 error, waiting for ${waitingMillis}ms before retry (${retry})...`);
+        await new Promise((r) => setTimeout(r, waitingMillis));
+      } else {
+        core.error(`-- Failed to upload ${localFilePath}: ${status} - ${statusText}`);
+      }
+    } catch (e) {
+      core.error(`-- Failed to upload ${localFilePath}: ${e}`);
     }
     ++retry;
   }