diff --git a/packages/rest/src/createInvalidRequestBucket.ts b/packages/rest/src/createInvalidRequestBucket.ts index 5c214828d..fb54550e0 100644 --- a/packages/rest/src/createInvalidRequestBucket.ts +++ b/packages/rest/src/createInvalidRequestBucket.ts @@ -83,7 +83,7 @@ export function createInvalidRequestBucket ( // Mark a request has been invalid bucket.current++ // If a timeout was not started, start a timeout to reset this bucket - if (bucket.timeoutId !== undefined) { + if (bucket.timeoutId === undefined) { bucket.timeoutId = setTimeout(() => { bucket.frozenAt = 0 bucket.current = 0 diff --git a/packages/rest/src/index.ts b/packages/rest/src/index.ts index faafb54cb..6b99548c0 100644 --- a/packages/rest/src/index.ts +++ b/packages/rest/src/index.ts @@ -4,7 +4,6 @@ export * from './convertRestError.js' export * from './createRequestBody.js' export * from './helpers/index.js' export * from './processGlobalQueue.js' -export * from './processQueue.js' export * from './processRateLimitedPaths.js' export * from './processRequest.js' export * from './processRequestHeaders.js' diff --git a/packages/rest/src/processQueue.ts b/packages/rest/src/processQueue.ts deleted file mode 100644 index 5641bbef6..000000000 --- a/packages/rest/src/processQueue.ts +++ /dev/null @@ -1,56 +0,0 @@ -import type { RestManager } from './restManager.js' - -/** Processes the queue by looping over each path separately until the queues are empty. */ -export function processQueue (rest: RestManager, id: string): void { - // const queue = rest.pathQueues.get(id); - // if (!queue) return; - // while (queue.requests.length) { - // rest.debug(`[REST - processQueue] Running while loop.`); - // if (rest.globallyRateLimited) { - // rest.debug(`[REST - processQueue] Globally rate limited.`); - // continue; - // } - // // SELECT THE FIRST ITEM FROM THIS QUEUE - // const queuedRequest = queue.requests[0]; - // // IF THIS DOESN'T HAVE ANY ITEMS JUST CANCEL, THE CLEANER WILL REMOVE IT. - // if (!queuedRequest) break; - // const basicURL = rest.simplifyUrl(queuedRequest.request.url, queuedRequest.request.method); - // // IF THIS URL IS STILL RATE LIMITED, TRY AGAIN - // const urlResetIn = rest.checkRateLimits(rest, basicURL); - // if (urlResetIn) { - // // ONLY ADD TIMEOUT IF ANOTHER QUEUE IS NOT PENDING - // if (!queue.isWaiting) { - // queue.isWaiting = true; - // setTimeout(() => { - // queue.isWaiting = false; - // rest.debug(`[REST - processQueue] rate limited, running setTimeout.`); - // rest.processQueue(rest, id); - // }, urlResetIn); - // } - // // BREAK WHILE LOOP - // break; - // } - // // IF A BUCKET EXISTS, CHECK THE BUCKET'S RATE LIMITS - // const bucketResetIn = queuedRequest.payload.bucketId - // ? rest.checkRateLimits(rest, queuedRequest.payload.bucketId) - // : false; - // // THIS BUCKET IS STILL RATE LIMITED, RE-ADD TO QUEUE - // if (bucketResetIn) continue; - // // EXECUTE THE REQUEST - // // CUSTOM HANDLER FOR USER TO LOG OR WHATEVER WHENEVER A FETCH IS MADE - // rest.debug(`[REST - Add To Global Queue] ${JSON.stringify(queuedRequest.payload)}`); - // // rest.globalQueue.push({ - // // ...queuedRequest, - // // urlToUse: queuedRequest.request.url, - // // basicURL, - // // }); - // rest.processGlobalQueue(rest, { - // ...queuedRequest, - // urlToUse: queuedRequest.request.url, - // basicURL, - // }); - // queue.requests.shift(); - // } - // // ONCE QUEUE IS DONE, WE CAN TRY CLEANING UP - // rest.cleanupQueues(rest); -} diff --git a/packages/rest/src/restManager.ts b/packages/rest/src/restManager.ts index c011ffab5..f918f8534 100644 --- a/packages/rest/src/restManager.ts +++ b/packages/rest/src/restManager.ts @@ -13,7 +13,6 @@ import type { QueueBucket } from './createQueueBucket.js' import { createRequestBody } from './createRequestBody.js' import * as helpers from './helpers/index.js' import { processGlobalQueue } from './processGlobalQueue.js' -import { processQueue } from './processQueue.js' import { processRateLimitedPaths } from './processRateLimitedPaths.js' import { processRequest } from './processRequest.js' import { processRequestHeaders } from './processRequestHeaders.js' @@ -60,7 +59,6 @@ export function createRestManager ( debug: options.debug ?? function (_text: string) {}, checkRateLimits: options.checkRateLimits ?? checkRateLimits, cleanupQueues: options.cleanupQueues ?? cleanupQueues, - processQueue: options.processQueue ?? processQueue, processRateLimitedPaths: options.processRateLimitedPaths ?? processRateLimitedPaths, processRequestHeaders: @@ -126,7 +124,6 @@ export interface CreateRestManagerOptions { debug?: (text: string) => unknown checkRateLimits?: typeof checkRateLimits cleanupQueues?: typeof cleanupQueues - processQueue?: typeof processQueue processRateLimitedPaths?: typeof processRateLimitedPaths processRequestHeaders?: typeof processRequestHeaders processRequest?: typeof processRequest @@ -165,7 +162,6 @@ export interface RestManager extends FinalHelpers { debug: (text: string) => unknown checkRateLimits: typeof checkRateLimits cleanupQueues: typeof cleanupQueues - processQueue: typeof processQueue processRateLimitedPaths: typeof processRateLimitedPaths processRequestHeaders: typeof processRequestHeaders processRequest: typeof processRequest