From dac7c65795c00e20696e18542bf2823b4d96de7e Mon Sep 17 00:00:00 2001 From: ITOH Date: Mon, 31 May 2021 22:29:54 +0200 Subject: [PATCH] change: make RestRequest.reject required --- src/rest/process_queue.ts | 6 +++--- src/rest/rest.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rest/process_queue.ts b/src/rest/process_queue.ts index 287f2e4d3..271e5ecde 100644 --- a/src/rest/process_queue.ts +++ b/src/rest/process_queue.ts @@ -98,12 +98,12 @@ export async function processQueue(id: string) { // If Rate limited should not remove from queue if (response.status !== 429) { - queuedRequest.request.reject?.(new Error(`[${response.status}] ${error}`)); + queuedRequest.request.reject(new Error(`[${response.status}] ${error}`)); queue.shift(); } else { if (queuedRequest.payload.retryCount++ >= rest.maxRetryCount) { 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.`) ); // REMOVE ITEM FROM QUEUE TO PREVENT RETRY @@ -155,7 +155,7 @@ export async function processQueue(id: string) { } catch (error) { // SOMETHING WENT WRONG, LOG AND RESPOND WITH ERROR rest.eventHandlers.fetchFailed(queuedRequest.payload, error); - queuedRequest.request.reject?.(error); + queuedRequest.request.reject(error); // REMOVE FROM QUEUE queue.shift(); } diff --git a/src/rest/rest.ts b/src/rest/rest.ts index 91aa47f6c..d0fd0ce95 100644 --- a/src/rest/rest.ts +++ b/src/rest/rest.ts @@ -56,7 +56,7 @@ export interface RestRequest { url: string; method: string; respond: (payload: { status: number; body?: string }) => unknown; - reject?: (error: unknown) => unknown; + reject: (error: unknown) => unknown; } export interface RestPayload {