Skip to content
Merged
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"dependencies": {
"@rimiti/stimmy": "1.11.0",
"axios": "1.6.8",
"axios-retry": "4.0.0",
"http-proxy-agent": "7.0.2",
"https-proxy-agent": "7.0.4"
},
Expand Down
13 changes: 13 additions & 0 deletions src/classes/providers/base/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import axios, { AxiosInstance, AxiosPromise, AxiosRequestConfig } from 'axios';
import axiosRetry from 'axios-retry';
import { IBaseConfig } from './types';

export class Base {
Expand All @@ -14,6 +15,18 @@ export class Base {
} else {
this.axios = axios.create({ proxy: false });
}

// Configure axios-retry with sensible defaults and allow overrides from config.retryConfig
const defaultRetryOptions = {
retries: 3,
retryDelay: axiosRetry.exponentialDelay,
shouldResetTimeout: true,
retryCondition: axiosRetry.isNetworkOrIdempotentRequestError,
};

const retryOptions = config.retryConfig ? { ...defaultRetryOptions, ...config.retryConfig } : defaultRetryOptions;

axiosRetry(this.axios, retryOptions);
}

/**
Expand Down
2 changes: 2 additions & 0 deletions src/classes/providers/base/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { HttpsProxyAgent } from 'https-proxy-agent';
import { HttpProxyAgent } from 'http-proxy-agent';
import { AxiosRequestConfig } from 'axios';
import { IAxiosRetryConfig } from 'axios-retry';

enum EStrategyMode {
MANUAL = 'MANUAL',
Expand All @@ -9,6 +10,7 @@ enum EStrategyMode {

interface IBaseConfig {
axiosConfig?: AxiosRequestConfig;
retryConfig?: IAxiosRetryConfig;
}

interface ICreateProxyConfig {
Expand Down
12 changes: 12 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1125,6 +1125,13 @@ asynckit@^0.4.0:
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=

axios-retry@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-4.0.0.tgz#d5cb8ea1db18e05ce6f08aa5fe8b2663bba48e60"
integrity sha512-F6P4HVGITD/v4z9Lw2mIA24IabTajvpDZmKa6zq/gGwn57wN5j1P3uWrAV0+diqnW6kTM2fTqmWNfgYWGmMuiA==
dependencies:
is-retry-allowed "^2.2.0"

axios@1.6.8:
version "1.6.8"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
Expand Down Expand Up @@ -1974,6 +1981,11 @@ is-path-inside@^3.0.3:
resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==

is-retry-allowed@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d"
integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==

is-stream@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
Expand Down