tornado-packages/ethers.js
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Retry-After support and adjustable slot interval to fetchJson.

Browse Source
This commit is contained in:
Richard Moore 2020-07-14 22:50:05 -04:00
parent 6fa853b309
commit 7d43545303
No known key found for this signature in database
GPG Key ID: 665176BE8E9DC651
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/web/src.ts/index.ts
View File

@ -27,6 +27,7 @@ export type ConnectionInfo = {
allowInsecureAuthentication?: boolean, allowInsecureAuthentication?: boolean,
throttleLimit?: number, throttleLimit?: number,
throttleSlotInterval?: number;
throttleCallback?: (attempt: number, url: string) => Promise<boolean>, throttleCallback?: (attempt: number, url: string) => Promise<boolean>,
timeout?: number, timeout?: number,
@ -66,6 +67,9 @@ export function fetchJson(connection: string | ConnectionInfo, json?: string, pr
"invalid connection throttle limit", "connection.throttleLimit", attemptLimit); "invalid connection throttle limit", "connection.throttleLimit", attemptLimit);
const throttleCallback = ((typeof(connection) === "object") ? connection.throttleCallback: null); const throttleCallback = ((typeof(connection) === "object") ? connection.throttleCallback: null);
const throttleSlotInterval = ((typeof(connection) === "object" && typeof(connection.throttleSlotInterval) === "number") ? connection.throttleSlotInterval: 100);
logger.assertArgument((throttleSlotInterval > 0 && (throttleSlotInterval % 1) === 0),
"invalid connection throttle slot interval", "connection.throttleSlotInterval", throttleSlotInterval);
const headers: { [key: string]: Header } = { }; const headers: { [key: string]: Header } = { };
@ -168,7 +172,7 @@ export function fetchJson(connection: string | ConnectionInfo, json?: string, pr
try { try {
response = await getUrl(url, options); response = await getUrl(url, options);
// Exponential back-off throttling (interval = 100ms) // Exponential back-off throttling
if (response.statusCode === 429 && attempt < attemptLimit) { if (response.statusCode === 429 && attempt < attemptLimit) {
let tryAgain = true; let tryAgain = true;
if (throttleCallback) { if (throttleCallback) {
@ -176,8 +180,16 @@ export function fetchJson(connection: string | ConnectionInfo, json?: string, pr
} }
if (tryAgain) { if (tryAgain) {
const timeout = 100 * parseInt(String(Math.random() * Math.pow(2, attempt))); let stall = 0;
await staller(timeout);
const retryAfter = response.headers["retry-after"];
if (typeof(retryAfter) === "string" && retryAfter.match(/^[1-9][0-9]*$/)) {
stall = parseInt(retryAfter) * 1000;
} else {
stall = throttleSlotInterval * parseInt(String(Math.random() * Math.pow(2, attempt)));
}
await staller(stall);
continue; continue;
} }
} }
@ -241,7 +253,7 @@ export function fetchJson(connection: string | ConnectionInfo, json?: string, pr
} }
if (tryAgain) { if (tryAgain) {
const timeout = 100 * parseInt(String(Math.random() * Math.pow(2, attempt))); const timeout = throttleSlotInterval * parseInt(String(Math.random() * Math.pow(2, attempt)));
await staller(timeout); await staller(timeout);
continue; continue;
} }