seyfert 4.4.0 → 5.0.1-dev-27861043347.0

package/lib/api/Routes/cdn.d.ts

@@ -82,4 +82,4 @@ export interface CDNRoute {
         };
     };
 }
-export type UserAvatarDefault = 1 | 2 | 3 | 4 | 5 | number;
+export type UserAvatarDefault = 0 | 1 | 2 | 3 | 4 | 5;

package/lib/api/Routes/guilds.d.ts

@@ -1,6 +1,6 @@
 import type { Identify, OmitInsert } from '../../common';
 import type { APIThreadChannel, RESTDeleteAPIAutoModerationRuleResult, RESTDeleteAPIGuildBanResult, RESTDeleteAPIGuildEmojiResult, RESTDeleteAPIGuildIntegrationResult, RESTDeleteAPIGuildMemberResult, RESTDeleteAPIGuildMemberRoleResult, RESTDeleteAPIGuildResult, RESTDeleteAPIGuildRoleResult, RESTDeleteAPIGuildScheduledEventResult, RESTDeleteAPIGuildStickerResult, RESTDeleteAPIGuildTemplateResult, RESTGetAPIAuditLogQuery, RESTGetAPIAuditLogResult, RESTGetAPIAutoModerationRuleResult, RESTGetAPIAutoModerationRulesResult, RESTGetAPIGuildBanResult, RESTGetAPIGuildBansQuery, RESTGetAPIGuildBansResult, RESTGetAPIGuildChannelsResult, RESTGetAPIGuildEmojiResult, RESTGetAPIGuildEmojisResult, RESTGetAPIGuildIntegrationsResult, RESTGetAPIGuildInvitesResult, RESTGetAPIGuildMemberResult, RESTGetAPIGuildMembersQuery, RESTGetAPIGuildMembersResult, RESTGetAPIGuildMembersSearchQuery, RESTGetAPIGuildMembersSearchResult, RESTGetAPIGuildMessagesSearchQuery, RESTGetAPIGuildMessagesSearchResult, RESTGetAPIGuildPreviewResult, RESTGetAPIGuildPruneCountQuery, RESTGetAPIGuildPruneCountResult, RESTGetAPIGuildQuery, RESTGetAPIGuildResult, RESTGetAPIGuildRoleMemberCountsResult, RESTGetAPIGuildRoleResult, RESTGetAPIGuildRolesResult, RESTGetAPIGuildScheduledEventQuery, RESTGetAPIGuildScheduledEventResult, RESTGetAPIGuildScheduledEventsQuery, RESTGetAPIGuildScheduledEventsResult, RESTGetAPIGuildScheduledEventUsersQuery, RESTGetAPIGuildScheduledEventUsersResult, RESTGetAPIGuildSoundboardSoundsResult, RESTGetAPIGuildStickerResult, RESTGetAPIGuildStickersResult, RESTGetAPIGuildTemplatesResult, RESTGetAPIGuildThreadsResult, RESTGetAPIGuildVanityUrlResult, RESTGetAPIGuildVoiceRegionsResult, RESTGetAPIGuildVoiceStateCurrentMemberResult, RESTGetAPIGuildVoiceStateUserResult, RESTGetAPIGuildWebhooksResult, RESTGetAPIGuildWelcomeScreenResult, RESTGetAPIGuildWidgetImageQuery, RESTGetAPIGuildWidgetImageResult, RESTGetAPIGuildWidgetJSONResult, RESTGetAPIGuildWidgetSettingsResult, RESTGetAPITemplateResult, RESTPatchAPIAutoModerationRuleJSONBody, RESTPatchAPIAutoModerationRuleResult, RESTPatchAPICurrentGuildMemberJSONBody, RESTPatchAPIGuildChannelPositionsJSONBody, RESTPatchAPIGuildChannelPositionsResult, RESTPatchAPIGuildEmojiJSONBody, RESTPatchAPIGuildEmojiResult, RESTPatchAPIGuildJSONBody, RESTPatchAPIGuildMemberJSONBody, RESTPatchAPIGuildMemberResult, RESTPatchAPIGuildResult, RESTPatchAPIGuildRoleJSONBody, RESTPatchAPIGuildRolePositionsJSONBody, RESTPatchAPIGuildRolePositionsResult, RESTPatchAPIGuildRoleResult, RESTPatchAPIGuildScheduledEventJSONBody, RESTPatchAPIGuildScheduledEventResult, RESTPatchAPIGuildSoundboardSoundJSONBody, RESTPatchAPIGuildSoundboardSoundResult, RESTPatchAPIGuildStickerJSONBody, RESTPatchAPIGuildStickerResult, RESTPatchAPIGuildTemplateJSONBody, RESTPatchAPIGuildTemplateResult, RESTPatchAPIGuildVoiceStateCurrentMemberJSONBody, RESTPatchAPIGuildVoiceStateCurrentMemberResult, RESTPatchAPIGuildVoiceStateUserJSONBody, RESTPatchAPIGuildVoiceStateUserResult, RESTPatchAPIGuildWelcomeScreenJSONBody, RESTPatchAPIGuildWelcomeScreenResult, RESTPatchAPIGuildWidgetSettingsJSONBody, RESTPatchAPIGuildWidgetSettingsResult, RESTPostAPIAutoModerationRuleJSONBody, RESTPostAPIAutoModerationRuleResult, RESTPostAPIGuildBulkBanJSONBody, RESTPostAPIGuildBulkBanResult, RESTPostAPIGuildChannelJSONBody, RESTPostAPIGuildChannelResult, RESTPostAPIGuildEmojiJSONBody, RESTPostAPIGuildEmojiResult, RESTPostAPIGuildPruneJSONBody, RESTPostAPIGuildPruneResult, RESTPostAPIGuildRoleJSONBody, RESTPostAPIGuildRoleResult, RESTPostAPIGuildScheduledEventJSONBody, RESTPostAPIGuildScheduledEventResult, RESTPostAPIGuildSoundboardSoundJSONBody, RESTPostAPIGuildSoundboardSoundResult, RESTPostAPIGuildStickerFormDataBody, RESTPostAPIGuildStickerResult, RESTPostAPIGuildsMFAJSONBody, RESTPostAPIGuildsMFAResult, RESTPostAPIGuildTemplatesJSONBody, RESTPostAPIGuildTemplatesResult, RESTPostAPITemplateCreateGuildJSONBody, RESTPostAPITemplateCreateGuildResult, RESTPutAPIGuildBanJSONBody, RESTPutAPIGuildBanResult, RESTPutAPIGuildMemberJSONBody, RESTPutAPIGuildMemberResult, RESTPutAPIGuildMemberRoleResult, RESTPutAPIGuildTemplateSyncResult } from '../../types';
-import type { RestArguments, RestArgumentsNoBody } from '../api';
+import type { RestArguments, RestArgumentsNoBody, RestArgumentsRequiredQuery } from '../api';
 import type { RawFile } from '../shared';
 export interface GuildRoutes {
     guilds: {
@@ -40,7 +40,7 @@ export interface GuildRoutes {
             members: {
                 get(args?: RestArgumentsNoBody<RESTGetAPIGuildMembersQuery>): Promise<RESTGetAPIGuildMembersResult>;
                 search: {
-                    get(args: RestArgumentsNoBody<RESTGetAPIGuildMembersSearchQuery>): Promise<RESTGetAPIGuildMembersSearchResult>;
+                    get(args: RestArgumentsRequiredQuery<RESTGetAPIGuildMembersSearchQuery>): Promise<RESTGetAPIGuildMembersSearchResult>;
                 };
                 '@me': {
                     patch(args: RestArguments<RESTPatchAPICurrentGuildMemberJSONBody>): Promise<RESTGetAPIGuildMemberResult>;

package/lib/api/api.d.ts

@@ -3,14 +3,15 @@ import { type Awaitable, Logger, SeyfertError } from '../common';
 import type { WorkerSendApiRequest } from '../websocket/discord/worker';
 import { Bucket } from './bucket';
 import type { APIRoutes } from './Routes';
-import { type ApiHandlerInternalOptions, type ApiHandlerOptions, type ApiRequestOptions, type HttpMethods, type RawFile, type RequestHeaders } from './shared';
-export interface ApiHandler {
+import { type ApiHandlerInternalOptions, type ApiHandlerOptions, type ApiRequestOptions, type HttpMethods, type RawFile, type RequestHeaders, type RestObserveOptions, type RestObserver, type RestObserverDisposer, type RestObserverEntry } from './shared';
+export type { RestObserveOptions, RestObserver, RestObserverDisposer, RestObserverEntry, RestObserverFailPayload, RestObserverRatelimitPayload, RestObserverRequestPayload, RestObserverSuccessPayload, } from './shared';
+export interface ApiHandler<TClient = unknown> {
     debugger?: Logger;
 }
 export type OnRatelimitCallback = (response: Response, request: ApiRequestOptions) => Awaitable<any>;
 export type OnSuccessRequestCallback = (method: HttpMethods, url: `/${string}`, response: Response) => Awaitable<any>;
 export type OnFailRequestCallback = (method: HttpMethods, url: `/${string}`, error: unknown, statusCode?: number) => Awaitable<any>;
-export declare class ApiHandler {
+export declare class ApiHandler<TClient = unknown> {
     options: ApiHandlerInternalOptions;
     globalBlock: boolean;
     ratelimits: Map<string, Bucket>;
@@ -23,22 +24,30 @@ export declare class ApiHandler {
     onRatelimit?: OnRatelimitCallback;
     onSuccessRequest?: OnSuccessRequestCallback;
     onFailRequest?: OnFailRequestCallback;
+    pluginRestObserverProvider?: () => readonly RestObserverEntry[];
+    pluginRestObserverClient?: TClient;
+    private restObservers;
     constructor(options: ApiHandlerOptions);
+    observe(observer: RestObserver<TClient>, _opts?: RestObserveOptions): RestObserverDisposer;
     set debug(active: boolean);
     get proxy(): APIRoutes;
     globalUnblock(): void;
     randomUUID(): UUID;
     protected sendMessage(_body: WorkerSendApiRequest): void;
     protected postMessage<T = unknown>(body: WorkerSendApiRequest): Promise<T>;
+    private notifyRequest;
     private notifySuccessRequest;
     private notifyFailRequest;
+    private notifyRatelimit;
+    private notifyRestObservers;
+    private notifyRestObserverEntries;
     request<T = unknown>(method: HttpMethods, url: `/${string}`, { auth, ...request }?: ApiRequestOptions): Promise<T>;
     parseError(method: HttpMethods, route: `/${string}`, response: Response, result: string | Record<string, any>, originTrace?: {
         stack?: string;
     }): SeyfertError;
     parseValidationError(data: Record<string, any>, path?: string, errors?: string[]): string[];
     handle50X(method: HttpMethods, url: `/${string}`, request: ApiRequestOptions, next: () => void): Promise<unknown>;
-    handle429(route: string, method: HttpMethods, url: `/${string}`, request: ApiRequestOptions, response: Response, result: string, next: () => void, reject: (err: unknown) => void, now: number): Promise<unknown>;
+    handle429(route: string, method: HttpMethods, url: `/${string}`, request: ApiRequestOptions, response: Response, result: string, next: () => void, reject: (err: unknown) => void, now: number, notifyUrl: `/${string}`): Promise<unknown>;
     clearResetInterval(route: string): void;
     setResetBucket(route: string, resp: Response, now: number, headerNow: number): void;
     setRatelimitsBucket(route: string, resp: Response): void;
@@ -63,3 +72,6 @@ export type RestArgumentsNoBody<Q extends never | Record<string, any> = never> =
     query?: Q;
     files?: RawFile[];
 } & RequestOptions;
+export type RestArgumentsRequiredQuery<Q extends Record<string, any>> = Omit<RestArgumentsNoBody<Q>, 'query'> & {
+    query: Q;
+};

package/lib/api/api.js

@@ -18,6 +18,9 @@ class ApiHandler {
     onRatelimit;
     onSuccessRequest;
     onFailRequest;
+    pluginRestObserverProvider;
+    pluginRestObserverClient;
+    restObservers = new Map();
     constructor(options) {
         this.options = {
             baseUrl: 'api/v10',
@@ -59,6 +62,17 @@ class ApiHandler {
             };
         }
     }
+    observe(observer, _opts) {
+        const id = Symbol('rest-observer');
+        this.restObservers.set(id, { observer });
+        let disposed = false;
+        return () => {
+            if (disposed)
+                return;
+            disposed = true;
+            this.restObservers.delete(id);
+        };
+    }
     set debug(active) {
         this.debugger = active
             ? new common_1.Logger({
@@ -91,7 +105,22 @@ class ApiHandler {
             this.workerPromises.set(body.nonce, { reject: rej, resolve: res });
         });
     }
-    async notifySuccessRequest(method, url, response) {
+    async notifyRequest(method, url, request) {
+        await this.notifyRestObservers('onRequest', () => freezeRestPayload({
+            client: this.pluginRestObserverClient,
+            method,
+            url,
+            request: readonlyRequestOptions(request),
+        }));
+    }
+    async notifySuccessRequest(method, url, response, request) {
+        await this.notifyRestObservers('onSuccess', () => freezeRestPayload({
+            client: this.pluginRestObserverClient,
+            method,
+            url,
+            request: readonlyRequestOptions(request),
+            response,
+        }));
         try {
             await this.onSuccessRequest?.(method, url, response);
         }
@@ -99,7 +128,15 @@ class ApiHandler {
             this.debugger?.warn('onSuccessRequest callback error', error);
         }
     }
-    async notifyFailRequest(method, url, error, statusCode) {
+    async notifyFailRequest(method, url, error, statusCode, request) {
+        await this.notifyRestObservers('onFail', () => freezeRestPayload({
+            client: this.pluginRestObserverClient,
+            method,
+            url,
+            request: readonlyRequestOptions(request),
+            error,
+            statusCode,
+        }));
         try {
             await this.onFailRequest?.(method, url, error, statusCode);
         }
@@ -107,6 +144,49 @@ class ApiHandler {
             this.debugger?.warn('onFailRequest callback error', callbackError);
         }
     }
+    async notifyRatelimit(response, request, method, url) {
+        await this.notifyRestObservers('onRatelimit', () => freezeRestPayload({
+            client: this.pluginRestObserverClient,
+            method,
+            url,
+            request: readonlyRequestOptions(request),
+            response,
+        }));
+        try {
+            await this.onRatelimit?.(response, request);
+        }
+        catch (error) {
+            this.debugger?.warn('onRatelimit callback error', error);
+        }
+    }
+    async notifyRestObservers(name, createPayload) {
+        let payload;
+        let hasPayload = false;
+        const getPayload = () => {
+            if (!hasPayload) {
+                payload = createPayload();
+                hasPayload = true;
+            }
+            return payload;
+        };
+        await this.notifyRestObserverEntries(name, getPayload, this.pluginRestObserverProvider?.() ?? []);
+        await this.notifyRestObserverEntries(name, getPayload, this.restObservers.values());
+    }
+    async notifyRestObserverEntries(name, getPayload, entries) {
+        for (const entry of entries) {
+            const observer = entry.observer[name];
+            if (!observer)
+                continue;
+            const payload = getPayload();
+            try {
+                await observer(payload);
+            }
+            catch (error) {
+                const source = entry.plugin ? `[plugin:${entry.plugin}] ` : '';
+                this.debugger?.warn(`${source}REST observer "${name}" callback error`, error);
+            }
+        }
+    }
     async request(method, url, { auth = true, ...request } = {}) {
         const originTrace = {};
         Error.captureStackTrace(originTrace, this.request);
@@ -127,14 +207,24 @@ class ApiHandler {
             const headers = {
                 'User-Agent': this.options.userAgent,
             };
-            const { data, finalUrl } = this.parseRequest({
-                url,
-                headers,
-                request: { ...request, auth },
-            });
+            let data;
+            let finalUrl;
+            try {
+                ({ data, finalUrl } = this.parseRequest({
+                    url,
+                    headers,
+                    request: { ...request, auth },
+                }));
+            }
+            catch (err) {
+                next();
+                reject(err);
+                return;
+            }
             let response;
             try {
                 const requestUrl = `${this.options.domain}/${this.options.baseUrl}${finalUrl}`;
+                await this.notifyRequest(method, finalUrl, { ...request, auth });
                 this.debugger?.debug(`Sending, Method: ${method} | Url: [${finalUrl}](${route}) | Auth: ${auth}`);
                 response = await fetch(requestUrl, {
                     method,
@@ -145,7 +235,7 @@ class ApiHandler {
             }
             catch (err) {
                 this.debugger?.debug('Fetch error', err);
-                await this.notifyFailRequest(method, finalUrl, err);
+                await this.notifyFailRequest(method, finalUrl, err, undefined, { ...request, auth });
                 next();
                 reject(err);
                 return;
@@ -154,13 +244,14 @@ class ApiHandler {
             const headerNow = Date.parse(response.headers.get('date') ?? '');
             this.setRatelimitsBucket(route, response);
             this.setResetBucket(route, response, now, headerNow);
+            const observerResponse = response.clone();
             let result = await response.text();
             if (response.status >= 300) {
                 if (response.status === 429) {
-                    const result429 = await this.handle429(route, method, url, request, response, result, next, reject, now);
+                    const result429 = await this.handle429(route, method, url, { ...request, auth }, observerResponse, result, next, reject, now, finalUrl);
                     if (result429 !== false)
                         return resolve(result429);
-                    await this.notifyFailRequest(method, finalUrl, result, response.status);
+                    await this.notifyFailRequest(method, finalUrl, result, response.status, { ...request, auth });
                     return this.clearResetInterval(route);
                 }
                 if ([502, 503].includes(response.status) && ++attempts < 4) {
@@ -176,7 +267,7 @@ class ApiHandler {
                         }
                         catch (err) {
                             this.debugger?.warn('SeyfertError parsing result error (', result, ')', err);
-                            await this.notifyFailRequest(method, finalUrl, err, response.status);
+                            await this.notifyFailRequest(method, finalUrl, err, response.status, { ...request, auth });
                             reject(err);
                             return;
                         }
@@ -184,7 +275,7 @@ class ApiHandler {
                 }
                 const parsedError = this.parseError(method, route, response, result, originTrace);
                 this.debugger?.warn(parsedError.message);
-                await this.notifyFailRequest(method, finalUrl, parsedError, response.status);
+                await this.notifyFailRequest(method, finalUrl, parsedError, response.status, { ...request, auth });
                 reject(parsedError);
                 return;
             }
@@ -195,14 +286,14 @@ class ApiHandler {
                     }
                     catch (err) {
                         this.debugger?.warn('Failed parsing result (', result, ')', err);
-                        await this.notifyFailRequest(method, finalUrl, err, response.status);
+                        await this.notifyFailRequest(method, finalUrl, err, response.status, { ...request, auth });
                         next();
                         reject(err);
                         return;
                     }
                 }
             }
-            await this.notifySuccessRequest(method, finalUrl, response);
+            await this.notifySuccessRequest(method, finalUrl, observerResponse, { ...request, auth });
             next();
             return resolve(result || undefined);
         };
@@ -285,15 +376,12 @@ class ApiHandler {
         next();
         await (0, common_1.delay)(wait);
         return this.request(method, url, {
-            body: request.body,
-            auth: request.auth,
-            reason: request.reason,
-            route: request.route,
+            ...request,
             unshift: true,
         });
     }
-    async handle429(route, method, url, request, response, result, next, reject, now) {
-        await this.onRatelimit?.(response, request);
+    async handle429(route, method, url, request, response, result, next, reject, now, notifyUrl) {
+        await this.notifyRatelimit(response, request, method, notifyUrl);
         const bucket = this.ratelimits.get(route);
         let retryAfter;
         const data = JSON.parse(result);
@@ -325,19 +413,13 @@ class ApiHandler {
             await (0, common_1.delay)(retryAfter);
             next();
             return this.request(method, url, {
-                body: request.body,
-                auth: request.auth,
-                reason: request.reason,
-                route: request.route,
+                ...request,
                 unshift: true,
             });
         }
         next();
         return this.request(method, url, {
-            body: request.body,
-            auth: request.auth,
-            reason: request.reason,
-            route: request.route,
+            ...request,
             unshift: true,
         });
     }
@@ -389,7 +471,11 @@ class ApiHandler {
         let finalUrl = options.url;
         let data;
         if (options.request.auth) {
-            options.headers.Authorization = `${this.options.type} ${options.request.token || this.options.token}`;
+            const token = options.request.token || this.options.token;
+            if (token === 'INVALID' || typeof token !== 'string' || token.length === 0) {
+                throw new common_1.SeyfertError('INVALID_TOKEN', { metadata: { detail: 'token is not a string' } });
+            }
+            options.headers.Authorization = `${this.options.type} ${token}`;
         }
         if (options.request.query) {
             const params = new URLSearchParams();
@@ -449,7 +535,7 @@ class ApiHandler {
             .replace(/^\/webhooks\/(\d+)\/[A-Za-z0-9-_]{64,}/, '/webhooks/$1/:token');
         if (method === 'DELETE' && route.endsWith('/messages/:id')) {
             const messageID = url.slice(url.lastIndexOf('/') + 1);
-            const createdAt = Number((0, common_1.snowflakeToTimestamp)(messageID));
+            const createdAt = (0, common_1.snowflakeToTimestamp)(messageID);
             if (Date.now() - createdAt >= 1000 * 60 * 60 * 24 * 14) {
                 method += '_OLD';
             }
@@ -471,3 +557,40 @@ class ApiHandler {
     }
 }
 exports.ApiHandler = ApiHandler;
+function freezeRestPayload(payload) {
+    return Object.freeze(payload);
+}
+function readonlyRequestOptions(request) {
+    const clone = deepClonePlain({
+        ...request,
+        body: request.body ? deepClonePlain(request.body) : undefined,
+        query: request.query ? deepClonePlain(request.query) : undefined,
+        files: request.files?.map(file => deepClonePlain(file)),
+    });
+    return deepFreezePlain(clone);
+}
+function deepClonePlain(value) {
+    if (Array.isArray(value))
+        return value.map(deepClonePlain);
+    if (!isPlainObject(value))
+        return value;
+    return Object.fromEntries(Object.entries(value).map(([key, entry]) => [key, deepClonePlain(entry)]));
+}
+function deepFreezePlain(value) {
+    if (Array.isArray(value)) {
+        for (const entry of value)
+            deepFreezePlain(entry);
+        return Object.freeze(value);
+    }
+    if (!isPlainObject(value))
+        return value;
+    for (const entry of Object.values(value))
+        deepFreezePlain(entry);
+    return Object.freeze(value);
+}
+function isPlainObject(value) {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const prototype = Object.getPrototypeOf(value);
+    return prototype === Object.prototype || prototype === null;
+}

package/lib/api/shared.d.ts

@@ -1,4 +1,4 @@
-import type { MakeRequired } from '../common';
+import type { Awaitable, MakeRequired } from '../common';
 export * from './api';
 export * from './utils/constants';
 export * from './utils/types';
@@ -34,3 +34,32 @@ export interface ApiRequestOptions {
     token?: string;
 }
 export type HttpMethods = 'GET' | 'DELETE' | 'PUT' | 'POST' | 'PATCH';
+export interface RestObserverRequestPayload<TClient = unknown> {
+    readonly client: TClient;
+    readonly method: HttpMethods;
+    readonly url: `/${string}`;
+    readonly request: Readonly<ApiRequestOptions>;
+}
+export interface RestObserverSuccessPayload<TClient = unknown> extends RestObserverRequestPayload<TClient> {
+    readonly response: Response;
+}
+export interface RestObserverFailPayload<TClient = unknown> extends RestObserverRequestPayload<TClient> {
+    readonly error: unknown;
+    readonly statusCode?: number;
+}
+export interface RestObserverRatelimitPayload<TClient = unknown> extends RestObserverRequestPayload<TClient> {
+    readonly response: Response;
+}
+export interface RestObserver<TClient = unknown> {
+    onRequest?(payload: RestObserverRequestPayload<TClient>): Awaitable<unknown>;
+    onSuccess?(payload: RestObserverSuccessPayload<TClient>): Awaitable<unknown>;
+    onFail?(payload: RestObserverFailPayload<TClient>): Awaitable<unknown>;
+    onRatelimit?(payload: RestObserverRatelimitPayload<TClient>): Awaitable<unknown>;
+}
+export interface RestObserverEntry<TClient = unknown> {
+    readonly plugin?: string;
+    readonly observer: RestObserver<TClient>;
+}
+export interface RestObserveOptions {
+}
+export type RestObserverDisposer = () => void;

package/lib/api/utils/constants.d.ts

@@ -1,4 +1,4 @@
-export declare const DefaultUserAgent: "DiscordBot (https://seyfert.dev, v4.4.0)";
+export declare const DefaultUserAgent: "DiscordBot (https://seyfert.dev, v4.0.0)";
 export declare const ALLOWED_EXTENSIONS: readonly ["webp", "png", "jpg", "jpeg", "gif"];
 export declare const ALLOWED_STICKER_EXTENSIONS: readonly ["png", "json", "gif"];
 export declare const ALLOWED_SIZES: readonly [16, 32, 64, 100, 128, 256, 512, 1024, 2048, 4096];

package/lib/api/utils/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ALLOWED_TAG_BADGE_EXTENSIONS = exports.ALLOWED_SOUNDS_EXTENSIONS = exports.ALLOWED_SIZES = exports.ALLOWED_STICKER_EXTENSIONS = exports.ALLOWED_EXTENSIONS = exports.DefaultUserAgent = void 0;
-exports.DefaultUserAgent = 'DiscordBot (https://seyfert.dev, v4.4.0)';
+exports.DefaultUserAgent = 'DiscordBot (https://seyfert.dev, v4.0.0)';
 exports.ALLOWED_EXTENSIONS = ['webp', 'png', 'jpg', 'jpeg', 'gif'];
 exports.ALLOWED_STICKER_EXTENSIONS = ['png', 'json', 'gif'];
 exports.ALLOWED_SIZES = [16, 32, 64, 100, 128, 256, 512, 1_024, 2_048, 4_096];

package/lib/api/utils/utils.d.ts

@@ -1,10 +1,11 @@
 import type { Snowflake } from '../../types';
+import type { UserAvatarDefault } from '../Routes/cdn';
 /**
  * Calculates the default avatar index for a given user id.
  *
  * @param userId - The user id to calculate the default avatar index for
  */
-export declare function calculateUserDefaultAvatarIndex(userId: Snowflake, discriminator: string): number;
+export declare function calculateUserDefaultAvatarIndex(userId: Snowflake, discriminator: string): UserAvatarDefault;
 /**
  * Verifies that a value is a buffer-like object.
  *

package/lib/api/utils/utils.js

@@ -8,7 +8,7 @@ exports.isBufferLike = isBufferLike;
  * @param userId - The user id to calculate the default avatar index for
  */
 function calculateUserDefaultAvatarIndex(userId, discriminator) {
-    return discriminator === '0' ? Number(BigInt(userId) >> 22n) % 6 : Number.parseInt(discriminator) % 5;
+    return (discriminator === '0' ? Number(BigInt(userId) >> 22n) % 6 : Number.parseInt(discriminator) % 5);
 }
 /**
  * Verifies that a value is a buffer-like object.

package/lib/builders/MediaGallery.d.ts

@@ -1,4 +1,4 @@
-import type { RestOrArray } from '../common';
+import { type RestOrArray } from '../common';
 import { type APIMediaGalleryComponent, type APIMediaGalleryItems } from '../types';
 import { BaseComponentBuilder } from './Base';
 /**

package/lib/builders/MediaGallery.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MediaGalleryItem = exports.MediaGallery = void 0;
+const common_1 = require("../common");
 const types_1 = require("../types");
 const Base_1 = require("./Base");
 /**
@@ -104,6 +105,15 @@ class MediaGalleryItem {
      * @returns The JSON representation of the item data.
      */
     toJSON() {
+        if (!this.data.media)
+            throw new common_1.SeyfertError('MISSING_MEDIA', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('media to be set before calling toJSON()', this.data.media, {
+                        component: 'MediaGalleryItem',
+                    }),
+                    detail: 'Cannot convert to JSON without media.',
+                },
+            });
         return { ...this.data };
     }
 }

package/lib/builders/Modal.d.ts

@@ -1,4 +1,4 @@
-import type { RestOrArray } from '../common';
+import { type RestOrArray } from '../common';
 import { type APIModalInteractionResponseCallbackData, type APITextInputComponent, type TextInputStyle } from '../types';
 import { BaseComponentBuilder, type OptionValuesLength } from './Base';
 import type { ModalBuilderComponents, ModalSubmitCallback } from './types';
@@ -8,10 +8,16 @@ import type { ModalBuilderComponents, ModalSubmitCallback } from './types';
  * @example
  * const modal = new Modal();
  * modal.setTitle("Sample Modal");
+ * modal.setCustomId("sample-modal");
  * modal.addComponents(
- *   new ActionRow<TextInput>()
- *   .addComponents(new TextInput().setLabel("Enter text"))
- * ));
+ *   new Label()
+ *     .setLabel("Enter text")
+ *     .setComponent(
+ *       new TextInput()
+ *         .setCustomId("sample-input")
+ *         .setStyle(TextInputStyle.Paragraph)
+ *     )
+ * );
  * modal.run((interaction) => {
  *   // Handle modal submission
  * });
@@ -64,10 +70,14 @@ export declare class Modal {
 /**
  * Represents a text input component builder.
  * @example
- * const textInput = new TextInput().setLabel("Enter text");
- * textInput.setStyle(TextInputStyle.Paragraph);
- * textInput.setPlaceholder("Type here");
- * const json = textInput.toJSON();
+ * const textInput = new TextInput()
+ *   .setCustomId("feedback")
+ *   .setStyle(TextInputStyle.Paragraph)
+ *   .setPlaceholder("Type here");
+ * const label = new Label()
+ *   .setLabel("Feedback")
+ *   .setComponent(textInput);
+ * const json = label.toJSON();
  */
 export declare class TextInput extends BaseComponentBuilder<APITextInputComponent> {
     /**

package/lib/builders/Modal.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TextInput = exports.Modal = void 0;
+const common_1 = require("../common");
 const types_1 = require("../types");
 const _1 = require(".");
 const Base_1 = require("./Base");
@@ -10,10 +11,16 @@ const Base_1 = require("./Base");
  * @example
  * const modal = new Modal();
  * modal.setTitle("Sample Modal");
+ * modal.setCustomId("sample-modal");
  * modal.addComponents(
- *   new ActionRow<TextInput>()
- *   .addComponents(new TextInput().setLabel("Enter text"))
- * ));
+ *   new Label()
+ *     .setLabel("Enter text")
+ *     .setComponent(
+ *       new TextInput()
+ *         .setCustomId("sample-input")
+ *         .setStyle(TextInputStyle.Paragraph)
+ *     )
+ * );
  * modal.run((interaction) => {
  *   // Handle modal submission
  * });
@@ -82,6 +89,24 @@ class Modal {
      * @returns The modal data in JSON format.
      */
     toJSON() {
+        if (!this.data.custom_id)
+            throw new common_1.SeyfertError('MISSING_MODAL_CUSTOM_ID', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('custom_id to be set before calling toJSON()', this.data.custom_id, {
+                        component: 'Modal',
+                    }),
+                    detail: 'Cannot convert to JSON without a custom_id.',
+                },
+            });
+        if (!this.data.title)
+            throw new common_1.SeyfertError('MISSING_MODAL_TITLE', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('title to be set before calling toJSON()', this.data.title, {
+                        component: 'Modal',
+                    }),
+                    detail: 'Cannot convert to JSON without a title.',
+                },
+            });
         return {
             custom_id: this.data.custom_id,
             title: this.data.title,
@@ -93,10 +118,14 @@ exports.Modal = Modal;
 /**
  * Represents a text input component builder.
  * @example
- * const textInput = new TextInput().setLabel("Enter text");
- * textInput.setStyle(TextInputStyle.Paragraph);
- * textInput.setPlaceholder("Type here");
- * const json = textInput.toJSON();
+ * const textInput = new TextInput()
+ *   .setCustomId("feedback")
+ *   .setStyle(TextInputStyle.Paragraph)
+ *   .setPlaceholder("Type here");
+ * const label = new Label()
+ *   .setLabel("Feedback")
+ *   .setComponent(textInput);
+ * const json = label.toJSON();
  */
 class TextInput extends Base_1.BaseComponentBuilder {
     /**

package/lib/builders/Poll.js

@@ -33,6 +33,24 @@ class PollBuilder {
         return this;
     }
     toJSON() {
+        if (!this.data.question?.text && !this.data.question?.emoji)
+            throw new common_1.SeyfertError('MISSING_POLL_QUESTION', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('question to be set before calling toJSON()', this.data.question, {
+                        component: 'PollBuilder',
+                    }),
+                    detail: 'Cannot convert to JSON without a question.',
+                },
+            });
+        if (!this.data.answers?.length)
+            throw new common_1.SeyfertError('MISSING_POLL_ANSWERS', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('at least one answer to be set before calling toJSON()', this.data.answers, {
+                        component: 'PollBuilder',
+                    }),
+                    detail: 'Cannot convert to JSON without answers.',
+                },
+            });
         return { ...this.data };
     }
     resolvedPollMedia(data) {