@discordeno/rest 19.0.0-next.40c19da → 19.0.0-next.4287398

package/dist/queue.js

@@ -11,6 +11,7 @@ export class Queue {
         /** Whether the first request is pending. */ this.firstRequest = false;
         /** When requests started being made to determine when the interval will reset it. */ this.frozenAt = 0;
         /** The time in milliseconds to wait before deleting this queue if it is empty. Defaults to 60000(one minute). */ this.deleteQueueDelay = 60000;
+        /** The authentication header used for the OAuth2 request. Defaults to an empty string for non-OAuth2 requests */ this.authentication = '';
         this.rest = rest;
         this.url = options.url;
         if (options.interval) this.interval = options.interval;
@@ -18,6 +19,7 @@ export class Queue {
         if (options.remaining) this.remaining = options.remaining;
         if (options.timeoutId) this.timeoutId = options.timeoutId;
         if (options.deleteQueueDelay) this.deleteQueueDelay = options.deleteQueueDelay;
+        if (options.authentication) this.authentication = options.authentication;
     }
     /** Check if there is any remaining requests that are allowed. */ isRequestAllowed() {
         return this.remaining > 0;
@@ -41,7 +43,7 @@ export class Queue {
         // Mark as processing so other loops don't start
         this.processing = true;
         while(this.waiting.length > 0){
-            logger.debug(`[Queue] ${this.url} process waiting while loop ran.`);
+            logger.debug(`[Queue] ${this.isOauth2Queue() ? '' : 'Bearer '}${this.url} process waiting while loop ran.`);
             if (this.isRequestAllowed()) {
                 // Resolve the next item in the queue
                 this.waiting.shift()?.();
@@ -58,7 +60,7 @@ export class Queue {
         // Mark as processing so other loops don't start
         this.processingPending = true;
         while(this.pending.length > 0){
-            logger.debug(`Queue ${this.url} process pending while loop ran with ${this.pending.length}.`);
+            logger.debug(`Queue ${this.isOauth2Queue() ? '' : 'Bearer '}${this.url} process pending while loop ran with ${this.pending.length}.`);
             if (!this.firstRequest && !this.isRequestAllowed()) {
                 const now = Date.now();
                 const future = this.frozenAt + this.interval;
@@ -67,13 +69,12 @@ export class Queue {
             }
             const request = this.pending[0];
             if (request) {
-                const basicURL = this.rest.simplifyUrl(request.url, request.method);
-                // IF THIS URL IS STILL RATE LIMITED, TRY AGAIN
+                const basicURL = this.rest.simplifyUrl(request.route, request.method);
                 // If this url is still rate limited, try again
-                const urlResetIn = this.rest.checkRateLimits(basicURL);
+                const urlResetIn = this.rest.checkRateLimits(basicURL, request.requestBodyOptions?.headers);
                 if (urlResetIn) await delay(urlResetIn);
                 // IF A BUCKET EXISTS, CHECK THE BUCKET'S RATE LIMITS
-                const bucketResetIn = request.bucketId ? this.rest.checkRateLimits(request.bucketId) : false;
+                const bucketResetIn = request.bucketId ? this.rest.checkRateLimits(request.bucketId, request.requestBodyOptions?.headers) : false;
                 if (bucketResetIn) await delay(bucketResetIn);
                 this.firstRequest = false;
                 this.remaining--;
@@ -91,7 +92,7 @@ export class Queue {
                 .catch(()=>null);
             }
         }
-        logger.debug(`Queue ${this.url} process pending while loop exited with ${this.pending.length}.`);
+        logger.debug(`Queue ${this.isOauth2Queue() ? '' : 'Bearer '}${this.url} process pending while loop exited with ${this.pending.length}.`);
         // Mark as false so next pending request can be triggered by new loop.
         this.processingPending = false;
         this.cleanup();
@@ -121,21 +122,21 @@ export class Queue {
             this.processPending();
             return;
         }
-        logger.debug(`[Queue] ${this.url}. Delaying delete for ${this.deleteQueueDelay}ms`);
+        logger.debug(`[Queue] ${this.isOauth2Queue() ? '' : 'Bearer '}${this.url}. Delaying delete for ${this.deleteQueueDelay}ms`);
         // Delete in a minute giving a bit of time to allow new requests that may reuse this queue
         setTimeout(async ()=>{
             if (!this.isQueueClearable()) {
-                logger.debug(`[Queue] ${this.url}. is not clearable. Restarting processing of queue.`);
+                logger.debug(`[Queue] ${this.isOauth2Queue() ? '' : 'Bearer '}${this.url}. is not clearable. Restarting processing of queue.`);
                 this.processPending();
                 return;
             }
             logger.debug(`[Queue] ${this.url}. Deleting`);
             if (this.timeoutId) clearTimeout(this.timeoutId);
             // No requests have been requested for this queue so we nuke this queue
-            this.rest.queues.delete(this.url);
+            this.rest.queues.delete(`${this.authentication}${this.url}`);
             logger.debug(`[Queue] ${this.url}. Deleted! Remaining: (${this.rest.queues.size})`, [
-                ...this.rest.queues.keys()
-            ]);
+                ...this.rest.queues.values()
+            ].map((queue)=>`${queue.isOauth2Queue() ? '' : 'Bearer '}${queue.url}`));
             if (this.rest.queues.size) this.processPending();
         }, this.deleteQueueDelay);
     }
@@ -148,6 +149,9 @@ export class Queue {
         if (this.processingPending) return false;
         return true;
     }
+    isOauth2Queue() {
+        return this.authentication === '';
+    }
 }
 
 //# sourceMappingURL=queue.js.map

package/dist/queue.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/queue.ts"],"sourcesContent":["import { delay, logger } from '@discordeno/utils'\nimport type { RestManager, SendRequestOptions } from './types.js'\n\nexport class Queue {\n  /** The rest manager */\n  rest: RestManager\n  /** Amount of requests that have are remaining. Defaults to 1. */\n  remaining: number = 1\n  /** Max requests for this this. Defaults to 1. */\n  max: number = 1\n  /** The time that discord allows to make the max number of requests. Defaults to 0 */\n  interval: number = 0\n  /** timer to reset to 0 */\n  timeoutId: NodeJS.Timeout | undefined\n  /** The requests that are currently pending. */\n  waiting: Array<(value: void | PromiseLike<void>) => void> = []\n  /** The requests that are currently pending. */\n  pending: SendRequestOptions[] = []\n  /** Whether or not the waiting queue is already processing. */\n  processing: boolean = false\n  /** Whether or not the pending queue is already processing. */\n  processingPending: boolean = false\n  /** Whether the first request is pending. */\n  firstRequest: boolean = false\n  /** The url that all the requests in this queue are sent to. */\n  url: string\n  /** When requests started being made to determine when the interval will reset it. */\n  frozenAt: number = 0\n  /** The time in milliseconds to wait before deleting this queue if it is empty. Defaults to 60000(one minute). */\n  deleteQueueDelay: number = 60000\n\n  constructor(rest: RestManager, options: QueueOptions) {\n    this.rest = rest\n    this.url = options.url\n\n    if (options.interval) this.interval = options.interval\n    if (options.max) this.max = options.max\n    if (options.remaining) this.remaining = options.remaining\n    if (options.timeoutId) this.timeoutId = options.timeoutId\n    if (options.deleteQueueDelay) this.deleteQueueDelay = options.deleteQueueDelay\n  }\n\n  /** Check if there is any remaining requests that are allowed. */\n  isRequestAllowed(): boolean {\n    return this.remaining > 0\n  }\n\n  /** Pauses the execution until a request is allowed to be made. */\n  async waitUntilRequestAvailable(): Promise<void> {\n    // eslint-disable-next-line no-async-promise-executor\n    return await new Promise(async (resolve) => {\n      // If whatever amount of requests is left is more than the safety margin, allow the request\n      if (this.isRequestAllowed()) {\n        // this.remaining++;\n        resolve()\n      } else {\n        this.waiting.push(resolve)\n        await this.processWaiting()\n      }\n    })\n  }\n\n  /** Process the queue of requests waiting to be handled. */\n  async processWaiting(): Promise<void> {\n    // If already processing, that loop will handle all waiting requests.\n    if (this.processing) return\n    // Mark as processing so other loops don't start\n    this.processing = true\n\n    while (this.waiting.length > 0) {\n      logger.debug(`[Queue] ${this.url} process waiting while loop ran.`)\n      if (this.isRequestAllowed()) {\n        // Resolve the next item in the queue\n        this.waiting.shift()?.()\n      } else {\n        await delay(1000)\n      }\n    }\n\n    // Mark as false so next pending request can be triggered by new loop.\n    this.processing = false\n  }\n\n  /** Process the queue of all requests pending to be sent. */\n  async processPending(): Promise<void> {\n    // If already processing, that loop will handle all pending requests.\n    if (this.processingPending || !this.pending.length) return\n\n    // Mark as processing so other loops don't start\n    this.processingPending = true\n\n    while (this.pending.length > 0) {\n      logger.debug(`Queue ${this.url} process pending while loop ran with ${this.pending.length}.`)\n      if (!this.firstRequest && !this.isRequestAllowed()) {\n        const now = Date.now()\n        const future = this.frozenAt + this.interval\n        await delay(future > now ? future - now : 1000)\n        continue\n      }\n\n      const request = this.pending[0]\n      if (request) {\n        const basicURL = this.rest.simplifyUrl(request.url, request.method)\n\n        // IF THIS URL IS STILL RATE LIMITED, TRY AGAIN\n        // If this url is still rate limited, try again\n        const urlResetIn = this.rest.checkRateLimits(basicURL)\n        if (urlResetIn) await delay(urlResetIn)\n\n        // IF A BUCKET EXISTS, CHECK THE BUCKET'S RATE LIMITS\n        const bucketResetIn = request.bucketId ? this.rest.checkRateLimits(request.bucketId) : false\n        if (bucketResetIn) await delay(bucketResetIn)\n\n        this.firstRequest = false\n        this.remaining--\n\n        if (this.timeoutId && this.remaining === 0 && this.interval !== 0) {\n          this.timeoutId = setTimeout(() => {\n            this.remaining = this.max\n            this.timeoutId = undefined\n          }, this.interval)\n        }\n\n        // Remove from queue, we are executing it.\n        this.pending.shift()\n        // Check if this request is able to be made globally\n        await this.rest.invalidBucket.waitUntilRequestAvailable()\n\n        await this.rest\n          .sendRequest(request)\n          // Should be handled in sendRequest, this catch just prevents bots from dying\n          .catch(() => null)\n      }\n    }\n\n    logger.debug(`Queue ${this.url} process pending while loop exited with ${this.pending.length}.`)\n\n    // Mark as false so next pending request can be triggered by new loop.\n    this.processingPending = false\n    this.cleanup()\n  }\n\n  handleCompletedRequest(headers: { max?: number; interval?: number; remaining?: number }): void {\n    if (headers.max === 0) {\n      this.remaining++\n      return\n    }\n\n    if (!this.frozenAt) this.frozenAt = Date.now()\n    if (headers.interval !== undefined) this.interval = headers.interval\n    if (headers.remaining !== undefined) this.remaining = headers.remaining\n\n    if (this.remaining <= 1) {\n      this.timeoutId = setTimeout(() => {\n        this.remaining = this.max\n        this.timeoutId = undefined\n      }, headers.interval)\n    }\n  }\n\n  /** Checks if a request is available and adds it to the queue. Also triggers queue processing if not already processing. */\n  async makeRequest(options: SendRequestOptions): Promise<void> {\n    await this.waitUntilRequestAvailable()\n    this.pending.push(options)\n    this.processPending()\n  }\n\n  /** Cleans up the queue by checking if there is nothing left and removing it. */\n  cleanup(): void {\n    if (!this.isQueueClearable()) {\n      this.processPending()\n      return\n    }\n\n    logger.debug(`[Queue] ${this.url}. Delaying delete for ${this.deleteQueueDelay}ms`)\n    // Delete in a minute giving a bit of time to allow new requests that may reuse this queue\n    setTimeout(async () => {\n      if (!this.isQueueClearable()) {\n        logger.debug(`[Queue] ${this.url}. is not clearable. Restarting processing of queue.`)\n        this.processPending()\n        return\n      }\n\n      logger.debug(`[Queue] ${this.url}. Deleting`)\n      if (this.timeoutId) clearTimeout(this.timeoutId)\n      // No requests have been requested for this queue so we nuke this queue\n      this.rest.queues.delete(this.url)\n      logger.debug(`[Queue] ${this.url}. Deleted! Remaining: (${this.rest.queues.size})`, [...this.rest.queues.keys()])\n      if (this.rest.queues.size) this.processPending()\n    }, this.deleteQueueDelay)\n  }\n\n  /** Simply checks if the queue is able to be cleared or it has requests pending. */\n  isQueueClearable(): boolean {\n    if (this.firstRequest) return false\n    if (this.waiting.length > 0) return false\n    if (this.pending.length > 0) return false\n    if (this.interval === 0) return false\n    if (this.processing) return false\n    if (this.processingPending) return false\n\n    return true\n  }\n}\n\nexport interface QueueOptions {\n  /** How many requests are remaining. Defaults to 1 */\n  remaining?: number\n  /** Max number of requests allowed in this this. Defaults to 1. */\n  max?: number\n  /** The time in milliseconds that discord allows to make the max number of invalid requests. Defaults to 0 */\n  interval?: number\n  /** timer to reset to 0 */\n  timeoutId?: NodeJS.Timeout\n  /** The url this queue will be handling. */\n  url: string\n  /** The time in milliseconds to wait before deleting this queue if it is empty. Defaults to 60000(one minute). */\n  deleteQueueDelay?: number\n}\n"],"names":["delay","logger","Queue","constructor","rest","options","remaining","max","interval","waiting","pending","processing","processingPending","firstRequest","frozenAt","deleteQueueDelay","url","timeoutId","isRequestAllowed","waitUntilRequestAvailable","Promise","resolve","push","processWaiting","length","debug","shift","processPending","now","Date","future","request","basicURL","simplifyUrl","method","urlResetIn","checkRateLimits","bucketResetIn","bucketId","setTimeout","undefined","invalidBucket","sendRequest","catch","cleanup","handleCompletedRequest","headers","makeRequest","isQueueClearable","clearTimeout","queues","delete","size","keys"],"mappings":"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"}
+{"version":3,"sources":["../src/queue.ts"],"sourcesContent":["import { delay, logger } from '@discordeno/utils'\nimport type { RestManager, SendRequestOptions } from './types.js'\n\nexport class Queue {\n  /** The rest manager */\n  rest: RestManager\n  /** Amount of requests that have are remaining. Defaults to 1. */\n  remaining: number = 1\n  /** Max requests for this this. Defaults to 1. */\n  max: number = 1\n  /** The time that discord allows to make the max number of requests. Defaults to 0 */\n  interval: number = 0\n  /** timer to reset to 0 */\n  timeoutId: NodeJS.Timeout | undefined\n  /** The requests that are currently pending. */\n  waiting: Array<(value: void | PromiseLike<void>) => void> = []\n  /** The requests that are currently pending. */\n  pending: SendRequestOptions[] = []\n  /** Whether or not the waiting queue is already processing. */\n  processing: boolean = false\n  /** Whether or not the pending queue is already processing. */\n  processingPending: boolean = false\n  /** Whether the first request is pending. */\n  firstRequest: boolean = false\n  /** The url that all the requests in this queue are sent to. */\n  url: string\n  /** When requests started being made to determine when the interval will reset it. */\n  frozenAt: number = 0\n  /** The time in milliseconds to wait before deleting this queue if it is empty. Defaults to 60000(one minute). */\n  deleteQueueDelay: number = 60000\n  /** The authentication header used for the OAuth2 request. Defaults to an empty string for non-OAuth2 requests */\n  authentication: string = ''\n\n  constructor(rest: RestManager, options: QueueOptions) {\n    this.rest = rest\n    this.url = options.url\n\n    if (options.interval) this.interval = options.interval\n    if (options.max) this.max = options.max\n    if (options.remaining) this.remaining = options.remaining\n    if (options.timeoutId) this.timeoutId = options.timeoutId\n    if (options.deleteQueueDelay) this.deleteQueueDelay = options.deleteQueueDelay\n    if (options.authentication) this.authentication = options.authentication\n  }\n\n  /** Check if there is any remaining requests that are allowed. */\n  isRequestAllowed(): boolean {\n    return this.remaining > 0\n  }\n\n  /** Pauses the execution until a request is allowed to be made. */\n  async waitUntilRequestAvailable(): Promise<void> {\n    // eslint-disable-next-line no-async-promise-executor\n    return await new Promise(async (resolve) => {\n      // If whatever amount of requests is left is more than the safety margin, allow the request\n      if (this.isRequestAllowed()) {\n        // this.remaining++;\n        resolve()\n      } else {\n        this.waiting.push(resolve)\n        await this.processWaiting()\n      }\n    })\n  }\n\n  /** Process the queue of requests waiting to be handled. */\n  async processWaiting(): Promise<void> {\n    // If already processing, that loop will handle all waiting requests.\n    if (this.processing) return\n    // Mark as processing so other loops don't start\n    this.processing = true\n\n    while (this.waiting.length > 0) {\n      logger.debug(`[Queue] ${this.isOauth2Queue() ? '' : 'Bearer '}${this.url} process waiting while loop ran.`)\n      if (this.isRequestAllowed()) {\n        // Resolve the next item in the queue\n        this.waiting.shift()?.()\n      } else {\n        await delay(1000)\n      }\n    }\n\n    // Mark as false so next pending request can be triggered by new loop.\n    this.processing = false\n  }\n\n  /** Process the queue of all requests pending to be sent. */\n  async processPending(): Promise<void> {\n    // If already processing, that loop will handle all pending requests.\n    if (this.processingPending || !this.pending.length) return\n\n    // Mark as processing so other loops don't start\n    this.processingPending = true\n\n    while (this.pending.length > 0) {\n      logger.debug(`Queue ${this.isOauth2Queue() ? '' : 'Bearer '}${this.url} process pending while loop ran with ${this.pending.length}.`)\n      if (!this.firstRequest && !this.isRequestAllowed()) {\n        const now = Date.now()\n        const future = this.frozenAt + this.interval\n        await delay(future > now ? future - now : 1000)\n        continue\n      }\n\n      const request = this.pending[0]\n      if (request) {\n        const basicURL = this.rest.simplifyUrl(request.route, request.method)\n\n        // If this url is still rate limited, try again\n        const urlResetIn = this.rest.checkRateLimits(basicURL, request.requestBodyOptions?.headers)\n        if (urlResetIn) await delay(urlResetIn)\n\n        // IF A BUCKET EXISTS, CHECK THE BUCKET'S RATE LIMITS\n        const bucketResetIn = request.bucketId ? this.rest.checkRateLimits(request.bucketId, request.requestBodyOptions?.headers) : false\n        if (bucketResetIn) await delay(bucketResetIn)\n\n        this.firstRequest = false\n        this.remaining--\n\n        if (this.timeoutId && this.remaining === 0 && this.interval !== 0) {\n          this.timeoutId = setTimeout(() => {\n            this.remaining = this.max\n            this.timeoutId = undefined\n          }, this.interval)\n        }\n\n        // Remove from queue, we are executing it.\n        this.pending.shift()\n        // Check if this request is able to be made globally\n        await this.rest.invalidBucket.waitUntilRequestAvailable()\n\n        await this.rest\n          .sendRequest(request)\n          // Should be handled in sendRequest, this catch just prevents bots from dying\n          .catch(() => null)\n      }\n    }\n\n    logger.debug(`Queue ${this.isOauth2Queue() ? '' : 'Bearer '}${this.url} process pending while loop exited with ${this.pending.length}.`)\n\n    // Mark as false so next pending request can be triggered by new loop.\n    this.processingPending = false\n    this.cleanup()\n  }\n\n  handleCompletedRequest(headers: { max?: number; interval?: number; remaining?: number }): void {\n    if (headers.max === 0) {\n      this.remaining++\n      return\n    }\n\n    if (!this.frozenAt) this.frozenAt = Date.now()\n    if (headers.interval !== undefined) this.interval = headers.interval\n    if (headers.remaining !== undefined) this.remaining = headers.remaining\n\n    if (this.remaining <= 1) {\n      this.timeoutId = setTimeout(() => {\n        this.remaining = this.max\n        this.timeoutId = undefined\n      }, headers.interval)\n    }\n  }\n\n  /** Checks if a request is available and adds it to the queue. Also triggers queue processing if not already processing. */\n  async makeRequest(options: SendRequestOptions): Promise<void> {\n    await this.waitUntilRequestAvailable()\n    this.pending.push(options)\n    this.processPending()\n  }\n\n  /** Cleans up the queue by checking if there is nothing left and removing it. */\n  cleanup(): void {\n    if (!this.isQueueClearable()) {\n      this.processPending()\n      return\n    }\n\n    logger.debug(`[Queue] ${this.isOauth2Queue() ? '' : 'Bearer '}${this.url}. Delaying delete for ${this.deleteQueueDelay}ms`)\n    // Delete in a minute giving a bit of time to allow new requests that may reuse this queue\n    setTimeout(async () => {\n      if (!this.isQueueClearable()) {\n        logger.debug(`[Queue] ${this.isOauth2Queue() ? '' : 'Bearer '}${this.url}. is not clearable. Restarting processing of queue.`)\n        this.processPending()\n        return\n      }\n\n      logger.debug(`[Queue] ${this.url}. Deleting`)\n      if (this.timeoutId) clearTimeout(this.timeoutId)\n      // No requests have been requested for this queue so we nuke this queue\n      this.rest.queues.delete(`${this.authentication}${this.url}`)\n      logger.debug(\n        `[Queue] ${this.url}. Deleted! Remaining: (${this.rest.queues.size})`,\n        [...this.rest.queues.values()].map((queue) => `${queue.isOauth2Queue() ? '' : 'Bearer '}${queue.url}`),\n      )\n      if (this.rest.queues.size) this.processPending()\n    }, this.deleteQueueDelay)\n  }\n\n  /** Simply checks if the queue is able to be cleared or it has requests pending. */\n  isQueueClearable(): boolean {\n    if (this.firstRequest) return false\n    if (this.waiting.length > 0) return false\n    if (this.pending.length > 0) return false\n    if (this.interval === 0) return false\n    if (this.processing) return false\n    if (this.processingPending) return false\n\n    return true\n  }\n\n  isOauth2Queue(): boolean {\n    return this.authentication === ''\n  }\n}\n\nexport interface QueueOptions {\n  /** How many requests are remaining. Defaults to 1 */\n  remaining?: number\n  /** Max number of requests allowed in this this. Defaults to 1. */\n  max?: number\n  /** The time in milliseconds that discord allows to make the max number of invalid requests. Defaults to 0 */\n  interval?: number\n  /** timer to reset to 0 */\n  timeoutId?: NodeJS.Timeout\n  /** The url this queue will be handling. */\n  url: string\n  /** The time in milliseconds to wait before deleting this queue if it is empty. Defaults to 60000(one minute). */\n  deleteQueueDelay?: number\n  /** Authentication used for the request. In non-OAuth2 situations should be an empty string. Defaults to an empty string */\n  authentication?: string\n}\n"],"names":["delay","logger","Queue","constructor","rest","options","remaining","max","interval","waiting","pending","processing","processingPending","firstRequest","frozenAt","deleteQueueDelay","authentication","url","timeoutId","isRequestAllowed","waitUntilRequestAvailable","Promise","resolve","push","processWaiting","length","debug","isOauth2Queue","shift","processPending","now","Date","future","request","basicURL","simplifyUrl","route","method","urlResetIn","checkRateLimits","requestBodyOptions","headers","bucketResetIn","bucketId","setTimeout","undefined","invalidBucket","sendRequest","catch","cleanup","handleCompletedRequest","makeRequest","isQueueClearable","clearTimeout","queues","delete","size","values","map","queue"],"mappings":"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"}

package/dist/routes.d.ts

@@ -0,0 +1,3 @@
+import type { RestRoutes } from './typings/routes.js';
+export declare function createRoutes(): RestRoutes;
+//# sourceMappingURL=routes.d.ts.map

package/dist/routes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAErD,wBAAgB,YAAY,IAAI,UAAU,CA+kBzC"}