@discordeno/rest 19.0.0-next.6ee061d → 19.0.0-next.6ffb584

package/dist/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAmEA,OAAO,KAAK,EAAE,wBAAwB,EAAE,WAAW,EAAsB,MAAM,YAAY,CAAA;AAK3F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,WAAW,CA2nDhF"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAqEA,OAAO,KAAK,EAAE,wBAAwB,EAAE,WAAW,EAAsB,MAAM,YAAY,CAAA;AAK3F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,WAAW,CA8qDhF"}

package/dist/manager.js

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */ /* eslint-disable no-const-assign */ import { InteractionResponseTypes } from '@discordeno/types';
-import { calculateBits, camelize, camelToSnakeCase, delay, findFiles, getBotIdFromToken, isGetMessagesAfter, isGetMessagesAround, isGetMessagesBefore, isGetMessagesLimit, logger, processReactionString, urlToBase64 } from '@discordeno/utils';
+import { calculateBits, camelize, camelToSnakeCase, delay, encode, findFiles, getBotIdFromToken, isGetMessagesAfter, isGetMessagesAround, isGetMessagesBefore, isGetMessagesLimit, logger, processReactionString, urlToBase64 } from '@discordeno/utils';
 import fetch from 'node-fetch';
 import { createInvalidRequestBucket } from './invalidBucket.js';
 import { Queue } from './queue.js';
@@ -12,7 +12,7 @@ export function createRestManager(options) {
         token: options.token,
         applicationId: options.applicationId ? BigInt(options.applicationId) : getBotIdFromToken(options.token),
         version: options.version ?? 10,
-        baseUrl: options.baseUrl ?? 'https://discord.com/api',
+        baseUrl: options.proxy?.baseUrl ?? 'https://discord.com/api',
         maxRetryCount: Infinity,
         globallyRateLimited: false,
         processingRateLimitedPaths: false,
@@ -20,6 +20,7 @@ export function createRestManager(options) {
         queues: new Map(),
         rateLimitedPaths: new Map(),
         invalidBucket: createInvalidRequestBucket({}),
+        authorization: options.proxy?.authorization,
         routes: {
             webhooks: {
                 id: (webhookId)=>{
@@ -656,8 +657,8 @@ export function createRestManager(options) {
             }
             // IF THERE IS NO REMAINING GLOBAL LIMIT, MARK IT RATE LIMITED GLOBALLY
             if (global) {
-                const retryAfter1 = headers.get('retry-after');
-                const globalReset = Date.now() + Number(retryAfter1) * 1000;
+                const retryAfter = headers.get('retry-after');
+                const globalReset = Date.now() + Number(retryAfter) * 1000;
                 //   rest.debug(
                 // `[REST = Globally Rate Limited] URL: ${url} | Global Rest: ${globalReset}`
                 //   )
@@ -713,11 +714,12 @@ export function createRestManager(options) {
                         logger.debug(`Request to ${url} exceeded the maximum allowed retries.`, 'with payload:', payload);
                         // rest.debug(`[REST - RetriesMaxed] ${JSON.stringify(options)}`)
                         // Remove item from queue to prevent retry
-                        return options.reject({
+                        options.reject({
                             ok: false,
                             status: response.status,
                             error: 'The options was rate limited and it maxed out the retries limit.'
                         });
+                        return;
                     }
                     // Rate limited, add back to queue
                     rest.invalidBucket.handleCompletedRequest(response.status, response.headers.get('X-RateLimit-Scope') === 'shared');
@@ -727,16 +729,17 @@ export function createRestManager(options) {
                     await response.json();
                     return await options.retryRequest?.(options);
                 }
-                return options.reject({
+                options.reject({
                     ok: false,
                     status: response.status,
                     body: JSON.stringify(await response.json())
                 });
+                return;
             }
             const is204 = response.status === 204;
             const json = is204 ? undefined : await response.json();
             // Discord sometimes sends no response with 204 code
-            return options.resolve({
+            options.resolve({
                 ok: true,
                 status: response.status,
                 body: JSON.stringify(json)
@@ -787,6 +790,42 @@ export function createRestManager(options) {
             }
         },
         async makeRequest (method, url, body, options) {
+            if (!rest.baseUrl.startsWith('https://discord.com') && url[0] === '/') {
+                // Special handling for sending blobs across http to proxy
+                if (body?.file) {
+                    if (!Array.isArray(body.file)) {
+                        body.file = [
+                            body.file
+                        ];
+                    }
+                    // convert blobs to string before sending to proxy
+                    body.file = await Promise.all(body.file.map(async (f)=>{
+                        const url = encode(await f.blob.arrayBuffer());
+                        return {
+                            name: f.name,
+                            blob: `data:${f.blob.type};base64,${url}`
+                        };
+                    }));
+                }
+                const headers = {
+                    Authorization: rest.authorization ?? ""
+                };
+                if (body) {
+                    headers['Content-Type'] = 'application/json';
+                }
+                const result = await fetch(`${rest.baseUrl}${url}`, {
+                    body: body ? JSON.stringify(body) : undefined,
+                    headers,
+                    method
+                });
+                if (!result.ok) {
+                    const err = await result.json().catch(()=>{});
+                    // Legacy Handling to not break old code or when body is missing
+                    if (!err?.body) throw new Error(`Error: ${err.message ?? result.statusText}`);
+                    throw new Error(JSON.stringify(err));
+                }
+                return result.status !== 204 ? await result.json() : undefined;
+            }
             return await new Promise((resolve, reject)=>{
                 const payload = {
                     url,
@@ -796,7 +835,9 @@ export function createRestManager(options) {
                     retryRequest: async function(options) {
                         rest.processRequest(payload);
                     },
-                    resolve: (data)=>resolve(data.status !== 204 ? JSON.parse(data.body ?? '{}') : undefined),
+                    resolve: (data)=>{
+                        resolve(data.status !== 204 ? JSON.parse(data.body ?? '{}') : undefined);
+                    },
                     reject,
                     options
                 };
@@ -810,7 +851,7 @@ export function createRestManager(options) {
             return camelize(await rest.makeRequest('POST', url, body));
         },
         async delete (url, body) {
-            return camelize(await rest.makeRequest('DELETE', url, body));
+            camelize(await rest.makeRequest('DELETE', url, body));
         },
         async patch (url, body) {
             return camelize(await rest.makeRequest('PATCH', url, body));
@@ -820,11 +861,13 @@ export function createRestManager(options) {
         },
         async addReaction (channelId, messageId, reaction) {
             reaction = processReactionString(reaction);
-            return await rest.put(rest.routes.channels.reactions.bot(channelId, messageId, reaction));
+            await rest.put(rest.routes.channels.reactions.bot(channelId, messageId, reaction));
         },
         async addReactions (channelId, messageId, reactions, ordered = false) {
             if (!ordered) {
-                await Promise.all(reactions.map(async (reaction)=>await rest.addReaction(channelId, messageId, reaction)));
+                await Promise.all(reactions.map(async (reaction)=>{
+                    await rest.addReaction(channelId, messageId, reaction);
+                }));
                 return;
             }
             for (const reaction of reactions){
@@ -832,12 +875,12 @@ export function createRestManager(options) {
             }
         },
         async addRole (guildId, userId, roleId, reason) {
-            return await rest.put(rest.routes.guilds.roles.member(guildId, userId, roleId), {
+            await rest.put(rest.routes.guilds.roles.member(guildId, userId, roleId), {
                 reason
             });
         },
         async addThreadMember (channelId, userId) {
-            return await rest.put(rest.routes.channels.threads.user(channelId, userId));
+            await rest.put(rest.routes.channels.threads.user(channelId, userId));
         },
         async createAutomodRule (guildId, options) {
             return await rest.post(rest.routes.guilds.automod.rules(guildId), options);
@@ -895,103 +938,103 @@ export function createRestManager(options) {
             });
         },
         async deleteAutomodRule (guildId, ruleId, reason) {
-            return await rest.delete(rest.routes.guilds.automod.rule(guildId, ruleId), {
+            await rest.delete(rest.routes.guilds.automod.rule(guildId, ruleId), {
                 reason
             });
         },
         async deleteChannel (channelId, reason) {
-            return await rest.delete(rest.routes.channels.channel(channelId), {
+            await rest.delete(rest.routes.channels.channel(channelId), {
                 reason
             });
         },
         async deleteChannelPermissionOverride (channelId, overwriteId, reason) {
-            return await rest.delete(rest.routes.channels.overwrite(channelId, overwriteId), reason ? {
+            await rest.delete(rest.routes.channels.overwrite(channelId, overwriteId), reason ? {
                 reason
             } : undefined);
         },
         async deleteEmoji (guildId, id, reason) {
-            return await rest.delete(rest.routes.guilds.emoji(guildId, id), {
+            await rest.delete(rest.routes.guilds.emoji(guildId, id), {
                 reason
             });
         },
         async deleteFollowupMessage (token, messageId) {
-            return await rest.delete(rest.routes.interactions.responses.message(rest.applicationId, token, messageId));
+            await rest.delete(rest.routes.interactions.responses.message(rest.applicationId, token, messageId));
         },
         async deleteGlobalApplicationCommand (commandId) {
-            return await rest.delete(rest.routes.interactions.commands.command(rest.applicationId, commandId));
+            await rest.delete(rest.routes.interactions.commands.command(rest.applicationId, commandId));
         },
         async deleteGuild (guildId) {
-            return await rest.delete(rest.routes.guilds.guild(guildId));
+            await rest.delete(rest.routes.guilds.guild(guildId));
         },
         async deleteGuildApplicationCommand (commandId, guildId) {
-            return await rest.delete(rest.routes.interactions.commands.guilds.one(rest.applicationId, guildId, commandId));
+            await rest.delete(rest.routes.interactions.commands.guilds.one(rest.applicationId, guildId, commandId));
         },
         async deleteGuildSticker (guildId, stickerId, reason) {
-            return await rest.delete(rest.routes.guilds.sticker(guildId, stickerId), reason ? {
+            await rest.delete(rest.routes.guilds.sticker(guildId, stickerId), reason ? {
                 reason
             } : undefined);
         },
         async deleteGuildTemplate (guildId, templateCode) {
-            return await rest.delete(rest.routes.guilds.templates.guild(guildId, templateCode));
+            await rest.delete(rest.routes.guilds.templates.guild(guildId, templateCode));
         },
         async deleteIntegration (guildId, integrationId) {
-            return await rest.delete(rest.routes.guilds.integration(guildId, integrationId));
+            await rest.delete(rest.routes.guilds.integration(guildId, integrationId));
         },
         async deleteInvite (inviteCode, reason) {
-            return await rest.delete(rest.routes.guilds.invite(inviteCode), reason ? {
+            await rest.delete(rest.routes.guilds.invite(inviteCode), reason ? {
                 reason
             } : undefined);
         },
         async deleteMessage (channelId, messageId, reason) {
-            return await rest.delete(rest.routes.channels.message(channelId, messageId), {
+            await rest.delete(rest.routes.channels.message(channelId, messageId), {
                 reason
             });
         },
         async deleteMessages (channelId, messageIds, reason) {
-            return await rest.post(rest.routes.channels.bulk(channelId), {
+            await rest.post(rest.routes.channels.bulk(channelId), {
                 messages: messageIds.slice(0, 100).map((id)=>id.toString()),
                 reason
             });
         },
         async deleteOriginalInteractionResponse (token) {
-            return await rest.delete(rest.routes.interactions.responses.original(rest.applicationId, token));
+            await rest.delete(rest.routes.interactions.responses.original(rest.applicationId, token));
         },
         async deleteOwnReaction (channelId, messageId, reaction) {
             reaction = processReactionString(reaction);
-            return await rest.delete(rest.routes.channels.reactions.bot(channelId, messageId, reaction));
+            await rest.delete(rest.routes.channels.reactions.bot(channelId, messageId, reaction));
         },
         async deleteReactionsAll (channelId, messageId) {
-            return await rest.delete(rest.routes.channels.reactions.all(channelId, messageId));
+            await rest.delete(rest.routes.channels.reactions.all(channelId, messageId));
         },
         async deleteReactionsEmoji (channelId, messageId, reaction) {
             reaction = processReactionString(reaction);
-            return await rest.delete(rest.routes.channels.reactions.emoji(channelId, messageId, reaction));
+            await rest.delete(rest.routes.channels.reactions.emoji(channelId, messageId, reaction));
         },
         async deleteRole (guildId, roleId) {
-            return await rest.delete(rest.routes.guilds.roles.one(guildId, roleId));
+            await rest.delete(rest.routes.guilds.roles.one(guildId, roleId));
         },
         async deleteScheduledEvent (guildId, eventId) {
-            return await rest.delete(rest.routes.guilds.events.event(guildId, eventId));
+            await rest.delete(rest.routes.guilds.events.event(guildId, eventId));
         },
         async deleteStageInstance (channelId, reason) {
-            return await rest.delete(rest.routes.channels.stage(channelId), reason ? {
+            await rest.delete(rest.routes.channels.stage(channelId), reason ? {
                 reason
             } : undefined);
         },
         async deleteUserReaction (channelId, messageId, userId, reaction) {
             reaction = processReactionString(reaction);
-            return await rest.delete(rest.routes.channels.reactions.user(channelId, messageId, reaction, userId));
+            await rest.delete(rest.routes.channels.reactions.user(channelId, messageId, reaction, userId));
         },
         async deleteWebhook (webhookId, reason) {
-            return await rest.delete(rest.routes.webhooks.id(webhookId), {
+            await rest.delete(rest.routes.webhooks.id(webhookId), {
                 reason
             });
         },
         async deleteWebhookMessage (webhookId, token, messageId, options) {
-            return await rest.delete(rest.routes.webhooks.message(webhookId, token, messageId, options));
+            await rest.delete(rest.routes.webhooks.message(webhookId, token, messageId, options));
         },
         async deleteWebhookWithToken (webhookId, token) {
-            return await rest.delete(rest.routes.webhooks.webhook(webhookId, token));
+            await rest.delete(rest.routes.webhooks.webhook(webhookId, token));
         },
         async editApplicationCommandPermissions (guildId, commandId, bearerToken, options) {
             return await rest.put(rest.routes.interactions.commands.permission(rest.applicationId, guildId, commandId), {
@@ -1016,10 +1059,10 @@ export function createRestManager(options) {
             return await rest.patch(rest.routes.channels.channel(channelId), options);
         },
         async editChannelPermissionOverrides (channelId, options) {
-            return await rest.put(rest.routes.channels.overwrite(channelId, options.id), options);
+            await rest.put(rest.routes.channels.overwrite(channelId, options.id), options);
         },
         async editChannelPositions (guildId, channelPositions) {
-            return await rest.patch(rest.routes.guilds.channels(guildId), channelPositions);
+            await rest.patch(rest.routes.guilds.channels(guildId), channelPositions);
         },
         async editEmoji (guildId, id, options) {
             return await rest.patch(rest.routes.guilds.emoji(guildId, id), options);
@@ -1037,7 +1080,7 @@ export function createRestManager(options) {
             return await rest.patch(rest.routes.interactions.commands.guilds.one(rest.applicationId, guildId, commandId), options);
         },
         async editGuildMfaLevel (guildId, mfaLevel, reason) {
-            return await rest.post(rest.routes.guilds.mfa(guildId), {
+            await rest.post(rest.routes.guilds.mfa(guildId), {
                 level: mfaLevel,
                 reason
             });
@@ -1061,7 +1104,7 @@ export function createRestManager(options) {
             });
         },
         async editOwnVoiceState (guildId, options) {
-            return await rest.patch(rest.routes.guilds.voice(guildId), {
+            await rest.patch(rest.routes.guilds.voice(guildId), {
                 channel_id: options.channelId,
                 suppress: options.suppress,
                 request_to_speak_timestamp: options.requestToSpeakTimestamp ? new Date(options.requestToSpeakTimestamp).toISOString() : options.requestToSpeakTimestamp
@@ -1082,7 +1125,7 @@ export function createRestManager(options) {
             });
         },
         async editUserVoiceState (guildId, options) {
-            return await rest.patch(rest.routes.guilds.voice(guildId, options.userId), {
+            await rest.patch(rest.routes.guilds.voice(guildId, options.userId), {
                 channel_id: options.channelId,
                 suppress: options.suppress,
                 user_id: options.userId
@@ -1299,24 +1342,24 @@ export function createRestManager(options) {
             return await rest.get(rest.routes.guilds.widget(guildId));
         },
         async joinThread (channelId) {
-            return await rest.put(rest.routes.channels.threads.me(channelId));
+            await rest.put(rest.routes.channels.threads.me(channelId));
         },
         async leaveGuild (guildId) {
-            return await rest.delete(rest.routes.guilds.leave(guildId));
+            await rest.delete(rest.routes.guilds.leave(guildId));
         },
         async leaveThread (channelId) {
-            return await rest.delete(rest.routes.channels.threads.me(channelId));
+            await rest.delete(rest.routes.channels.threads.me(channelId));
         },
         async publishMessage (channelId, messageId) {
             return await rest.post(rest.routes.channels.crosspost(channelId, messageId));
         },
         async removeRole (guildId, userId, roleId, reason) {
-            return await rest.delete(rest.routes.guilds.roles.member(guildId, userId, roleId), {
+            await rest.delete(rest.routes.guilds.roles.member(guildId, userId, roleId), {
                 reason
             });
         },
         async removeThreadMember (channelId, userId) {
-            return await rest.delete(rest.routes.channels.threads.user(channelId, userId));
+            await rest.delete(rest.routes.channels.threads.user(channelId, userId));
         },
         async sendFollowupMessage (token, options) {
             return await new Promise((resolve, reject)=>{
@@ -1329,13 +1372,15 @@ export function createRestManager(options) {
                         // TODO: should change to reprocess queue item
                         await rest.sendRequest(options);
                     },
-                    resolve: (data)=>resolve(data.status !== 204 ? JSON.parse(data.body ?? '{}') : undefined),
+                    resolve: (data)=>{
+                        resolve(data.status !== 204 ? JSON.parse(data.body ?? '{}') : undefined);
+                    },
                     reject
                 });
             });
         },
         async sendInteractionResponse (interactionId, token, options) {
-            return await new Promise((resolve, reject)=>{
+            await new Promise((resolve, reject)=>{
                 rest.sendRequest({
                     url: rest.routes.interactions.responses.callback(interactionId, token),
                     method: 'POST',
@@ -1345,7 +1390,9 @@ export function createRestManager(options) {
                         // TODO: should change to reprocess queue item
                         await rest.sendRequest(options);
                     },
-                    resolve: (data)=>resolve(data.status !== 204 ? JSON.parse(data.body ?? '{}') : undefined),
+                    resolve: (data)=>{
+                        resolve(data.status !== 204 ? JSON.parse(data.body ?? '{}') : undefined);
+                    },
                     reject
                 });
             });
@@ -1363,7 +1410,7 @@ export function createRestManager(options) {
             return await rest.put(rest.routes.guilds.templates.all(guildId));
         },
         async banMember (guildId, userId, options) {
-            return await rest.put(rest.routes.guilds.members.ban(guildId, userId), options);
+            await rest.put(rest.routes.guilds.members.ban(guildId, userId), options);
         },
         async editBotMember (guildId, options) {
             return await rest.patch(rest.routes.guilds.members.bot(guildId), options);
@@ -1378,12 +1425,12 @@ export function createRestManager(options) {
             return await rest.get(rest.routes.guilds.members.members(guildId, options));
         },
         async kickMember (guildId, userId, reason) {
-            return await rest.delete(rest.routes.guilds.members.member(guildId, userId), {
+            await rest.delete(rest.routes.guilds.members.member(guildId, userId), {
                 reason
             });
         },
         async pinMessage (channelId, messageId, reason) {
-            return await rest.put(rest.routes.channels.pin(channelId, messageId), reason ? {
+            await rest.put(rest.routes.channels.pin(channelId, messageId), reason ? {
                 reason
             } : undefined);
         },
@@ -1394,15 +1441,15 @@ export function createRestManager(options) {
             return await rest.get(rest.routes.guilds.members.search(guildId, query, options));
         },
         async unbanMember (guildId, userId) {
-            return await rest.delete(rest.routes.guilds.members.ban(guildId, userId));
+            await rest.delete(rest.routes.guilds.members.ban(guildId, userId));
         },
         async unpinMessage (channelId, messageId, reason) {
-            return await rest.delete(rest.routes.channels.pin(channelId, messageId), reason ? {
+            await rest.delete(rest.routes.channels.pin(channelId, messageId), reason ? {
                 reason
             } : undefined);
         },
         async triggerTypingIndicator (channelId) {
-            return await rest.post(rest.routes.channels.typing(channelId));
+            await rest.post(rest.routes.channels.typing(channelId));
         },
         async upsertGlobalApplicationCommands (commands) {
             return await rest.put(rest.routes.interactions.commands.commands(rest.applicationId), commands);