Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/handler/retry-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const {

function calculateRetryAfterHeader (retryAfter) {
const retryTime = new Date(retryAfter).getTime()
return isNaN(retryTime) ? 0 : retryTime - Date.now()
return isNaN(retryTime) ? null : retryTime - Date.now()
}

// A stable controller handed to the downstream handler for the lifetime of the
Expand Down Expand Up @@ -211,9 +211,11 @@ class RetryHandler {
}

const retryTimeout =
retryAfterHeader > 0
? Math.min(retryAfterHeader, maxTimeout)
: Math.min(minTimeout * timeoutFactor ** (counter - 1), maxTimeout)
retryAfterHeader === 0
? 0
: retryAfterHeader > 0
? Math.min(retryAfterHeader, maxTimeout)
: Math.min(minTimeout * timeoutFactor ** (counter - 1), maxTimeout)

setTimeout(() => cb(null), retryTimeout)
}
Expand Down
35 changes: 35 additions & 0 deletions test/retry-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const { test, after } = require('node:test')
const { createServer } = require('node:http')
const { once } = require('node:events')
const { Readable } = require('node:stream')
const FakeTimers = require('@sinonjs/fake-timers')

const { RetryHandler, Client } = require('..')
const { RequestHandler } = require('../lib/api/api-request')
Expand Down Expand Up @@ -346,6 +347,40 @@ test('Should use retry-after header for retries', async t => {
await t.completed
})

test('Should retry immediately when retry-after is zero', async t => {
const clock = FakeTimers.install()
t.after(() => clock.uninstall())

let retries = 0
const handler = new RetryHandler(
{
method: 'GET',
retryOptions: {
maxRetries: 1,
minTimeout: 500
}
},
{
dispatch () {
retries++
},
handler: {}
}
)

handler.onResponseError(null, {
statusCode: 429,
code: 'UND_ERR_REQ_RETRY',
headers: {
'retry-after': '0'
}
})

await clock.tickAsync(0)

t.assert.strictEqual(retries, 1)
})

test('Should use retry-after header for retries (date)', async t => {
t = tspl(t, { plan: 3 })

Expand Down
Loading