Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: export the shouldRetryRequest method #74

Merged
merged 11 commits into from
Oct 23, 2020
Merged

fix: export the shouldRetryRequest method #74

Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fc75074
feat: export `shouldRetryRequest` so it can be used in `config.should…
bdcarr Nov 4, 2019
656ee80
fix: https://github.com/JustinBeckwith/retry-axios/issues/1 (credit: …
bdcarr Nov 4, 2019
2f67b33
chore: `npm run fix` to fix linting errors
bdcarr Nov 5, 2019
8252539
Merge branch 'master' into master
JustinBeckwith Jan 11, 2020
962222b
Merge branch 'master' into master
JustinBeckwith Jan 11, 2020
07b4449
refactor: remove changes from 656ee80
bdcarr Jan 12, 2020
c1ea668
build: fix linting errors
bdcarr Jan 12, 2020
6d581c3
Merge branch 'master' into master
bdcarr Jan 12, 2020
ac97145
docs: add `shouldRetryRequest` usage example
bdcarr Jan 13, 2020
6660981
Merge branch 'master' into master
JustinBeckwith Oct 23, 2020
3f75b05
fixy
JustinBeckwith Oct 23, 2020
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
21 changes: 12 additions & 9 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,21 @@ function onFulfilled(res: AxiosResponse) {
return res;
}

// tslint:disable-next-line no-any
const values = (objOrArray: { [key: string]: any }) => {
return Object.keys(objOrArray).map((key: string) => objOrArray[key]);
};

function onError(err: AxiosError) {
const config = getConfig(err) || {};
config.currentRetryAttempt = config.currentRetryAttempt || 0;
config.retry =
config.retry === undefined || config.retry === null ? 3 : config.retry;
config.retryDelay = config.retryDelay || 100;
config.instance = config.instance || axios;
config.httpMethodsToRetry = config.httpMethodsToRetry || [
'GET',
'HEAD',
'PUT',
'OPTIONS',
'DELETE',
];
config.httpMethodsToRetry = values(
config.httpMethodsToRetry || ['GET', 'HEAD', 'PUT', 'OPTIONS', 'DELETE']
);
config.noResponseRetries =
config.noResponseRetries === undefined || config.noResponseRetries === null
? 2
Expand All @@ -119,7 +120,9 @@ function onError(err: AxiosError) {
[429, 429],
[500, 599],
];
config.statusCodesToRetry = config.statusCodesToRetry || retryRanges;
config.statusCodesToRetry = values(
config.statusCodesToRetry || retryRanges
).map(values);

// Put the config back into the err
(err.config as RaxConfig).raxConfig = config;
Expand Down Expand Up @@ -157,7 +160,7 @@ function onError(err: AxiosError) {
* Determine based on config if we should retry the request.
* @param err The AxiosError passed to the interceptor.
*/
function shouldRetryRequest(err: AxiosError) {
export function shouldRetryRequest(err: AxiosError) {
const config = (err.config as RaxConfig).raxConfig;

// If there's no config, or retries are disabled, return.
Expand Down