@discordeno/rest 19.0.0-next.8ed5aed → 19.0.0-next.8f2daff

package/dist/invalidBucket.js

@@ -21,7 +21,7 @@ import { delay, logger } from '@discordeno/utils';
         processing: false,
         waiting: [],
         requestsAllowed: function() {
-            if (bucket.resetAt !== undefined && Date.now() > bucket.resetAt) {
+            if (bucket.resetAt !== undefined && Date.now() >= bucket.resetAt) {
                 bucket.invalidRequests = 0;
                 bucket.resetAt = Date.now() + bucket.interval;
             }
@@ -45,14 +45,13 @@ import { delay, logger } from '@discordeno/utils';
         },
         processWaiting: async function() {
             // If already processing, that loop will handle all waiting requests.
-            if (bucket.processing) {
-                return;
-            }
+            if (bucket.processing) return;
             // Mark as processing so other loops don't start
             bucket.processing = true;
             while(bucket.waiting.length > 0){
-                logger.info(`[InvalidBucket] processing waiting queue while loop ran with ${bucket.waiting.length} remaining.`);
-                if (bucket.resetAt !== undefined && !bucket.isRequestAllowed()) {
+                logger.info(`[InvalidBucket] processing waiting queue while loop ran with ${bucket.waiting.length} pending requests to be made. ${JSON.stringify(bucket)}`);
+                if (!bucket.isRequestAllowed() && bucket.resetAt !== undefined) {
+                    logger.warn(`[InvalidBucket] processing waiting queue is now paused until more requests are available. ${bucket.waiting.length} pending requests. ${JSON.stringify(bucket)}`);
                     await delay(bucket.resetAt - Date.now());
                 }
                 bucket.activeRequests += 1;
@@ -74,6 +73,7 @@ import { delay, logger } from '@discordeno/utils';
                 bucket.resetAt = Date.now() + bucket.interval;
             }
             bucket.invalidRequests += 1;
+            logger.warn(`[InvalidBucket] an invalid request was made. Increasing invalidRequests count to ${bucket.invalidRequests}`);
         }
     };
     return bucket;

package/dist/invalidBucket.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/invalidBucket.ts"],"sourcesContent":["import { delay, logger } from '@discordeno/utils'\n\n/**\n * A invalid request bucket is used in a similar manner as a leaky bucket but a invalid request bucket can be refilled as needed.\n * It's purpose is to make sure the bot does not hit the limit to getting a 1 hr ban.\n *\n * @param options The options used to configure this bucket.\n * @returns RefillingBucket\n */\nexport function createInvalidRequestBucket(options: InvalidRequestBucketOptions): InvalidRequestBucket {\n  const bucket: InvalidRequestBucket = {\n    invalidRequests: options.current ?? 0,\n    max: options.max ?? 10000,\n    interval: options.interval ?? 600_000, // 10 minutes\n    resetAt: options.resetAt,\n    safety: options.safety ?? 1,\n    errorStatuses: options.errorStatuses ?? [401, 403, 429],\n    activeRequests: options.requested ?? 0,\n    processing: false,\n\n    waiting: [],\n\n    requestsAllowed: function () {\n      if (bucket.resetAt !== undefined && Date.now() > bucket.resetAt) {\n        bucket.invalidRequests = 0\n        bucket.resetAt = Date.now() + bucket.interval\n      }\n\n      return bucket.max - bucket.invalidRequests - bucket.activeRequests - bucket.safety\n    },\n\n    isRequestAllowed: function () {\n      return bucket.requestsAllowed() > 0\n    },\n\n    waitUntilRequestAvailable: async function () {\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 (bucket.isRequestAllowed()) {\n          bucket.activeRequests += 1\n          resolve()\n        } else {\n          bucket.waiting.push(resolve)\n          await bucket.processWaiting()\n        }\n      })\n    },\n\n    processWaiting: async function () {\n      // If already processing, that loop will handle all waiting requests.\n      if (bucket.processing) {\n        return\n      }\n\n      // Mark as processing so other loops don't start\n      bucket.processing = true\n\n      while (bucket.waiting.length > 0) {\n        logger.info(`[InvalidBucket] processing waiting queue while loop ran with ${bucket.waiting.length} remaining.`)\n\n        if (bucket.resetAt !== undefined && !bucket.isRequestAllowed()) {\n          await delay(bucket.resetAt - Date.now())\n        }\n\n        bucket.activeRequests += 1\n        // Resolve the next item in the queue\n        bucket.waiting.shift()?.()\n      }\n\n      // Mark as false so next pending request can be triggered by new loop.\n      bucket.processing = false\n    },\n\n    handleCompletedRequest: function (code, sharedScope) {\n      // Since request is complete, we can remove one from requested.\n      bucket.activeRequests -= 1\n      // Since it is as a valid request, we don't need to do anything\n      if (!bucket.errorStatuses.includes(code)) return\n      // Shared scope is not considered invalid\n      if (code === 429 && sharedScope) return\n\n      // INVALID REQUEST WAS MADE\n      if (bucket.resetAt === undefined) {\n        bucket.resetAt = Date.now() + bucket.interval\n      }\n\n      bucket.invalidRequests += 1\n    },\n  }\n\n  return bucket\n}\n\nexport interface InvalidRequestBucketOptions {\n  /** current invalid amount */\n  current?: number\n  /** max invalid requests allowed until ban. Defaults to 10,000 */\n  max?: number\n  /** The time that discord allows to make the max number of invalid requests. Defaults to 10 minutes */\n  interval?: number\n  /** When the timeout for the bucket has started at. */\n  resetAt?: number\n  /** how safe to be from max. Defaults to 1 */\n  safety?: number\n  /** The request statuses that count as an invalid request. */\n  errorStatuses?: number[]\n  /** The amount of requests that were requested from this bucket. */\n  requested?: number\n}\n\nexport interface InvalidRequestBucket {\n  /** current invalid amount */\n  invalidRequests: number\n  /** max invalid requests allowed until ban. Defaults to 10,000 */\n  max: number\n  /** The time that discord allows to make the max number of invalid requests. Defaults to 10 minutes */\n  interval: number\n  /** When the timeout for this bucket has started at. */\n  resetAt: number | undefined\n  /** how safe to be from max. Defaults to 1 */\n  safety: number\n  /** The request statuses that count as an invalid request. */\n  errorStatuses: number[]\n  /** The amount of requests that were requested from this bucket. */\n  activeRequests: number\n  /** The requests that are currently pending. */\n  waiting: Array<(value: void | PromiseLike<void>) => void>\n  /** Whether or not the waiting queue is already processing. */\n  processing: boolean\n\n  /** Gives the number of requests that are currently allowed. */\n  requestsAllowed: () => number\n  /** Checks if a request is allowed at this time. */\n  isRequestAllowed: () => boolean\n  /** Waits until a request is available */\n  waitUntilRequestAvailable: () => Promise<void>\n  /** Begins processing the waiting queue of requests. */\n  processWaiting: () => Promise<void>\n  /** Handler for whenever a request is validated. This should update the requested values or trigger any other necessary stuff. */\n  handleCompletedRequest: (code: number, sharedScope: boolean) => void\n}\n"],"names":["delay","logger","createInvalidRequestBucket","options","bucket","invalidRequests","current","max","interval","resetAt","safety","errorStatuses","activeRequests","requested","processing","waiting","requestsAllowed","undefined","Date","now","isRequestAllowed","waitUntilRequestAvailable","Promise","resolve","push","processWaiting","length","info","shift","handleCompletedRequest","code","sharedScope","includes"],"mappings":"AAAA,SAASA,KAAK,EAAEC,MAAM,QAAQ,oBAAmB;AAEjD;;;;;;CAMC,GACD,OAAO,SAASC,2BAA2BC,OAAoC,EAAwB;IACrG,MAAMC,SAA+B;QACnCC,iBAAiBF,QAAQG,OAAO,IAAI;QACpCC,KAAKJ,QAAQI,GAAG,IAAI;QACpBC,UAAUL,QAAQK,QAAQ,IAAI;QAC9BC,SAASN,QAAQM,OAAO;QACxBC,QAAQP,QAAQO,MAAM,IAAI;QAC1BC,eAAeR,QAAQQ,aAAa,IAAI;YAAC;YAAK;YAAK;SAAI;QACvDC,gBAAgBT,QAAQU,SAAS,IAAI;QACrCC,YAAY,KAAK;QAEjBC,SAAS,EAAE;QAEXC,iBAAiB,WAAY;YAC3B,IAAIZ,OAAOK,OAAO,KAAKQ,aAAaC,KAAKC,GAAG,KAAKf,OAAOK,OAAO,EAAE;gBAC/DL,OAAOC,eAAe,GAAG;gBACzBD,OAAOK,OAAO,GAAGS,KAAKC,GAAG,KAAKf,OAAOI,QAAQ;YAC/C,CAAC;YAED,OAAOJ,OAAOG,GAAG,GAAGH,OAAOC,eAAe,GAAGD,OAAOQ,cAAc,GAAGR,OAAOM,MAAM;QACpF;QAEAU,kBAAkB,WAAY;YAC5B,OAAOhB,OAAOY,eAAe,KAAK;QACpC;QAEAK,2BAA2B,iBAAkB;YAC3C,qDAAqD;YACrD,OAAO,MAAM,IAAIC,QAAQ,OAAOC,UAAY;gBAC1C,2FAA2F;gBAC3F,IAAInB,OAAOgB,gBAAgB,IAAI;oBAC7BhB,OAAOQ,cAAc,IAAI;oBACzBW;gBACF,OAAO;oBACLnB,OAAOW,OAAO,CAACS,IAAI,CAACD;oBACpB,MAAMnB,OAAOqB,cAAc;gBAC7B,CAAC;YACH;QACF;QAEAA,gBAAgB,iBAAkB;YAChC,qEAAqE;YACrE,IAAIrB,OAAOU,UAAU,EAAE;gBACrB;YACF,CAAC;YAED,gDAAgD;YAChDV,OAAOU,UAAU,GAAG,IAAI;YAExB,MAAOV,OAAOW,OAAO,CAACW,MAAM,GAAG,EAAG;gBAChCzB,OAAO0B,IAAI,CAAC,CAAC,6DAA6D,EAAEvB,OAAOW,OAAO,CAACW,MAAM,CAAC,WAAW,CAAC;gBAE9G,IAAItB,OAAOK,OAAO,KAAKQ,aAAa,CAACb,OAAOgB,gBAAgB,IAAI;oBAC9D,MAAMpB,MAAMI,OAAOK,OAAO,GAAGS,KAAKC,GAAG;gBACvC,CAAC;gBAEDf,OAAOQ,cAAc,IAAI;gBACzB,qCAAqC;gBACrCR,OAAOW,OAAO,CAACa,KAAK;YACtB;YAEA,sEAAsE;YACtExB,OAAOU,UAAU,GAAG,KAAK;QAC3B;QAEAe,wBAAwB,SAAUC,IAAI,EAAEC,WAAW,EAAE;YACnD,+DAA+D;YAC/D3B,OAAOQ,cAAc,IAAI;YACzB,+DAA+D;YAC/D,IAAI,CAACR,OAAOO,aAAa,CAACqB,QAAQ,CAACF,OAAO;YAC1C,yCAAyC;YACzC,IAAIA,SAAS,OAAOC,aAAa;YAEjC,2BAA2B;YAC3B,IAAI3B,OAAOK,OAAO,KAAKQ,WAAW;gBAChCb,OAAOK,OAAO,GAAGS,KAAKC,GAAG,KAAKf,OAAOI,QAAQ;YAC/C,CAAC;YAEDJ,OAAOC,eAAe,IAAI;QAC5B;IACF;IAEA,OAAOD;AACT,CAAC"}
+{"version":3,"sources":["../src/invalidBucket.ts"],"sourcesContent":["import { delay, logger } from '@discordeno/utils'\n\n/**\n * A invalid request bucket is used in a similar manner as a leaky bucket but a invalid request bucket can be refilled as needed.\n * It's purpose is to make sure the bot does not hit the limit to getting a 1 hr ban.\n *\n * @param options The options used to configure this bucket.\n * @returns RefillingBucket\n */\nexport function createInvalidRequestBucket(options: InvalidRequestBucketOptions): InvalidRequestBucket {\n  const bucket: InvalidRequestBucket = {\n    invalidRequests: options.current ?? 0,\n    max: options.max ?? 10000,\n    interval: options.interval ?? 600_000, // 10 minutes\n    resetAt: options.resetAt,\n    safety: options.safety ?? 1,\n    errorStatuses: options.errorStatuses ?? [401, 403, 429],\n    activeRequests: options.requested ?? 0,\n    processing: false,\n\n    waiting: [],\n\n    requestsAllowed: function () {\n      if (bucket.resetAt !== undefined && Date.now() >= bucket.resetAt) {\n        bucket.invalidRequests = 0\n        bucket.resetAt = Date.now() + bucket.interval\n      }\n\n      return bucket.max - bucket.invalidRequests - bucket.activeRequests - bucket.safety\n    },\n\n    isRequestAllowed: function () {\n      return bucket.requestsAllowed() > 0\n    },\n\n    waitUntilRequestAvailable: async function () {\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 (bucket.isRequestAllowed()) {\n          bucket.activeRequests += 1\n          resolve()\n        } else {\n          bucket.waiting.push(resolve)\n          await bucket.processWaiting()\n        }\n      })\n    },\n\n    processWaiting: async function () {\n      // If already processing, that loop will handle all waiting requests.\n      if (bucket.processing) return\n\n      // Mark as processing so other loops don't start\n      bucket.processing = true\n\n      while (bucket.waiting.length > 0) {\n        logger.info(`[InvalidBucket] processing waiting queue while loop ran with ${bucket.waiting.length} pending requests to be made. ${JSON.stringify(bucket)}`)\n\n        if (!bucket.isRequestAllowed() && bucket.resetAt !== undefined) {\n          logger.warn(`[InvalidBucket] processing waiting queue is now paused until more requests are available. ${bucket.waiting.length} pending requests. ${JSON.stringify(bucket)}`)\n          await delay(bucket.resetAt - Date.now())\n        }\n\n        bucket.activeRequests += 1\n        // Resolve the next item in the queue\n        bucket.waiting.shift()?.()\n      }\n\n      // Mark as false so next pending request can be triggered by new loop.\n      bucket.processing = false\n    },\n\n    handleCompletedRequest: function (code, sharedScope) {\n      // Since request is complete, we can remove one from requested.\n      bucket.activeRequests -= 1\n      // Since it is as a valid request, we don't need to do anything\n      if (!bucket.errorStatuses.includes(code)) return\n      // Shared scope is not considered invalid\n      if (code === 429 && sharedScope) return\n\n      // INVALID REQUEST WAS MADE\n      if (bucket.resetAt === undefined) {\n        bucket.resetAt = Date.now() + bucket.interval\n      }\n\n      bucket.invalidRequests += 1\n      logger.warn(`[InvalidBucket] an invalid request was made. Increasing invalidRequests count to ${bucket.invalidRequests}`)\n    },\n  }\n\n  return bucket\n}\n\nexport interface InvalidRequestBucketOptions {\n  /** current invalid amount */\n  current?: number\n  /** max invalid requests allowed until ban. Defaults to 10,000 */\n  max?: number\n  /** The time that discord allows to make the max number of invalid requests. Defaults to 10 minutes */\n  interval?: number\n  /** When the timeout for the bucket has started at. */\n  resetAt?: number\n  /** how safe to be from max. Defaults to 1 */\n  safety?: number\n  /** The request statuses that count as an invalid request. */\n  errorStatuses?: number[]\n  /** The amount of requests that were requested from this bucket. */\n  requested?: number\n}\n\nexport interface InvalidRequestBucket {\n  /** current invalid amount */\n  invalidRequests: number\n  /** max invalid requests allowed until ban. Defaults to 10,000 */\n  max: number\n  /** The time that discord allows to make the max number of invalid requests. Defaults to 10 minutes */\n  interval: number\n  /** When the timeout for this bucket has started at. */\n  resetAt: number | undefined\n  /** how safe to be from max. Defaults to 1 */\n  safety: number\n  /** The request statuses that count as an invalid request. */\n  errorStatuses: number[]\n  /** The amount of requests that were requested from this bucket. */\n  activeRequests: number\n  /** The requests that are currently pending. */\n  waiting: Array<(value: void | PromiseLike<void>) => void>\n  /** Whether or not the waiting queue is already processing. */\n  processing: boolean\n\n  /** Gives the number of requests that are currently allowed. */\n  requestsAllowed: () => number\n  /** Checks if a request is allowed at this time. */\n  isRequestAllowed: () => boolean\n  /** Waits until a request is available */\n  waitUntilRequestAvailable: () => Promise<void>\n  /** Begins processing the waiting queue of requests. */\n  processWaiting: () => Promise<void>\n  /** Handler for whenever a request is validated. This should update the requested values or trigger any other necessary stuff. */\n  handleCompletedRequest: (code: number, sharedScope: boolean) => void\n}\n"],"names":["delay","logger","createInvalidRequestBucket","options","bucket","invalidRequests","current","max","interval","resetAt","safety","errorStatuses","activeRequests","requested","processing","waiting","requestsAllowed","undefined","Date","now","isRequestAllowed","waitUntilRequestAvailable","Promise","resolve","push","processWaiting","length","info","JSON","stringify","warn","shift","handleCompletedRequest","code","sharedScope","includes"],"mappings":"AAAA,SAASA,KAAK,EAAEC,MAAM,QAAQ,oBAAmB;AAEjD;;;;;;CAMC,GACD,OAAO,SAASC,2BAA2BC,OAAoC,EAAwB;IACrG,MAAMC,SAA+B;QACnCC,iBAAiBF,QAAQG,OAAO,IAAI;QACpCC,KAAKJ,QAAQI,GAAG,IAAI;QACpBC,UAAUL,QAAQK,QAAQ,IAAI;QAC9BC,SAASN,QAAQM,OAAO;QACxBC,QAAQP,QAAQO,MAAM,IAAI;QAC1BC,eAAeR,QAAQQ,aAAa,IAAI;YAAC;YAAK;YAAK;SAAI;QACvDC,gBAAgBT,QAAQU,SAAS,IAAI;QACrCC,YAAY,KAAK;QAEjBC,SAAS,EAAE;QAEXC,iBAAiB,WAAY;YAC3B,IAAIZ,OAAOK,OAAO,KAAKQ,aAAaC,KAAKC,GAAG,MAAMf,OAAOK,OAAO,EAAE;gBAChEL,OAAOC,eAAe,GAAG;gBACzBD,OAAOK,OAAO,GAAGS,KAAKC,GAAG,KAAKf,OAAOI,QAAQ;YAC/C,CAAC;YAED,OAAOJ,OAAOG,GAAG,GAAGH,OAAOC,eAAe,GAAGD,OAAOQ,cAAc,GAAGR,OAAOM,MAAM;QACpF;QAEAU,kBAAkB,WAAY;YAC5B,OAAOhB,OAAOY,eAAe,KAAK;QACpC;QAEAK,2BAA2B,iBAAkB;YAC3C,qDAAqD;YACrD,OAAO,MAAM,IAAIC,QAAQ,OAAOC,UAAY;gBAC1C,2FAA2F;gBAC3F,IAAInB,OAAOgB,gBAAgB,IAAI;oBAC7BhB,OAAOQ,cAAc,IAAI;oBACzBW;gBACF,OAAO;oBACLnB,OAAOW,OAAO,CAACS,IAAI,CAACD;oBACpB,MAAMnB,OAAOqB,cAAc;gBAC7B,CAAC;YACH;QACF;QAEAA,gBAAgB,iBAAkB;YAChC,qEAAqE;YACrE,IAAIrB,OAAOU,UAAU,EAAE;YAEvB,gDAAgD;YAChDV,OAAOU,UAAU,GAAG,IAAI;YAExB,MAAOV,OAAOW,OAAO,CAACW,MAAM,GAAG,EAAG;gBAChCzB,OAAO0B,IAAI,CAAC,CAAC,6DAA6D,EAAEvB,OAAOW,OAAO,CAACW,MAAM,CAAC,8BAA8B,EAAEE,KAAKC,SAAS,CAACzB,QAAQ,CAAC;gBAE1J,IAAI,CAACA,OAAOgB,gBAAgB,MAAMhB,OAAOK,OAAO,KAAKQ,WAAW;oBAC9DhB,OAAO6B,IAAI,CAAC,CAAC,0FAA0F,EAAE1B,OAAOW,OAAO,CAACW,MAAM,CAAC,mBAAmB,EAAEE,KAAKC,SAAS,CAACzB,QAAQ,CAAC;oBAC5K,MAAMJ,MAAMI,OAAOK,OAAO,GAAGS,KAAKC,GAAG;gBACvC,CAAC;gBAEDf,OAAOQ,cAAc,IAAI;gBACzB,qCAAqC;gBACrCR,OAAOW,OAAO,CAACgB,KAAK;YACtB;YAEA,sEAAsE;YACtE3B,OAAOU,UAAU,GAAG,KAAK;QAC3B;QAEAkB,wBAAwB,SAAUC,IAAI,EAAEC,WAAW,EAAE;YACnD,+DAA+D;YAC/D9B,OAAOQ,cAAc,IAAI;YACzB,+DAA+D;YAC/D,IAAI,CAACR,OAAOO,aAAa,CAACwB,QAAQ,CAACF,OAAO;YAC1C,yCAAyC;YACzC,IAAIA,SAAS,OAAOC,aAAa;YAEjC,2BAA2B;YAC3B,IAAI9B,OAAOK,OAAO,KAAKQ,WAAW;gBAChCb,OAAOK,OAAO,GAAGS,KAAKC,GAAG,KAAKf,OAAOI,QAAQ;YAC/C,CAAC;YAEDJ,OAAOC,eAAe,IAAI;YAC1BJ,OAAO6B,IAAI,CAAC,CAAC,iFAAiF,EAAE1B,OAAOC,eAAe,CAAC,CAAC;QAC1H;IACF;IAEA,OAAOD;AACT,CAAC"}

package/dist/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAkDA,OAAO,KAAK,EAA4B,wBAAwB,EAAE,WAAW,EAAsB,MAAM,YAAY,CAAA;AAMrH,eAAO,MAAM,mBAAmB,KAAK,CAAA;AACrC,eAAO,MAAM,eAAe,4BAA4B,CAAA;AAExD,eAAO,MAAM,uBAAuB,uBAAuB,CAAA;AAC3D,eAAO,MAAM,2BAA2B,0BAA0B,CAAA;AAClE,eAAO,MAAM,6BAA6B,4BAA4B,CAAA;AACtE,eAAO,MAAM,wBAAwB,uBAAuB,CAAA;AAC5D,eAAO,MAAM,wBAAwB,uBAAuB,CAAA;AAC5D,eAAO,MAAM,uBAAuB,sBAAsB,CAAA;AAC1D,eAAO,MAAM,uBAAuB,sBAAsB,CAAA;AAE1D,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,WAAW,CAwnChF"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAyDA,OAAO,KAAK,EAA4B,wBAAwB,EAAsB,WAAW,EAAsB,MAAM,YAAY,CAAA;AAKzI,eAAO,MAAM,mBAAmB,KAAK,CAAA;AACrC,eAAO,MAAM,eAAe,4BAA4B,CAAA;AAExD,eAAO,MAAM,uBAAuB,uBAAuB,CAAA;AAC3D,eAAO,MAAM,2BAA2B,0BAA0B,CAAA;AAClE,eAAO,MAAM,6BAA6B,4BAA4B,CAAA;AACtE,eAAO,MAAM,wBAAwB,uBAAuB,CAAA;AAC5D,eAAO,MAAM,wBAAwB,uBAAuB,CAAA;AAC5D,eAAO,MAAM,uBAAuB,sBAAsB,CAAA;AAC1D,eAAO,MAAM,uBAAuB,sBAAsB,CAAA;AAE1D,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,WAAW,CAs3ChF"}

package/dist/manager.js

@@ -1,8 +1,8 @@
-/* eslint-disable @typescript-eslint/restrict-template-expressions */ /* eslint-disable no-const-assign */ import { InteractionResponseTypes } from '@discordeno/types';
+/* eslint-disable @typescript-eslint/restrict-template-expressions */ /* eslint-disable no-const-assign */ import { Buffer } from 'node:buffer';
 import { calculateBits, camelize, camelToSnakeCase, delay, getBotIdFromToken, logger, processReactionString, urlToBase64 } from '@discordeno/utils';
-import fetch from 'node-fetch';
 import { createInvalidRequestBucket } from './invalidBucket.js';
 import { Queue } from './queue.js';
+import { InteractionResponseTypes } from '@discordeno/types';
 import { createRoutes } from './routes.js';
 // TODO: make dynamic based on package.json file
 const version = '19.0.0-alpha.1';
@@ -24,6 +24,7 @@ export function createRestManager(options) {
     const rest = {
         applicationId,
         authorization: options.proxy?.authorization,
+        authorizationHeader: options.proxy?.authorizationHeader ?? 'authorization',
         baseUrl,
         deleteQueueDelay: 60000,
         globallyRateLimited: false,
@@ -36,8 +37,14 @@ export function createRestManager(options) {
         token: options.token,
         version: options.version ?? DISCORD_API_VERSION,
         routes: createRoutes(),
-        checkRateLimits (url) {
-            const ratelimited = rest.rateLimitedPaths.get(url);
+        createBaseHeaders () {
+            return {
+                'user-agent': `DiscordBot (https://github.com/discordeno/discordeno, v${version})`
+            };
+        },
+        checkRateLimits (url, headers) {
+            const authHeader = headers?.authorization ?? '';
+            const ratelimited = rest.rateLimitedPaths.get(`${authHeader}${url}`);
             const global = rest.rateLimitedPaths.get('global');
             const now = Date.now();
             if (ratelimited && now < ratelimited.resetTimestamp) {
@@ -56,20 +63,27 @@ export function createRestManager(options) {
                 }
                 const newObj = {};
                 for (const key of Object.keys(obj)){
-                    // Keys that dont require snake casing
-                    if ([
-                        'permissions',
-                        'allow',
-                        'deny'
-                    ].includes(key)) {
-                        newObj[key] = calculateBits(obj[key]);
-                        continue;
+                    const value = obj[key];
+                    // Some falsy values should be allowed like null or 0
+                    if (value !== undefined) {
+                        switch(key){
+                            case 'permissions':
+                            case 'allow':
+                            case 'deny':
+                                newObj[key] = typeof value === 'string' ? value : calculateBits(value);
+                                continue;
+                            case 'defaultMemberPermissions':
+                                newObj.default_member_permissions = typeof value === 'string' ? value : calculateBits(value);
+                                continue;
+                            case 'nameLocalizations':
+                                newObj.name_localizations = value;
+                                continue;
+                            case 'descriptionLocalizations':
+                                newObj.description_localizations = value;
+                                continue;
+                        }
                     }
-                    if (key === 'defaultMemberPermissions') {
-                        newObj.default_member_permissions = calculateBits(obj[key]);
-                        continue;
-                    }
-                    newObj[camelToSnakeCase(key)] = rest.changeToDiscordFormat(obj[key]);
+                    newObj[camelToSnakeCase(key)] = rest.changeToDiscordFormat(value);
                 }
                 return newObj;
             }
@@ -77,10 +91,8 @@ export function createRestManager(options) {
             return obj;
         },
         createRequestBody (method, options) {
-            const headers = {
-                'user-agent': `DiscordBot (https://github.com/discordeno/discordeno, v${version})`
-            };
-            if (options?.unauthorized !== false) headers.authorization = `Bot ${rest.token}`;
+            const headers = this.createBaseHeaders();
+            if (options?.unauthorized !== true) headers.authorization = `Bot ${rest.token}`;
             // IF A REASON IS PROVIDED ENCODE IT IN HEADERS
             if (options?.reason !== undefined) {
                 headers[AUDIT_LOG_REASON_HEADER] = encodeURIComponent(options?.reason);
@@ -94,12 +106,21 @@ export function createRestManager(options) {
                 for(let i = 0; i < options.files.length; ++i){
                     form.append(`file${i}`, options.files[i].blob, options.files[i].name);
                 }
-                form.append('payload_json', JSON.stringify({
+                // Have to use changeToDiscordFormat or else JSON.stringify may throw an error for the presence of BigInt(s) in the json
+                form.append('payload_json', JSON.stringify(rest.changeToDiscordFormat({
                     ...options.body,
                     files: undefined
-                }));
+                })));
+                // No need to set the `content-type` header since `fetch` does that automatically for us when we use a `FormData` object.
                 body = form;
-            // No need to set the `content-type` header since `fetch` does that automatically for us when we use a `FormData` object.
+            } else if (options?.body && options.headers && options.headers['content-type'] === 'application/x-www-form-urlencoded') {
+                // OAuth2 body handling
+                const formBody = [];
+                const discordBody = rest.changeToDiscordFormat(options.body);
+                for(const prop in discordBody){
+                    formBody.push(`${encodeURIComponent(prop)}=${encodeURIComponent(discordBody[prop])}`);
+                }
+                body = formBody.join('&');
             } else if (options?.body !== undefined) {
                 if (options.body instanceof FormData) {
                     body = options.body;
@@ -146,7 +167,7 @@ export function createRestManager(options) {
                 }, 1000);
             }
         },
-        /** Processes the rate limit headers and determines if it needs to be rate limited and returns the bucket id if available */ processHeaders (url, headers) {
+        /** Processes the rate limit headers and determines if it needs to be rate limited and returns the bucket id if available */ processHeaders (url, headers, requestAuthorization) {
             let rateLimited = false;
             // GET ALL NECESSARY HEADERS
             const remaining = headers.get(RATE_LIMIT_REMAINING_HEADER);
@@ -156,7 +177,7 @@ export function createRestManager(options) {
             // undefined override null needed for typings
             const bucketId = headers.get(RATE_LIMIT_BUCKET_HEADER) ?? undefined;
             const limit = headers.get(RATE_LIMIT_LIMIT_HEADER);
-            rest.queues.get(url)?.handleCompletedRequest({
+            rest.queues.get(`${requestAuthorization}${url}`)?.handleCompletedRequest({
                 remaining: remaining ? Number(remaining) : undefined,
                 interval: retryAfter ? Number(retryAfter) * 1000 : undefined,
                 max: limit ? Number(limit) : undefined
@@ -165,14 +186,14 @@ export function createRestManager(options) {
             if (remaining === '0') {
                 rateLimited = true;
                 // SAVE THE URL AS LIMITED, IMPORTANT FOR NEW REQUESTS BY USER WITHOUT BUCKET
-                rest.rateLimitedPaths.set(url, {
+                rest.rateLimitedPaths.set(`${requestAuthorization}${url}`, {
                     url,
                     resetTimestamp: reset,
                     bucketId
                 });
                 // SAVE THE BUCKET AS LIMITED SINCE DIFFERENT URLS MAY SHARE A BUCKET
                 if (bucketId) {
-                    rest.rateLimitedPaths.set(bucketId, {
+                    rest.rateLimitedPaths.set(`${requestAuthorization}${bucketId}`, {
                         url,
                         resetTimestamp: reset,
                         bucketId
@@ -181,8 +202,8 @@ export function createRestManager(options) {
             }
             // IF THERE IS NO REMAINING GLOBAL LIMIT, MARK IT RATE LIMITED GLOBALLY
             if (global) {
-                const retryAfter = headers.get('retry-after');
-                const globalReset = Date.now() + Number(retryAfter) * 1000;
+                const retryAfter = Number(headers.get('retry-after')) * 1000;
+                const globalReset = Date.now() + retryAfter;
                 //   rest.debug(
                 // `[REST = Globally Rate Limited] URL: ${url} | Global Rest: ${globalReset}`
                 //   )
@@ -190,14 +211,14 @@ export function createRestManager(options) {
                 rateLimited = true;
                 setTimeout(()=>{
                     rest.globallyRateLimited = false;
-                }, globalReset);
+                }, retryAfter);
                 rest.rateLimitedPaths.set('global', {
                     url: 'global',
                     resetTimestamp: globalReset,
                     bucketId
                 });
                 if (bucketId) {
-                    rest.rateLimitedPaths.set(bucketId, {
+                    rest.rateLimitedPaths.set(`${requestAuthorization}${bucketId}`, {
                         url: 'global',
                         resetTimestamp: globalReset,
                         bucketId
@@ -212,17 +233,33 @@ export function createRestManager(options) {
         async sendRequest (options) {
             const url = `${rest.baseUrl}/v${rest.version}${options.route}`;
             const payload = rest.createRequestBody(options.method, options.requestBodyOptions);
+            const loggingHeaders = {
+                ...payload.headers
+            };
+            const authenticationScheme = payload.headers.authorization?.split(' ')[0];
+            if (payload.headers.authorization) {
+                loggingHeaders.authorization = `${authenticationScheme} tokenhere`;
+            }
             logger.debug(`sending request to ${url}`, 'with payload:', {
                 ...payload,
-                headers: {
-                    ...payload.headers,
-                    authorization: 'Bot tokenhere'
-                }
+                headers: loggingHeaders
+            });
+            const response = await fetch(url, payload).catch(async (error)=>{
+                logger.error(error);
+                // Mark request and completed
+                rest.invalidBucket.handleCompletedRequest(999, false);
+                options.reject({
+                    ok: false,
+                    status: 999,
+                    error: 'Possible network or request shape issue occurred. If this is rare, its a network glitch. If it occurs a lot something is wrong.'
+                });
+                throw error;
             });
-            const response = await fetch(url, payload);
             logger.debug(`request fetched from ${url} with status ${response.status} & ${response.statusText}`);
+            // Mark request and completed
+            rest.invalidBucket.handleCompletedRequest(response.status, response.headers.get(RATE_LIMIT_SCOPE_HEADER) === 'shared');
             // Set the bucket id if it was available on the headers
-            const bucketId = rest.processHeaders(rest.simplifyUrl(options.route, options.method), response.headers);
+            const bucketId = rest.processHeaders(rest.simplifyUrl(options.route, options.method), response.headers, authenticationScheme === 'Bearer' ? payload.headers.authorization : '');
             if (bucketId) options.bucketId = bucketId;
             if (response.status < 200 || response.status >= 400) {
                 logger.debug(`Request to ${url} failed.`);
@@ -247,8 +284,6 @@ export function createRestManager(options) {
                     return;
                 }
                 options.retryCount += 1;
-                // Rate limited, add back to queue
-                rest.invalidBucket.handleCompletedRequest(response.status, response.headers.get(RATE_LIMIT_SCOPE_HEADER) === 'shared');
                 const resetAfter = response.headers.get(RATE_LIMIT_RESET_AFTER_HEADER);
                 if (resetAfter) await delay(Number(resetAfter) * 1000);
                 // process the response to prevent mem leak
@@ -289,19 +324,21 @@ export function createRestManager(options) {
                 await rest.sendRequest(request);
                 return;
             }
-            const queue = rest.queues.get(url);
+            const authHeader = request.requestBodyOptions?.headers?.authorization ?? '';
+            const queue = rest.queues.get(`${authHeader}${url}`);
             if (queue !== undefined) {
                 queue.makeRequest(request);
             } else {
                 // CREATES A NEW QUEUE
                 const bucketQueue = new Queue(rest, {
                     url,
-                    deleteQueueDelay: rest.deleteQueueDelay
+                    deleteQueueDelay: rest.deleteQueueDelay,
+                    authentication: authHeader
                 });
                 // Add request to queue
                 bucketQueue.makeRequest(request);
                 // Save queue
-                rest.queues.set(url, bucketQueue);
+                rest.queues.set(`${authHeader}${url}`, bucketQueue);
             }
         },
         async makeRequest (method, route, options) {
@@ -309,7 +346,7 @@ export function createRestManager(options) {
                 if (rest.authorization !== undefined) {
                     options ??= {};
                     options.headers ??= {};
-                    options.headers.authorization = rest.authorization;
+                    options.headers[rest.authorizationHeader] = rest.authorization;
                 }
                 const result = await fetch(`${rest.baseUrl}/v${rest.version}${route}`, rest.createRequestBody(method, options));
                 if (!result.ok) {
@@ -377,6 +414,11 @@ export function createRestManager(options) {
         async addThreadMember (channelId, userId) {
             await rest.put(rest.routes.channels.threads.user(channelId, userId));
         },
+        async addDmRecipient (channelId, userId, body) {
+            await rest.put(rest.routes.channels.dmRecipient(channelId, userId), {
+                body
+            });
+        },
         async createAutomodRule (guildId, body, reason) {
             return await rest.post(rest.routes.guilds.automod.rules(guildId), {
                 body,
@@ -395,20 +437,34 @@ export function createRestManager(options) {
                 reason
             });
         },
-        async createGlobalApplicationCommand (body) {
-            return await rest.post(rest.routes.interactions.commands.commands(rest.applicationId), {
+        async createGlobalApplicationCommand (body, options) {
+            const restOptions = {
                 body
-            });
+            };
+            if (options?.bearerToken) {
+                restOptions.unauthorized = true;
+                restOptions.headers = {
+                    authorization: `Bearer ${options.bearerToken}`
+                };
+            }
+            return await rest.post(rest.routes.interactions.commands.commands(rest.applicationId), restOptions);
         },
         async createGuild (body) {
             return await rest.post(rest.routes.guilds.all(), {
                 body
             });
         },
-        async createGuildApplicationCommand (body, guildId) {
-            return await rest.post(rest.routes.interactions.commands.guilds.all(rest.applicationId, guildId), {
+        async createGuildApplicationCommand (body, guildId, options) {
+            const restOptions = {
                 body
-            });
+            };
+            if (options?.bearerToken) {
+                restOptions.unauthorized = true;
+                restOptions.headers = {
+                    authorization: `Bearer ${options.bearerToken}`
+                };
+            }
+            return await rest.post(rest.routes.interactions.commands.guilds.all(rest.applicationId, guildId), restOptions);
         },
         async createGuildFromTemplate (templateCode, body) {
             if (body.icon) {
@@ -601,7 +657,7 @@ export function createRestManager(options) {
         },
         async editBotProfile (options) {
             const avatar = options?.botAvatarURL ? await urlToBase64(options?.botAvatarURL) : options?.botAvatarURL;
-            return await rest.patch(rest.routes.userBot(), {
+            return await rest.patch(rest.routes.currentUser(), {
                 body: {
                     username: options.username?.trim(),
                     avatar
@@ -675,7 +731,8 @@ export function createRestManager(options) {
         },
         async editMessage (channelId, messageId, body) {
             return await rest.patch(rest.routes.channels.message(channelId, messageId), {
-                body
+                body,
+                files: body.files
             });
         },
         async editOriginalInteractionResponse (token, body) {
@@ -777,14 +834,62 @@ export function createRestManager(options) {
         async getActiveThreads (guildId) {
             return await rest.get(rest.routes.channels.threads.active(guildId));
         },
-        async getApplicationCommandPermission (guildId, commandId) {
-            return await rest.get(rest.routes.interactions.commands.permission(rest.applicationId, guildId, commandId));
-        },
-        async getApplicationCommandPermissions (guildId) {
-            return await rest.get(rest.routes.interactions.commands.permissions(rest.applicationId, guildId));
+        async getApplicationCommandPermission (guildId, commandId, options) {
+            const restOptions = {};
+            if (options?.accessToken) {
+                restOptions.unauthorized = true;
+                restOptions.headers = {
+                    authorization: `Bearer ${options.accessToken}`
+                };
+            }
+            return await rest.get(rest.routes.interactions.commands.permission(options?.applicationId ?? rest.applicationId, guildId, commandId), restOptions);
+        },
+        async getApplicationCommandPermissions (guildId, options) {
+            const restOptions = {};
+            if (options?.accessToken) {
+                restOptions.unauthorized = true;
+                restOptions.headers = {
+                    authorization: `Bearer ${options.accessToken}`
+                };
+            }
+            return await rest.get(rest.routes.interactions.commands.permissions(options?.applicationId ?? rest.applicationId, guildId), restOptions);
         },
         async getApplicationInfo () {
-            return await rest.get(rest.routes.oauth2Application());
+            return await rest.get(rest.routes.oauth2.application());
+        },
+        async getCurrentAuthenticationInfo (token) {
+            return await rest.get(rest.routes.oauth2.currentAuthorization(), {
+                headers: {
+                    authorization: `Bearer ${token}`
+                },
+                unauthorized: true
+            });
+        },
+        async exchangeToken (clientId, clientSecret, body) {
+            const basicCredentials = Buffer.from(`${clientId}:${clientSecret}`);
+            const restOptions = {
+                body,
+                headers: {
+                    'content-type': 'application/x-www-form-urlencoded',
+                    authorization: `Basic ${basicCredentials.toString('base64')}`
+                },
+                unauthorized: true
+            };
+            if (body.grantType === 'client_credentials') {
+                restOptions.body.scope = body.scope.join(' ');
+            }
+            return await rest.post(rest.routes.oauth2.tokenExchange(), restOptions);
+        },
+        async revokeToken (clientId, clientSecret, body) {
+            const basicCredentials = Buffer.from(`${clientId}:${clientSecret}`);
+            await rest.post(rest.routes.oauth2.tokenRevoke(), {
+                body,
+                headers: {
+                    'content-type': 'application/x-www-form-urlencoded',
+                    authorization: `Basic ${basicCredentials.toString('base64')}`
+                },
+                unauthorized: true
+            });
         },
         async getAuditLog (guildId, options) {
             return await rest.get(rest.routes.guilds.auditlogs(guildId, options));
@@ -823,6 +928,11 @@ export function createRestManager(options) {
                 }
             });
         },
+        async getGroupDmChannel (body) {
+            return await rest.post(rest.routes.channels.dm(), {
+                body
+            });
+        },
         async getEmoji (guildId, emojiId) {
             return await rest.get(rest.routes.guilds.emoji(guildId, emojiId));
         },
@@ -848,6 +958,14 @@ export function createRestManager(options) {
         }) {
             return await rest.get(rest.routes.guilds.guild(guildId, options.counts));
         },
+        async getGuilds (token, options) {
+            return await rest.get(rest.routes.guilds.userGuilds(options), {
+                headers: {
+                    authorization: `Bearer ${token}`
+                },
+                unauthorized: true
+            });
+        },
         async getGuildApplicationCommand (commandId, guildId) {
             return await rest.get(rest.routes.interactions.commands.guilds.one(rest.applicationId, guildId, commandId));
         },
@@ -943,6 +1061,30 @@ export function createRestManager(options) {
         async getUser (id) {
             return await rest.get(rest.routes.user(id));
         },
+        async getCurrentUser (token) {
+            return await rest.get(rest.routes.currentUser(), {
+                headers: {
+                    authorization: `Bearer ${token}`
+                },
+                unauthorized: true
+            });
+        },
+        async getUserConnections (token) {
+            return await rest.get(rest.routes.oauth2.connections(), {
+                headers: {
+                    authorization: `Bearer ${token}`
+                },
+                unauthorized: true
+            });
+        },
+        async getUserApplicationRoleConnection (token, applicationId) {
+            return await rest.get(rest.routes.oauth2.roleConnections(applicationId), {
+                headers: {
+                    authorization: `Bearer ${token}`
+                },
+                unauthorized: true
+            });
+        },
         async getVanityUrl (guildId) {
             return await rest.get(rest.routes.guilds.vanity(guildId));
         },
@@ -987,6 +1129,9 @@ export function createRestManager(options) {
         async removeThreadMember (channelId, userId) {
             await rest.delete(rest.routes.channels.threads.user(channelId, userId));
         },
+        async removeDmRecipient (channelId, userId) {
+            await rest.delete(rest.routes.channels.dmRecipient(channelId, userId));
+        },
         async sendFollowupMessage (token, options) {
             return await rest.post(rest.routes.webhooks.webhook(rest.applicationId, token), {
                 body: options,
@@ -1044,6 +1189,14 @@ export function createRestManager(options) {
         async getMember (guildId, userId) {
             return await rest.get(rest.routes.guilds.members.member(guildId, userId));
         },
+        async getCurrentMember (guildId, token) {
+            return await rest.get(rest.routes.guilds.members.currentMember(guildId), {
+                headers: {
+                    authorization: `Bearer ${token}`
+                },
+                unauthorized: true
+            });
+        },
         async getMembers (guildId, options) {
             return await rest.get(rest.routes.guilds.members.members(guildId, options));
         },
@@ -1079,15 +1232,62 @@ export function createRestManager(options) {
         async triggerTypingIndicator (channelId) {
             await rest.post(rest.routes.channels.typing(channelId));
         },
-        async upsertGlobalApplicationCommands (body) {
-            return await rest.put(rest.routes.interactions.commands.commands(rest.applicationId), {
+        async upsertGlobalApplicationCommands (body, options) {
+            const restOptions = {
                 body
+            };
+            if (options?.bearerToken) {
+                restOptions.unauthorized = true;
+                restOptions.headers = {
+                    authorization: `Bearer ${options.bearerToken}`
+                };
+            }
+            return await rest.put(rest.routes.interactions.commands.commands(rest.applicationId), restOptions);
+        },
+        async upsertGuildApplicationCommands (guildId, body, options) {
+            const restOptions = {
+                body
+            };
+            if (options?.bearerToken) {
+                restOptions.unauthorized = true;
+                restOptions.headers = {
+                    authorization: `Bearer ${options.bearerToken}`
+                };
+            }
+            return await rest.put(rest.routes.interactions.commands.guilds.all(rest.applicationId, guildId), restOptions);
+        },
+        async editUserApplicationRoleConnection (token, applicationId, body) {
+            return await rest.put(rest.routes.oauth2.roleConnections(applicationId), {
+                body,
+                headers: {
+                    authorization: `Bearer ${token}`
+                },
+                unauthorized: true
             });
         },
-        async upsertGuildApplicationCommands (guildId, body) {
-            return await rest.put(rest.routes.interactions.commands.guilds.all(rest.applicationId, guildId), {
+        async addGuildMember (guildId, userId, body) {
+            return await rest.put(rest.routes.guilds.members.member(guildId, userId), {
                 body
             });
+        },
+        preferSnakeCase (enabled) {
+            const camelizer = enabled ? (x)=>x : camelize;
+            rest.get = async (url, options)=>{
+                return camelizer(await rest.makeRequest('GET', url, options));
+            };
+            rest.post = async (url, options)=>{
+                return camelizer(await rest.makeRequest('POST', url, options));
+            };
+            rest.delete = async (url, options)=>{
+                camelizer(await rest.makeRequest('DELETE', url, options));
+            };
+            rest.patch = async (url, options)=>{
+                return camelizer(await rest.makeRequest('PATCH', url, options));
+            };
+            rest.put = async (url, options)=>{
+                return camelizer(await rest.makeRequest('PUT', url, options));
+            };
+            return rest;
         }
     };
     return rest;