@ovencord/rest 2.5.8 → 2.6.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package.json",
 	"name": "@ovencord/rest",
-	"version": "2.5.8",
+	"version": "2.6.0",
 	"description": "The REST API for discord.js",
 	"scripts": {
 		"test": "bun test",
@@ -36,8 +36,8 @@
 	"homepage": "https://ovencord.dev",
 	"funding": "https://github.com/ovencord/ovencord?sponsor",
 	"dependencies": {
-		"@ovencord/collection": "^2.1.2",
-		"@ovencord/util": "^1.1.4",
+		"@ovencord/collection": "^2.1.4",
+		"@ovencord/util": "^1.1.8",
 		"discord-api-types": "^0.38.40"
 	},
 	"devDependencies": {},

package/src/index.ts

@@ -5,4 +5,3 @@ import { makeRequest } from './strategies/bunRequest.js';
 setDefaultStrategy(makeRequest);
 
 export * from './shared.js';
-

package/src/lib/CDN.ts

@@ -1,4 +1,3 @@
-
 import { CDNRoutes } from 'discord-api-types/v10';
 import {
 	ALLOWED_EXTENSIONS,

package/src/lib/REST.ts

@@ -1,33 +1,31 @@
 import { Collection } from '@ovencord/collection';
 import { DiscordSnowflake } from '@ovencord/util';
-import { AsyncEventEmitter } from './utils/AsyncEventEmitter.js';
-import { uuidv5 as uuidV5 } from './utils/utils.js';
 import { CDN } from './CDN.js';
 import { BurstHandler } from './handlers/BurstHandler.js';
 import { SequentialHandler } from './handlers/SequentialHandler.js';
 import type { IHandler } from './interfaces/Handler.js';
+import { AsyncEventEmitter } from './utils/AsyncEventEmitter.js';
 import {
 	AUTH_UUID_NAMESPACE,
 	BurstHandlerMajorIdKey,
 	DefaultRestOptions,
 	DefaultUserAgent,
-
 	RESTEvents,
 } from './utils/constants.js';
-import { RequestMethod } from './utils/types.js';
 import type {
-	RESTOptions,
-	ResponseLike,
-	RestEvents,
+	AuthData,
 	HashData,
 	InternalRequest,
-	RouteLike,
+	RESTOptions,
+	RequestData,
 	RequestHeaders,
+	ResponseLike,
+	RestEvents,
 	RouteData,
-	RequestData,
-	AuthData,
+	RouteLike,
 } from './utils/types.js';
-import { isBufferLike, parseResponse } from './utils/utils.js';
+import { RequestMethod } from './utils/types.js';
+import { isBufferLike, parseResponse, uuidv5 as uuidV5 } from './utils/utils.js';
 
 /**
  * Represents the class that manages handlers for endpoints
@@ -380,15 +378,12 @@ export class REST extends AsyncEventEmitter<RestEvents> {
 
 			// Set the final body to the form data
 			finalBody = formData;
-
 		} else if (request.body != null) {
 			if (request.passThroughBody) {
 				finalBody = request.body as any;
 			} else {
 				// Stringify the JSON data
-				finalBody = JSON.stringify(request.body, (_, value) =>
-					typeof value === 'bigint' ? value.toString() : value,
-				);
+				finalBody = JSON.stringify(request.body, (_, value) => (typeof value === 'bigint' ? value.toString() : value));
 				// Set the additional headers to specify the content-type
 				additionalHeaders = { 'Content-Type': 'application/json' };
 			}
@@ -459,10 +454,12 @@ export class REST extends AsyncEventEmitter<RestEvents> {
 		// Hard-Code Old Message Deletion Exception (2 week+ old messages are a different bucket)
 		// https://github.com/discord/discord-api-docs/issues/1295
 		if (method === RequestMethod.Delete && baseRoute === '/channels/:id/messages/:id') {
-			const id = /\d{17,19}$/.exec(endpoint)![0]!;
-			const timestamp = DiscordSnowflake.timestampFrom(id);
-			if (Date.now() - timestamp > 1_000 * 60 * 60 * 24 * 14) {
-				exceptions += '/Delete Old Message';
+			const id = /\d{17,19}$/.exec(endpoint)?.[0];
+			if (id) {
+				const timestamp = DiscordSnowflake.timestampFrom(id);
+				if (Date.now() - timestamp > 1_000 * 60 * 60 * 24 * 14) {
+					exceptions += '/Delete Old Message';
+				}
 			}
 		}
 

package/src/lib/errors/DiscordAPIError.ts

@@ -77,7 +77,7 @@ export class DiscordAPIError extends Error {
 		let flattened = '';
 		if ('code' in error) {
 			if (error.errors) {
-				flattened = [...this.flattenDiscordError(error.errors)].join('\n');
+				flattened = [...DiscordAPIError.flattenDiscordError(error.errors)].join('\n');
 			}
 
 			return error.message && flattened
@@ -106,10 +106,10 @@ export class DiscordAPIError extends Error {
 				yield val;
 			} else if (isErrorGroupWrapper(val)) {
 				for (const error of val._errors) {
-					yield* this.flattenDiscordError(error, nextKey);
+					yield* DiscordAPIError.flattenDiscordError(error, nextKey);
 				}
 			} else {
-				yield* this.flattenDiscordError(val, nextKey);
+				yield* DiscordAPIError.flattenDiscordError(val, nextKey);
 			}
 		}
 	}

package/src/lib/handlers/BurstHandler.ts

@@ -1,8 +1,7 @@
-
-import type { REST } from '../REST.js';
 import type { IHandler } from '../interfaces/Handler.js';
+import type { REST } from '../REST.js';
 import { RESTEvents } from '../utils/constants.js';
-import type { ResponseLike, HandlerRequestData, RouteData, RateLimitData } from '../utils/types.js';
+import type { HandlerRequestData, RateLimitData, ResponseLike, RouteData } from '../utils/types.js';
 import { normalizeRateLimitOffset, onRateLimit, sleep } from '../utils/utils.js';
 import { handleErrors, incrementInvalidCount, makeNetworkRequest } from './Shared.js';
 

package/src/lib/handlers/SequentialHandler.ts

@@ -1,12 +1,12 @@
-import { AsyncQueue } from '../utils/AsyncQueue.js';
-import type { REST } from '../REST.js';
 import type { IHandler } from '../interfaces/Handler.js';
+import type { REST } from '../REST.js';
+import { AsyncQueue } from '../utils/AsyncQueue.js';
 import { RESTEvents } from '../utils/constants.js';
-import type { RateLimitData, ResponseLike, HandlerRequestData, RouteData } from '../utils/types.js';
+import type { HandlerRequestData, RateLimitData, ResponseLike, RouteData } from '../utils/types.js';
 import { hasSublimit, normalizeRateLimitOffset, onRateLimit, sleep } from '../utils/utils.js';
 import { handleErrors, incrementInvalidCount, makeNetworkRequest } from './Shared.js';
 
-const enum QueueType {
+enum QueueType {
 	Standard,
 	Sublimit,
 }

package/src/lib/handlers/Shared.ts

@@ -1,11 +1,9 @@
-
-
-import type { REST } from '../REST.js';
 import type { DiscordErrorData, OAuthErrorData } from '../errors/DiscordAPIError.js';
 import { DiscordAPIError } from '../errors/DiscordAPIError.js';
 import { HTTPError } from '../errors/HTTPError.js';
+import type { REST } from '../REST.js';
 import { RESTEvents } from '../utils/constants.js';
-import type { ResponseLike, HandlerRequestData, RouteData } from '../utils/types.js';
+import type { HandlerRequestData, ResponseLike, RouteData } from '../utils/types.js';
 import { normalizeRetryBackoff, normalizeTimeout, parseResponse, shouldRetry, sleep } from '../utils/utils.js';
 
 let authFalseWarningEmitted = false;

package/src/lib/interfaces/Handler.ts

@@ -1,5 +1,4 @@
-
-import type { HandlerRequestData, RouteData, ResponseLike } from '../utils/types.js';
+import type { HandlerRequestData, ResponseLike, RouteData } from '../utils/types.js';
 
 export interface IHandler {
 	/**

package/src/lib/utils/AsyncEventEmitter.ts

@@ -1,2 +1 @@
 export { AsyncEventEmitter } from '@ovencord/util';
-

package/src/lib/utils/AsyncQueue.ts

@@ -17,7 +17,7 @@ export class AsyncQueue {
 	 * @param options.signal - An optional abort signal
 	 */
 	public wait(options?: { signal?: AbortSignal }): Promise<void> {
-		const next = this.#promises.length ? this.#promises.at(-1)!.promise : Promise.resolve();
+		const next = this.#promises.length ? this.#promises.at(-1)?.promise : Promise.resolve();
 
 		let resolve!: () => void;
 		const promise = new Promise<void>((res) => {
@@ -26,32 +26,32 @@ export class AsyncQueue {
 
 		this.#promises.push({ promise, resolve });
 
-        // If no signal, just return the promise we wait on
-        if (!options?.signal) {
-            return next;
-        }
+		// If no signal, just return the promise we wait on
+		if (!options?.signal) {
+			return next;
+		}
 
-        return new Promise((res, rej) => {
-            if (options.signal!.aborted) {
-                // Bridge immediately: when next resolves, we resolve our token
-                next.then(() => resolve());
-                rej(new Error('AbortError')); // TODO: Use DOMException or standard AbortError if available
-                return;
-            }
+		return new Promise((res, rej) => {
+			if (options.signal?.aborted) {
+				// Bridge immediately: when next resolves, we resolve our token
+				next.then(() => resolve());
+				rej(new Error('AbortError')); // TODO: Use DOMException or standard AbortError if available
+				return;
+			}
 
-            const abortHandler = () => {
-                // Bridge: when next resolves, we resolve our token
-                next.then(() => resolve());
-                rej(new Error('AbortError'));
-            };
+			const abortHandler = () => {
+				// Bridge: when next resolves, we resolve our token
+				next.then(() => resolve());
+				rej(new Error('AbortError'));
+			};
 
-            options.signal!.addEventListener('abort', abortHandler, { once: true });
+			options.signal?.addEventListener('abort', abortHandler, { once: true });
 
-            next.then(() => {
-                options.signal!.removeEventListener('abort', abortHandler);
-                res();
-            });
-        });
+			next.then(() => {
+				options.signal?.removeEventListener('abort', abortHandler);
+				res();
+			});
+		});
 	}
 
 	/**

package/src/lib/utils/constants.ts

@@ -15,7 +15,7 @@ export const DefaultUserAgent =
 export const DefaultUserAgentAppendix = getUserAgentAppendix();
 
 export const DefaultRestOptions = {
-	// @ts-ignore
+	// @ts-expect-error
 	agent: null,
 	api: 'https://discord.com/api',
 	authPrefix: 'Bot',
@@ -24,7 +24,7 @@ export const DefaultRestOptions = {
 	invalidRequestWarningInterval: 0,
 	globalRequestsPerSecond: 50,
 	offset: 50,
-	// @ts-ignore
+	// @ts-expect-error
 	rejectOnRateLimit: null,
 	retries: 3,
 	retryBackoff: 0,
@@ -61,7 +61,6 @@ export const ALLOWED_SIZES: readonly number[] = [
 export type ImageExtension = (typeof ALLOWED_EXTENSIONS)[number];
 export type StickerExtension = (typeof ALLOWED_STICKER_EXTENSIONS)[number];
 
-
 export const BurstHandlerMajorIdKey = 'burst';
 
 export const AUTH_UUID_NAMESPACE = 'acc82a4c-f887-417b-a69c-f74096ff7e59';

package/src/lib/utils/types.ts

@@ -260,10 +260,11 @@ export interface APIRequest {
 	route: string;
 }
 
-export interface ResponseLike extends Pick<
-	globalThis.Response,
-	'arrayBuffer' | 'bodyUsed' | 'headers' | 'json' | 'ok' | 'status' | 'statusText' | 'text'
-> {
+export interface ResponseLike
+	extends Pick<
+		globalThis.Response,
+		'arrayBuffer' | 'bodyUsed' | 'headers' | 'json' | 'ok' | 'status' | 'statusText' | 'text'
+	> {
 	body: ReadableStream | null;
 }
 

package/src/lib/utils/utils.ts

@@ -1,8 +1,6 @@
-
 import type { RESTPatchAPIChannelJSONBody, Snowflake } from 'discord-api-types/v10';
-import type { REST } from '../REST.js';
 import { RateLimitError } from '../errors/RateLimitError.js';
-import { RequestMethod } from './types.js';
+import type { REST } from '../REST.js';
 import type {
 	GetRateLimitOffsetFunction,
 	GetRetryBackoffFunction,
@@ -10,6 +8,7 @@ import type {
 	RateLimitData,
 	ResponseLike,
 } from './types.js';
+import { RequestMethod } from './types.js';
 
 function serializeSearchParam(value: unknown): string | null {
 	switch (typeof value) {
@@ -203,44 +202,44 @@ export function normalizeTimeout(timeout: GetTimeoutFunction | number, route: st
  * @param namespace - The namespace UUID
  */
 export function uuidv5(value: string | Uint8Array, namespace: string): string {
-    // 1. Verify namespace is a valid UUID
-    if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(namespace)) {
-        throw new TypeError('Invalid namespace UUID');
-    }
-
-    // 2. Parse namespace UUID into bytes
-    const namespaceBytes = new Uint8Array(16);
-    const hex = namespace.replace(/-/g, '');
-    for (let i = 0; i < 16; i++) {
-        namespaceBytes[i] = Number.parseInt(hex.slice(i * 2, i * 2 + 2), 16);
-    }
-
-    // 3. Convert value to bytes if string
-    const valueBytes = typeof value === 'string' ? new TextEncoder().encode(value) : value;
-
-    // 4. Concatenate namespace and value
-    const data = new Uint8Array(namespaceBytes.length + valueBytes.length);
-    data.set(namespaceBytes);
-    data.set(valueBytes, namespaceBytes.length);
-
-    // 5. Hash with SHA-1
-    const buffer = new Bun.CryptoHasher('sha1').update(data).digest();
-    const hash = new Uint8Array(buffer);
-
-    // 6. Set version to 5 (0101)
-    hash[6] = (hash[6]! & 0x0f) | 0x50;
-
-    // 7. Set variant to RFC 4122 (10xx)
-    hash[8] = (hash[8]! & 0x3f) | 0x80;
-
-    // 8. Convert to hex string with dashes
-    const hexHash = Array.from(hash, (byte) => byte.toString(16).padStart(2, '0'));
-    
-    return [
-        hexHash.slice(0, 4).join(''),
-        hexHash.slice(4, 6).join(''),
-        hexHash.slice(6, 8).join(''),
-        hexHash.slice(8, 10).join(''),
-        hexHash.slice(10, 16).join('')
-    ].join('-');
+	// 1. Verify namespace is a valid UUID
+	if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(namespace)) {
+		throw new TypeError('Invalid namespace UUID');
+	}
+
+	// 2. Parse namespace UUID into bytes
+	const namespaceBytes = new Uint8Array(16);
+	const hex = namespace.replace(/-/g, '');
+	for (let i = 0; i < 16; i++) {
+		namespaceBytes[i] = Number.parseInt(hex.slice(i * 2, i * 2 + 2), 16);
+	}
+
+	// 3. Convert value to bytes if string
+	const valueBytes = typeof value === 'string' ? new TextEncoder().encode(value) : value;
+
+	// 4. Concatenate namespace and value
+	const data = new Uint8Array(namespaceBytes.length + valueBytes.length);
+	data.set(namespaceBytes);
+	data.set(valueBytes, namespaceBytes.length);
+
+	// 5. Hash with SHA-1
+	const buffer = new Bun.CryptoHasher('sha1').update(data).digest();
+	const hash = new Uint8Array(buffer);
+
+	// 6. Set version to 5 (0101)
+	hash[6] = (hash[6]! & 0x0f) | 0x50;
+
+	// 7. Set variant to RFC 4122 (10xx)
+	hash[8] = (hash[8]! & 0x3f) | 0x80;
+
+	// 8. Convert to hex string with dashes
+	const hexHash = Array.from(hash, (byte) => byte.toString(16).padStart(2, '0'));
+
+	return [
+		hexHash.slice(0, 4).join(''),
+		hexHash.slice(4, 6).join(''),
+		hexHash.slice(6, 8).join(''),
+		hexHash.slice(8, 10).join(''),
+		hexHash.slice(10, 16).join(''),
+	].join('-');
 }