@discordeno/rest 19.0.0-next.7a69c02 → 19.0.0-next.7b5d99e

package/dist/manager.d.ts.map

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

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, encode, getBotIdFromToken, isGetMessagesAfter, isGetMessagesAround, isGetMessagesBefore, isGetMessagesLimit, logger, processReactionString, urlToBase64 } from '@discordeno/utils';
+import { calculateBits, camelize, camelToSnakeCase, delay, 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';
@@ -754,7 +754,7 @@ export function createRestManager(options) {
             }
             return parts.join('/');
         },
-        processRequest (request) {
+        async processRequest (request) {
             const route = request.url.substring(request.url.indexOf('api/'));
             const parts = route.split('/');
             // Remove the api/
@@ -764,6 +764,10 @@ export function createRestManager(options) {
             // Set the full url to discord api in case it was recieved in a proxy rest
             request.url = `${rest.baseUrl}/v${rest.version}/${parts.join('/')}`;
             const url = rest.simplifyUrl(request.url, request.method);
+            if (request.runThroughQueue === false) {
+                await rest.sendRequest(request);
+                return;
+            }
             const queue = rest.queues.get(url);
             if (queue !== undefined) {
                 queue.makeRequest(request);
@@ -781,34 +785,7 @@ export function createRestManager(options) {
         },
         async makeRequest (method, url, options) {
             if (!rest.baseUrl.startsWith('https://discord.com') && url[0] === '/') {
-                // Special handling for sending blobs across http to proxy
-                // TODO: fix this hacky handling
-                if (!(options?.body instanceof FormData) && !Array.isArray(options?.body) && options?.body?.file) {
-                    if (!Array.isArray(options.body.file)) {
-                        options.body.file = [
-                            options.body.file
-                        ];
-                    }
-                    // convert blobs to string before sending to proxy
-                    options.body.file = await Promise.all(options.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 (options?.body) {
-                    headers['Content-Type'] = 'application/json';
-                }
-                const result = await fetch(`${rest.baseUrl}${url}`, {
-                    body: options?.body ? JSON.stringify(options.body) : undefined,
-                    headers,
-                    method
-                });
+                const result = await fetch(`${rest.baseUrl}${url}`, rest.createRequestBody(method, options));
                 if (!result.ok) {
                     const err = await result.json().catch(()=>{});
                     // Legacy Handling to not break old code or when body is missing
@@ -817,21 +794,22 @@ export function createRestManager(options) {
                 }
                 return result.status !== 204 ? await result.json() : undefined;
             }
-            return await new Promise((resolve, reject)=>{
+            return await new Promise(async (resolve, reject)=>{
                 const payload = {
                     url,
                     method,
                     requestBodyOptions: options,
                     retryCount: 0,
                     retryRequest: async function(payload) {
-                        rest.processRequest(payload);
+                        await rest.processRequest(payload);
                     },
                     resolve: (data)=>{
                         resolve(data.status !== 204 ? JSON.parse(data.body ?? '{}') : undefined);
                     },
-                    reject
+                    reject,
+                    runThroughQueue: options?.runThroughQueue
                 };
-                rest.processRequest(payload);
+                await rest.processRequest(payload);
             });
         },
         async get (url, options) {
@@ -990,7 +968,9 @@ export function createRestManager(options) {
             });
         },
         async deleteFollowupMessage (token, messageId) {
-            await rest.delete(rest.routes.interactions.responses.message(rest.applicationId, token, messageId));
+            await rest.delete(rest.routes.interactions.responses.message(rest.applicationId, token, messageId), {
+                unauthorized: true
+            });
         },
         async deleteGlobalApplicationCommand (commandId) {
             await rest.delete(rest.routes.interactions.commands.command(rest.applicationId, commandId));
@@ -1033,7 +1013,9 @@ export function createRestManager(options) {
             });
         },
         async deleteOriginalInteractionResponse (token) {
-            await rest.delete(rest.routes.interactions.responses.original(rest.applicationId, token));
+            await rest.delete(rest.routes.interactions.responses.original(rest.applicationId, token), {
+                unauthorized: true
+            });
         },
         async deleteOwnReaction (channelId, messageId, reaction) {
             reaction = processReactionString(reaction);
@@ -1125,7 +1107,8 @@ export function createRestManager(options) {
         async editFollowupMessage (token, messageId, body) {
             return await rest.patch(rest.routes.interactions.responses.message(rest.applicationId, token, messageId), {
                 body,
-                files: body.files
+                files: body.files,
+                unauthorized: true
             });
         },
         async editGlobalApplicationCommand (commandId, body) {
@@ -1180,7 +1163,8 @@ export function createRestManager(options) {
                     type: InteractionResponseTypes.UpdateMessage,
                     data: options
                 },
-                files: options.files
+                files: options.files,
+                unauthorized: true
             });
         },
         async editOwnVoiceState (guildId, options) {
@@ -1319,7 +1303,9 @@ export function createRestManager(options) {
             return await rest.get(rest.routes.guilds.emojis(guildId));
         },
         async getFollowupMessage (token, messageId) {
-            return await rest.get(rest.routes.interactions.responses.message(rest.applicationId, token, messageId));
+            return await rest.get(rest.routes.interactions.responses.message(rest.applicationId, token, messageId), {
+                unauthorized: true
+            });
         },
         async getGatewayBot () {
             return await rest.get(rest.routes.gatewayBot());
@@ -1372,7 +1358,9 @@ export function createRestManager(options) {
             return await rest.get(rest.routes.nitroStickerPacks());
         },
         async getOriginalInteractionResponse (token) {
-            return await rest.get(rest.routes.interactions.responses.original(rest.applicationId, token));
+            return await rest.get(rest.routes.interactions.responses.original(rest.applicationId, token), {
+                unauthorized: true
+            });
         },
         async getPinnedMessages (channelId) {
             return await rest.get(rest.routes.channels.pins(channelId));
@@ -1472,47 +1460,19 @@ export function createRestManager(options) {
         async removeThreadMember (channelId, userId) {
             await rest.delete(rest.routes.channels.threads.user(channelId, userId));
         },
-        // TODO: why that
         async sendFollowupMessage (token, options) {
-            return await new Promise((resolve, reject)=>{
-                rest.sendRequest({
-                    url: rest.routes.webhooks.webhook(rest.applicationId, token),
-                    method: 'POST',
-                    requestBodyOptions: {
-                        body: options,
-                        files: options.files
-                    },
-                    retryCount: 0,
-                    retryRequest: async function(options) {
-                        // TODO: should change to reprocess queue item
-                        await rest.sendRequest(options);
-                    },
-                    resolve: (data)=>{
-                        resolve(data.status !== 204 ? JSON.parse(data.body ?? '{}') : undefined);
-                    },
-                    reject
-                });
+            return await rest.post(rest.routes.webhooks.webhook(rest.applicationId, token), {
+                body: options,
+                files: options.files,
+                unauthorized: true
             });
         },
-        // TODO: why that
         async sendInteractionResponse (interactionId, token, options) {
-            await new Promise((resolve, reject)=>{
-                rest.sendRequest({
-                    url: rest.routes.interactions.responses.callback(interactionId, token),
-                    method: 'POST',
-                    requestBodyOptions: {
-                        body: options
-                    },
-                    retryCount: 0,
-                    retryRequest: async function(options) {
-                        // TODO: should change to reprocess queue item
-                        await rest.sendRequest(options);
-                    },
-                    resolve: (data)=>{
-                        resolve(data.status !== 204 ? JSON.parse(data.body ?? '{}') : undefined);
-                    },
-                    reject
-                });
+            return await rest.post(rest.routes.interactions.responses.callback(interactionId, token), {
+                body: options,
+                files: options.data?.files,
+                runThroughQueue: false,
+                unauthorized: true
             });
         },
         async sendMessage (channelId, body) {