@discordjs/rest 2.1.0-dev.1699704227-5b0aa92c8 → 2.1.0

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { R as ResponseLike, a as RawFile, I as InternalRequest, b as RateLimitData, c as RestEventsMap, H as HashData, d as IHandler, e as RESTOptions, f as RouteLike, g as RequestData } from './types-65527f29.js';
-export { A as APIRequest, m as HandlerRequestData, j as InvalidRequestWarningData, i as RateLimitQueueFilter, k as RequestHeaders, l as RequestMethod, h as RestEvents, n as RouteData } from './types-65527f29.js';
+import { R as ResponseLike, a as RawFile, I as InternalRequest, b as RateLimitData, c as RestEventsMap, H as HashData, d as IHandler, e as RESTOptions, f as RouteLike, g as RequestData } from './types-0c39b617.js';
+export { A as APIRequest, m as HandlerRequestData, j as InvalidRequestWarningData, i as RateLimitQueueFilter, k as RequestHeaders, l as RequestMethod, h as RestEvents, n as RouteData } from './types-0c39b617.js';
 import * as url from 'url';
 import { Snowflake } from 'discord-api-types/v10';
 import * as undici from 'undici';
@@ -359,7 +359,9 @@ declare class RateLimitError extends Error implements RateLimitData {
     route: string;
     majorParameter: string;
     global: boolean;
-    constructor({ timeToReset, limit, method, hash, url, route, majorParameter, global }: RateLimitData);
+    retryAfter: number;
+    sublimitTimeout: number;
+    constructor({ timeToReset, limit, method, hash, url, route, majorParameter, global, retryAfter, sublimitTimeout, }: RateLimitData);
     /**
      * The name of the error
      */
@@ -501,7 +503,7 @@ declare class REST extends AsyncEventEmitter<RestEventsMap> {
  * @param options - The options to use
  * @returns A populated URLSearchParams instance
  */
-declare function makeURLSearchParams<T extends object>(options?: Readonly<T>): url.URLSearchParams;
+declare function makeURLSearchParams<OptionsType extends object>(options?: Readonly<OptionsType>): url.URLSearchParams;
 /**
  * Converts the response to usable data
  *

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { R as ResponseLike, a as RawFile, I as InternalRequest, b as RateLimitData, c as RestEventsMap, H as HashData, d as IHandler, e as RESTOptions, f as RouteLike, g as RequestData } from './types-65527f29.js';
-export { A as APIRequest, m as HandlerRequestData, j as InvalidRequestWarningData, i as RateLimitQueueFilter, k as RequestHeaders, l as RequestMethod, h as RestEvents, n as RouteData } from './types-65527f29.js';
+import { R as ResponseLike, a as RawFile, I as InternalRequest, b as RateLimitData, c as RestEventsMap, H as HashData, d as IHandler, e as RESTOptions, f as RouteLike, g as RequestData } from './types-0c39b617.js';
+export { A as APIRequest, m as HandlerRequestData, j as InvalidRequestWarningData, i as RateLimitQueueFilter, k as RequestHeaders, l as RequestMethod, h as RestEvents, n as RouteData } from './types-0c39b617.js';
 import * as url from 'url';
 import { Snowflake } from 'discord-api-types/v10';
 import * as undici from 'undici';
@@ -359,7 +359,9 @@ declare class RateLimitError extends Error implements RateLimitData {
     route: string;
     majorParameter: string;
     global: boolean;
-    constructor({ timeToReset, limit, method, hash, url, route, majorParameter, global }: RateLimitData);
+    retryAfter: number;
+    sublimitTimeout: number;
+    constructor({ timeToReset, limit, method, hash, url, route, majorParameter, global, retryAfter, sublimitTimeout, }: RateLimitData);
     /**
      * The name of the error
      */
@@ -501,7 +503,7 @@ declare class REST extends AsyncEventEmitter<RestEventsMap> {
  * @param options - The options to use
  * @returns A populated URLSearchParams instance
  */
-declare function makeURLSearchParams<T extends object>(options?: Readonly<T>): url.URLSearchParams;
+declare function makeURLSearchParams<OptionsType extends object>(options?: Readonly<OptionsType>): url.URLSearchParams;
 /**
  * Converts the response to usable data
  *

package/dist/index.js

@@ -124,7 +124,7 @@ __name(resolveBody, "resolveBody");
 // src/lib/utils/constants.ts
 var import_util = require("@discordjs/util");
 var import_v10 = require("discord-api-types/v10");
-var DefaultUserAgent = `DiscordBot (https://discord.js.org, 2.1.0-dev.1699704227-5b0aa92c8)`;
+var DefaultUserAgent = `DiscordBot (https://discord.js.org, 2.1.0)`;
 var DefaultUserAgentAppendix = (0, import_util.getUserAgentAppendix)();
 var DefaultRestOptions = {
   agent: null,
@@ -182,7 +182,20 @@ var RateLimitError = class _RateLimitError extends Error {
   route;
   majorParameter;
   global;
-  constructor({ timeToReset, limit, method, hash, url, route, majorParameter, global }) {
+  retryAfter;
+  sublimitTimeout;
+  constructor({
+    timeToReset,
+    limit,
+    method,
+    hash,
+    url,
+    route,
+    majorParameter,
+    global,
+    retryAfter,
+    sublimitTimeout
+  }) {
     super();
     this.timeToReset = timeToReset;
     this.limit = limit;
@@ -192,6 +205,8 @@ var RateLimitError = class _RateLimitError extends Error {
     this.route = route;
     this.majorParameter = majorParameter;
     this.global = global;
+    this.retryAfter = retryAfter;
+    this.sublimitTimeout = sublimitTimeout;
   }
   /**
    * The name of the error
@@ -774,14 +789,16 @@ var BurstHandler = class {
     } else if (status === 429) {
       const isGlobal = res.headers.has("X-RateLimit-Global");
       await onRateLimit(this.manager, {
-        timeToReset: retryAfter,
-        limit: Number.POSITIVE_INFINITY,
+        global: isGlobal,
         method,
-        hash: this.hash,
         url,
         route: routeId.bucketRoute,
         majorParameter: this.majorParameter,
-        global: isGlobal
+        hash: this.hash,
+        limit: Number.POSITIVE_INFINITY,
+        timeToReset: retryAfter,
+        retryAfter,
+        sublimitTimeout: 0
       });
       this.debug(
         [
@@ -968,14 +985,16 @@ var SequentialHandler = class {
         delay = sleep(timeout);
       }
       const rateLimitData = {
-        timeToReset: timeout,
-        limit: limit2,
+        global: isGlobal,
         method: options.method ?? "get",
-        hash: this.hash,
         url,
         route: routeId.bucketRoute,
         majorParameter: this.majorParameter,
-        global: isGlobal
+        hash: this.hash,
+        limit: limit2,
+        timeToReset: timeout,
+        retryAfter: timeout,
+        sublimitTimeout: 0
       };
       this.manager.emit("rateLimited" /* RateLimited */, rateLimitData);
       await onRateLimit(this.manager, rateLimitData);
@@ -1043,14 +1062,16 @@ var SequentialHandler = class {
         timeout = this.timeToReset;
       }
       await onRateLimit(this.manager, {
-        timeToReset: timeout,
-        limit: limit2,
+        global: isGlobal,
         method,
-        hash: this.hash,
         url,
         route: routeId.bucketRoute,
         majorParameter: this.majorParameter,
-        global: isGlobal
+        hash: this.hash,
+        limit: limit2,
+        timeToReset: timeout,
+        retryAfter,
+        sublimitTimeout: sublimitTimeout ?? 0
       });
       this.debug(
         [
@@ -1389,9 +1410,11 @@ var REST = class _REST extends import_async_event_emitter.AsyncEventEmitter {
         original: endpoint
       };
     }
-    const majorIdMatch = /^\/(?:channels|guilds|webhooks)\/(\d{17,19})/.exec(endpoint);
-    const majorId = majorIdMatch?.[1] ?? "global";
-    const baseRoute = endpoint.replaceAll(/\d{17,19}/g, ":id").replace(/\/reactions\/(.*)/, "/reactions/:reaction");
+    const majorIdMatch = /(?:^\/webhooks\/(\d{17,19}\/[^/?]+))|(?:^\/(?:channels|guilds|webhooks)\/(\d{17,19}))/.exec(
+      endpoint
+    );
+    const majorId = majorIdMatch?.[2] ?? majorIdMatch?.[1] ?? "global";
+    const baseRoute = endpoint.replaceAll(/\d{17,19}/g, ":id").replace(/\/reactions\/(.*)/, "/reactions/:reaction").replace(/\/webhooks\/:id\/[^/?]+/, "/webhooks/:id/:token");
     let exceptions = "";
     if (method === "DELETE" /* Delete */ && baseRoute === "/channels/:id/messages/:id") {
       const id = /\d{17,19}$/.exec(endpoint)[0];
@@ -1409,7 +1432,7 @@ var REST = class _REST extends import_async_event_emitter.AsyncEventEmitter {
 };
 
 // src/shared.ts
-var version = "2.1.0-dev.1699704227-5b0aa92c8";
+var version = "2.1.0";
 
 // src/index.ts
 globalThis.FormData ??= import_undici2.FormData;