change: make RestRequest.reject required

This commit is contained in:
ITOH
2021-05-31 22:29:54 +02:00
parent 96f8a1c568
commit dac7c65795
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -98,12 +98,12 @@ export async function processQueue(id: string) {
// If Rate limited should not remove from queue // If Rate limited should not remove from queue
if (response.status !== 429) { if (response.status !== 429) {
queuedRequest.request.reject?.(new Error(`[${response.status}] ${error}`)); queuedRequest.request.reject(new Error(`[${response.status}] ${error}`));
queue.shift(); queue.shift();
} else { } else {
if (queuedRequest.payload.retryCount++ >= rest.maxRetryCount) { if (queuedRequest.payload.retryCount++ >= rest.maxRetryCount) {
rest.eventHandlers.retriesMaxed(queuedRequest.payload); rest.eventHandlers.retriesMaxed(queuedRequest.payload);
queuedRequest.request.reject?.( queuedRequest.request.reject(
new Error(`[${response.status}] The request was rate limited and it maxed out the retries limit.`) new Error(`[${response.status}] The request was rate limited and it maxed out the retries limit.`)
); );
// REMOVE ITEM FROM QUEUE TO PREVENT RETRY // REMOVE ITEM FROM QUEUE TO PREVENT RETRY
@@ -155,7 +155,7 @@ export async function processQueue(id: string) {
} catch (error) { } catch (error) {
// SOMETHING WENT WRONG, LOG AND RESPOND WITH ERROR // SOMETHING WENT WRONG, LOG AND RESPOND WITH ERROR
rest.eventHandlers.fetchFailed(queuedRequest.payload, error); rest.eventHandlers.fetchFailed(queuedRequest.payload, error);
queuedRequest.request.reject?.(error); queuedRequest.request.reject(error);
// REMOVE FROM QUEUE // REMOVE FROM QUEUE
queue.shift(); queue.shift();
} }
+1 -1
View File
@@ -56,7 +56,7 @@ export interface RestRequest {
url: string; url: string;
method: string; method: string;
respond: (payload: { status: number; body?: string }) => unknown; respond: (payload: { status: number; body?: string }) => unknown;
reject?: (error: unknown) => unknown; reject: (error: unknown) => unknown;
} }
export interface RestPayload { export interface RestPayload {