Merge pull request #274 from happo/fetch-form-data

Move FormData instantiation inside makeRequest retry

src/makeRequest.js

@@ -38,15 +38,20 @@ export default async function makeRequest(
   { HTTP_PROXY } = process.env,
 ) {
   const { url, method = 'GET', formData, body: jsonBody } = requestAttributes;
-  const body = formData
-    ? prepareFormData(formData)
-    : jsonBody
-    ? JSON.stringify(jsonBody)
-    : undefined;
 
   return asyncRetry(
     async () => {
       const start = Date.now();
+
+      // We must avoid reusing FormData instances when retrying requests
+      // because they are consumed and cannot be reused.
+      // More info: https://github.com/node-fetch/node-fetch/issues/1743
+      const body = formData
+        ? prepareFormData(formData)
+        : jsonBody
+        ? JSON.stringify(jsonBody)
+        : undefined;
+
       const signed = jwt.sign({ key: apiKey }, apiSecret, {
         header: { kid: apiKey },
       });

test/makeRequest-test.js

@@ -35,7 +35,7 @@ beforeAll(async () => {
           result: 'Hello world!',
         }),
       );
-    } else if (req.url === '/form-data') {
+    } else if (req.url === '/form-data' || (req.url === '/form-data-failure-retry' && errorTries > 2)) {
       const form = new multiparty.Form();
 
       form.parse(req, (err, fields, files) => {
@@ -146,6 +146,47 @@ it('can upload form data with buffers', async () => {
   });
 });
 
+it('can retry uploading form data with buffers', async () => {
+  props.url = 'http://localhost:8990/form-data-failure-retry';
+  props.method = 'POST';
+  props.formData = {
+    type: 'browser-chrome',
+    targetName: 'chrome',
+    payloadHash: 'foobar',
+    payload: {
+      options: {
+        filename: 'payload.json',
+        contentType: 'application/json',
+      },
+      value: Buffer.from('{"foo": "bar"}'),
+    },
+  };
+  const response = await subject();
+  expect(response).toEqual({
+    fields: {
+      payloadHash: ['foobar'],
+      targetName: ['chrome'],
+      type: ['browser-chrome'],
+    },
+    files: {
+      payload: [
+        {
+          fieldName: 'payload',
+          headers: {
+            'content-disposition':
+              'form-data; name="payload"; filename="payload.json"',
+            'content-type': 'application/json',
+          },
+          originalFilename: 'payload.json',
+          path: expect.any(String),
+          size: 14,
+        },
+      ],
+    },
+  });
+});
+
+
 it('can upload form data with streams', async () => {
   props.url = 'http://localhost:8990/form-data';
   props.method = 'POST';