Merge pull request #109 from julienp/recreate-options-on-retry

Recreate function body on retry

Author: ehmicky

src/index.test.js

@@ -553,6 +553,26 @@ test('Gives up retrying on API rate limiting after a timeout', async t => {
   t.false(scope.isDone())
 })
 
+test('Recreates a function body when handling API rate limiting', async t => {
+  const deploy_id = '3'
+  const path = 'testPath'
+  const body = 'test'
+  const retryAtMs = Date.now() + TEST_RATE_LIMIT_DELAY
+  const retryAt = Math.ceil(retryAtMs / SECS_TO_MSECS)
+  const expectedResponse = { test: 'test' }
+  const scope = nock(origin)
+    .put(`${pathPrefix}/deploys/${deploy_id}/files/${path}`, body, { 'Content-Type': 'application/octet-stream' })
+    .reply(429, { retryAt }, { 'X-RateLimit-Reset': retryAt })
+    .put(`${pathPrefix}/deploys/${deploy_id}/files/${path}`, body, { 'Content-Type': 'application/octet-stream' })
+    .reply(200, expectedResponse)
+  const client = getClient()
+  const response = await client.uploadDeployFile({ deploy_id, path, body: () => fromString(body) })
+
+  t.true(Date.now() >= retryAtMs)
+  t.deepEqual(response, expectedResponse)
+  t.true(scope.isDone())
+})
+
 test('Can set (proxy) agent', async t => {
   const client = getClient({ accessToken, agent })
   t.is(client.agent, agent)

src/methods/index.js

@@ -31,9 +31,7 @@ const getMethod = function(method, NetlifyApi) {
 const callMethod = async function(method, NetlifyApi, params, opts) {
   const requestParams = Object.assign({}, NetlifyApi.globalParams, params)
   const url = getUrl(method, NetlifyApi, requestParams)
-  const optsA = getOpts(method, NetlifyApi, requestParams, opts)
-
-  const response = await makeRequestOrRetry(url, optsA)
+  const response = await makeRequestOrRetry({ url, method, NetlifyApi, requestParams, opts })
 
   const parsedResponse = await parseResponse(response)
   return parsedResponse
@@ -68,9 +66,10 @@ const addAgent = function(NetlifyApi, opts) {
   }
 }
 
-const makeRequestOrRetry = async function(url, opts) {
+const makeRequestOrRetry = async function({ url, method, NetlifyApi, requestParams, opts }) {
   for (let index = 0; index <= MAX_RETRY; index++) {
-    const response = await makeRequest(url, opts)
+    const optsA = getOpts(method, NetlifyApi, requestParams, opts)
+    const response = await makeRequest(url, optsA)
 
     if (shouldRetry(response, index)) {
       await waitForRetry(response)