@discordjs/rest 3.0.0-dev.1757160090-352c9819b → 3.0.0-dev.1757548920-90aac127f

package/dist/web.mjs

@@ -18,7 +18,7 @@ import { CDNRoutes } from "discord-api-types/v10";
 // src/lib/utils/constants.ts
 import { getUserAgentAppendix } from "@discordjs/util";
 import { APIVersion } from "discord-api-types/v10";
-var DefaultUserAgent = `DiscordBot (https://discord.js.org, 3.0.0-dev.1757160090-352c9819b)`;
+var DefaultUserAgent = `DiscordBot (https://discord.js.org, 3.0.0-dev.1757548920-90aac127f)`;
 var DefaultUserAgentAppendix = getUserAgentAppendix();
 var DefaultRestOptions = {
   agent: null,
@@ -31,6 +31,7 @@ var DefaultRestOptions = {
   offset: 50,
   rejectOnRateLimit: null,
   retries: 3,
+  retryBackoff: 0,
   timeout: 15e3,
   userAgentAppendix: DefaultUserAgentAppendix,
   version: APIVersion,
@@ -560,6 +561,21 @@ function normalizeRateLimitOffset(offset, route) {
   return Math.max(0, result);
 }
 __name(normalizeRateLimitOffset, "normalizeRateLimitOffset");
+function normalizeRetryBackoff(retryBackoff, route, statusCode, retryCount, requestBody) {
+  if (typeof retryBackoff === "number") {
+    return Math.max(0, retryBackoff) * (1 << retryCount);
+  }
+  return retryBackoff(route, statusCode, retryCount, requestBody);
+}
+__name(normalizeRetryBackoff, "normalizeRetryBackoff");
+function normalizeTimeout(timeout, route, requestBody) {
+  if (typeof timeout === "number") {
+    return Math.max(0, timeout);
+  }
+  const result = timeout(route, requestBody);
+  return Math.max(0, result);
+}
+__name(normalizeTimeout, "normalizeTimeout");
 
 // src/lib/handlers/Shared.ts
 var authFalseWarningEmitted = false;
@@ -582,7 +598,10 @@ function incrementInvalidCount(manager) {
 __name(incrementInvalidCount, "incrementInvalidCount");
 async function makeNetworkRequest(manager, routeId, url, options, requestData, retries) {
   const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), manager.options.timeout);
+  const timeout = setTimeout(
+    () => controller.abort(),
+    normalizeTimeout(manager.options.timeout, routeId.bucketRoute, requestData.body)
+  );
   if (requestData.signal) {
     if (requestData.signal.aborted) controller.abort();
     else requestData.signal.addEventListener("abort", () => controller.abort());
@@ -593,6 +612,19 @@ async function makeNetworkRequest(manager, routeId, url, options, requestData, r
   } catch (error) {
     if (!(error instanceof Error)) throw error;
     if (shouldRetry(error) && retries !== manager.options.retries) {
+      const backoff = normalizeRetryBackoff(
+        manager.options.retryBackoff,
+        routeId.bucketRoute,
+        null,
+        retries,
+        requestData.body
+      );
+      if (backoff === null) {
+        throw error;
+      }
+      if (backoff > 0) {
+        await sleep(backoff);
+      }
       return null;
     }
     throw error;
@@ -616,10 +648,23 @@ async function makeNetworkRequest(manager, routeId, url, options, requestData, r
   return res;
 }
 __name(makeNetworkRequest, "makeNetworkRequest");
-async function handleErrors(manager, res, method, url, requestData, retries) {
+async function handleErrors(manager, res, method, url, requestData, retries, routeId) {
   const status = res.status;
   if (status >= 500 && status < 600) {
     if (retries !== manager.options.retries) {
+      const backoff = normalizeRetryBackoff(
+        manager.options.retryBackoff,
+        routeId.bucketRoute,
+        status,
+        retries,
+        requestData.body
+      );
+      if (backoff === null) {
+        throw new HTTPError(status, res.statusText, method, url, requestData);
+      }
+      if (backoff > 0) {
+        await sleep(backoff);
+      }
       return null;
     }
     throw new HTTPError(status, res.statusText, method, url, requestData);
@@ -743,7 +788,7 @@ var BurstHandler = class {
       await sleep(retryAfter);
       return this.runRequest(routeId, url, options, requestData, retries);
     } else {
-      const handled = await handleErrors(this.manager, res, method, url, requestData, retries);
+      const handled = await handleErrors(this.manager, res, method, url, requestData, retries, routeId);
       if (handled === null) {
         return this.runRequest(routeId, url, options, requestData, ++retries);
       }
@@ -1045,7 +1090,7 @@ var SequentialHandler = class {
       }
       return this.runRequest(routeId, url, options, requestData, retries);
     } else {
-      const handled = await handleErrors(this.manager, res, method, url, requestData, retries);
+      const handled = await handleErrors(this.manager, res, method, url, requestData, retries, routeId);
       if (handled === null) {
         return this.runRequest(routeId, url, options, requestData, ++retries);
       }
@@ -1374,7 +1419,7 @@ var REST = class _REST extends AsyncEventEmitter {
 };
 
 // src/shared.ts
-var version = "3.0.0-dev.1757160090-352c9819b";
+var version = "3.0.0-dev.1757548920-90aac127f";
 
 // src/web.ts
 setDefaultStrategy(fetch);