@discordjs/rest 3.0.0-dev.1736727183-101bef1c5 → 3.0.0-dev.1736769922-18ab0cf62

package/dist/index.d.mts

@@ -282,6 +282,18 @@ interface RawFile {
      */
     name: string;
 }
+interface AuthData {
+    /**
+     * The authorization prefix to use for this request, useful if you use this with bearer tokens
+     *
+     * @defaultValue `REST.options.authPrefix`
+     */
+    prefix?: 'Bearer' | 'Bot';
+    /**
+     * The authorization token to use for this request
+     */
+    token: string;
+}
 /**
  * Represents possible data to be given to an endpoint
  */
@@ -291,17 +303,11 @@ interface RequestData {
      */
     appendToFormData?: boolean;
     /**
-     * If this request needs the `Authorization` header
+     * Alternate authorization data to use for this request only, or `false` to disable the Authorization header
      *
      * @defaultValue `true`
      */
-    auth?: boolean;
-    /**
-     * The authorization prefix to use for this request, useful if you use this with bearer tokens
-     *
-     * @defaultValue `'Bot'`
-     */
-    authPrefix?: 'Bearer' | 'Bot';
+    auth?: AuthData | boolean;
     /**
      * The body to send to this request.
      * If providing as BodyInit, set `passThroughBody: true`
@@ -371,7 +377,9 @@ interface InternalRequest extends RequestData {
     fullRoute: RouteLike;
     method: RequestMethod;
 }
-type HandlerRequestData = Pick<InternalRequest, 'auth' | 'body' | 'files' | 'signal'>;
+interface HandlerRequestData extends Pick<InternalRequest, 'body' | 'files' | 'signal'> {
+    auth: boolean | string;
+}
 /**
  * Parsed route data for an endpoint
  *
@@ -438,6 +446,7 @@ declare const OverwrittenMimeTypes: {
     readonly 'image/apng': "image/png";
 };
 declare const BurstHandlerMajorIdKey = "burst";
+declare const AUTH_UUID_NAMESPACE = "acc82a4c-f887-417b-a69c-f74096ff7e59";
 
 /**
  * The options used for image URLs
@@ -900,4 +909,4 @@ declare function calculateUserDefaultAvatarIndex(userId: Snowflake): number;
  */
 declare const version: string;
 
-export { ALLOWED_EXTENSIONS, ALLOWED_SIZES, ALLOWED_STICKER_EXTENSIONS, type APIRequest, type BaseImageURLOptions, BurstHandlerMajorIdKey, CDN, DefaultRestOptions, DefaultUserAgent, DefaultUserAgentAppendix, DiscordAPIError, type DiscordErrorData, type GetRateLimitOffsetFunction, HTTPError, type HandlerRequestData, type HashData, type ImageExtension, type ImageSize, type ImageURLOptions, type InternalRequest, type InvalidRequestWarningData, type MakeURLOptions, type OAuthErrorData, OverwrittenMimeTypes, REST, RESTEvents, type RESTOptions, type RateLimitData, RateLimitError, type RateLimitQueueFilter, type RawFile, type RequestBody, type RequestData, type RequestHeaders, RequestMethod, type ResponseLike, type RestEvents, type RestEventsMap, type RouteData, type RouteLike, type StickerExtension, calculateUserDefaultAvatarIndex, makeURLSearchParams, parseResponse, version };
+export { ALLOWED_EXTENSIONS, ALLOWED_SIZES, ALLOWED_STICKER_EXTENSIONS, type APIRequest, AUTH_UUID_NAMESPACE, type AuthData, type BaseImageURLOptions, BurstHandlerMajorIdKey, CDN, DefaultRestOptions, DefaultUserAgent, DefaultUserAgentAppendix, DiscordAPIError, type DiscordErrorData, type GetRateLimitOffsetFunction, HTTPError, type HandlerRequestData, type HashData, type ImageExtension, type ImageSize, type ImageURLOptions, type InternalRequest, type InvalidRequestWarningData, type MakeURLOptions, type OAuthErrorData, OverwrittenMimeTypes, REST, RESTEvents, type RESTOptions, type RateLimitData, RateLimitError, type RateLimitQueueFilter, type RawFile, type RequestBody, type RequestData, type RequestHeaders, RequestMethod, type ResponseLike, type RestEvents, type RestEventsMap, type RouteData, type RouteLike, type StickerExtension, calculateUserDefaultAvatarIndex, makeURLSearchParams, parseResponse, version };

package/dist/index.d.ts

@@ -282,6 +282,18 @@ interface RawFile {
      */
     name: string;
 }
+interface AuthData {
+    /**
+     * The authorization prefix to use for this request, useful if you use this with bearer tokens
+     *
+     * @defaultValue `REST.options.authPrefix`
+     */
+    prefix?: 'Bearer' | 'Bot';
+    /**
+     * The authorization token to use for this request
+     */
+    token: string;
+}
 /**
  * Represents possible data to be given to an endpoint
  */
@@ -291,17 +303,11 @@ interface RequestData {
      */
     appendToFormData?: boolean;
     /**
-     * If this request needs the `Authorization` header
+     * Alternate authorization data to use for this request only, or `false` to disable the Authorization header
      *
      * @defaultValue `true`
      */
-    auth?: boolean;
-    /**
-     * The authorization prefix to use for this request, useful if you use this with bearer tokens
-     *
-     * @defaultValue `'Bot'`
-     */
-    authPrefix?: 'Bearer' | 'Bot';
+    auth?: AuthData | boolean;
     /**
      * The body to send to this request.
      * If providing as BodyInit, set `passThroughBody: true`
@@ -371,7 +377,9 @@ interface InternalRequest extends RequestData {
     fullRoute: RouteLike;
     method: RequestMethod;
 }
-type HandlerRequestData = Pick<InternalRequest, 'auth' | 'body' | 'files' | 'signal'>;
+interface HandlerRequestData extends Pick<InternalRequest, 'body' | 'files' | 'signal'> {
+    auth: boolean | string;
+}
 /**
  * Parsed route data for an endpoint
  *
@@ -438,6 +446,7 @@ declare const OverwrittenMimeTypes: {
     readonly 'image/apng': "image/png";
 };
 declare const BurstHandlerMajorIdKey = "burst";
+declare const AUTH_UUID_NAMESPACE = "acc82a4c-f887-417b-a69c-f74096ff7e59";
 
 /**
  * The options used for image URLs
@@ -900,4 +909,4 @@ declare function calculateUserDefaultAvatarIndex(userId: Snowflake): number;
  */
 declare const version: string;
 
-export { ALLOWED_EXTENSIONS, ALLOWED_SIZES, ALLOWED_STICKER_EXTENSIONS, type APIRequest, type BaseImageURLOptions, BurstHandlerMajorIdKey, CDN, DefaultRestOptions, DefaultUserAgent, DefaultUserAgentAppendix, DiscordAPIError, type DiscordErrorData, type GetRateLimitOffsetFunction, HTTPError, type HandlerRequestData, type HashData, type ImageExtension, type ImageSize, type ImageURLOptions, type InternalRequest, type InvalidRequestWarningData, type MakeURLOptions, type OAuthErrorData, OverwrittenMimeTypes, REST, RESTEvents, type RESTOptions, type RateLimitData, RateLimitError, type RateLimitQueueFilter, type RawFile, type RequestBody, type RequestData, type RequestHeaders, RequestMethod, type ResponseLike, type RestEvents, type RestEventsMap, type RouteData, type RouteLike, type StickerExtension, calculateUserDefaultAvatarIndex, makeURLSearchParams, parseResponse, version };
+export { ALLOWED_EXTENSIONS, ALLOWED_SIZES, ALLOWED_STICKER_EXTENSIONS, type APIRequest, AUTH_UUID_NAMESPACE, type AuthData, type BaseImageURLOptions, BurstHandlerMajorIdKey, CDN, DefaultRestOptions, DefaultUserAgent, DefaultUserAgentAppendix, DiscordAPIError, type DiscordErrorData, type GetRateLimitOffsetFunction, HTTPError, type HandlerRequestData, type HashData, type ImageExtension, type ImageSize, type ImageURLOptions, type InternalRequest, type InvalidRequestWarningData, type MakeURLOptions, type OAuthErrorData, OverwrittenMimeTypes, REST, RESTEvents, type RESTOptions, type RateLimitData, RateLimitError, type RateLimitQueueFilter, type RawFile, type RequestBody, type RequestData, type RequestHeaders, RequestMethod, type ResponseLike, type RestEvents, type RestEventsMap, type RouteData, type RouteLike, type StickerExtension, calculateUserDefaultAvatarIndex, makeURLSearchParams, parseResponse, version };

package/dist/index.js

@@ -24,6 +24,7 @@ __export(index_exports, {
   ALLOWED_EXTENSIONS: () => ALLOWED_EXTENSIONS,
   ALLOWED_SIZES: () => ALLOWED_SIZES,
   ALLOWED_STICKER_EXTENSIONS: () => ALLOWED_STICKER_EXTENSIONS,
+  AUTH_UUID_NAMESPACE: () => AUTH_UUID_NAMESPACE,
   BurstHandlerMajorIdKey: () => BurstHandlerMajorIdKey,
   CDN: () => CDN,
   DefaultRestOptions: () => DefaultRestOptions,
@@ -123,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, 3.0.0-dev.1736727183-101bef1c5)`;
+var DefaultUserAgent = `DiscordBot (https://discord.js.org, 3.0.0-dev.1736769922-18ab0cf62)`;
 var DefaultUserAgentAppendix = (0, import_util.getUserAgentAppendix)();
 var DefaultRestOptions = {
   agent: null,
@@ -167,6 +168,7 @@ var OverwrittenMimeTypes = {
   "image/apng": "image/png"
 };
 var BurstHandlerMajorIdKey = "burst";
+var AUTH_UUID_NAMESPACE = "acc82a4c-f887-417b-a69c-f74096ff7e59";
 
 // src/lib/CDN.ts
 var CDN = class {
@@ -546,6 +548,7 @@ var import_collection = require("@discordjs/collection");
 var import_snowflake = require("@sapphire/snowflake");
 var import_async_event_emitter = require("@vladfrangu/async_event_emitter");
 var import_magic_bytes = require("magic-bytes.js");
+var import_uuid = require("uuid");
 
 // src/lib/utils/types.ts
 var RequestMethod = /* @__PURE__ */ ((RequestMethod2) => {
@@ -705,7 +708,7 @@ async function handleErrors(manager, res, method, url, requestData, retries) {
     throw new HTTPError(status, res.statusText, method, url, requestData);
   } else {
     if (status >= 400 && status < 500) {
-      if (status === 401 && requestData.auth) {
+      if (status === 401 && requestData.auth === true) {
         manager.setToken(null);
       }
       const data = await parseResponse(res);
@@ -1029,9 +1032,14 @@ var SequentialHandler = class {
     if (retry) retryAfter = Number(retry) * 1e3 + offset;
     if (hash && hash !== this.hash) {
       this.debug(["Received bucket hash update", `  Old Hash  : ${this.hash}`, `  New Hash  : ${hash}`].join("\n"));
-      this.manager.hashes.set(`${method}:${routeId.bucketRoute}`, { value: hash, lastAccess: Date.now() });
+      this.manager.hashes.set(
+        `${method}:${routeId.bucketRoute}${typeof requestData.auth === "string" ? `:${requestData.auth}` : ""}`,
+        { value: hash, lastAccess: Date.now() }
+      );
     } else if (hash) {
-      const hashData = this.manager.hashes.get(`${method}:${routeId.bucketRoute}`);
+      const hashData = this.manager.hashes.get(
+        `${method}:${routeId.bucketRoute}${typeof requestData.auth === "string" ? `:${requestData.auth}` : ""}`
+      );
       if (hashData) {
         hashData.lastAccess = Date.now();
       }
@@ -1283,8 +1291,10 @@ var REST = class _REST extends import_async_event_emitter.AsyncEventEmitter {
    */
   async queueRequest(request2) {
     const routeId = _REST.generateRouteData(request2.fullRoute, request2.method);
-    const hash = this.hashes.get(`${request2.method}:${routeId.bucketRoute}`) ?? {
-      value: `Global(${request2.method}:${routeId.bucketRoute})`,
+    const customAuth = typeof request2.auth === "object" && request2.auth.token !== this.#token;
+    const auth = customAuth ? (0, import_uuid.v5)(request2.auth.token, AUTH_UUID_NAMESPACE) : request2.auth !== false;
+    const hash = this.hashes.get(`${request2.method}:${routeId.bucketRoute}${customAuth ? `:${auth}` : ""}`) ?? {
+      value: `Global(${request2.method}:${routeId.bucketRoute}${customAuth ? `:${auth}` : ""})`,
       lastAccess: -1
     };
     const handler = this.handlers.get(`${hash.value}:${routeId.majorParameter}`) ?? this.createHandler(hash.value, routeId.majorParameter);
@@ -1292,7 +1302,7 @@ var REST = class _REST extends import_async_event_emitter.AsyncEventEmitter {
     return handler.queueRequest(routeId, url, fetchOptions, {
       body: request2.body,
       files: request2.files,
-      auth: request2.auth !== false,
+      auth,
       signal: request2.signal
     });
   }
@@ -1327,10 +1337,14 @@ var REST = class _REST extends import_async_event_emitter.AsyncEventEmitter {
       "User-Agent": `${DefaultUserAgent} ${options.userAgentAppendix}`.trim()
     };
     if (request2.auth !== false) {
-      if (!this.#token) {
-        throw new Error("Expected token to be set for this request, but none was present");
+      if (typeof request2.auth === "object") {
+        headers.Authorization = `${request2.auth.prefix ?? this.options.authPrefix} ${request2.auth.token}`;
+      } else {
+        if (!this.#token) {
+          throw new Error("Expected token to be set for this request, but none was present");
+        }
+        headers.Authorization = `${this.options.authPrefix} ${this.#token}`;
       }
-      headers.Authorization = `${request2.authPrefix ?? this.options.authPrefix} ${this.#token}`;
     }
     if (request2.reason?.length) {
       headers["X-Audit-Log-Reason"] = encodeURIComponent(request2.reason);
@@ -1433,7 +1447,7 @@ var REST = class _REST extends import_async_event_emitter.AsyncEventEmitter {
 };
 
 // src/shared.ts
-var version = "3.0.0-dev.1736727183-101bef1c5";
+var version = "3.0.0-dev.1736769922-18ab0cf62";
 
 // src/index.ts
 globalThis.FormData ??= import_undici2.FormData;
@@ -1444,6 +1458,7 @@ setDefaultStrategy((0, import_util2.shouldUseGlobalFetchAndWebSocket)() ? fetch
   ALLOWED_EXTENSIONS,
   ALLOWED_SIZES,
   ALLOWED_STICKER_EXTENSIONS,
+  AUTH_UUID_NAMESPACE,
   BurstHandlerMajorIdKey,
   CDN,
   DefaultRestOptions,