discordeno 16.0.0 → 16.0.1

package/esm/rest/processGlobalQueue.js

@@ -53,6 +53,9 @@ export async function processGlobalQueue(rest) {
             bucketId: request.payload.bucketId,
             reject: request.request.reject,
             respond: request.request.respond,
+            retryRequest: function () {
+                rest.globalQueue.unshift(request);
+            },
             retryCount: request.payload.retryCount ?? 0,
             payload: rest.createRequestBody(rest, {
                 method: request.request.method,

package/esm/rest/sendRequest.js

@@ -1,4 +1,5 @@
 import * as dntShim from "../_dnt.shims.js";
+import { delay } from "../mod.js";
 import { HTTPResponseCodes } from "../types/shared.js";
 import { BASE_URL } from "../util/constants.js";
 export async function sendRequest(rest, options) {
@@ -62,6 +63,7 @@ export async function sendRequest(rest, options) {
                 });
             }
             else {
+                // TOO MANY ATTEMPTS, GET RID OF REQUEST FROM QUEUE.
                 if (options.retryCount && options.retryCount++ >= rest.maxRetryCount) {
                     rest.debug(`[REST - RetriesMaxed] ${JSON.stringify(options)}`);
                     // REMOVE ITEM FROM QUEUE TO PREVENT RETRY
@@ -72,6 +74,11 @@ export async function sendRequest(rest, options) {
                     });
                     // @ts-ignore Code should never reach here
                     return;
+                } // RATE LIMITED, ADD BACK TO QUEUE
+                else {
+                    const json = await response.json();
+                    await delay(json.retry_after * 1000);
+                    return options.retryRequest?.();
                 }
             }
         }

package/esm/util/constants.js

@@ -4,7 +4,7 @@ export const BASE_URL = "https://discord.com/api";
 export const API_VERSION = 10;
 // TODO: update this version
 /** https://github.com/discordeno/discordeno/releases */
-export const DISCORDENO_VERSION = "16.0.0";
+export const DISCORDENO_VERSION = "16.0.1";
 /** https://discord.com/developers/docs/reference#user-agent */
 export const USER_AGENT = `DiscordBot (https://github.com/discordeno/discordeno, v${DISCORDENO_VERSION})`;
 /** https://discord.com/developers/docs/reference#image-formatting-image-base-url */

package/package.json

@@ -3,7 +3,7 @@
   "main": "./script/mod.js",
   "types": "./types/mod.d.ts",
   "name": "discordeno",
-  "version": "16.0.0",
+  "version": "16.0.1",
   "description": "Discordeno is simplistic, easy-to-use, versatile while being efficient and lightweight.",
   "keywords": [
     "javascript",

package/script/rest/processGlobalQueue.js

@@ -79,6 +79,9 @@ async function processGlobalQueue(rest) {
             bucketId: request.payload.bucketId,
             reject: request.request.reject,
             respond: request.request.respond,
+            retryRequest: function () {
+                rest.globalQueue.unshift(request);
+            },
             retryCount: request.payload.retryCount ?? 0,
             payload: rest.createRequestBody(rest, {
                 method: request.request.method,

package/script/rest/sendRequest.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendRequest = void 0;
 const dntShim = __importStar(require("../_dnt.shims.js"));
+const mod_js_1 = require("../mod.js");
 const shared_js_1 = require("../types/shared.js");
 const constants_js_1 = require("../util/constants.js");
 async function sendRequest(rest, options) {
@@ -88,6 +89,7 @@ async function sendRequest(rest, options) {
                 });
             }
             else {
+                // TOO MANY ATTEMPTS, GET RID OF REQUEST FROM QUEUE.
                 if (options.retryCount && options.retryCount++ >= rest.maxRetryCount) {
                     rest.debug(`[REST - RetriesMaxed] ${JSON.stringify(options)}`);
                     // REMOVE ITEM FROM QUEUE TO PREVENT RETRY
@@ -98,6 +100,11 @@ async function sendRequest(rest, options) {
                     });
                     // @ts-ignore Code should never reach here
                     return;
+                } // RATE LIMITED, ADD BACK TO QUEUE
+                else {
+                    const json = await response.json();
+                    await (0, mod_js_1.delay)(json.retry_after * 1000);
+                    return options.retryRequest?.();
                 }
             }
         }

package/script/util/constants.js

@@ -7,7 +7,7 @@ exports.BASE_URL = "https://discord.com/api";
 exports.API_VERSION = 10;
 // TODO: update this version
 /** https://github.com/discordeno/discordeno/releases */
-exports.DISCORDENO_VERSION = "16.0.0";
+exports.DISCORDENO_VERSION = "16.0.1";
 /** https://discord.com/developers/docs/reference#user-agent */
 exports.USER_AGENT = `DiscordBot (https://github.com/discordeno/discordeno, v${exports.DISCORDENO_VERSION})`;
 /** https://discord.com/developers/docs/reference#image-formatting-image-base-url */

package/types/rest/sendRequest.d.ts

@@ -7,6 +7,7 @@ export interface RestSendRequestOptions {
     bucketId?: string;
     reject?: Function;
     respond?: Function;
+    retryRequest?: Function;
     retryCount?: number;
     payload?: {
         headers: Record<string, string>;

package/types/types/discord.d.ts

@@ -52,6 +52,8 @@ export interface DiscordConnection {
     visibility: VisibilityTypes;
     /** An array of partial server integrations */
     integrations?: DiscordIntegration[];
+    /** Whether this connection has a corresponding third party OAuth2 token. */
+    two_way_link: boolean;
 }
 /** https://discord.com/developers/docs/resources/user#connection-object-services */
 export declare type DiscordConnectionServices = "battlenet" | "ebay" | "epicgames" | "facebook" | "github" | "leagueoflegends" | "playstation" | "reddit" | "riotgames" | "spotify" | "skype" | "steam" | "twitch" | "twitter" | "xbox" | "youtube";

package/types/util/constants.d.ts

@@ -3,7 +3,7 @@ export declare const BASE_URL = "https://discord.com/api";
 /** https://discord.com/developers/docs/reference#api-versioning-api-versions */
 export declare const API_VERSION = 10;
 /** https://github.com/discordeno/discordeno/releases */
-export declare const DISCORDENO_VERSION = "16.0.0";
+export declare const DISCORDENO_VERSION = "16.0.1";
 /** https://discord.com/developers/docs/reference#user-agent */
 export declare const USER_AGENT: string;
 /** https://discord.com/developers/docs/reference#image-formatting-image-base-url */